diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index e5f0624a8c..d0b8bb94ba 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -8,11 +8,15 @@ on:
       - main
       - next
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     name: lint
     runs-on: ubuntu-latest
-    
+    timeout-minutes: 5
 
     steps:
       - uses: actions/checkout@v4
@@ -22,14 +26,34 @@ jobs:
         with:
           node-version: '18'
 
-      - name: Install dependencies
-        run: yarn install
+      - name: Bootstrap
+        run: ./scripts/bootstrap
 
       - name: Check types
         run: ./scripts/lint
+
+  build:
+    name: build
+    runs-on: ubuntu-latest
+    
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Set up Node
+        uses: actions/setup-node@v4
+        with:
+          node-version: '18'
+
+      - name: Bootstrap
+        run: ./scripts/bootstrap
+
+      - name: Check build
+        run: ./scripts/build
   test:
     name: test
     runs-on: ubuntu-latest
+    timeout-minutes: 10
 
     steps:
       - uses: actions/checkout@v4
@@ -47,6 +71,7 @@ jobs:
   examples:
     name: examples
     runs-on: ubuntu-latest
+    timeout-minutes: 5
 
     steps:
       - uses: actions/checkout@v4
@@ -59,10 +84,10 @@ jobs:
         run: |
           yarn install
 
-      - env: 
+      - env:
           CLOUDFLARE_ACCOUNT_ID: f037e56e89293a057740de681ac9abbe
           CLOUDFLARE_EMAIL: terraform-acceptance-test@cfapi.net
           CLOUDFLARE_ZONE_ID: 0da42c8d2132a9ddaf714f9e7c92011
           CLOUDFLARE_API_KEY: ${{ secrets.CLOUDFLARE_API_KEY }}
         run: |
-            yarn tsn ./examples/workers/ai/demo.ts
+            yarn tsn ./examples/ai/demo.ts
diff --git a/.github/workflows/release-doctor.yml b/.github/workflows/release-doctor.yml
index 3008e5bc96..962bb2a13c 100644
--- a/.github/workflows/release-doctor.yml
+++ b/.github/workflows/release-doctor.yml
@@ -1,12 +1,19 @@
 name: Release Doctor
 on:
   pull_request:
+    branches:
+      - main
   workflow_dispatch:
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   release_doctor:
     name: release doctor
     runs-on: ubuntu-latest
+    timeout-minutes: 2
     if: github.repository == 'cloudflare/cloudflare-typescript' && (github.event_name == 'push' || github.event_name == 'workflow_dispatch' || startsWith(github.head_ref, 'release-please') || github.head_ref == 'next')
 
     steps:
@@ -17,3 +24,4 @@ jobs:
           bash ./bin/check-release-environment
         env:
           NPM_TOKEN: ${{ secrets.CLOUDFLARE_NPM_TOKEN || secrets.NPM_TOKEN }}
+
diff --git a/.github/workflows/semgrep.yml b/.github/workflows/semgrep.yml
new file mode 100644
index 0000000000..788c64e100
--- /dev/null
+++ b/.github/workflows/semgrep.yml
@@ -0,0 +1,19 @@
+on:
+  workflow_dispatch: {}
+  schedule:
+    - cron: '0 4 * * *'
+name: Semgrep config
+jobs:
+  semgrep:
+    name: semgrep/ci
+    runs-on: ubuntu-latest
+    env:
+      SEMGREP_APP_TOKEN: ${{ secrets.SEMGREP_APP_TOKEN }}
+      SEMGREP_URL: https://cloudflare.semgrep.dev
+      SEMGREP_APP_URL: https://cloudflare.semgrep.dev
+      SEMGREP_VERSION_CHECK_URL: https://cloudflare.semgrep.dev/api/check-version
+    container:
+      image: semgrep/semgrep
+    steps:
+      - uses: actions/checkout@v4
+      - run: semgrep ci
diff --git a/.gitignore b/.gitignore
index 3eed6ddf26..d98d51a880 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@ yarn-error.log
 codegen.log
 Brewfile.lock.json
 dist
-/deno
+dist-deno
 /*.tgz
 .idea/
 
diff --git a/.release-please-manifest.json b/.release-please-manifest.json
index 3cf104e936..e6f877563b 100644
--- a/.release-please-manifest.json
+++ b/.release-please-manifest.json
@@ -1,3 +1,3 @@
 {
-  ".": "3.5.0"
+  ".": "4.0.0"
 }
diff --git a/.stats.yml b/.stats.yml
index 21a17687b3..e8e51bfa08 100644
--- a/.stats.yml
+++ b/.stats.yml
@@ -1,2 +1,2 @@
-configured_endpoints: 1256
-openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-923d8c7667b68c786e6c026c4f4851798943c7d68ea055c0043d9253413c5847.yml
+configured_endpoints: 1493
+openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/cloudflare%2Fcloudflare-292d86018649794a0921751cee7162cb618358a55576fe9e18995601ad7484cc.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bce03e7dc6..1852244cca 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,260 @@
 # Changelog
 
+## 4.0.0 (2025-01-14)
+
+Full Changelog: [v3.5.0...v4.0.0](https://github.com/cloudflare/cloudflare-typescript/compare/v3.5.0...v4.0.0)
+
+### ⚠ BREAKING CHANGES
+
+* **addressing:** reshuffle relationship in the namespace to align with the product ([#2290](https://github.com/cloudflare/cloudflare-typescript/issues/2290))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2279](https://github.com/cloudflare/cloudflare-typescript/issues/2279))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2278](https://github.com/cloudflare/cloudflare-typescript/issues/2278))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2277](https://github.com/cloudflare/cloudflare-typescript/issues/2277))
+* **loa_documents:** move download subresource into parent as `get` ([#2274](https://github.com/cloudflare/cloudflare-typescript/issues/2274))
+* **addressing:** move service bindings to dedicated namespace  ([#2273](https://github.com/cloudflare/cloudflare-typescript/issues/2273))
+* **ai:** move to dedicated namespace ([#2241](https://github.com/cloudflare/cloudflare-typescript/issues/2241))
+* **kv:** move analytics under existing namespace ([#2212](https://github.com/cloudflare/cloudflare-typescript/issues/2212))
+* **zone_transfers:** move under DNS namespace ([#2208](https://github.com/cloudflare/cloudflare-typescript/issues/2208))
+* **dnssec:** move under DNS namespace ([#2207](https://github.com/cloudflare/cloudflare-typescript/issues/2207))
+* **url_scanner:** swap all methods to be v2 only ([#2206](https://github.com/cloudflare/cloudflare-typescript/issues/2206))
+* **warp_connector:** move under zero trust namespace ([#2195](https://github.com/cloudflare/cloudflare-typescript/issues/2195))
+* **calls:** split turn and sfu apps ([#2099](https://github.com/cloudflare/cloudflare-typescript/issues/2099))
+
+### Features
+
+* **addressing:** move service bindings to dedicated namespace  ([#2273](https://github.com/cloudflare/cloudflare-typescript/issues/2273)) ([66e2a04](https://github.com/cloudflare/cloudflare-typescript/commit/66e2a040bff49a0397715999b1b6f9260f1da582))
+* **addressing:** reshuffle relationship in the namespace to align with the product ([#2290](https://github.com/cloudflare/cloudflare-typescript/issues/2290)) ([af68b5d](https://github.com/cloudflare/cloudflare-typescript/commit/af68b5d6c53c7505a70eaf09fef8fb5ef741b50f))
+* **ai:** add support for search endpoints and finetunes ([#2275](https://github.com/cloudflare/cloudflare-typescript/issues/2275)) ([7cbefee](https://github.com/cloudflare/cloudflare-typescript/commit/7cbefee616dedd3e84f419a3fe6c6353e5a470c9))
+* **ai:** move AI back to dedicated namespace ([#2246](https://github.com/cloudflare/cloudflare-typescript/issues/2246)) ([ef18a36](https://github.com/cloudflare/cloudflare-typescript/commit/ef18a366b445ee32e54c03be3587564632c10ac7))
+* **ai:** move to dedicated namespace ([#2241](https://github.com/cloudflare/cloudflare-typescript/issues/2241)) ([0e5231b](https://github.com/cloudflare/cloudflare-typescript/commit/0e5231b6d1c4b80970f4fc6079f3351eea4e7c67))
+* **api:** add more path mappings ([#2153](https://github.com/cloudflare/cloudflare-typescript/issues/2153)) ([f95f175](https://github.com/cloudflare/cloudflare-typescript/commit/f95f175ffcb2497b19a8492b19793eabba6a1c99))
+* **api:** Add new Aegis zone setting ([#2287](https://github.com/cloudflare/cloudflare-typescript/issues/2287)) ([fc1c802](https://github.com/cloudflare/cloudflare-typescript/commit/fc1c802de1ec0a3ff7400165b87823b2e0ce25a2))
+* **api:** Add PATCH zone hold update method ([#2240](https://github.com/cloudflare/cloudflare-typescript/issues/2240)) ([bf162ce](https://github.com/cloudflare/cloudflare-typescript/commit/bf162cec406c7d185f74af7d6ce8cface973180c))
+* **api:** api shield operations updates; rename discovery resource ([#2263](https://github.com/cloudflare/cloudflare-typescript/issues/2263)) ([6053b14](https://github.com/cloudflare/cloudflare-typescript/commit/6053b148fb85adebc899b5ad5554df20d145f271))
+* **api:** api update ([#2095](https://github.com/cloudflare/cloudflare-typescript/issues/2095)) ([8bc3925](https://github.com/cloudflare/cloudflare-typescript/commit/8bc392544ec12a3964aabb911291bf9bb0a5f33e))
+* **api:** api update ([#2096](https://github.com/cloudflare/cloudflare-typescript/issues/2096)) ([2ad4904](https://github.com/cloudflare/cloudflare-typescript/commit/2ad49043944539bcb751db428795dc0e1e5c33ab))
+* **api:** api update ([#2097](https://github.com/cloudflare/cloudflare-typescript/issues/2097)) ([7b27dc1](https://github.com/cloudflare/cloudflare-typescript/commit/7b27dc1a2928cf011b699156087f6104a89de20e))
+* **api:** api update ([#2098](https://github.com/cloudflare/cloudflare-typescript/issues/2098)) ([6c37a3e](https://github.com/cloudflare/cloudflare-typescript/commit/6c37a3e9b1f171a3fbad896235f5a2811923c72a))
+* **api:** api update ([#2102](https://github.com/cloudflare/cloudflare-typescript/issues/2102)) ([0317db2](https://github.com/cloudflare/cloudflare-typescript/commit/0317db201085ceee4e68f17b3551cd3a86367b25))
+* **api:** api update ([#2103](https://github.com/cloudflare/cloudflare-typescript/issues/2103)) ([a76563d](https://github.com/cloudflare/cloudflare-typescript/commit/a76563de2ae6f91306fae6e5fe22ae92c31c47ad))
+* **api:** api update ([#2104](https://github.com/cloudflare/cloudflare-typescript/issues/2104)) ([93ce20e](https://github.com/cloudflare/cloudflare-typescript/commit/93ce20e267c372ee3fd769abd892065015e21044))
+* **api:** api update ([#2105](https://github.com/cloudflare/cloudflare-typescript/issues/2105)) ([ad74309](https://github.com/cloudflare/cloudflare-typescript/commit/ad7430908b4bb1d61d28abeef8fdbe5b7988f523))
+* **api:** api update ([#2106](https://github.com/cloudflare/cloudflare-typescript/issues/2106)) ([2330530](https://github.com/cloudflare/cloudflare-typescript/commit/2330530af838d1e1a501676c937f78faf6265061))
+* **api:** api update ([#2108](https://github.com/cloudflare/cloudflare-typescript/issues/2108)) ([5bef56e](https://github.com/cloudflare/cloudflare-typescript/commit/5bef56e6c6d3d7c017f4c60092316446f755b478))
+* **api:** api update ([#2109](https://github.com/cloudflare/cloudflare-typescript/issues/2109)) ([04903fe](https://github.com/cloudflare/cloudflare-typescript/commit/04903fe5bc76122f3e0651c15759df9a65581f79))
+* **api:** api update ([#2111](https://github.com/cloudflare/cloudflare-typescript/issues/2111)) ([ead76b8](https://github.com/cloudflare/cloudflare-typescript/commit/ead76b842b4023a21dbae99182a581cd45063a73))
+* **api:** api update ([#2112](https://github.com/cloudflare/cloudflare-typescript/issues/2112)) ([67cd748](https://github.com/cloudflare/cloudflare-typescript/commit/67cd7482e7bb4af84417c6d619a444da434056b5))
+* **api:** api update ([#2113](https://github.com/cloudflare/cloudflare-typescript/issues/2113)) ([b1749ec](https://github.com/cloudflare/cloudflare-typescript/commit/b1749ec548855fa6714756b244062b45a0755c60))
+* **api:** api update ([#2114](https://github.com/cloudflare/cloudflare-typescript/issues/2114)) ([1fe3d47](https://github.com/cloudflare/cloudflare-typescript/commit/1fe3d47a07d878fc75805b6f99454303c0f38163))
+* **api:** api update ([#2115](https://github.com/cloudflare/cloudflare-typescript/issues/2115)) ([a0555ed](https://github.com/cloudflare/cloudflare-typescript/commit/a0555edfa67022c8a3e45d6003c2b4495cbc7dad))
+* **api:** api update ([#2119](https://github.com/cloudflare/cloudflare-typescript/issues/2119)) ([a31ec78](https://github.com/cloudflare/cloudflare-typescript/commit/a31ec788e5a2f2b253204b10da3789310dbec0eb))
+* **api:** api update ([#2120](https://github.com/cloudflare/cloudflare-typescript/issues/2120)) ([55849b2](https://github.com/cloudflare/cloudflare-typescript/commit/55849b2667173ad22825cba28fa9bb3f74a261d0))
+* **api:** api update ([#2121](https://github.com/cloudflare/cloudflare-typescript/issues/2121)) ([c34e30a](https://github.com/cloudflare/cloudflare-typescript/commit/c34e30a31c4414ae5bfb9e9eee49b4326f439477))
+* **api:** api update ([#2123](https://github.com/cloudflare/cloudflare-typescript/issues/2123)) ([9911931](https://github.com/cloudflare/cloudflare-typescript/commit/9911931cf80c8a5c75ff84f83c12188e7f41e70d))
+* **api:** api update ([#2124](https://github.com/cloudflare/cloudflare-typescript/issues/2124)) ([025572d](https://github.com/cloudflare/cloudflare-typescript/commit/025572dae0a7206b2032c01f9bcd259d925ad961))
+* **api:** api update ([#2125](https://github.com/cloudflare/cloudflare-typescript/issues/2125)) ([b126dd9](https://github.com/cloudflare/cloudflare-typescript/commit/b126dd9c3cdbbe94066f7591370aefa3b2d67e44))
+* **api:** api update ([#2126](https://github.com/cloudflare/cloudflare-typescript/issues/2126)) ([93b93d8](https://github.com/cloudflare/cloudflare-typescript/commit/93b93d87d5a11301a9ce16a06cded6b6c42d0d80))
+* **api:** api update ([#2127](https://github.com/cloudflare/cloudflare-typescript/issues/2127)) ([c5ec717](https://github.com/cloudflare/cloudflare-typescript/commit/c5ec71794dcd90fb56470e355da2f7b20ab252cd))
+* **api:** api update ([#2128](https://github.com/cloudflare/cloudflare-typescript/issues/2128)) ([62b07b5](https://github.com/cloudflare/cloudflare-typescript/commit/62b07b5289c1a9d14174297435c6fcb1c8a375c7))
+* **api:** api update ([#2129](https://github.com/cloudflare/cloudflare-typescript/issues/2129)) ([7f1d762](https://github.com/cloudflare/cloudflare-typescript/commit/7f1d76242102bdceb4e3f7036d9b9439a79a27ee))
+* **api:** api update ([#2137](https://github.com/cloudflare/cloudflare-typescript/issues/2137)) ([a24a64d](https://github.com/cloudflare/cloudflare-typescript/commit/a24a64d25ec71027b6534d50d64ec611b7212f30))
+* **api:** api update ([#2138](https://github.com/cloudflare/cloudflare-typescript/issues/2138)) ([caa573c](https://github.com/cloudflare/cloudflare-typescript/commit/caa573cd76416f43307ab0755badc0bac1f00344))
+* **api:** api update ([#2139](https://github.com/cloudflare/cloudflare-typescript/issues/2139)) ([07e6bab](https://github.com/cloudflare/cloudflare-typescript/commit/07e6bab18d2df7de22ca8f3de79ef28c56e9b91b))
+* **api:** api update ([#2140](https://github.com/cloudflare/cloudflare-typescript/issues/2140)) ([1db4f06](https://github.com/cloudflare/cloudflare-typescript/commit/1db4f06d6ad838b8a915293c97f3a24971dc1c32))
+* **api:** api update ([#2141](https://github.com/cloudflare/cloudflare-typescript/issues/2141)) ([1ecdef9](https://github.com/cloudflare/cloudflare-typescript/commit/1ecdef9eda66fa5070513a8e30442879752b94fc))
+* **api:** api update ([#2144](https://github.com/cloudflare/cloudflare-typescript/issues/2144)) ([a7d7b34](https://github.com/cloudflare/cloudflare-typescript/commit/a7d7b343874d9e3f7c122c2866a746f5fc1baee7))
+* **api:** api update ([#2145](https://github.com/cloudflare/cloudflare-typescript/issues/2145)) ([d1f8295](https://github.com/cloudflare/cloudflare-typescript/commit/d1f8295950ff5ba92e54d727d3cc5f691f0ebec0))
+* **api:** api update ([#2146](https://github.com/cloudflare/cloudflare-typescript/issues/2146)) ([d5ed817](https://github.com/cloudflare/cloudflare-typescript/commit/d5ed817382a6cc0a6378af3c96fdac3deefc0df1))
+* **api:** api update ([#2147](https://github.com/cloudflare/cloudflare-typescript/issues/2147)) ([f100cae](https://github.com/cloudflare/cloudflare-typescript/commit/f100cae808c594f9b8d8dcf7b519bbed7c346d64))
+* **api:** api update ([#2148](https://github.com/cloudflare/cloudflare-typescript/issues/2148)) ([9fe68a6](https://github.com/cloudflare/cloudflare-typescript/commit/9fe68a6d9052a5813bc4a7691d41d7bf4a4dddc3))
+* **api:** api update ([#2149](https://github.com/cloudflare/cloudflare-typescript/issues/2149)) ([5e25c9c](https://github.com/cloudflare/cloudflare-typescript/commit/5e25c9c0287d54c3e10cbd5c5b2390bf59adfced))
+* **api:** api update ([#2150](https://github.com/cloudflare/cloudflare-typescript/issues/2150)) ([21e5e4e](https://github.com/cloudflare/cloudflare-typescript/commit/21e5e4e67390ac197d707d9a3efa1d4598babf10))
+* **api:** api update ([#2151](https://github.com/cloudflare/cloudflare-typescript/issues/2151)) ([9d4ff30](https://github.com/cloudflare/cloudflare-typescript/commit/9d4ff30b0e92a80e81a6b6c6fa84a6567614878b))
+* **api:** api update ([#2152](https://github.com/cloudflare/cloudflare-typescript/issues/2152)) ([0075dd0](https://github.com/cloudflare/cloudflare-typescript/commit/0075dd01853dcc8bc278de4057ba3ffdd2d4d5f5))
+* **api:** api update ([#2157](https://github.com/cloudflare/cloudflare-typescript/issues/2157)) ([3489fce](https://github.com/cloudflare/cloudflare-typescript/commit/3489fce6c48a09a711bc08b3312d6aaa2a422c68))
+* **api:** api update ([#2158](https://github.com/cloudflare/cloudflare-typescript/issues/2158)) ([47c824c](https://github.com/cloudflare/cloudflare-typescript/commit/47c824cc196036b5c63e0bf4baef2b4076c7714e))
+* **api:** api update ([#2160](https://github.com/cloudflare/cloudflare-typescript/issues/2160)) ([1eff626](https://github.com/cloudflare/cloudflare-typescript/commit/1eff626c981e9a70ebeb94590bb8033ec1dbc566))
+* **api:** api update ([#2163](https://github.com/cloudflare/cloudflare-typescript/issues/2163)) ([bae2265](https://github.com/cloudflare/cloudflare-typescript/commit/bae226583ac0dce0422e6d1484b1080b646c3032))
+* **api:** api update ([#2179](https://github.com/cloudflare/cloudflare-typescript/issues/2179)) ([964ff22](https://github.com/cloudflare/cloudflare-typescript/commit/964ff223fd10fe6ea8c2be608de997bb27a7e903))
+* **api:** api update ([#2180](https://github.com/cloudflare/cloudflare-typescript/issues/2180)) ([6c95adf](https://github.com/cloudflare/cloudflare-typescript/commit/6c95adfbbc2ad0d3563294bebb5fa43816e71c49))
+* **api:** api update ([#2181](https://github.com/cloudflare/cloudflare-typescript/issues/2181)) ([56305fb](https://github.com/cloudflare/cloudflare-typescript/commit/56305fb2175d8bc4cf7c6304cf73acd1a26f57c3))
+* **api:** api update ([#2182](https://github.com/cloudflare/cloudflare-typescript/issues/2182)) ([15378ee](https://github.com/cloudflare/cloudflare-typescript/commit/15378ee10b70ad01db5e38dd420a6cde3febda04))
+* **api:** api update ([#2183](https://github.com/cloudflare/cloudflare-typescript/issues/2183)) ([0e498f7](https://github.com/cloudflare/cloudflare-typescript/commit/0e498f7163d4869553e4450e06a2de3896ed5abf))
+* **api:** api update ([#2184](https://github.com/cloudflare/cloudflare-typescript/issues/2184)) ([d01a09e](https://github.com/cloudflare/cloudflare-typescript/commit/d01a09e71a91df3ea12a27ce78ca7da266b2990c))
+* **api:** api update ([#2185](https://github.com/cloudflare/cloudflare-typescript/issues/2185)) ([5c1b4a0](https://github.com/cloudflare/cloudflare-typescript/commit/5c1b4a0b3e476620aa24d09a1bc5ce2732014554))
+* **api:** api update ([#2187](https://github.com/cloudflare/cloudflare-typescript/issues/2187)) ([3bbb4be](https://github.com/cloudflare/cloudflare-typescript/commit/3bbb4bebdd8e7ceae9f7cc785de442e4c7556328))
+* **api:** api update ([#2188](https://github.com/cloudflare/cloudflare-typescript/issues/2188)) ([ce27401](https://github.com/cloudflare/cloudflare-typescript/commit/ce27401acf3ade16bf02582c5cb289e06606b838))
+* **api:** api update ([#2191](https://github.com/cloudflare/cloudflare-typescript/issues/2191)) ([7530379](https://github.com/cloudflare/cloudflare-typescript/commit/7530379d6e97dc309971ac859e129b1867b61922))
+* **api:** api update ([#2192](https://github.com/cloudflare/cloudflare-typescript/issues/2192)) ([92cf869](https://github.com/cloudflare/cloudflare-typescript/commit/92cf869b2df4cd13a86db7a471b9760352053839))
+* **api:** api update ([#2193](https://github.com/cloudflare/cloudflare-typescript/issues/2193)) ([c5e0d4d](https://github.com/cloudflare/cloudflare-typescript/commit/c5e0d4d1b62e53dc3ab07c979a7bd70968a2e34d))
+* **api:** api update ([#2194](https://github.com/cloudflare/cloudflare-typescript/issues/2194)) ([84d580a](https://github.com/cloudflare/cloudflare-typescript/commit/84d580ae686bf18f30691462452831f042557d74))
+* **api:** api update ([#2197](https://github.com/cloudflare/cloudflare-typescript/issues/2197)) ([139259d](https://github.com/cloudflare/cloudflare-typescript/commit/139259d0a16fe4a2220b0729b2e21d409b47bbd3))
+* **api:** api update ([#2198](https://github.com/cloudflare/cloudflare-typescript/issues/2198)) ([8c26eb4](https://github.com/cloudflare/cloudflare-typescript/commit/8c26eb46e73c0cc2d8e5961883a4e426ac1df78b))
+* **api:** api update ([#2203](https://github.com/cloudflare/cloudflare-typescript/issues/2203)) ([03b1587](https://github.com/cloudflare/cloudflare-typescript/commit/03b158733008ae76996b55e99f7f2ab8bf410e56))
+* **api:** api update ([#2210](https://github.com/cloudflare/cloudflare-typescript/issues/2210)) ([cb517eb](https://github.com/cloudflare/cloudflare-typescript/commit/cb517eb320764fa65f71abe38c4d3fb045bf9cad))
+* **api:** api update ([#2211](https://github.com/cloudflare/cloudflare-typescript/issues/2211)) ([0e7c5d2](https://github.com/cloudflare/cloudflare-typescript/commit/0e7c5d2c4f18179ce18b9ef73e98ac36d173ab71))
+* **api:** api update ([#2214](https://github.com/cloudflare/cloudflare-typescript/issues/2214)) ([6cd6861](https://github.com/cloudflare/cloudflare-typescript/commit/6cd6861c8313bfd9d9ce8a54b8255c3f08ad414a))
+* **api:** api update ([#2215](https://github.com/cloudflare/cloudflare-typescript/issues/2215)) ([e5b8bff](https://github.com/cloudflare/cloudflare-typescript/commit/e5b8bffcc4a641555ba2731aeb6be43caca0f22e))
+* **api:** api update ([#2216](https://github.com/cloudflare/cloudflare-typescript/issues/2216)) ([72247d2](https://github.com/cloudflare/cloudflare-typescript/commit/72247d2032c9213ae1baa4df0c2d51c45a40d4d1))
+* **api:** api update ([#2217](https://github.com/cloudflare/cloudflare-typescript/issues/2217)) ([d0a4299](https://github.com/cloudflare/cloudflare-typescript/commit/d0a4299ff2576c993804224aa2db982fc71f24ae))
+* **api:** api update ([#2219](https://github.com/cloudflare/cloudflare-typescript/issues/2219)) ([c75fe51](https://github.com/cloudflare/cloudflare-typescript/commit/c75fe5193072817c1b992ffff846999042ef28d9))
+* **api:** api update ([#2238](https://github.com/cloudflare/cloudflare-typescript/issues/2238)) ([a12b08c](https://github.com/cloudflare/cloudflare-typescript/commit/a12b08c44e7316bb9f424d5736979b571788662b))
+* **api:** api update ([#2243](https://github.com/cloudflare/cloudflare-typescript/issues/2243)) ([1ec784d](https://github.com/cloudflare/cloudflare-typescript/commit/1ec784d0293eca30081031dc1008f170d56b8b5a))
+* **api:** api update ([#2245](https://github.com/cloudflare/cloudflare-typescript/issues/2245)) ([ff355fa](https://github.com/cloudflare/cloudflare-typescript/commit/ff355fac8924e3927f3632516441c9cda1e544f8))
+* **api:** api update ([#2252](https://github.com/cloudflare/cloudflare-typescript/issues/2252)) ([2305a6e](https://github.com/cloudflare/cloudflare-typescript/commit/2305a6e24ccca1650ca7433c2642527c9a2f54a0))
+* **api:** api update ([#2253](https://github.com/cloudflare/cloudflare-typescript/issues/2253)) ([b470fa2](https://github.com/cloudflare/cloudflare-typescript/commit/b470fa29e4e102d6e57028171ca6b707d846922e))
+* **api:** api update ([#2254](https://github.com/cloudflare/cloudflare-typescript/issues/2254)) ([3048fd7](https://github.com/cloudflare/cloudflare-typescript/commit/3048fd7ac1a9219e5b62862ea4b36f0558af06d9))
+* **api:** api update ([#2255](https://github.com/cloudflare/cloudflare-typescript/issues/2255)) ([4813cce](https://github.com/cloudflare/cloudflare-typescript/commit/4813cce96c07068691badb5d2a5f15a8cf651332))
+* **api:** api update ([#2257](https://github.com/cloudflare/cloudflare-typescript/issues/2257)) ([90aa09d](https://github.com/cloudflare/cloudflare-typescript/commit/90aa09d8703eebb78f2eb65d9304d4dd177d335e))
+* **api:** api update ([#2258](https://github.com/cloudflare/cloudflare-typescript/issues/2258)) ([e7769f2](https://github.com/cloudflare/cloudflare-typescript/commit/e7769f2781c43005295a6293145e93bd4ef5cac2))
+* **api:** api update ([#2259](https://github.com/cloudflare/cloudflare-typescript/issues/2259)) ([bfbfdcf](https://github.com/cloudflare/cloudflare-typescript/commit/bfbfdcf70374fe0a233374b4b29ce58daf5b14e3))
+* **api:** api update ([#2260](https://github.com/cloudflare/cloudflare-typescript/issues/2260)) ([c0259cd](https://github.com/cloudflare/cloudflare-typescript/commit/c0259cd2854820058c9d202a90aa08cc763e9a48))
+* **api:** api update ([#2261](https://github.com/cloudflare/cloudflare-typescript/issues/2261)) ([d7bf349](https://github.com/cloudflare/cloudflare-typescript/commit/d7bf3490e1180ea242cb36899fdee19192de6e39))
+* **api:** api update ([#2264](https://github.com/cloudflare/cloudflare-typescript/issues/2264)) ([c30593b](https://github.com/cloudflare/cloudflare-typescript/commit/c30593b469751e4d7cf27c019ee1ebeedbac7059))
+* **api:** api update ([#2266](https://github.com/cloudflare/cloudflare-typescript/issues/2266)) ([1ca4274](https://github.com/cloudflare/cloudflare-typescript/commit/1ca42744548d6ce861f66152b06178ba2cbfc3f3))
+* **api:** api update ([#2269](https://github.com/cloudflare/cloudflare-typescript/issues/2269)) ([332891a](https://github.com/cloudflare/cloudflare-typescript/commit/332891a45ebc62091984ab4cd2c79ded6b27e85a))
+* **api:** api update ([#2282](https://github.com/cloudflare/cloudflare-typescript/issues/2282)) ([6c77547](https://github.com/cloudflare/cloudflare-typescript/commit/6c77547806cefd6469b59c5149ddbb810ffd3aed))
+* **api:** api update ([#2284](https://github.com/cloudflare/cloudflare-typescript/issues/2284)) ([f0140e7](https://github.com/cloudflare/cloudflare-typescript/commit/f0140e736ceb0c63fe5ff2c37d34138f87666891))
+* **api:** api update ([#2285](https://github.com/cloudflare/cloudflare-typescript/issues/2285)) ([2b0e272](https://github.com/cloudflare/cloudflare-typescript/commit/2b0e272686388172733ff21c88aabed55a72d731))
+* **api:** api update ([#2286](https://github.com/cloudflare/cloudflare-typescript/issues/2286)) ([a7c30c4](https://github.com/cloudflare/cloudflare-typescript/commit/a7c30c478eeb8d26242fe930c47f1c6e95da72a1))
+* **api:** api update ([#2288](https://github.com/cloudflare/cloudflare-typescript/issues/2288)) ([cc2ec85](https://github.com/cloudflare/cloudflare-typescript/commit/cc2ec8535ead18c8c3204aa8bcbdfafa21ad0c06))
+* **api:** api update ([#2305](https://github.com/cloudflare/cloudflare-typescript/issues/2305)) ([b3cf0be](https://github.com/cloudflare/cloudflare-typescript/commit/b3cf0be70d65dca419c7eac91cb21b610833b3a1))
+* **api:** api update ([#2306](https://github.com/cloudflare/cloudflare-typescript/issues/2306)) ([5d3f037](https://github.com/cloudflare/cloudflare-typescript/commit/5d3f0374ca025eb4a11f97402651e446473d3bca))
+* **api:** api update ([#2308](https://github.com/cloudflare/cloudflare-typescript/issues/2308)) ([a796481](https://github.com/cloudflare/cloudflare-typescript/commit/a79648149403d0b4f3527cc2e2b58f3873de49ae))
+* **api:** api update ([#2309](https://github.com/cloudflare/cloudflare-typescript/issues/2309)) ([87ce3eb](https://github.com/cloudflare/cloudflare-typescript/commit/87ce3eb166f902ae2b32663394c4bef0ffe9f0a5))
+* **api:** api update ([#2311](https://github.com/cloudflare/cloudflare-typescript/issues/2311)) ([3e6e73e](https://github.com/cloudflare/cloudflare-typescript/commit/3e6e73e4dbc9181153bb3acaea713fa5d39d6c5e))
+* **api:** api update ([#2320](https://github.com/cloudflare/cloudflare-typescript/issues/2320)) ([d23ab1a](https://github.com/cloudflare/cloudflare-typescript/commit/d23ab1a63d4010fb68f332206e5a368daf576026))
+* **api:** api update ([#2321](https://github.com/cloudflare/cloudflare-typescript/issues/2321)) ([59ce70c](https://github.com/cloudflare/cloudflare-typescript/commit/59ce70c8decd17a0cca5a0d6081a87249fd03e59))
+* **api:** api update ([#2322](https://github.com/cloudflare/cloudflare-typescript/issues/2322)) ([a77ee98](https://github.com/cloudflare/cloudflare-typescript/commit/a77ee98ddff97de44cfc703737b01c286d634461))
+* **api:** api update ([#2323](https://github.com/cloudflare/cloudflare-typescript/issues/2323)) ([a783c38](https://github.com/cloudflare/cloudflare-typescript/commit/a783c3828b925e070882690dcaf4673b3eaf359c))
+* **api:** api update ([#2324](https://github.com/cloudflare/cloudflare-typescript/issues/2324)) ([8857c9f](https://github.com/cloudflare/cloudflare-typescript/commit/8857c9fd12feca3607dc3960245103a63ae6640f))
+* **api:** api update ([#2326](https://github.com/cloudflare/cloudflare-typescript/issues/2326)) ([a5bb664](https://github.com/cloudflare/cloudflare-typescript/commit/a5bb6643cc2b382d7b175478517b6337f0cb1b48))
+* **api:** clean up indirect models ([#2134](https://github.com/cloudflare/cloudflare-typescript/issues/2134)) ([8ddd7ce](https://github.com/cloudflare/cloudflare-typescript/commit/8ddd7ce75e5d6252fda2e2c86b0614927d706fb8))
+* **api:** clean up missing model references ([#2117](https://github.com/cloudflare/cloudflare-typescript/issues/2117)) ([4db7324](https://github.com/cloudflare/cloudflare-typescript/commit/4db73243e1f783b4abc54a103e916de8d9a7b390))
+* **api:** clean up missing models ([#2155](https://github.com/cloudflare/cloudflare-typescript/issues/2155)) ([0cc346f](https://github.com/cloudflare/cloudflare-typescript/commit/0cc346f90903b1613fa09a586e4c7125105cf841))
+* **api:** fix internal URL mappings ([#2239](https://github.com/cloudflare/cloudflare-typescript/issues/2239)) ([35935d1](https://github.com/cloudflare/cloudflare-typescript/commit/35935d11e59f9c9b83e99d2af976c19ac7f1ee83))
+* **api:** initialism for SFU ([#2100](https://github.com/cloudflare/cloudflare-typescript/issues/2100)) ([7546361](https://github.com/cloudflare/cloudflare-typescript/commit/7546361a1c119f18045bf9e93fa660e7f04b0047))
+* **api:** introduce bulk operation methods ([#2154](https://github.com/cloudflare/cloudflare-typescript/issues/2154)) ([880277c](https://github.com/cloudflare/cloudflare-typescript/commit/880277cd4920ea3fa186878cb81ae3ca4861f6d7))
+* **api:** manual updates ([#2130](https://github.com/cloudflare/cloudflare-typescript/issues/2130)) ([b868967](https://github.com/cloudflare/cloudflare-typescript/commit/b868967f3304ce1bf23dcae9cbde4b916de005a0))
+* **api:** manual updates ([#2142](https://github.com/cloudflare/cloudflare-typescript/issues/2142)) ([04083fd](https://github.com/cloudflare/cloudflare-typescript/commit/04083fd5fc56a899f048f15ba53fc21980d1e648))
+* **api:** manual updates ([#2177](https://github.com/cloudflare/cloudflare-typescript/issues/2177)) ([cddc5fd](https://github.com/cloudflare/cloudflare-typescript/commit/cddc5fd8e12a7ead25665f415d3e250bf2ea36f9))
+* **api:** manual updates ([#2190](https://github.com/cloudflare/cloudflare-typescript/issues/2190)) ([491ae64](https://github.com/cloudflare/cloudflare-typescript/commit/491ae64bd5a67301926605b8383f7f19607c765a))
+* **api:** manual updates ([#2202](https://github.com/cloudflare/cloudflare-typescript/issues/2202)) ([07c7c62](https://github.com/cloudflare/cloudflare-typescript/commit/07c7c62d576cb592fb4d5a072310642c03feb31d))
+* **api:** manual updates ([#2226](https://github.com/cloudflare/cloudflare-typescript/issues/2226)) ([2fed205](https://github.com/cloudflare/cloudflare-typescript/commit/2fed205d3ddd5392195bc7d9030af58d55d58abf))
+* **api:** manual updates ([#2262](https://github.com/cloudflare/cloudflare-typescript/issues/2262)) ([3718325](https://github.com/cloudflare/cloudflare-typescript/commit/3718325dc6926a3944fa5644c005b850f49848db))
+* **api:** manual updates ([#2271](https://github.com/cloudflare/cloudflare-typescript/issues/2271)) ([072f2da](https://github.com/cloudflare/cloudflare-typescript/commit/072f2da9c91a51658253f71f1ad87a8b1f3d23f8))
+* **api:** manual updates ([#2272](https://github.com/cloudflare/cloudflare-typescript/issues/2272)) ([a984ead](https://github.com/cloudflare/cloudflare-typescript/commit/a984eada87599d74766c8830dd3b085e5923a017))
+* **api:** manual updates ([#2281](https://github.com/cloudflare/cloudflare-typescript/issues/2281)) ([05e1ed4](https://github.com/cloudflare/cloudflare-typescript/commit/05e1ed470ecab9a2c169c47b7a926a8ab34e0d87))
+* **api:** manual updates ([#2293](https://github.com/cloudflare/cloudflare-typescript/issues/2293)) ([d44d2bc](https://github.com/cloudflare/cloudflare-typescript/commit/d44d2bc59f9ad952c687cc150dbe7379df99f3d3))
+* **api:** manual updates ([#2294](https://github.com/cloudflare/cloudflare-typescript/issues/2294)) ([3768767](https://github.com/cloudflare/cloudflare-typescript/commit/3768767bd0fb6273893ef1252ee3bb384accabe2))
+* **api:** manual updates ([#2295](https://github.com/cloudflare/cloudflare-typescript/issues/2295)) ([5517452](https://github.com/cloudflare/cloudflare-typescript/commit/55174522e643415b8fe9ed0a2ce6bacf1579ce3f))
+* **api:** manual updates ([#2313](https://github.com/cloudflare/cloudflare-typescript/issues/2313)) ([ac6814a](https://github.com/cloudflare/cloudflare-typescript/commit/ac6814a8a50960857bad491c423497fe432eaa61))
+* **api:** manual updates ([#2316](https://github.com/cloudflare/cloudflare-typescript/issues/2316)) ([5e653ff](https://github.com/cloudflare/cloudflare-typescript/commit/5e653ffe3c311c3e9a417f4f1f20f619bb422a9e))
+* **api:** map in new endpoints for account owned tokens, dns setting views and worker assets ([#2122](https://github.com/cloudflare/cloudflare-typescript/issues/2122)) ([601da6b](https://github.com/cloudflare/cloudflare-typescript/commit/601da6bbc9a16bccab441cdf5bf21460bbb26725))
+* **api:** map more endpoints ([#2256](https://github.com/cloudflare/cloudflare-typescript/issues/2256)) ([fde51c5](https://github.com/cloudflare/cloudflare-typescript/commit/fde51c5dab6563eeaf5bb2f988310c7ea2e5856e))
+* **api:** mark JSON as initialism ([#2292](https://github.com/cloudflare/cloudflare-typescript/issues/2292)) ([047e98f](https://github.com/cloudflare/cloudflare-typescript/commit/047e98f294f852d3d7a8e2133933b781c4e8633f))
+* **api:** remap models for magic visibility ([#2107](https://github.com/cloudflare/cloudflare-typescript/issues/2107)) ([7bf017e](https://github.com/cloudflare/cloudflare-typescript/commit/7bf017eeff6651c6be0445e42dfdd2c9a6cf7cd8))
+* **api:** remove unneeded DNS transforms ([#2304](https://github.com/cloudflare/cloudflare-typescript/issues/2304)) ([63a6fc3](https://github.com/cloudflare/cloudflare-typescript/commit/63a6fc38de3cde0dbd0aaea255b0e1f972aed1aa))
+* **api:** skip authorization failures in prism ([#2291](https://github.com/cloudflare/cloudflare-typescript/issues/2291)) ([0ba9745](https://github.com/cloudflare/cloudflare-typescript/commit/0ba97458dfe3b25b34627cab3f3f7aa3cde9fedd))
+* **api:** update api shield operation endpoint ([#2312](https://github.com/cloudflare/cloudflare-typescript/issues/2312)) ([f0c04b8](https://github.com/cloudflare/cloudflare-typescript/commit/f0c04b8c57c875a7a900bf2d5737c0f71b2e7bc6))
+* **api:** Update verb on PATCH zone hold method ([#2244](https://github.com/cloudflare/cloudflare-typescript/issues/2244)) ([11b2590](https://github.com/cloudflare/cloudflare-typescript/commit/11b25905a2bbfdfe7069f9db2295860ad335a095))
+* **api:** update via SDK Studio ([#2161](https://github.com/cloudflare/cloudflare-typescript/issues/2161)) ([194d70d](https://github.com/cloudflare/cloudflare-typescript/commit/194d70d939d4504ec28865c5b61139abdac965a9))
+* **api:** update via SDK Studio ([#2162](https://github.com/cloudflare/cloudflare-typescript/issues/2162)) ([ea7acdc](https://github.com/cloudflare/cloudflare-typescript/commit/ea7acdcdb72dbe4169cb3aae3c9447b4042ac9fd))
+* **api:** update via SDK Studio ([#2164](https://github.com/cloudflare/cloudflare-typescript/issues/2164)) ([87066cf](https://github.com/cloudflare/cloudflare-typescript/commit/87066cf7033708d40f407505ae03235f2ee33b66))
+* **api:** update via SDK Studio ([#2166](https://github.com/cloudflare/cloudflare-typescript/issues/2166)) ([060eef8](https://github.com/cloudflare/cloudflare-typescript/commit/060eef8e533bf6ca7a944dab688d4bfbcf80af59))
+* **api:** update via SDK Studio ([#2167](https://github.com/cloudflare/cloudflare-typescript/issues/2167)) ([1d10dd4](https://github.com/cloudflare/cloudflare-typescript/commit/1d10dd477808aeca6b16ca32c812b5e3b85ff091))
+* **api:** update via SDK Studio ([#2170](https://github.com/cloudflare/cloudflare-typescript/issues/2170)) ([587eda7](https://github.com/cloudflare/cloudflare-typescript/commit/587eda705ee1190b14f0fb45882b1c4c6ecb2bac))
+* **api:** update via SDK Studio ([#2171](https://github.com/cloudflare/cloudflare-typescript/issues/2171)) ([32f9736](https://github.com/cloudflare/cloudflare-typescript/commit/32f9736924ee257bcc49bd6cc6c263392df405fe))
+* **api:** update via SDK Studio ([#2172](https://github.com/cloudflare/cloudflare-typescript/issues/2172)) ([fdccf87](https://github.com/cloudflare/cloudflare-typescript/commit/fdccf87a2dbb165c13727eb5a3e3166f7b18b704))
+* **api:** update via SDK Studio ([#2173](https://github.com/cloudflare/cloudflare-typescript/issues/2173)) ([899c979](https://github.com/cloudflare/cloudflare-typescript/commit/899c9797bf4ba1abddeaee1ad8f531cce7396ff9))
+* **api:** update via SDK Studio ([#2174](https://github.com/cloudflare/cloudflare-typescript/issues/2174)) ([c706071](https://github.com/cloudflare/cloudflare-typescript/commit/c706071aacec8840f7d026c2587cdceeeec5ab4d))
+* **api:** update via SDK Studio ([#2175](https://github.com/cloudflare/cloudflare-typescript/issues/2175)) ([7abc050](https://github.com/cloudflare/cloudflare-typescript/commit/7abc050701d3ec3241fa3775d860eabda87a7382))
+* **api:** update via SDK Studio ([#2176](https://github.com/cloudflare/cloudflare-typescript/issues/2176)) ([02e148a](https://github.com/cloudflare/cloudflare-typescript/commit/02e148af83bd709a0a5dfc41fa5feaa2aad1b732))
+* **calls:** split turn and sfu apps ([#2099](https://github.com/cloudflare/cloudflare-typescript/issues/2099)) ([ea46545](https://github.com/cloudflare/cloudflare-typescript/commit/ea46545b00fa7597c899087bbca6b8afeff61a7c))
+* **cloud_connector:** define body param name ([#2283](https://github.com/cloudflare/cloudflare-typescript/issues/2283)) ([e9b85b4](https://github.com/cloudflare/cloudflare-typescript/commit/e9b85b406e2a32af0f62db5be7f0996d6effb036))
+* **content_scanning:** introduce support ([#2225](https://github.com/cloudflare/cloudflare-typescript/issues/2225)) ([80dcb52](https://github.com/cloudflare/cloudflare-typescript/commit/80dcb52d023047023ec0b7810453353965e6dbc4))
+* **dex:** add commands support ([#2220](https://github.com/cloudflare/cloudflare-typescript/issues/2220)) ([e1ca1f5](https://github.com/cloudflare/cloudflare-typescript/commit/e1ca1f506d79a7d4860f3b97125fd00aea412746))
+* **dlp:** disable problematic test ([#2232](https://github.com/cloudflare/cloudflare-typescript/issues/2232)) ([f37ca9c](https://github.com/cloudflare/cloudflare-typescript/commit/f37ca9c23f6ad10dbb2c5891680bfc4c8f53a6b7))
+* **dlp:** skip tests for `entries` update due to HTTP 422 in prism ([#2297](https://github.com/cloudflare/cloudflare-typescript/issues/2297)) ([31e81a3](https://github.com/cloudflare/cloudflare-typescript/commit/31e81a34fc5c75094699fde533fefec58555e31c))
+* **dns_firewall:** break out into standalone package ([#2209](https://github.com/cloudflare/cloudflare-typescript/issues/2209)) ([d543759](https://github.com/cloudflare/cloudflare-typescript/commit/d543759ffe695498465c595b27beeb04e3698d66))
+* **dns:** add models for batch operations and response ([#2303](https://github.com/cloudflare/cloudflare-typescript/issues/2303)) ([b583557](https://github.com/cloudflare/cloudflare-typescript/commit/b583557434bd1a500be249e2d4d893d893818e7f))
+* **dns:** fix model oneOf ([#2247](https://github.com/cloudflare/cloudflare-typescript/issues/2247)) ([2fb0edc](https://github.com/cloudflare/cloudflare-typescript/commit/2fb0edcba17d380229b0ab2a13a5be8ddea91ed5))
+* **dns:** remove `delta` model ([#2213](https://github.com/cloudflare/cloudflare-typescript/issues/2213)) ([3459c10](https://github.com/cloudflare/cloudflare-typescript/commit/3459c10a594f7fae966f5513bcc1f0adb80285ba))
+* **dnssec:** move under DNS namespace ([#2207](https://github.com/cloudflare/cloudflare-typescript/issues/2207)) ([465de38](https://github.com/cloudflare/cloudflare-typescript/commit/465de38877cfc843ee5922a87cb2e430486544d1))
+* **fleet_status:** update path placeholders to match conventions ([#2132](https://github.com/cloudflare/cloudflare-typescript/issues/2132)) ([d91a8cf](https://github.com/cloudflare/cloudflare-typescript/commit/d91a8cf6c4f4381aacb6ef96f716596aad836fb1))
+* generate more types that are used as request bodies ([#2236](https://github.com/cloudflare/cloudflare-typescript/issues/2236)) ([2ec75e4](https://github.com/cloudflare/cloudflare-typescript/commit/2ec75e441791064d5afcb11d122fdbebcf02ab60))
+* **iam:** fix model mappings ([#2133](https://github.com/cloudflare/cloudflare-typescript/issues/2133)) ([6f6e51b](https://github.com/cloudflare/cloudflare-typescript/commit/6f6e51b9ccec4ffebadcf684d595de9676e20363))
+* **infrastructure_targets:** add bulk endpoints ([#2218](https://github.com/cloudflare/cloudflare-typescript/issues/2218)) ([df4531d](https://github.com/cloudflare/cloudflare-typescript/commit/df4531d7c0570b37970a595fe70464af7bd8f2e7))
+* **internal:** make git install file structure match npm ([#2199](https://github.com/cloudflare/cloudflare-typescript/issues/2199)) ([0436f37](https://github.com/cloudflare/cloudflare-typescript/commit/0436f37c1a26d3270f685def62222bf9ddb6c6c0))
+* **internal:** update path placeholders ([#2200](https://github.com/cloudflare/cloudflare-typescript/issues/2200)) ([9b8c031](https://github.com/cloudflare/cloudflare-typescript/commit/9b8c031d063c476b7270a834942809d89267d821))
+* **kv:** move analytics under existing namespace ([#2212](https://github.com/cloudflare/cloudflare-typescript/issues/2212)) ([f25f70f](https://github.com/cloudflare/cloudflare-typescript/commit/f25f70f5055b8f2e5cd5f74ebe7e253ec518f5fc))
+* **leaked_credential_check:** add terraform resource ([#2204](https://github.com/cloudflare/cloudflare-typescript/issues/2204)) ([938073f](https://github.com/cloudflare/cloudflare-typescript/commit/938073f61554a9660138aff74b3dda7d26b20f06))
+* **list_item:** remove duplicated `anyOf` properties from component ([#2307](https://github.com/cloudflare/cloudflare-typescript/issues/2307)) ([0d902e0](https://github.com/cloudflare/cloudflare-typescript/commit/0d902e04f00672f709f40a1c63e7be957edb4623))
+* **loa_documents:** move download subresource into parent as `get` ([#2274](https://github.com/cloudflare/cloudflare-typescript/issues/2274)) ([8e808ee](https://github.com/cloudflare/cloudflare-typescript/commit/8e808eeba654bb0c3322a9361d49f2d5bc29b51e))
+* **origin_post_quantum_encryption:** swap PUT for PATCH operation ([#2289](https://github.com/cloudflare/cloudflare-typescript/issues/2289)) ([f870d7b](https://github.com/cloudflare/cloudflare-typescript/commit/f870d7b058ac3c5ce114bfb246a61ced4fd422de))
+* **pagerules:** rename namespace to page_rules ([#2237](https://github.com/cloudflare/cloudflare-typescript/issues/2237)) ([7d758f7](https://github.com/cloudflare/cloudflare-typescript/commit/7d758f72c9bee1bd020bc098c4f85c0335cf904d))
+* **r2_bucket:** add `cors` support ([#2178](https://github.com/cloudflare/cloudflare-typescript/issues/2178)) ([803fd0e](https://github.com/cloudflare/cloudflare-typescript/commit/803fd0e3db891b19e5afc3d6cb132c34d16d62e0))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2277](https://github.com/cloudflare/cloudflare-typescript/issues/2277)) ([0d6423b](https://github.com/cloudflare/cloudflare-typescript/commit/0d6423b4f8e7ac1306ef3895e579acf70d1b8126))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2278](https://github.com/cloudflare/cloudflare-typescript/issues/2278)) ([ba52017](https://github.com/cloudflare/cloudflare-typescript/commit/ba52017ae3c3af940092adea1f0bb145b8f8f7cd))
+* **r2:** rename `cf-r2-jurisdiction` to more usable `jurisdiction` parameter ([#2279](https://github.com/cloudflare/cloudflare-typescript/issues/2279)) ([5aae807](https://github.com/cloudflare/cloudflare-typescript/commit/5aae8071a1e82d1b1dd27e34b58d47044f518f5e))
+* **tokens:** move condition and policy to shared models ([#2136](https://github.com/cloudflare/cloudflare-typescript/issues/2136)) ([db8c1ce](https://github.com/cloudflare/cloudflare-typescript/commit/db8c1cebd6d61253f32ffca62915f8f3c7fac6bc))
+* **tokens:** move token value model to shared ([#2135](https://github.com/cloudflare/cloudflare-typescript/issues/2135)) ([e5755e4](https://github.com/cloudflare/cloudflare-typescript/commit/e5755e4ecc5faf4bce9116a1c75ee499234a4526))
+* **url_scanner:** swap all methods to be v2 only ([#2206](https://github.com/cloudflare/cloudflare-typescript/issues/2206)) ([cfd4df6](https://github.com/cloudflare/cloudflare-typescript/commit/cfd4df6188914f7a32415d050412af9602642fc4))
+* **urlscanner:** swap to v2 create ([#2201](https://github.com/cloudflare/cloudflare-typescript/issues/2201)) ([311951a](https://github.com/cloudflare/cloudflare-typescript/commit/311951abc60b978de69c78c9b746574ae35b1d30))
+* **warp_connector:** move under zero trust namespace ([#2195](https://github.com/cloudflare/cloudflare-typescript/issues/2195)) ([6df8c3b](https://github.com/cloudflare/cloudflare-typescript/commit/6df8c3ba7c2dc562cf73dcca5203164212760b5c))
+* **workers:** add routes support ([#2248](https://github.com/cloudflare/cloudflare-typescript/issues/2248)) ([0ed4e90](https://github.com/cloudflare/cloudflare-typescript/commit/0ed4e9061479e0980f46d123b6f3dd5f7757b6ac))
+* **zero_trust_device_certificates:** update path placeholders ([#2186](https://github.com/cloudflare/cloudflare-typescript/issues/2186)) ([da2f852](https://github.com/cloudflare/cloudflare-typescript/commit/da2f85275f933bf4fce5b0282cd22db4e66fcef2))
+* **zero_trust_device_default_profile_certificates:** define as `upsert` operation ([#2131](https://github.com/cloudflare/cloudflare-typescript/issues/2131)) ([be41552](https://github.com/cloudflare/cloudflare-typescript/commit/be415526caa043d8edf932412c5e18e27851c603))
+* **zero_trust_device:** reshuffle structure to allow use of custom and default ([#2116](https://github.com/cloudflare/cloudflare-typescript/issues/2116)) ([715ae0b](https://github.com/cloudflare/cloudflare-typescript/commit/715ae0b1f8351f345814c49b719be2ce85393d89))
+* **zero_trust_local_domain_fallback:** define body param for updates ([#2101](https://github.com/cloudflare/cloudflare-typescript/issues/2101)) ([1e1f783](https://github.com/cloudflare/cloudflare-typescript/commit/1e1f78349b3e399640f80bb61337566c4134292d))
+* **zero_trust_organization:** swap to upsert for creation ([#2165](https://github.com/cloudflare/cloudflare-typescript/issues/2165)) ([faffcaf](https://github.com/cloudflare/cloudflare-typescript/commit/faffcaf4913df11b22ab1d23e1298648a98c4dad))
+* **zone_settings:** update `origin_max_http_version` model ([#2280](https://github.com/cloudflare/cloudflare-typescript/issues/2280)) ([f781ef8](https://github.com/cloudflare/cloudflare-typescript/commit/f781ef88ec430519ea22258f7f965647c081c5fd))
+* **zone_setting:** update origin_max_http_version model definition ([#2276](https://github.com/cloudflare/cloudflare-typescript/issues/2276)) ([e8ececd](https://github.com/cloudflare/cloudflare-typescript/commit/e8ececd645906808a1a718b77094e004060b1cfd))
+* **zone_transfers:** move under DNS namespace ([#2208](https://github.com/cloudflare/cloudflare-typescript/issues/2208)) ([4a11c28](https://github.com/cloudflare/cloudflare-typescript/commit/4a11c28d1619d5a650f6f0b1790df3efec88bf80))
+
+
+### Bug Fixes
+
+* **api:** better support union schemas with common properties ([#2314](https://github.com/cloudflare/cloudflare-typescript/issues/2314)) ([2208ea4](https://github.com/cloudflare/cloudflare-typescript/commit/2208ea4983dd01dc8a0948e6a4b1faf335d20061))
+* **client:** normalize method ([#2265](https://github.com/cloudflare/cloudflare-typescript/issues/2265)) ([9cc7114](https://github.com/cloudflare/cloudflare-typescript/commit/9cc7114698755948ba6b6a3379497e68a0684ef7))
+* **client:** reexport resource as value ([#2318](https://github.com/cloudflare/cloudflare-typescript/issues/2318)) ([97cdae4](https://github.com/cloudflare/cloudflare-typescript/commit/97cdae45814da933279f45ca93197b5061ca09e6))
+* **internal:** add cleaner handling of DNS unions ([#2242](https://github.com/cloudflare/cloudflare-typescript/issues/2242)) ([2053a15](https://github.com/cloudflare/cloudflare-typescript/commit/2053a1546ccf0c5f32e7c6dea0057d4a6facfe0e))
+* send correct Accept header for certain endpoints ([#2317](https://github.com/cloudflare/cloudflare-typescript/issues/2317)) ([d64c9bc](https://github.com/cloudflare/cloudflare-typescript/commit/d64c9bc41434343b62338fea539d2dfefeceeac1))
+* **urlscanner:** fix invalid schema definition for plain text ([#2227](https://github.com/cloudflare/cloudflare-typescript/issues/2227)) ([1adb0c4](https://github.com/cloudflare/cloudflare-typescript/commit/1adb0c45137264a7d9d41311ed164a9fc503fc1f))
+* **waiting_room_rules:** define `body_param_name` for bulk rules endpoint  ([#2118](https://github.com/cloudflare/cloudflare-typescript/issues/2118)) ([01dc8b3](https://github.com/cloudflare/cloudflare-typescript/commit/01dc8b31cb9ce1c3625d57248e619b5860afaaa6))
+
+
+### Chores
+
+* add missing files back ([6426588](https://github.com/cloudflare/cloudflare-typescript/commit/64265880b79c7b6f2f90de0ba53f23dd5af0443f))
+* **internal:** bump cross-spawn to v7.0.6 ([#2233](https://github.com/cloudflare/cloudflare-typescript/issues/2233)) ([4387d91](https://github.com/cloudflare/cloudflare-typescript/commit/4387d9186de629f34950782693abae1071567cd4))
+* **internal:** codegen related update ([#2168](https://github.com/cloudflare/cloudflare-typescript/issues/2168)) ([6cb6868](https://github.com/cloudflare/cloudflare-typescript/commit/6cb6868e307e80fa0ce699b79b034dcbf2696e86))
+* **internal:** codegen related update ([#2169](https://github.com/cloudflare/cloudflare-typescript/issues/2169)) ([062b84d](https://github.com/cloudflare/cloudflare-typescript/commit/062b84d5720cf2ffe17d4b093b986d9cd31e74a3))
+* **internal:** codegen related update ([#2205](https://github.com/cloudflare/cloudflare-typescript/issues/2205)) ([0e85698](https://github.com/cloudflare/cloudflare-typescript/commit/0e856980f8d0bc245243d581d224c836e7b143b5))
+* **internal:** codegen related update ([#2224](https://github.com/cloudflare/cloudflare-typescript/issues/2224)) ([1532bb6](https://github.com/cloudflare/cloudflare-typescript/commit/1532bb64c5d6b95053344f628b5ca08f93ad21bc))
+* **internal:** codegen related update ([#2250](https://github.com/cloudflare/cloudflare-typescript/issues/2250)) ([5493317](https://github.com/cloudflare/cloudflare-typescript/commit/549331726b303188361ed82105dd5df08cc0949d))
+* **internal:** codegen related update ([#2270](https://github.com/cloudflare/cloudflare-typescript/issues/2270)) ([e528947](https://github.com/cloudflare/cloudflare-typescript/commit/e5289472e15f4b0d4ba84fdc40755cb48009b19c))
+* **internal:** codegen related update ([#2301](https://github.com/cloudflare/cloudflare-typescript/issues/2301)) ([aa69ad7](https://github.com/cloudflare/cloudflare-typescript/commit/aa69ad74831fd279a79b4f796da85821ab350368))
+* **internal:** codegen related update ([#2315](https://github.com/cloudflare/cloudflare-typescript/issues/2315)) ([4389861](https://github.com/cloudflare/cloudflare-typescript/commit/438986147fd9574b68af581f638340e6d8f1f746))
+* **internal:** codegen related update ([#2325](https://github.com/cloudflare/cloudflare-typescript/issues/2325)) ([086577c](https://github.com/cloudflare/cloudflare-typescript/commit/086577c84b20ae60a53c9ac2814894de0ab57803))
+* **internal:** fix some typos ([#2251](https://github.com/cloudflare/cloudflare-typescript/issues/2251)) ([6ad407c](https://github.com/cloudflare/cloudflare-typescript/commit/6ad407ccc6b8f8041ee98621673e4d9b59283ca4))
+* **internal:** remove unnecessary getRequestClient function ([#2223](https://github.com/cloudflare/cloudflare-typescript/issues/2223)) ([1242e4c](https://github.com/cloudflare/cloudflare-typescript/commit/1242e4cb37449e30d06b54123a63244e424cf3bf))
+* **internal:** skip broken tests ([#2310](https://github.com/cloudflare/cloudflare-typescript/issues/2310)) ([2ed931e](https://github.com/cloudflare/cloudflare-typescript/commit/2ed931ed51f82c8227338a23cb85cd5d725e7d91))
+* **internal:** skip some tests ([#2327](https://github.com/cloudflare/cloudflare-typescript/issues/2327)) ([03ef5f0](https://github.com/cloudflare/cloudflare-typescript/commit/03ef5f0b13041760da3c7ff7044acb75b74ae31b))
+* **internal:** update isAbsoluteURL ([#2235](https://github.com/cloudflare/cloudflare-typescript/issues/2235)) ([bc092f6](https://github.com/cloudflare/cloudflare-typescript/commit/bc092f6dc091906eccefbeb2b4af4d278cbf876e))
+* rebuild project due to codegen change ([#2143](https://github.com/cloudflare/cloudflare-typescript/issues/2143)) ([12bd9ea](https://github.com/cloudflare/cloudflare-typescript/commit/12bd9ea9886d2235847c485de7581c7ee5854440))
+* remove redundant word in comment ([#2159](https://github.com/cloudflare/cloudflare-typescript/issues/2159)) ([eaf523c](https://github.com/cloudflare/cloudflare-typescript/commit/eaf523cdabbec65ed63575c1ac3e085ceb1aae8a))
+* **types:** nicer error class types + jsdocs ([#2234](https://github.com/cloudflare/cloudflare-typescript/issues/2234)) ([8b68374](https://github.com/cloudflare/cloudflare-typescript/commit/8b68374ef2c5186764f466a3aaeffebdecd696bd))
+* **types:** use `declare namespace` ([#2296](https://github.com/cloudflare/cloudflare-typescript/issues/2296)) ([6930665](https://github.com/cloudflare/cloudflare-typescript/commit/69306654bdadb7395268724e59ce88633d89cd6a))
+* updates ([#2231](https://github.com/cloudflare/cloudflare-typescript/issues/2231)) ([4b363c1](https://github.com/cloudflare/cloudflare-typescript/commit/4b363c17715836ed4dda3c5904cd1eae64754943))
+* updates ([#2319](https://github.com/cloudflare/cloudflare-typescript/issues/2319)) ([bbc7f09](https://github.com/cloudflare/cloudflare-typescript/commit/bbc7f098e6a9535c019b77ec0618eb10f780a4b8))
+
+
+### Documentation
+
+* minor formatting changes ([#2268](https://github.com/cloudflare/cloudflare-typescript/issues/2268)) ([f9819f3](https://github.com/cloudflare/cloudflare-typescript/commit/f9819f35de3841a7e9c34e87537eefc4c09acaad))
+* remove suggestion to use `npm` call out ([#2156](https://github.com/cloudflare/cloudflare-typescript/issues/2156)) ([a0db5f3](https://github.com/cloudflare/cloudflare-typescript/commit/a0db5f371e26995b66a3cabe82117bcdd2dbaf0f))
+
 ## 3.5.0 (2024-07-16)
 
 Full Changelog: [v3.4.0...v3.5.0](https://github.com/cloudflare/cloudflare-typescript/compare/v3.4.0...v3.5.0)
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 850d6ceaaf..1cdd45f8d6 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,38 +1,38 @@
 ## Setting up the environment
 
-This repository uses [`yarn@v1`](https://classic.yarnpkg.com/lang/en/docs/install/#mac-stable).
+This repository uses [`yarn@v1`](https://classic.yarnpkg.com/lang/en/docs/install).
 Other package managers may work but are not officially supported for development.
 
 To set up the repository, run:
 
-```bash
-yarn
-yarn build
+```sh
+$ yarn
+$ yarn build
 ```
 
 This will install all the required dependencies and build output files to `dist/`.
 
 ## Modifying/Adding code
 
-Most of the SDK is generated code, and any modified code will be overridden on the next generation. The
-`src/lib/` and `examples/` directories are exceptions and will never be overridden.
+Most of the SDK is generated code. Modifications to code will be persisted between generations, but may
+result in merge conflicts between manual patches and changes from the generator. The generator will never
+modify the contents of the `src/lib/` and `examples/` directories.
 
 ## Adding and running examples
 
-All files in the `examples/` directory are not modified by the Stainless generator and can be freely edited or
-added to.
+All files in the `examples/` directory are not modified by the generator and can be freely edited or added to.
 
-```bash
+```ts
 // add an example to examples/<your-example>.ts
 
 #!/usr/bin/env -S npm run tsn -T
 …
 ```
 
-```
-chmod +x examples/<your-example>.ts
+```sh
+$ chmod +x examples/<your-example>.ts
 # run the example against your api
-yarn tsn -T examples/<your-example>.ts
+$ yarn tsn -T examples/<your-example>.ts
 ```
 
 ## Using the repository from source
@@ -41,38 +41,38 @@ If you’d like to use the repository from source, you can either install from g
 
 To install via git:
 
-```bash
-npm install git+ssh://git@github.com:cloudflare/cloudflare-typescript.git
+```sh
+$ npm install git+ssh://git@github.com:cloudflare/cloudflare-typescript.git
 ```
 
 Alternatively, to link a local copy of the repo:
 
-```bash
+```sh
 # Clone
-git clone https://www.github.com/cloudflare/cloudflare-typescript
-cd cloudflare-typescript
+$ git clone https://www.github.com/cloudflare/cloudflare-typescript
+$ cd cloudflare-typescript
 
 # With yarn
-yarn link
-cd ../my-package
-yarn link cloudflare
+$ yarn link
+$ cd ../my-package
+$ yarn link cloudflare
 
 # With pnpm
-pnpm link --global
-cd ../my-package
-pnpm link -—global cloudflare
+$ pnpm link --global
+$ cd ../my-package
+$ pnpm link -—global cloudflare
 ```
 
 ## Running tests
 
 Most tests require you to [set up a mock server](https://github.com/stoplightio/prism) against the OpenAPI spec to run the tests.
 
-```bash
-npx prism mock path/to/your/openapi.yml
+```sh
+$ npx prism mock path/to/your/openapi.yml
 ```
 
-```bash
-yarn run test
+```sh
+$ yarn run test
 ```
 
 ## Linting and formatting
@@ -82,14 +82,14 @@ This repository uses [prettier](https://www.npmjs.com/package/prettier) and
 
 To lint:
 
-```bash
-yarn lint
+```sh
+$ yarn lint
 ```
 
 To format and fix all lint issues automatically:
 
-```bash
-yarn fix
+```sh
+$ yarn fix
 ```
 
 ## Publishing and releases
diff --git a/LICENSE b/LICENSE
index 827fca03dd..f303cce4b5 100644
--- a/LICENSE
+++ b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2024 Cloudflare
+   Copyright 2025 Cloudflare
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/README.md b/README.md
index fe79de5f9b..0bae1d8d3e 100644
--- a/README.md
+++ b/README.md
@@ -20,13 +20,13 @@ The full API of this library can be found in [api.md](api.md).
 ```js
 import Cloudflare from 'cloudflare';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiEmail: process.env['CLOUDFLARE_EMAIL'], // This is the default and can be omitted
   apiKey: process.env['CLOUDFLARE_API_KEY'], // This is the default and can be omitted
 });
 
 async function main() {
-  const zone = await cloudflare.zones.create({
+  const zone = await client.zones.create({
     account: { id: '023e105f4ecef8ad9ca31a8372d0c353' },
     name: 'example.com',
     type: 'full',
@@ -46,7 +46,7 @@ This library includes TypeScript definitions for all request params and response
 ```ts
 import Cloudflare from 'cloudflare';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiEmail: process.env['CLOUDFLARE_EMAIL'], // This is the default and can be omitted
   apiKey: process.env['CLOUDFLARE_API_KEY'], // This is the default and can be omitted
 });
@@ -57,7 +57,7 @@ async function main() {
     name: 'example.com',
     type: 'full',
   };
-  const zone: Cloudflare.Zone = await cloudflare.zones.create(params);
+  const zone: Cloudflare.Zone = await client.zones.create(params);
 }
 
 main();
@@ -74,17 +74,15 @@ a subclass of `APIError` will be thrown:
 <!-- prettier-ignore -->
 ```ts
 async function main() {
-  const zone = await cloudflare.zones
-    .get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' })
-    .catch(async (err) => {
-      if (err instanceof Cloudflare.APIError) {
-        console.log(err.status); // 400
-        console.log(err.name); // BadRequestError
-        console.log(err.headers); // {server: 'nginx', ...}
-      } else {
-        throw err;
-      }
-    });
+  const zone = await client.zones.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' }).catch(async (err) => {
+    if (err instanceof Cloudflare.APIError) {
+      console.log(err.status); // 400
+      console.log(err.name); // BadRequestError
+      console.log(err.headers); // {server: 'nginx', ...}
+    } else {
+      throw err;
+    }
+  });
 }
 
 main();
@@ -114,12 +112,12 @@ You can use the `maxRetries` option to configure or disable this:
 <!-- prettier-ignore -->
 ```js
 // Configure the default for all requests:
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   maxRetries: 0, // default is 2
 });
 
 // Or, configure per-request:
-await cloudflare.zones.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' }, {
+await client.zones.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' }, {
   maxRetries: 5,
 });
 ```
@@ -131,12 +129,12 @@ Requests time out after 1 minute by default. You can configure this with a `time
 <!-- prettier-ignore -->
 ```ts
 // Configure the default for all requests:
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   timeout: 20 * 1000, // 20 seconds (default is 1 minute)
 });
 
 // Override per-request:
-await cloudflare.zones.edit({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' }, {
+await client.zones.edit({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' }, {
   timeout: 5 * 1000,
 });
 ```
@@ -148,30 +146,30 @@ Note that requests which time out will be [retried twice by default](#retries).
 ## Auto-pagination
 
 List methods in the Cloudflare API are paginated.
-You can use `for await … of` syntax to iterate through items across all pages:
+You can use the `for await … of` syntax to iterate through items across all pages:
 
 ```ts
 async function fetchAllAccounts(params) {
   const allAccounts = [];
   // Automatically fetches more pages as needed.
-  for await (const accountListResponse of cloudflare.accounts.list()) {
-    allAccounts.push(accountListResponse);
+  for await (const account of client.accounts.list()) {
+    allAccounts.push(account);
   }
   return allAccounts;
 }
 ```
 
-Alternatively, you can make request a single page at a time:
+Alternatively, you can request a single page at a time:
 
 ```ts
-let page = await cloudflare.accounts.list();
-for (const accountListResponse of page.result) {
-  console.log(accountListResponse);
+let page = await client.accounts.list();
+for (const account of page.result) {
+  console.log(account);
 }
 
 // Convenience methods are provided for manually paginating:
 while (page.hasNextPage()) {
-  page = page.getNextPage();
+  page = await page.getNextPage();
   // ...
 }
 ```
@@ -186,15 +184,15 @@ You can also use the `.withResponse()` method to get the raw `Response` along wi
 
 <!-- prettier-ignore -->
 ```ts
-const cloudflare = new Cloudflare();
+const client = new Cloudflare();
 
-const response = await cloudflare.zones
+const response = await client.zones
   .create({ account: { id: '023e105f4ecef8ad9ca31a8372d0c353' }, name: 'example.com', type: 'full' })
   .asResponse();
 console.log(response.headers.get('X-My-Header'));
 console.log(response.statusText); // access the underlying Response object
 
-const { data: zone, response: raw } = await cloudflare.zones
+const { data: zone, response: raw } = await client.zones
   .create({ account: { id: '023e105f4ecef8ad9ca31a8372d0c353' }, name: 'example.com', type: 'full' })
   .withResponse();
 console.log(raw.headers.get('X-My-Header'));
@@ -297,12 +295,12 @@ import http from 'http';
 import { HttpsProxyAgent } from 'https-proxy-agent';
 
 // Configure the default for all requests:
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   httpAgent: new HttpsProxyAgent(process.env.PROXY_URL),
 });
 
 // Override per-request:
-await cloudflare.zones.delete(
+await client.zones.delete(
   { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
   {
     httpAgent: new http.Agent({ keepAlive: false }),
@@ -315,12 +313,8 @@ await cloudflare.zones.delete(
 This package generally follows [SemVer](https://semver.org/spec/v2.0.0.html) conventions, though certain backwards-incompatible changes may be released as minor versions:
 
 1. Changes that only affect static types, without breaking runtime behavior.
-2. Changes to library internals which are technically public but not intended or documented for external use. _(Please open a GitHub issue to let us know if you are relying on such internals)_.
-3. Changes that we do not expect to impact the vast majority of users in practice.
-
-We take backwards-compatibility seriously and work hard to ensure you can rely on a smooth upgrade experience.
-
-We are keen for your feedback; please open an [issue](https://www.github.com/cloudflare/cloudflare-typescript/issues) with questions, bugs, or suggestions.
+1. Changes to library internals which are technically public but not intended or documented for external use.
+1. Changes that we do not expect to impact the vast majority of users in practice.
 
 ## Requirements
 
@@ -330,7 +324,7 @@ The following runtimes are supported:
 
 - Web browsers (Up-to-date Chrome, Firefox, Safari, Edge, and more)
 - Node.js 18 LTS or later ([non-EOL](https://endoflife.date/nodejs)) versions.
-- Deno v1.28.0 or higher, using `import Cloudflare from "npm:cloudflare"`.
+- Deno v1.28.0 or higher.
 - Bun 1.0 or later.
 - Cloudflare Workers.
 - Vercel Edge Runtime.
@@ -340,3 +334,7 @@ The following runtimes are supported:
 Note that React Native is not supported at this time.
 
 If you are interested in other runtime environments, please open or upvote an issue on GitHub.
+
+## Contributing
+
+See [the contributing documentation](./CONTRIBUTING.md).
diff --git a/SECURITY.md b/SECURITY.md
index 8cd70e5e93..0735c89299 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -1,27 +1,3 @@
-# Security Policy
+# Reporting Security Vulnerabilities
 
-## Reporting Security Issues
-
-This SDK is generated by [Stainless Software Inc](http://stainlessapi.com). Stainless takes security seriously, and encourages you to report any security vulnerability promptly so that appropriate action can be taken.
-
-To report a security issue, please contact the Stainless team at security@stainlessapi.com.
-
-## Responsible Disclosure
-
-We appreciate the efforts of security researchers and individuals who help us maintain the security of
-SDKs we generate. If you believe you have found a security vulnerability, please adhere to responsible
-disclosure practices by allowing us a reasonable amount of time to investigate and address the issue
-before making any information public.
-
-## Reporting Non-SDK Related Security Issues
-
-If you encounter security issues that are not directly related to SDKs but pertain to the services
-or products provided by Cloudflare please follow the respective company's security reporting guidelines.
-
-### Cloudflare Terms and Policies
-
-Please contact api@cloudflare.com for any questions or concerns regarding security of our services.
-
----
-
-Thank you for helping us keep the SDKs and systems they interact with secure.
+Please see [this page](https://www.cloudflare.com/.well-known/security.txt) for information on how to report a vulnerability to Cloudflare. Thanks!
diff --git a/api.md b/api.md
index 3ae4322470..16c090c144 100644
--- a/api.md
+++ b/api.md
@@ -14,72 +14,130 @@ Types:
 - <code><a href="./src/resources/shared.ts">PaginationInfo</a></code>
 - <code><a href="./src/resources/shared.ts">Permission</a></code>
 - <code><a href="./src/resources/shared.ts">PermissionGrant</a></code>
+- <code><a href="./src/resources/shared.ts">RatePlan</a></code>
 - <code><a href="./src/resources/shared.ts">ResponseInfo</a></code>
 - <code><a href="./src/resources/shared.ts">Result</a></code>
 - <code><a href="./src/resources/shared.ts">Role</a></code>
 - <code><a href="./src/resources/shared.ts">SortDirection</a></code>
+- <code><a href="./src/resources/shared.ts">Subscription</a></code>
+- <code><a href="./src/resources/shared.ts">SubscriptionComponent</a></code>
+- <code><a href="./src/resources/shared.ts">SubscriptionZone</a></code>
+- <code><a href="./src/resources/shared.ts">Token</a></code>
+- <code><a href="./src/resources/shared.ts">TokenConditionCIDRList</a></code>
+- <code><a href="./src/resources/shared.ts">TokenPolicy</a></code>
+- <code><a href="./src/resources/shared.ts">TokenValue</a></code>
 
 # Accounts
 
 Types:
 
 - <code><a href="./src/resources/accounts/accounts.ts">Account</a></code>
-- <code><a href="./src/resources/accounts/accounts.ts">AccountUpdateResponse</a></code>
-- <code><a href="./src/resources/accounts/accounts.ts">AccountListResponse</a></code>
-- <code><a href="./src/resources/accounts/accounts.ts">AccountGetResponse</a></code>
+- <code><a href="./src/resources/accounts/accounts.ts">AccountDeleteResponse</a></code>
 
 Methods:
 
-- <code title="put /accounts/{account_id}">client.accounts.<a href="./src/resources/accounts/accounts.ts">update</a>({ ...params }) -> AccountUpdateResponse</code>
-- <code title="get /accounts">client.accounts.<a href="./src/resources/accounts/accounts.ts">list</a>({ ...params }) -> AccountListResponsesV4PagePaginationArray</code>
-- <code title="get /accounts/{account_id}">client.accounts.<a href="./src/resources/accounts/accounts.ts">get</a>({ ...params }) -> AccountGetResponse</code>
+- <code title="post /accounts">client.accounts.<a href="./src/resources/accounts/accounts.ts">create</a>({ ...params }) -> Account</code>
+- <code title="put /accounts/{account_id}">client.accounts.<a href="./src/resources/accounts/accounts.ts">update</a>({ ...params }) -> Account</code>
+- <code title="get /accounts">client.accounts.<a href="./src/resources/accounts/accounts.ts">list</a>({ ...params }) -> AccountsV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}">client.accounts.<a href="./src/resources/accounts/accounts.ts">delete</a>({ ...params }) -> AccountDeleteResponse | null</code>
+- <code title="get /accounts/{account_id}">client.accounts.<a href="./src/resources/accounts/accounts.ts">get</a>({ ...params }) -> Account</code>
 
 ## Members
 
 Types:
 
 - <code><a href="./src/resources/accounts/members.ts">Status</a></code>
-- <code><a href="./src/resources/accounts/members.ts">UserWithInviteCode</a></code>
-- <code><a href="./src/resources/accounts/members.ts">MemberCreateResponse</a></code>
-- <code><a href="./src/resources/accounts/members.ts">MemberUpdateResponse</a></code>
-- <code><a href="./src/resources/accounts/members.ts">MemberListResponse</a></code>
 - <code><a href="./src/resources/accounts/members.ts">MemberDeleteResponse</a></code>
-- <code><a href="./src/resources/accounts/members.ts">MemberGetResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/members">client.accounts.members.<a href="./src/resources/accounts/members.ts">create</a>({ ...params }) -> MemberCreateResponse</code>
-- <code title="put /accounts/{account_id}/members/{member_id}">client.accounts.members.<a href="./src/resources/accounts/members.ts">update</a>(memberId, { ...params }) -> MemberUpdateResponse</code>
-- <code title="get /accounts/{account_id}/members">client.accounts.members.<a href="./src/resources/accounts/members.ts">list</a>({ ...params }) -> MemberListResponsesV4PagePaginationArray</code>
+- <code title="post /accounts/{account_id}/members">client.accounts.members.<a href="./src/resources/accounts/members.ts">create</a>({ ...params }) -> Member</code>
+- <code title="put /accounts/{account_id}/members/{member_id}">client.accounts.members.<a href="./src/resources/accounts/members.ts">update</a>(memberId, { ...params }) -> Member</code>
+- <code title="get /accounts/{account_id}/members">client.accounts.members.<a href="./src/resources/accounts/members.ts">list</a>({ ...params }) -> MembersV4PagePaginationArray</code>
 - <code title="delete /accounts/{account_id}/members/{member_id}">client.accounts.members.<a href="./src/resources/accounts/members.ts">delete</a>(memberId, { ...params }) -> MemberDeleteResponse | null</code>
-- <code title="get /accounts/{account_id}/members/{member_id}">client.accounts.members.<a href="./src/resources/accounts/members.ts">get</a>(memberId, { ...params }) -> MemberGetResponse</code>
+- <code title="get /accounts/{account_id}/members/{member_id}">client.accounts.members.<a href="./src/resources/accounts/members.ts">get</a>(memberId, { ...params }) -> Member</code>
 
 ## Roles
 
+Methods:
+
+- <code title="get /accounts/{account_id}/roles">client.accounts.roles.<a href="./src/resources/accounts/roles.ts">list</a>({ ...params }) -> RolesSinglePage</code>
+- <code title="get /accounts/{account_id}/roles/{role_id}">client.accounts.roles.<a href="./src/resources/accounts/roles.ts">get</a>(roleId, { ...params }) -> Role</code>
+
+## Subscriptions
+
 Types:
 
-- <code><a href="./src/resources/accounts/roles.ts">RoleGetResponse</a></code>
+- <code><a href="./src/resources/accounts/subscriptions.ts">SubscriptionCreateResponse</a></code>
+- <code><a href="./src/resources/accounts/subscriptions.ts">SubscriptionUpdateResponse</a></code>
+- <code><a href="./src/resources/accounts/subscriptions.ts">SubscriptionDeleteResponse</a></code>
+- <code><a href="./src/resources/accounts/subscriptions.ts">SubscriptionGetResponse</a></code>
 
 Methods:
 
-- <code title="get /accounts/{account_id}/roles">client.accounts.roles.<a href="./src/resources/accounts/roles.ts">list</a>({ ...params }) -> RolesSinglePage</code>
-- <code title="get /accounts/{account_id}/roles/{role_id}">client.accounts.roles.<a href="./src/resources/accounts/roles.ts">get</a>(roleId, { ...params }) -> RoleGetResponse</code>
+- <code title="post /accounts/{account_id}/subscriptions">client.accounts.subscriptions.<a href="./src/resources/accounts/subscriptions.ts">create</a>({ ...params }) -> SubscriptionCreateResponse</code>
+- <code title="put /accounts/{account_id}/subscriptions/{subscription_identifier}">client.accounts.subscriptions.<a href="./src/resources/accounts/subscriptions.ts">update</a>(subscriptionIdentifier, { ...params }) -> SubscriptionUpdateResponse</code>
+- <code title="delete /accounts/{account_id}/subscriptions/{subscription_identifier}">client.accounts.subscriptions.<a href="./src/resources/accounts/subscriptions.ts">delete</a>(subscriptionIdentifier, { ...params }) -> SubscriptionDeleteResponse</code>
+- <code title="get /accounts/{account_id}/subscriptions">client.accounts.subscriptions.<a href="./src/resources/accounts/subscriptions.ts">get</a>({ ...params }) -> SubscriptionGetResponse | null</code>
+
+## Tokens
+
+Types:
+
+- <code><a href="./src/resources/accounts/tokens/tokens.ts">TokenCreateResponse</a></code>
+- <code><a href="./src/resources/accounts/tokens/tokens.ts">TokenDeleteResponse</a></code>
+- <code><a href="./src/resources/accounts/tokens/tokens.ts">TokenVerifyResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/tokens">client.accounts.tokens.<a href="./src/resources/accounts/tokens/tokens.ts">create</a>({ ...params }) -> TokenCreateResponse</code>
+- <code title="put /accounts/{account_id}/tokens/{token_id}">client.accounts.tokens.<a href="./src/resources/accounts/tokens/tokens.ts">update</a>(tokenId, { ...params }) -> Token</code>
+- <code title="get /accounts/{account_id}/tokens">client.accounts.tokens.<a href="./src/resources/accounts/tokens/tokens.ts">list</a>({ ...params }) -> TokensV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/tokens/{token_id}">client.accounts.tokens.<a href="./src/resources/accounts/tokens/tokens.ts">delete</a>(tokenId, { ...params }) -> TokenDeleteResponse | null</code>
+- <code title="get /accounts/{account_id}/tokens/{token_id}">client.accounts.tokens.<a href="./src/resources/accounts/tokens/tokens.ts">get</a>(tokenId, { ...params }) -> Token</code>
+- <code title="get /accounts/{account_id}/tokens/verify">client.accounts.tokens.<a href="./src/resources/accounts/tokens/tokens.ts">verify</a>({ ...params }) -> TokenVerifyResponse</code>
+
+### PermissionGroups
+
+Types:
+
+- <code><a href="./src/resources/accounts/tokens/permission-groups.ts">PermissionGroupListResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/tokens/permission_groups">client.accounts.tokens.permissionGroups.<a href="./src/resources/accounts/tokens/permission-groups.ts">list</a>({ ...params }) -> PermissionGroupListResponsesSinglePage</code>
+
+### Value
+
+Methods:
+
+- <code title="put /accounts/{account_id}/tokens/{token_id}/value">client.accounts.tokens.value.<a href="./src/resources/accounts/tokens/value.ts">update</a>(tokenId, { ...params }) -> TokenValue</code>
+
+## Logs
+
+### Audit
+
+Types:
+
+- <code><a href="./src/resources/accounts/logs/audit.ts">AuditListResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/logs/audit">client.accounts.logs.audit.<a href="./src/resources/accounts/logs/audit.ts">list</a>({ ...params }) -> AuditListResponsesCursorLimitPagination</code>
 
 # OriginCACertificates
 
 Types:
 
 - <code><a href="./src/resources/origin-ca-certificates.ts">OriginCACertificate</a></code>
-- <code><a href="./src/resources/origin-ca-certificates.ts">OriginCACertificateCreateResponse</a></code>
 - <code><a href="./src/resources/origin-ca-certificates.ts">OriginCACertificateDeleteResponse</a></code>
-- <code><a href="./src/resources/origin-ca-certificates.ts">OriginCACertificateGetResponse</a></code>
 
 Methods:
 
-- <code title="post /certificates">client.originCACertificates.<a href="./src/resources/origin-ca-certificates.ts">create</a>({ ...params }) -> OriginCACertificateCreateResponse</code>
+- <code title="post /certificates">client.originCACertificates.<a href="./src/resources/origin-ca-certificates.ts">create</a>({ ...params }) -> OriginCACertificate</code>
 - <code title="get /certificates">client.originCACertificates.<a href="./src/resources/origin-ca-certificates.ts">list</a>({ ...params }) -> OriginCACertificatesSinglePage</code>
 - <code title="delete /certificates/{certificate_id}">client.originCACertificates.<a href="./src/resources/origin-ca-certificates.ts">delete</a>(certificateId) -> OriginCACertificateDeleteResponse</code>
-- <code title="get /certificates/{certificate_id}">client.originCACertificates.<a href="./src/resources/origin-ca-certificates.ts">get</a>(certificateId) -> OriginCACertificateGetResponse</code>
+- <code title="get /certificates/{certificate_id}">client.originCACertificates.<a href="./src/resources/origin-ca-certificates.ts">get</a>(certificateId) -> OriginCACertificate</code>
 
 # IPs
 
@@ -154,14 +212,12 @@ Methods:
 Types:
 
 - <code><a href="./src/resources/user/invites.ts">Invite</a></code>
-- <code><a href="./src/resources/user/invites.ts">InviteEditResponse</a></code>
-- <code><a href="./src/resources/user/invites.ts">InviteGetResponse</a></code>
 
 Methods:
 
 - <code title="get /user/invites">client.user.invites.<a href="./src/resources/user/invites.ts">list</a>() -> InvitesSinglePage</code>
-- <code title="patch /user/invites/{invite_id}">client.user.invites.<a href="./src/resources/user/invites.ts">edit</a>(inviteId, { ...params }) -> InviteEditResponse</code>
-- <code title="get /user/invites/{invite_id}">client.user.invites.<a href="./src/resources/user/invites.ts">get</a>(inviteId) -> InviteGetResponse</code>
+- <code title="patch /user/invites/{invite_id}">client.user.invites.<a href="./src/resources/user/invites.ts">edit</a>(inviteId, { ...params }) -> Invite</code>
+- <code title="get /user/invites/{invite_id}">client.user.invites.<a href="./src/resources/user/invites.ts">get</a>(inviteId) -> Invite</code>
 
 ## Organizations
 
@@ -181,43 +237,31 @@ Methods:
 
 Types:
 
-- <code><a href="./src/resources/user/subscriptions.ts">RatePlan</a></code>
-- <code><a href="./src/resources/user/subscriptions.ts">Subscription</a></code>
-- <code><a href="./src/resources/user/subscriptions.ts">SubscriptionComponent</a></code>
-- <code><a href="./src/resources/user/subscriptions.ts">SubscriptionZone</a></code>
 - <code><a href="./src/resources/user/subscriptions.ts">SubscriptionUpdateResponse</a></code>
 - <code><a href="./src/resources/user/subscriptions.ts">SubscriptionDeleteResponse</a></code>
-- <code><a href="./src/resources/user/subscriptions.ts">SubscriptionEditResponse</a></code>
 - <code><a href="./src/resources/user/subscriptions.ts">SubscriptionGetResponse</a></code>
 
 Methods:
 
 - <code title="put /user/subscriptions/{identifier}">client.user.subscriptions.<a href="./src/resources/user/subscriptions.ts">update</a>(identifier, { ...params }) -> SubscriptionUpdateResponse</code>
 - <code title="delete /user/subscriptions/{identifier}">client.user.subscriptions.<a href="./src/resources/user/subscriptions.ts">delete</a>(identifier) -> SubscriptionDeleteResponse</code>
-- <code title="put /zones/{identifier}/subscription">client.user.subscriptions.<a href="./src/resources/user/subscriptions.ts">edit</a>(identifier, { ...params }) -> SubscriptionEditResponse</code>
 - <code title="get /user/subscriptions">client.user.subscriptions.<a href="./src/resources/user/subscriptions.ts">get</a>() -> SubscriptionGetResponse | null</code>
 
 ## Tokens
 
 Types:
 
-- <code><a href="./src/resources/user/tokens/tokens.ts">CIDRList</a></code>
-- <code><a href="./src/resources/user/tokens/tokens.ts">Policy</a></code>
-- <code><a href="./src/resources/user/tokens/tokens.ts">Token</a></code>
 - <code><a href="./src/resources/user/tokens/tokens.ts">TokenCreateResponse</a></code>
-- <code><a href="./src/resources/user/tokens/tokens.ts">TokenUpdateResponse</a></code>
-- <code><a href="./src/resources/user/tokens/tokens.ts">TokenListResponse</a></code>
 - <code><a href="./src/resources/user/tokens/tokens.ts">TokenDeleteResponse</a></code>
-- <code><a href="./src/resources/user/tokens/tokens.ts">TokenGetResponse</a></code>
 - <code><a href="./src/resources/user/tokens/tokens.ts">TokenVerifyResponse</a></code>
 
 Methods:
 
 - <code title="post /user/tokens">client.user.tokens.<a href="./src/resources/user/tokens/tokens.ts">create</a>({ ...params }) -> TokenCreateResponse</code>
-- <code title="put /user/tokens/{token_id}">client.user.tokens.<a href="./src/resources/user/tokens/tokens.ts">update</a>(tokenId, { ...params }) -> TokenUpdateResponse</code>
-- <code title="get /user/tokens">client.user.tokens.<a href="./src/resources/user/tokens/tokens.ts">list</a>({ ...params }) -> TokenListResponsesV4PagePaginationArray</code>
+- <code title="put /user/tokens/{token_id}">client.user.tokens.<a href="./src/resources/user/tokens/tokens.ts">update</a>(tokenId, { ...params }) -> Token</code>
+- <code title="get /user/tokens">client.user.tokens.<a href="./src/resources/user/tokens/tokens.ts">list</a>({ ...params }) -> TokensV4PagePaginationArray</code>
 - <code title="delete /user/tokens/{token_id}">client.user.tokens.<a href="./src/resources/user/tokens/tokens.ts">delete</a>(tokenId) -> TokenDeleteResponse | null</code>
-- <code title="get /user/tokens/{token_id}">client.user.tokens.<a href="./src/resources/user/tokens/tokens.ts">get</a>(tokenId) -> TokenGetResponse</code>
+- <code title="get /user/tokens/{token_id}">client.user.tokens.<a href="./src/resources/user/tokens/tokens.ts">get</a>(tokenId) -> Token</code>
 - <code title="get /user/tokens/verify">client.user.tokens.<a href="./src/resources/user/tokens/tokens.ts">verify</a>() -> TokenVerifyResponse</code>
 
 ### PermissionGroups
@@ -232,13 +276,9 @@ Methods:
 
 ### Value
 
-Types:
-
-- <code><a href="./src/resources/user/tokens/value.ts">Value</a></code>
-
 Methods:
 
-- <code title="put /user/tokens/{token_id}/value">client.user.tokens.value.<a href="./src/resources/user/tokens/value.ts">update</a>(tokenId, { ...params }) -> Value</code>
+- <code title="put /user/tokens/{token_id}/value">client.user.tokens.value.<a href="./src/resources/user/tokens/value.ts">update</a>(tokenId, { ...params }) -> TokenValue</code>
 
 # Zones
 
@@ -271,6 +311,7 @@ Methods:
 Types:
 
 - <code><a href="./src/resources/zones/settings.ts">AdvancedDDoS</a></code>
+- <code><a href="./src/resources/zones/settings.ts">Aegis</a></code>
 - <code><a href="./src/resources/zones/settings.ts">AlwaysOnline</a></code>
 - <code><a href="./src/resources/zones/settings.ts">AlwaysUseHTTPS</a></code>
 - <code><a href="./src/resources/zones/settings.ts">AutomaticHTTPSRewrites</a></code>
@@ -293,9 +334,7 @@ Types:
 - <code><a href="./src/resources/zones/settings.ts">IPGeolocation</a></code>
 - <code><a href="./src/resources/zones/settings.ts">IPV6</a></code>
 - <code><a href="./src/resources/zones/settings.ts">MinTLSVersion</a></code>
-- <code><a href="./src/resources/zones/settings.ts">Minify</a></code>
 - <code><a href="./src/resources/zones/settings.ts">Mirage</a></code>
-- <code><a href="./src/resources/zones/settings.ts">MobileRedirect</a></code>
 - <code><a href="./src/resources/zones/settings.ts">NEL</a></code>
 - <code><a href="./src/resources/zones/settings.ts">OpportunisticEncryption</a></code>
 - <code><a href="./src/resources/zones/settings.ts">OpportunisticOnion</a></code>
@@ -338,8 +377,8 @@ Types:
 
 Methods:
 
-- <code title="put /zones/{zone_id}/custom_ns">client.zones.customNameservers.<a href="./src/resources/zones/custom-nameservers.ts">update</a>({ ...params }) -> CustomNameserverUpdateResponse | null</code>
-- <code title="get /zones/{zone_id}/custom_ns">client.zones.customNameservers.<a href="./src/resources/zones/custom-nameservers.ts">get</a>({ ...params }) -> CustomNameserverGetResponse | null</code>
+- <code title="put /zones/{zone_id}/custom_ns">client.zones.customNameservers.<a href="./src/resources/zones/custom-nameservers.ts">update</a>({ ...params }) -> CustomNameserverUpdateResponse</code>
+- <code title="get /zones/{zone_id}/custom_ns">client.zones.customNameservers.<a href="./src/resources/zones/custom-nameservers.ts">get</a>({ ...params }) -> CustomNameserverGetResponse</code>
 
 ## Holds
 
@@ -351,6 +390,7 @@ Methods:
 
 - <code title="post /zones/{zone_id}/hold">client.zones.holds.<a href="./src/resources/zones/holds.ts">create</a>({ ...params }) -> ZoneHold</code>
 - <code title="delete /zones/{zone_id}/hold">client.zones.holds.<a href="./src/resources/zones/holds.ts">delete</a>({ ...params }) -> ZoneHold</code>
+- <code title="patch /zones/{zone_id}/hold">client.zones.holds.<a href="./src/resources/zones/holds.ts">edit</a>({ ...params }) -> ZoneHold</code>
 - <code title="get /zones/{zone_id}/hold">client.zones.holds.<a href="./src/resources/zones/holds.ts">get</a>({ ...params }) -> ZoneHold</code>
 
 ## Subscriptions
@@ -358,14 +398,36 @@ Methods:
 Types:
 
 - <code><a href="./src/resources/zones/subscriptions.ts">SubscriptionCreateResponse</a></code>
+- <code><a href="./src/resources/zones/subscriptions.ts">SubscriptionUpdateResponse</a></code>
 - <code><a href="./src/resources/zones/subscriptions.ts">SubscriptionGetResponse</a></code>
 
 Methods:
 
 - <code title="post /zones/{identifier}/subscription">client.zones.subscriptions.<a href="./src/resources/zones/subscriptions.ts">create</a>(identifier, { ...params }) -> SubscriptionCreateResponse</code>
-- <code title="get /accounts/{account_identifier}/subscriptions">client.zones.subscriptions.<a href="./src/resources/zones/subscriptions.ts">list</a>(accountIdentifier) -> SubscriptionsSinglePage</code>
+- <code title="put /zones/{identifier}/subscription">client.zones.subscriptions.<a href="./src/resources/zones/subscriptions.ts">update</a>(identifier, { ...params }) -> SubscriptionUpdateResponse</code>
 - <code title="get /zones/{identifier}/subscription">client.zones.subscriptions.<a href="./src/resources/zones/subscriptions.ts">get</a>(identifier) -> SubscriptionGetResponse</code>
 
+## Plans
+
+Types:
+
+- <code><a href="./src/resources/zones/plans.ts">AvailableRatePlan</a></code>
+
+Methods:
+
+- <code title="get /zones/{zone_id}/available_plans">client.zones.plans.<a href="./src/resources/zones/plans.ts">list</a>({ ...params }) -> AvailableRatePlansSinglePage</code>
+- <code title="get /zones/{zone_id}/available_plans/{plan_identifier}">client.zones.plans.<a href="./src/resources/zones/plans.ts">get</a>(planIdentifier, { ...params }) -> AvailableRatePlan</code>
+
+## RatePlans
+
+Types:
+
+- <code><a href="./src/resources/zones/rate-plans.ts">RatePlanGetResponse</a></code>
+
+Methods:
+
+- <code title="get /zones/{zone_id}/available_rate_plans">client.zones.ratePlans.<a href="./src/resources/zones/rate-plans.ts">get</a>({ ...params }) -> RatePlanGetResponse | null</code>
+
 # LoadBalancers
 
 Types:
@@ -432,7 +494,7 @@ Types:
 
 Methods:
 
-- <code title="get /accounts/{account_id}/load_balancers/monitors/{monitor_id}/references">client.loadBalancers.monitors.references.<a href="./src/resources/load-balancers/monitors/references.ts">get</a>(monitorId, { ...params }) -> ReferenceGetResponse | null</code>
+- <code title="get /accounts/{account_id}/load_balancers/monitors/{monitor_id}/references">client.loadBalancers.monitors.references.<a href="./src/resources/load-balancers/monitors/references.ts">get</a>(monitorId, { ...params }) -> ReferenceGetResponse</code>
 
 ## Pools
 
@@ -440,6 +502,7 @@ Types:
 
 - <code><a href="./src/resources/load-balancers/pools/pools.ts">Pool</a></code>
 - <code><a href="./src/resources/load-balancers/pools/pools.ts">PoolDeleteResponse</a></code>
+- <code><a href="./src/resources/load-balancers/pools/pools.ts">PoolBulkEditResponse</a></code>
 
 Methods:
 
@@ -447,6 +510,7 @@ Methods:
 - <code title="put /accounts/{account_id}/load_balancers/pools/{pool_id}">client.loadBalancers.pools.<a href="./src/resources/load-balancers/pools/pools.ts">update</a>(poolId, { ...params }) -> Pool</code>
 - <code title="get /accounts/{account_id}/load_balancers/pools">client.loadBalancers.pools.<a href="./src/resources/load-balancers/pools/pools.ts">list</a>({ ...params }) -> PoolsSinglePage</code>
 - <code title="delete /accounts/{account_id}/load_balancers/pools/{pool_id}">client.loadBalancers.pools.<a href="./src/resources/load-balancers/pools/pools.ts">delete</a>(poolId, { ...params }) -> PoolDeleteResponse</code>
+- <code title="patch /accounts/{account_id}/load_balancers/pools">client.loadBalancers.pools.<a href="./src/resources/load-balancers/pools/pools.ts">bulkEdit</a>({ ...params }) -> PoolBulkEditResponse</code>
 - <code title="patch /accounts/{account_id}/load_balancers/pools/{pool_id}">client.loadBalancers.pools.<a href="./src/resources/load-balancers/pools/pools.ts">edit</a>(poolId, { ...params }) -> Pool</code>
 - <code title="get /accounts/{account_id}/load_balancers/pools/{pool_id}">client.loadBalancers.pools.<a href="./src/resources/load-balancers/pools/pools.ts">get</a>(poolId, { ...params }) -> Pool</code>
 
@@ -470,7 +534,7 @@ Types:
 
 Methods:
 
-- <code title="get /accounts/{account_id}/load_balancers/pools/{pool_id}/references">client.loadBalancers.pools.references.<a href="./src/resources/load-balancers/pools/references.ts">get</a>(poolId, { ...params }) -> ReferenceGetResponse | null</code>
+- <code title="get /accounts/{account_id}/load_balancers/pools/{pool_id}/references">client.loadBalancers.pools.references.<a href="./src/resources/load-balancers/pools/references.ts">get</a>(poolId, { ...params }) -> ReferenceGetResponse</code>
 
 ## Previews
 
@@ -502,7 +566,7 @@ Types:
 
 Methods:
 
-- <code title="get /accounts/{account_id}/load_balancers/search">client.loadBalancers.searches.<a href="./src/resources/load-balancers/searches.ts">get</a>({ ...params }) -> SearchGetResponse | null</code>
+- <code title="get /accounts/{account_id}/load_balancers/search">client.loadBalancers.searches.<a href="./src/resources/load-balancers/searches.ts">get</a>({ ...params }) -> SearchGetResponse</code>
 
 # Cache
 
@@ -552,13 +616,13 @@ Methods:
 Types:
 
 - <code><a href="./src/resources/cache/variants.ts">CacheVariant</a></code>
-- <code><a href="./src/resources/cache/variants.ts">CacheVariantIdentifier</a></code>
+- <code><a href="./src/resources/cache/variants.ts">VariantDeleteResponse</a></code>
 - <code><a href="./src/resources/cache/variants.ts">VariantEditResponse</a></code>
 - <code><a href="./src/resources/cache/variants.ts">VariantGetResponse</a></code>
 
 Methods:
 
-- <code title="delete /zones/{zone_id}/cache/variants">client.cache.variants.<a href="./src/resources/cache/variants.ts">delete</a>({ ...params }) -> CacheVariant</code>
+- <code title="delete /zones/{zone_id}/cache/variants">client.cache.variants.<a href="./src/resources/cache/variants.ts">delete</a>({ ...params }) -> VariantDeleteResponse</code>
 - <code title="patch /zones/{zone_id}/cache/variants">client.cache.variants.<a href="./src/resources/cache/variants.ts">edit</a>({ ...params }) -> VariantEditResponse</code>
 - <code title="get /zones/{zone_id}/cache/variants">client.cache.variants.<a href="./src/resources/cache/variants.ts">get</a>({ ...params }) -> VariantGetResponse</code>
 
@@ -595,6 +659,7 @@ Types:
 - <code><a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">RequestValidity</a></code>
 - <code><a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">Status</a></code>
 - <code><a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">ValidationMethod</a></code>
+- <code><a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">CertificatePackCreateResponse</a></code>
 - <code><a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">CertificatePackListResponse</a></code>
 - <code><a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">CertificatePackDeleteResponse</a></code>
 - <code><a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">CertificatePackEditResponse</a></code>
@@ -602,21 +667,12 @@ Types:
 
 Methods:
 
+- <code title="post /zones/{zone_id}/ssl/certificate_packs/order">client.ssl.certificatePacks.<a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">create</a>({ ...params }) -> CertificatePackCreateResponse</code>
 - <code title="get /zones/{zone_id}/ssl/certificate_packs">client.ssl.certificatePacks.<a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">list</a>({ ...params }) -> CertificatePackListResponsesSinglePage</code>
 - <code title="delete /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}">client.ssl.certificatePacks.<a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">delete</a>(certificatePackId, { ...params }) -> CertificatePackDeleteResponse</code>
 - <code title="patch /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}">client.ssl.certificatePacks.<a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">edit</a>(certificatePackId, { ...params }) -> CertificatePackEditResponse</code>
 - <code title="get /zones/{zone_id}/ssl/certificate_packs/{certificate_pack_id}">client.ssl.certificatePacks.<a href="./src/resources/ssl/certificate-packs/certificate-packs.ts">get</a>(certificatePackId, { ...params }) -> CertificatePackGetResponse</code>
 
-### Order
-
-Types:
-
-- <code><a href="./src/resources/ssl/certificate-packs/order.ts">OrderCreateResponse</a></code>
-
-Methods:
-
-- <code title="post /zones/{zone_id}/ssl/certificate_packs/order">client.ssl.certificatePacks.order.<a href="./src/resources/ssl/certificate-packs/order.ts">create</a>({ ...params }) -> OrderCreateResponse</code>
-
 ### Quota
 
 Types:
@@ -663,23 +719,6 @@ Methods:
 - <code title="patch /zones/{zone_id}/ssl/verification/{certificate_pack_id}">client.ssl.verification.<a href="./src/resources/ssl/verification.ts">edit</a>(certificatePackId, { ...params }) -> VerificationEditResponse</code>
 - <code title="get /zones/{zone_id}/ssl/verification">client.ssl.verification.<a href="./src/resources/ssl/verification.ts">get</a>({ ...params }) -> VerificationGetResponse</code>
 
-# Subscriptions
-
-Types:
-
-- <code><a href="./src/resources/subscriptions.ts">SubscriptionCreateResponse</a></code>
-- <code><a href="./src/resources/subscriptions.ts">SubscriptionUpdateResponse</a></code>
-- <code><a href="./src/resources/subscriptions.ts">SubscriptionDeleteResponse</a></code>
-- <code><a href="./src/resources/subscriptions.ts">SubscriptionGetResponse</a></code>
-
-Methods:
-
-- <code title="post /zones/{identifier}/subscription">client.subscriptions.<a href="./src/resources/subscriptions.ts">create</a>(identifier, { ...params }) -> SubscriptionCreateResponse</code>
-- <code title="put /accounts/{account_identifier}/subscriptions/{subscription_identifier}">client.subscriptions.<a href="./src/resources/subscriptions.ts">update</a>(accountIdentifier, subscriptionIdentifier, { ...params }) -> SubscriptionUpdateResponse</code>
-- <code title="get /accounts/{account_identifier}/subscriptions">client.subscriptions.<a href="./src/resources/subscriptions.ts">list</a>(accountIdentifier) -> SubscriptionsSinglePage</code>
-- <code title="delete /accounts/{account_identifier}/subscriptions/{subscription_identifier}">client.subscriptions.<a href="./src/resources/subscriptions.ts">delete</a>(accountIdentifier, subscriptionIdentifier) -> SubscriptionDeleteResponse</code>
-- <code title="get /zones/{identifier}/subscription">client.subscriptions.<a href="./src/resources/subscriptions.ts">get</a>(identifier) -> SubscriptionGetResponse</code>
-
 # ACM
 
 ## TotalTLS
@@ -721,28 +760,6 @@ Methods:
 - <code title="patch /zones/{zone_id}/argo/tiered_caching">client.argo.tieredCaching.<a href="./src/resources/argo/tiered-caching.ts">edit</a>({ ...params }) -> TieredCachingEditResponse</code>
 - <code title="get /zones/{zone_id}/argo/tiered_caching">client.argo.tieredCaching.<a href="./src/resources/argo/tiered-caching.ts">get</a>({ ...params }) -> TieredCachingGetResponse</code>
 
-# Plans
-
-Types:
-
-- <code><a href="./src/resources/plans.ts">AvailableRatePlan</a></code>
-
-Methods:
-
-- <code title="get /zones/{zone_identifier}/available_plans">client.plans.<a href="./src/resources/plans.ts">list</a>(zoneIdentifier) -> AvailableRatePlansSinglePage</code>
-- <code title="get /zones/{zone_identifier}/available_plans/{plan_identifier}">client.plans.<a href="./src/resources/plans.ts">get</a>(zoneIdentifier, planIdentifier) -> AvailableRatePlan</code>
-
-# RatePlans
-
-Types:
-
-- <code><a href="./src/resources/rate-plans.ts">RatePlan</a></code>
-- <code><a href="./src/resources/rate-plans.ts">RatePlanGetResponse</a></code>
-
-Methods:
-
-- <code title="get /zones/{zone_identifier}/available_rate_plans">client.ratePlans.<a href="./src/resources/rate-plans.ts">get</a>(zoneIdentifier) -> RatePlanGetResponse | null</code>
-
 # CertificateAuthorities
 
 ## HostnameAssociations
@@ -780,18 +797,15 @@ Types:
 - <code><a href="./src/resources/custom-certificates/custom-certificates.ts">CustomCertificate</a></code>
 - <code><a href="./src/resources/custom-certificates/custom-certificates.ts">GeoRestrictions</a></code>
 - <code><a href="./src/resources/custom-certificates/custom-certificates.ts">Status</a></code>
-- <code><a href="./src/resources/custom-certificates/custom-certificates.ts">CustomCertificateCreateResponse</a></code>
 - <code><a href="./src/resources/custom-certificates/custom-certificates.ts">CustomCertificateDeleteResponse</a></code>
-- <code><a href="./src/resources/custom-certificates/custom-certificates.ts">CustomCertificateEditResponse</a></code>
-- <code><a href="./src/resources/custom-certificates/custom-certificates.ts">CustomCertificateGetResponse</a></code>
 
 Methods:
 
-- <code title="post /zones/{zone_id}/custom_certificates">client.customCertificates.<a href="./src/resources/custom-certificates/custom-certificates.ts">create</a>({ ...params }) -> CustomCertificateCreateResponse</code>
+- <code title="post /zones/{zone_id}/custom_certificates">client.customCertificates.<a href="./src/resources/custom-certificates/custom-certificates.ts">create</a>({ ...params }) -> CustomCertificate</code>
 - <code title="get /zones/{zone_id}/custom_certificates">client.customCertificates.<a href="./src/resources/custom-certificates/custom-certificates.ts">list</a>({ ...params }) -> CustomCertificatesV4PagePaginationArray</code>
 - <code title="delete /zones/{zone_id}/custom_certificates/{custom_certificate_id}">client.customCertificates.<a href="./src/resources/custom-certificates/custom-certificates.ts">delete</a>(customCertificateId, { ...params }) -> CustomCertificateDeleteResponse</code>
-- <code title="patch /zones/{zone_id}/custom_certificates/{custom_certificate_id}">client.customCertificates.<a href="./src/resources/custom-certificates/custom-certificates.ts">edit</a>(customCertificateId, { ...params }) -> CustomCertificateEditResponse</code>
-- <code title="get /zones/{zone_id}/custom_certificates/{custom_certificate_id}">client.customCertificates.<a href="./src/resources/custom-certificates/custom-certificates.ts">get</a>(customCertificateId, { ...params }) -> CustomCertificateGetResponse</code>
+- <code title="patch /zones/{zone_id}/custom_certificates/{custom_certificate_id}">client.customCertificates.<a href="./src/resources/custom-certificates/custom-certificates.ts">edit</a>(customCertificateId, { ...params }) -> CustomCertificate</code>
+- <code title="get /zones/{zone_id}/custom_certificates/{custom_certificate_id}">client.customCertificates.<a href="./src/resources/custom-certificates/custom-certificates.ts">get</a>(customCertificateId, { ...params }) -> CustomCertificate</code>
 
 ## Prioritize
 
@@ -801,7 +815,7 @@ Types:
 
 Methods:
 
-- <code title="put /zones/{zone_id}/custom_certificates/prioritize">client.customCertificates.prioritize.<a href="./src/resources/custom-certificates/prioritize.ts">update</a>({ ...params }) -> PrioritizeUpdateResponse | null</code>
+- <code title="put /zones/{zone_id}/custom_certificates/prioritize">client.customCertificates.prioritize.<a href="./src/resources/custom-certificates/prioritize.ts">update</a>({ ...params }) -> PrioritizeUpdateResponse</code>
 
 # CustomHostnames
 
@@ -851,9 +865,56 @@ Types:
 Methods:
 
 - <code title="post /accounts/{account_id}/custom_ns">client.customNameservers.<a href="./src/resources/custom-nameservers.ts">create</a>({ ...params }) -> CustomNameserver</code>
-- <code title="delete /accounts/{account_id}/custom_ns/{custom_ns_id}">client.customNameservers.<a href="./src/resources/custom-nameservers.ts">delete</a>(customNSId, { ...params }) -> CustomNameserverDeleteResponse | null</code>
-- <code title="get /accounts/{account_id}/custom_ns/availability">client.customNameservers.<a href="./src/resources/custom-nameservers.ts">availabilty</a>({ ...params }) -> CustomNameserverAvailabiltyResponse | null</code>
-- <code title="get /accounts/{account_id}/custom_ns">client.customNameservers.<a href="./src/resources/custom-nameservers.ts">get</a>({ ...params }) -> CustomNameserverGetResponse | null</code>
+- <code title="delete /accounts/{account_id}/custom_ns/{custom_ns_id}">client.customNameservers.<a href="./src/resources/custom-nameservers.ts">delete</a>(customNSId, { ...params }) -> CustomNameserverDeleteResponse</code>
+- <code title="get /accounts/{account_id}/custom_ns/availability">client.customNameservers.<a href="./src/resources/custom-nameservers.ts">availabilty</a>({ ...params }) -> CustomNameserverAvailabiltyResponse</code>
+- <code title="get /accounts/{account_id}/custom_ns">client.customNameservers.<a href="./src/resources/custom-nameservers.ts">get</a>({ ...params }) -> CustomNameserverGetResponse</code>
+
+# DNSFirewall
+
+Types:
+
+- <code><a href="./src/resources/dns-firewall/dns-firewall.ts">AttackMitigation</a></code>
+- <code><a href="./src/resources/dns-firewall/dns-firewall.ts">FirewallIPs</a></code>
+- <code><a href="./src/resources/dns-firewall/dns-firewall.ts">UpstreamIPs</a></code>
+- <code><a href="./src/resources/dns-firewall/dns-firewall.ts">DNSFirewallCreateResponse</a></code>
+- <code><a href="./src/resources/dns-firewall/dns-firewall.ts">DNSFirewallListResponse</a></code>
+- <code><a href="./src/resources/dns-firewall/dns-firewall.ts">DNSFirewallDeleteResponse</a></code>
+- <code><a href="./src/resources/dns-firewall/dns-firewall.ts">DNSFirewallEditResponse</a></code>
+- <code><a href="./src/resources/dns-firewall/dns-firewall.ts">DNSFirewallGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dns_firewall">client.dnsFirewall.<a href="./src/resources/dns-firewall/dns-firewall.ts">create</a>({ ...params }) -> DNSFirewallCreateResponse</code>
+- <code title="get /accounts/{account_id}/dns_firewall">client.dnsFirewall.<a href="./src/resources/dns-firewall/dns-firewall.ts">list</a>({ ...params }) -> DNSFirewallListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dnsFirewall.<a href="./src/resources/dns-firewall/dns-firewall.ts">delete</a>(dnsFirewallId, { ...params }) -> DNSFirewallDeleteResponse</code>
+- <code title="patch /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dnsFirewall.<a href="./src/resources/dns-firewall/dns-firewall.ts">edit</a>(dnsFirewallId, { ...params }) -> DNSFirewallEditResponse</code>
+- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dnsFirewall.<a href="./src/resources/dns-firewall/dns-firewall.ts">get</a>(dnsFirewallId, { ...params }) -> DNSFirewallGetResponse</code>
+
+## Analytics
+
+### Reports
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report">client.dnsFirewall.analytics.reports.<a href="./src/resources/dns-firewall/analytics/reports/reports.ts">get</a>(dnsFirewallId, { ...params }) -> Report</code>
+
+#### Bytimes
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report/bytime">client.dnsFirewall.analytics.reports.bytimes.<a href="./src/resources/dns-firewall/analytics/reports/bytimes.ts">get</a>(dnsFirewallId, { ...params }) -> ByTime</code>
+
+## ReverseDNS
+
+Types:
+
+- <code><a href="./src/resources/dns-firewall/reverse-dns.ts">ReverseDNSEditResponse</a></code>
+- <code><a href="./src/resources/dns-firewall/reverse-dns.ts">ReverseDNSGetResponse</a></code>
+
+Methods:
+
+- <code title="patch /accounts/{account_id}/dns_firewall/{dns_firewall_id}/reverse_dns">client.dnsFirewall.reverseDNS.<a href="./src/resources/dns-firewall/reverse-dns.ts">edit</a>(dnsFirewallId, { ...params }) -> ReverseDNSEditResponse</code>
+- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}/reverse_dns">client.dnsFirewall.reverseDNS.<a href="./src/resources/dns-firewall/reverse-dns.ts">get</a>(dnsFirewallId, { ...params }) -> ReverseDNSGetResponse</code>
 
 # DNS
 
@@ -862,12 +923,27 @@ Types:
 - <code><a href="./src/resources/dns/dns.ts">DNSAnalyticsNominalMetric</a></code>
 - <code><a href="./src/resources/dns/dns.ts">DNSAnalyticsQuery</a></code>
 
+## DNSSEC
+
+Types:
+
+- <code><a href="./src/resources/dns/dnssec.ts">DNSSEC</a></code>
+- <code><a href="./src/resources/dns/dnssec.ts">DNSSECDeleteResponse</a></code>
+
+Methods:
+
+- <code title="delete /zones/{zone_id}/dnssec">client.dns.dnssec.<a href="./src/resources/dns/dnssec.ts">delete</a>({ ...params }) -> DNSSECDeleteResponse</code>
+- <code title="patch /zones/{zone_id}/dnssec">client.dns.dnssec.<a href="./src/resources/dns/dnssec.ts">edit</a>({ ...params }) -> DNSSEC</code>
+- <code title="get /zones/{zone_id}/dnssec">client.dns.dnssec.<a href="./src/resources/dns/dnssec.ts">get</a>({ ...params }) -> DNSSEC</code>
+
 ## Records
 
 Types:
 
 - <code><a href="./src/resources/dns/records.ts">ARecord</a></code>
 - <code><a href="./src/resources/dns/records.ts">AAAARecord</a></code>
+- <code><a href="./src/resources/dns/records.ts">BatchPatch</a></code>
+- <code><a href="./src/resources/dns/records.ts">BatchPut</a></code>
 - <code><a href="./src/resources/dns/records.ts">CAARecord</a></code>
 - <code><a href="./src/resources/dns/records.ts">CERTRecord</a></code>
 - <code><a href="./src/resources/dns/records.ts">CNAMERecord</a></code>
@@ -880,8 +956,7 @@ Types:
 - <code><a href="./src/resources/dns/records.ts">NSRecord</a></code>
 - <code><a href="./src/resources/dns/records.ts">PTRRecord</a></code>
 - <code><a href="./src/resources/dns/records.ts">Record</a></code>
-- <code><a href="./src/resources/dns/records.ts">RecordMetadata</a></code>
-- <code><a href="./src/resources/dns/records.ts">RecordProcessTiming</a></code>
+- <code><a href="./src/resources/dns/records.ts">RecordResponse</a></code>
 - <code><a href="./src/resources/dns/records.ts">RecordTags</a></code>
 - <code><a href="./src/resources/dns/records.ts">SMIMEARecord</a></code>
 - <code><a href="./src/resources/dns/records.ts">SRVRecord</a></code>
@@ -892,19 +967,21 @@ Types:
 - <code><a href="./src/resources/dns/records.ts">TXTRecord</a></code>
 - <code><a href="./src/resources/dns/records.ts">URIRecord</a></code>
 - <code><a href="./src/resources/dns/records.ts">RecordDeleteResponse</a></code>
+- <code><a href="./src/resources/dns/records.ts">RecordBatchResponse</a></code>
 - <code><a href="./src/resources/dns/records.ts">RecordExportResponse</a></code>
 - <code><a href="./src/resources/dns/records.ts">RecordImportResponse</a></code>
 - <code><a href="./src/resources/dns/records.ts">RecordScanResponse</a></code>
 
 Methods:
 
-- <code title="post /zones/{zone_id}/dns_records">client.dns.records.<a href="./src/resources/dns/records.ts">create</a>({ ...params }) -> Record</code>
-- <code title="put /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/resources/dns/records.ts">update</a>(dnsRecordId, { ...params }) -> Record</code>
-- <code title="get /zones/{zone_id}/dns_records">client.dns.records.<a href="./src/resources/dns/records.ts">list</a>({ ...params }) -> RecordsV4PagePaginationArray</code>
+- <code title="post /zones/{zone_id}/dns_records">client.dns.records.<a href="./src/resources/dns/records.ts">create</a>({ ...params }) -> RecordResponse</code>
+- <code title="put /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/resources/dns/records.ts">update</a>(dnsRecordId, { ...params }) -> RecordResponse</code>
+- <code title="get /zones/{zone_id}/dns_records">client.dns.records.<a href="./src/resources/dns/records.ts">list</a>({ ...params }) -> RecordResponsesV4PagePaginationArray</code>
 - <code title="delete /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/resources/dns/records.ts">delete</a>(dnsRecordId, { ...params }) -> RecordDeleteResponse</code>
-- <code title="patch /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/resources/dns/records.ts">edit</a>(dnsRecordId, { ...params }) -> Record</code>
+- <code title="post /zones/{zone_id}/dns_records/batch">client.dns.records.<a href="./src/resources/dns/records.ts">batch</a>({ ...params }) -> RecordBatchResponse</code>
+- <code title="patch /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/resources/dns/records.ts">edit</a>(dnsRecordId, { ...params }) -> RecordResponse</code>
 - <code title="get /zones/{zone_id}/dns_records/export">client.dns.records.<a href="./src/resources/dns/records.ts">export</a>({ ...params }) -> string</code>
-- <code title="get /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/resources/dns/records.ts">get</a>(dnsRecordId, { ...params }) -> Record</code>
+- <code title="get /zones/{zone_id}/dns_records/{dns_record_id}">client.dns.records.<a href="./src/resources/dns/records.ts">get</a>(dnsRecordId, { ...params }) -> RecordResponse</code>
 - <code title="post /zones/{zone_id}/dns_records/import">client.dns.records.<a href="./src/resources/dns/records.ts">import</a>({ ...params }) -> RecordImportResponse</code>
 - <code title="post /zones/{zone_id}/dns_records/scan">client.dns.records.<a href="./src/resources/dns/records.ts">scan</a>({ ...params }) -> RecordScanResponse</code>
 
@@ -912,15 +989,32 @@ Methods:
 
 Types:
 
-- <code><a href="./src/resources/dns/settings.ts">DNSSetting</a></code>
-- <code><a href="./src/resources/dns/settings.ts">Nameserver</a></code>
-- <code><a href="./src/resources/dns/settings.ts">SettingEditResponse</a></code>
-- <code><a href="./src/resources/dns/settings.ts">SettingGetResponse</a></code>
+- <code><a href="./src/resources/dns/settings/settings.ts">DNSSetting</a></code>
+- <code><a href="./src/resources/dns/settings/settings.ts">SettingEditResponse</a></code>
+- <code><a href="./src/resources/dns/settings/settings.ts">SettingGetResponse</a></code>
+
+Methods:
+
+- <code title="patch /{account_or_zone}/{account_or_zone_id}/dns_settings">client.dns.settings.<a href="./src/resources/dns/settings/settings.ts">edit</a>({ ...params }) -> SettingEditResponse</code>
+- <code title="get /{account_or_zone}/{account_or_zone_id}/dns_settings">client.dns.settings.<a href="./src/resources/dns/settings/settings.ts">get</a>({ ...params }) -> SettingGetResponse</code>
+
+### Views
+
+Types:
+
+- <code><a href="./src/resources/dns/settings/views.ts">ViewCreateResponse</a></code>
+- <code><a href="./src/resources/dns/settings/views.ts">ViewListResponse</a></code>
+- <code><a href="./src/resources/dns/settings/views.ts">ViewDeleteResponse</a></code>
+- <code><a href="./src/resources/dns/settings/views.ts">ViewEditResponse</a></code>
+- <code><a href="./src/resources/dns/settings/views.ts">ViewGetResponse</a></code>
 
 Methods:
 
-- <code title="patch /{account_or_zone}/{account_or_zone_id}/dns_settings">client.dns.settings.<a href="./src/resources/dns/settings.ts">edit</a>({ ...params }) -> SettingEditResponse</code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/dns_settings">client.dns.settings.<a href="./src/resources/dns/settings.ts">get</a>({ ...params }) -> SettingGetResponse</code>
+- <code title="post /accounts/{account_id}/dns_settings/views">client.dns.settings.views.<a href="./src/resources/dns/settings/views.ts">create</a>({ ...params }) -> ViewCreateResponse</code>
+- <code title="get /accounts/{account_id}/dns_settings/views">client.dns.settings.views.<a href="./src/resources/dns/settings/views.ts">list</a>({ ...params }) -> ViewListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/dns_settings/views/{view_id}">client.dns.settings.views.<a href="./src/resources/dns/settings/views.ts">delete</a>(viewId, { ...params }) -> ViewDeleteResponse</code>
+- <code title="patch /accounts/{account_id}/dns_settings/views/{view_id}">client.dns.settings.views.<a href="./src/resources/dns/settings/views.ts">edit</a>(viewId, { ...params }) -> ViewEditResponse</code>
+- <code title="get /accounts/{account_id}/dns_settings/views/{view_id}">client.dns.settings.views.<a href="./src/resources/dns/settings/views.ts">get</a>(viewId, { ...params }) -> ViewGetResponse</code>
 
 ## Analytics
 
@@ -944,54 +1038,299 @@ Methods:
 
 - <code title="get /zones/{zone_id}/dns_analytics/report/bytime">client.dns.analytics.reports.bytimes.<a href="./src/resources/dns/analytics/reports/bytimes.ts">get</a>({ ...params }) -> ByTime</code>
 
-## Firewall
+## ZoneTransfers
+
+### ForceAXFR
 
 Types:
 
-- <code><a href="./src/resources/dns/firewall/firewall.ts">AttackMitigation</a></code>
-- <code><a href="./src/resources/dns/firewall/firewall.ts">Firewall</a></code>
-- <code><a href="./src/resources/dns/firewall/firewall.ts">FirewallIPs</a></code>
-- <code><a href="./src/resources/dns/firewall/firewall.ts">UpstreamIPs</a></code>
-- <code><a href="./src/resources/dns/firewall/firewall.ts">FirewallDeleteResponse</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/force-axfr.ts">ForceAXFR</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/dns_firewall">client.dns.firewall.<a href="./src/resources/dns/firewall/firewall.ts">create</a>({ ...params }) -> Firewall</code>
-- <code title="get /accounts/{account_id}/dns_firewall">client.dns.firewall.<a href="./src/resources/dns/firewall/firewall.ts">list</a>({ ...params }) -> FirewallsV4PagePaginationArray</code>
-- <code title="delete /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dns.firewall.<a href="./src/resources/dns/firewall/firewall.ts">delete</a>(dnsFirewallId, { ...params }) -> FirewallDeleteResponse</code>
-- <code title="patch /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dns.firewall.<a href="./src/resources/dns/firewall/firewall.ts">edit</a>(dnsFirewallId, { ...params }) -> Firewall</code>
-- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}">client.dns.firewall.<a href="./src/resources/dns/firewall/firewall.ts">get</a>(dnsFirewallId, { ...params }) -> Firewall</code>
+- <code title="post /zones/{zone_id}/secondary_dns/force_axfr">client.dns.zoneTransfers.forceAXFR.<a href="./src/resources/dns/zone-transfers/force-axfr.ts">create</a>({ ...params }) -> ForceAXFR</code>
 
-### Analytics
+### Incoming
+
+Types:
+
+- <code><a href="./src/resources/dns/zone-transfers/incoming.ts">Incoming</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/incoming.ts">IncomingCreateResponse</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/incoming.ts">IncomingUpdateResponse</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/incoming.ts">IncomingDeleteResponse</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/incoming.ts">IncomingGetResponse</a></code>
+
+Methods:
+
+- <code title="post /zones/{zone_id}/secondary_dns/incoming">client.dns.zoneTransfers.incoming.<a href="./src/resources/dns/zone-transfers/incoming.ts">create</a>({ ...params }) -> IncomingCreateResponse</code>
+- <code title="put /zones/{zone_id}/secondary_dns/incoming">client.dns.zoneTransfers.incoming.<a href="./src/resources/dns/zone-transfers/incoming.ts">update</a>({ ...params }) -> IncomingUpdateResponse</code>
+- <code title="delete /zones/{zone_id}/secondary_dns/incoming">client.dns.zoneTransfers.incoming.<a href="./src/resources/dns/zone-transfers/incoming.ts">delete</a>({ ...params }) -> IncomingDeleteResponse</code>
+- <code title="get /zones/{zone_id}/secondary_dns/incoming">client.dns.zoneTransfers.incoming.<a href="./src/resources/dns/zone-transfers/incoming.ts">get</a>({ ...params }) -> IncomingGetResponse</code>
+
+### Outgoing
+
+Types:
+
+- <code><a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">DisableTransfer</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">EnableTransfer</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">Outgoing</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">OutgoingStatus</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">OutgoingCreateResponse</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">OutgoingUpdateResponse</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">OutgoingDeleteResponse</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">OutgoingForceNotifyResponse</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">OutgoingGetResponse</a></code>
+
+Methods:
+
+- <code title="post /zones/{zone_id}/secondary_dns/outgoing">client.dns.zoneTransfers.outgoing.<a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">create</a>({ ...params }) -> OutgoingCreateResponse</code>
+- <code title="put /zones/{zone_id}/secondary_dns/outgoing">client.dns.zoneTransfers.outgoing.<a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">update</a>({ ...params }) -> OutgoingUpdateResponse</code>
+- <code title="delete /zones/{zone_id}/secondary_dns/outgoing">client.dns.zoneTransfers.outgoing.<a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">delete</a>({ ...params }) -> OutgoingDeleteResponse</code>
+- <code title="post /zones/{zone_id}/secondary_dns/outgoing/disable">client.dns.zoneTransfers.outgoing.<a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">disable</a>({ ...params }) -> DisableTransfer</code>
+- <code title="post /zones/{zone_id}/secondary_dns/outgoing/enable">client.dns.zoneTransfers.outgoing.<a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">enable</a>({ ...params }) -> EnableTransfer</code>
+- <code title="post /zones/{zone_id}/secondary_dns/outgoing/force_notify">client.dns.zoneTransfers.outgoing.<a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">forceNotify</a>({ ...params }) -> OutgoingForceNotifyResponse</code>
+- <code title="get /zones/{zone_id}/secondary_dns/outgoing">client.dns.zoneTransfers.outgoing.<a href="./src/resources/dns/zone-transfers/outgoing/outgoing.ts">get</a>({ ...params }) -> OutgoingGetResponse</code>
+
+#### Status
+
+Methods:
+
+- <code title="get /zones/{zone_id}/secondary_dns/outgoing/status">client.dns.zoneTransfers.outgoing.status.<a href="./src/resources/dns/zone-transfers/outgoing/status.ts">get</a>({ ...params }) -> EnableTransfer</code>
+
+### ACLs
+
+Types:
+
+- <code><a href="./src/resources/dns/zone-transfers/acls.ts">ACL</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/acls.ts">ACLDeleteResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/secondary_dns/acls">client.dns.zoneTransfers.acls.<a href="./src/resources/dns/zone-transfers/acls.ts">create</a>({ ...params }) -> ACL</code>
+- <code title="put /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.dns.zoneTransfers.acls.<a href="./src/resources/dns/zone-transfers/acls.ts">update</a>(aclId, { ...params }) -> ACL</code>
+- <code title="get /accounts/{account_id}/secondary_dns/acls">client.dns.zoneTransfers.acls.<a href="./src/resources/dns/zone-transfers/acls.ts">list</a>({ ...params }) -> ACLsSinglePage</code>
+- <code title="delete /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.dns.zoneTransfers.acls.<a href="./src/resources/dns/zone-transfers/acls.ts">delete</a>(aclId, { ...params }) -> ACLDeleteResponse</code>
+- <code title="get /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.dns.zoneTransfers.acls.<a href="./src/resources/dns/zone-transfers/acls.ts">get</a>(aclId, { ...params }) -> ACL</code>
+
+### Peers
+
+Types:
+
+- <code><a href="./src/resources/dns/zone-transfers/peers.ts">Peer</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/peers.ts">PeerDeleteResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/secondary_dns/peers">client.dns.zoneTransfers.peers.<a href="./src/resources/dns/zone-transfers/peers.ts">create</a>({ ...params }) -> Peer</code>
+- <code title="put /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.dns.zoneTransfers.peers.<a href="./src/resources/dns/zone-transfers/peers.ts">update</a>(peerId, { ...params }) -> Peer</code>
+- <code title="get /accounts/{account_id}/secondary_dns/peers">client.dns.zoneTransfers.peers.<a href="./src/resources/dns/zone-transfers/peers.ts">list</a>({ ...params }) -> PeersSinglePage</code>
+- <code title="delete /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.dns.zoneTransfers.peers.<a href="./src/resources/dns/zone-transfers/peers.ts">delete</a>(peerId, { ...params }) -> PeerDeleteResponse</code>
+- <code title="get /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.dns.zoneTransfers.peers.<a href="./src/resources/dns/zone-transfers/peers.ts">get</a>(peerId, { ...params }) -> Peer</code>
+
+### TSIGs
+
+Types:
+
+- <code><a href="./src/resources/dns/zone-transfers/tsigs.ts">TSIG</a></code>
+- <code><a href="./src/resources/dns/zone-transfers/tsigs.ts">TSIGDeleteResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/secondary_dns/tsigs">client.dns.zoneTransfers.tsigs.<a href="./src/resources/dns/zone-transfers/tsigs.ts">create</a>({ ...params }) -> TSIG</code>
+- <code title="put /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.dns.zoneTransfers.tsigs.<a href="./src/resources/dns/zone-transfers/tsigs.ts">update</a>(tsigId, { ...params }) -> TSIG</code>
+- <code title="get /accounts/{account_id}/secondary_dns/tsigs">client.dns.zoneTransfers.tsigs.<a href="./src/resources/dns/zone-transfers/tsigs.ts">list</a>({ ...params }) -> TSIGsSinglePage</code>
+- <code title="delete /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.dns.zoneTransfers.tsigs.<a href="./src/resources/dns/zone-transfers/tsigs.ts">delete</a>(tsigId, { ...params }) -> TSIGDeleteResponse</code>
+- <code title="get /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.dns.zoneTransfers.tsigs.<a href="./src/resources/dns/zone-transfers/tsigs.ts">get</a>(tsigId, { ...params }) -> TSIG</code>
+
+# EmailSecurity
+
+## Investigate
+
+Types:
+
+- <code><a href="./src/resources/email-security/investigate/investigate.ts">InvestigateListResponse</a></code>
+- <code><a href="./src/resources/email-security/investigate/investigate.ts">InvestigateGetResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/email-security/investigate">client.emailSecurity.investigate.<a href="./src/resources/email-security/investigate/investigate.ts">list</a>({ ...params }) -> InvestigateListResponsesV4PagePaginationArray</code>
+- <code title="get /accounts/{account_id}/email-security/investigate/{postfix_id}">client.emailSecurity.investigate.<a href="./src/resources/email-security/investigate/investigate.ts">get</a>(postfixId, { ...params }) -> InvestigateGetResponse</code>
+
+### Detections
+
+Types:
+
+- <code><a href="./src/resources/email-security/investigate/detections.ts">DetectionGetResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/email-security/investigate/{postfix_id}/detections">client.emailSecurity.investigate.detections.<a href="./src/resources/email-security/investigate/detections.ts">get</a>(postfixId, { ...params }) -> DetectionGetResponse</code>
+
+### Preview
+
+Types:
+
+- <code><a href="./src/resources/email-security/investigate/preview.ts">PreviewCreateResponse</a></code>
+- <code><a href="./src/resources/email-security/investigate/preview.ts">PreviewGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/investigate/preview">client.emailSecurity.investigate.preview.<a href="./src/resources/email-security/investigate/preview.ts">create</a>({ ...params }) -> PreviewCreateResponse</code>
+- <code title="get /accounts/{account_id}/email-security/investigate/{postfix_id}/preview">client.emailSecurity.investigate.preview.<a href="./src/resources/email-security/investigate/preview.ts">get</a>(postfixId, { ...params }) -> PreviewGetResponse</code>
+
+### Raw
+
+Types:
+
+- <code><a href="./src/resources/email-security/investigate/raw.ts">RawGetResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/email-security/investigate/{postfix_id}/raw">client.emailSecurity.investigate.raw.<a href="./src/resources/email-security/investigate/raw.ts">get</a>(postfixId, { ...params }) -> RawGetResponse</code>
+
+### Trace
+
+Types:
+
+- <code><a href="./src/resources/email-security/investigate/trace.ts">TraceGetResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/email-security/investigate/{postfix_id}/trace">client.emailSecurity.investigate.trace.<a href="./src/resources/email-security/investigate/trace.ts">get</a>(postfixId, { ...params }) -> TraceGetResponse</code>
+
+### Move
+
+Types:
+
+- <code><a href="./src/resources/email-security/investigate/move.ts">MoveCreateResponse</a></code>
+- <code><a href="./src/resources/email-security/investigate/move.ts">MoveBulkResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/investigate/{postfix_id}/move">client.emailSecurity.investigate.move.<a href="./src/resources/email-security/investigate/move.ts">create</a>(postfixId, { ...params }) -> MoveCreateResponse</code>
+- <code title="post /accounts/{account_id}/email-security/investigate/move">client.emailSecurity.investigate.move.<a href="./src/resources/email-security/investigate/move.ts">bulk</a>({ ...params }) -> MoveBulkResponse</code>
+
+### Reclassify
+
+Types:
+
+- <code><a href="./src/resources/email-security/investigate/reclassify.ts">ReclassifyCreateResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/investigate/{postfix_id}/reclassify">client.emailSecurity.investigate.reclassify.<a href="./src/resources/email-security/investigate/reclassify.ts">create</a>(postfixId, { ...params }) -> ReclassifyCreateResponse</code>
+
+### Release
+
+Types:
+
+- <code><a href="./src/resources/email-security/investigate/release.ts">ReleaseBulkResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/investigate/release">client.emailSecurity.investigate.release.<a href="./src/resources/email-security/investigate/release.ts">bulk</a>([ ...body ]) -> ReleaseBulkResponse</code>
+
+## Settings
+
+### AllowPolicies
+
+Types:
+
+- <code><a href="./src/resources/email-security/settings/allow-policies.ts">AllowPolicyCreateResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/allow-policies.ts">AllowPolicyListResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/allow-policies.ts">AllowPolicyDeleteResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/allow-policies.ts">AllowPolicyEditResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/allow-policies.ts">AllowPolicyGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/settings/allow_policies">client.emailSecurity.settings.allowPolicies.<a href="./src/resources/email-security/settings/allow-policies.ts">create</a>({ ...params }) -> AllowPolicyCreateResponse</code>
+- <code title="get /accounts/{account_id}/email-security/settings/allow_policies">client.emailSecurity.settings.allowPolicies.<a href="./src/resources/email-security/settings/allow-policies.ts">list</a>({ ...params }) -> AllowPolicyListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/email-security/settings/allow_policies/{policy_id}">client.emailSecurity.settings.allowPolicies.<a href="./src/resources/email-security/settings/allow-policies.ts">delete</a>(policyId, { ...params }) -> AllowPolicyDeleteResponse</code>
+- <code title="patch /accounts/{account_id}/email-security/settings/allow_policies/{policy_id}">client.emailSecurity.settings.allowPolicies.<a href="./src/resources/email-security/settings/allow-policies.ts">edit</a>(policyId, { ...params }) -> AllowPolicyEditResponse</code>
+- <code title="get /accounts/{account_id}/email-security/settings/allow_policies/{policy_id}">client.emailSecurity.settings.allowPolicies.<a href="./src/resources/email-security/settings/allow-policies.ts">get</a>(policyId, { ...params }) -> AllowPolicyGetResponse</code>
+
+### BlockSenders
+
+Types:
+
+- <code><a href="./src/resources/email-security/settings/block-senders.ts">BlockSenderCreateResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/block-senders.ts">BlockSenderListResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/block-senders.ts">BlockSenderDeleteResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/block-senders.ts">BlockSenderEditResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/block-senders.ts">BlockSenderGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/email-security/settings/block_senders">client.emailSecurity.settings.blockSenders.<a href="./src/resources/email-security/settings/block-senders.ts">create</a>({ ...params }) -> BlockSenderCreateResponse</code>
+- <code title="get /accounts/{account_id}/email-security/settings/block_senders">client.emailSecurity.settings.blockSenders.<a href="./src/resources/email-security/settings/block-senders.ts">list</a>({ ...params }) -> BlockSenderListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/email-security/settings/block_senders/{pattern_id}">client.emailSecurity.settings.blockSenders.<a href="./src/resources/email-security/settings/block-senders.ts">delete</a>(patternId, { ...params }) -> BlockSenderDeleteResponse</code>
+- <code title="patch /accounts/{account_id}/email-security/settings/block_senders/{pattern_id}">client.emailSecurity.settings.blockSenders.<a href="./src/resources/email-security/settings/block-senders.ts">edit</a>(patternId, { ...params }) -> BlockSenderEditResponse</code>
+- <code title="get /accounts/{account_id}/email-security/settings/block_senders/{pattern_id}">client.emailSecurity.settings.blockSenders.<a href="./src/resources/email-security/settings/block-senders.ts">get</a>(patternId, { ...params }) -> BlockSenderGetResponse</code>
+
+### Domains
 
 Types:
 
-- <code><a href="./src/resources/dns/firewall/analytics/analytics.ts">Delta</a></code>
+- <code><a href="./src/resources/email-security/settings/domains.ts">DomainListResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/domains.ts">DomainDeleteResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/domains.ts">DomainBulkDeleteResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/domains.ts">DomainEditResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/domains.ts">DomainGetResponse</a></code>
 
-#### Reports
+Methods:
+
+- <code title="get /accounts/{account_id}/email-security/settings/domains">client.emailSecurity.settings.domains.<a href="./src/resources/email-security/settings/domains.ts">list</a>({ ...params }) -> DomainListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/email-security/settings/domains/{domain_id}">client.emailSecurity.settings.domains.<a href="./src/resources/email-security/settings/domains.ts">delete</a>(domainId, { ...params }) -> DomainDeleteResponse</code>
+- <code title="delete /accounts/{account_id}/email-security/settings/domains">client.emailSecurity.settings.domains.<a href="./src/resources/email-security/settings/domains.ts">bulkDelete</a>({ ...params }) -> DomainBulkDeleteResponse</code>
+- <code title="patch /accounts/{account_id}/email-security/settings/domains/{domain_id}">client.emailSecurity.settings.domains.<a href="./src/resources/email-security/settings/domains.ts">edit</a>(domainId, { ...params }) -> DomainEditResponse</code>
+- <code title="get /accounts/{account_id}/email-security/settings/domains/{domain_id}">client.emailSecurity.settings.domains.<a href="./src/resources/email-security/settings/domains.ts">get</a>(domainId, { ...params }) -> DomainGetResponse</code>
+
+### ImpersonationRegistry
+
+Types:
+
+- <code><a href="./src/resources/email-security/settings/impersonation-registry.ts">ImpersonationRegistryCreateResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/impersonation-registry.ts">ImpersonationRegistryListResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/impersonation-registry.ts">ImpersonationRegistryDeleteResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/impersonation-registry.ts">ImpersonationRegistryEditResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/impersonation-registry.ts">ImpersonationRegistryGetResponse</a></code>
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report">client.dns.firewall.analytics.reports.<a href="./src/resources/dns/firewall/analytics/reports/reports.ts">get</a>(dnsFirewallId, { ...params }) -> Report</code>
+- <code title="post /accounts/{account_id}/email-security/settings/impersonation_registry">client.emailSecurity.settings.impersonationRegistry.<a href="./src/resources/email-security/settings/impersonation-registry.ts">create</a>({ ...params }) -> ImpersonationRegistryCreateResponse</code>
+- <code title="get /accounts/{account_id}/email-security/settings/impersonation_registry">client.emailSecurity.settings.impersonationRegistry.<a href="./src/resources/email-security/settings/impersonation-registry.ts">list</a>({ ...params }) -> ImpersonationRegistryListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}">client.emailSecurity.settings.impersonationRegistry.<a href="./src/resources/email-security/settings/impersonation-registry.ts">delete</a>(displayNameId, { ...params }) -> ImpersonationRegistryDeleteResponse</code>
+- <code title="patch /accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}">client.emailSecurity.settings.impersonationRegistry.<a href="./src/resources/email-security/settings/impersonation-registry.ts">edit</a>(displayNameId, { ...params }) -> ImpersonationRegistryEditResponse</code>
+- <code title="get /accounts/{account_id}/email-security/settings/impersonation_registry/{display_name_id}">client.emailSecurity.settings.impersonationRegistry.<a href="./src/resources/email-security/settings/impersonation-registry.ts">get</a>(displayNameId, { ...params }) -> ImpersonationRegistryGetResponse</code>
+
+### TrustedDomains
 
-##### Bytimes
+Types:
+
+- <code><a href="./src/resources/email-security/settings/trusted-domains.ts">TrustedDomainCreateResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/trusted-domains.ts">TrustedDomainListResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/trusted-domains.ts">TrustedDomainDeleteResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/trusted-domains.ts">TrustedDomainEditResponse</a></code>
+- <code><a href="./src/resources/email-security/settings/trusted-domains.ts">TrustedDomainGetResponse</a></code>
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dns_firewall/{dns_firewall_id}/dns_analytics/report/bytime">client.dns.firewall.analytics.reports.bytimes.<a href="./src/resources/dns/firewall/analytics/reports/bytimes.ts">get</a>(dnsFirewallId, { ...params }) -> ByTime</code>
+- <code title="post /accounts/{account_id}/email-security/settings/trusted_domains">client.emailSecurity.settings.trustedDomains.<a href="./src/resources/email-security/settings/trusted-domains.ts">create</a>({ ...params }) -> TrustedDomainCreateResponse</code>
+- <code title="get /accounts/{account_id}/email-security/settings/trusted_domains">client.emailSecurity.settings.trustedDomains.<a href="./src/resources/email-security/settings/trusted-domains.ts">list</a>({ ...params }) -> TrustedDomainListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}">client.emailSecurity.settings.trustedDomains.<a href="./src/resources/email-security/settings/trusted-domains.ts">delete</a>(trustedDomainId, { ...params }) -> TrustedDomainDeleteResponse</code>
+- <code title="patch /accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}">client.emailSecurity.settings.trustedDomains.<a href="./src/resources/email-security/settings/trusted-domains.ts">edit</a>(trustedDomainId, { ...params }) -> TrustedDomainEditResponse</code>
+- <code title="get /accounts/{account_id}/email-security/settings/trusted_domains/{trusted_domain_id}">client.emailSecurity.settings.trustedDomains.<a href="./src/resources/email-security/settings/trusted-domains.ts">get</a>(trustedDomainId, { ...params }) -> TrustedDomainGetResponse</code>
 
-# DNSSEC
+## Submissions
 
 Types:
 
-- <code><a href="./src/resources/dnssec.ts">DNSSEC</a></code>
-- <code><a href="./src/resources/dnssec.ts">DNSSECDeleteResponse</a></code>
+- <code><a href="./src/resources/email-security/submissions.ts">SubmissionListResponse</a></code>
 
 Methods:
 
-- <code title="delete /zones/{zone_id}/dnssec">client.dnssec.<a href="./src/resources/dnssec.ts">delete</a>({ ...params }) -> DNSSECDeleteResponse</code>
-- <code title="patch /zones/{zone_id}/dnssec">client.dnssec.<a href="./src/resources/dnssec.ts">edit</a>({ ...params }) -> DNSSEC</code>
-- <code title="get /zones/{zone_id}/dnssec">client.dnssec.<a href="./src/resources/dnssec.ts">get</a>({ ...params }) -> DNSSEC</code>
+- <code title="get /accounts/{account_id}/email-security/submissions">client.emailSecurity.submissions.<a href="./src/resources/email-security/submissions.ts">list</a>({ ...params }) -> SubmissionListResponsesV4PagePaginationArray</code>
 
 # EmailRouting
 
@@ -1001,20 +1340,24 @@ Types:
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/email/routing/disable">client.emailRouting.<a href="./src/resources/email-routing/email-routing.ts">disable</a>(zoneIdentifier, { ...params }) -> Settings</code>
-- <code title="post /zones/{zone_identifier}/email/routing/enable">client.emailRouting.<a href="./src/resources/email-routing/email-routing.ts">enable</a>(zoneIdentifier, { ...params }) -> Settings</code>
-- <code title="get /zones/{zone_identifier}/email/routing">client.emailRouting.<a href="./src/resources/email-routing/email-routing.ts">get</a>(zoneIdentifier) -> Settings</code>
+- <code title="post /zones/{zone_id}/email/routing/disable">client.emailRouting.<a href="./src/resources/email-routing/email-routing.ts">disable</a>({ ...params }) -> Settings</code>
+- <code title="post /zones/{zone_id}/email/routing/enable">client.emailRouting.<a href="./src/resources/email-routing/email-routing.ts">enable</a>({ ...params }) -> Settings</code>
+- <code title="get /zones/{zone_id}/email/routing">client.emailRouting.<a href="./src/resources/email-routing/email-routing.ts">get</a>({ ...params }) -> Settings</code>
 
 ## DNS
 
 Types:
 
 - <code><a href="./src/resources/email-routing/dns.ts">DNSRecord</a></code>
+- <code><a href="./src/resources/email-routing/dns.ts">DNSDeleteResponse</a></code>
 - <code><a href="./src/resources/email-routing/dns.ts">DNSGetResponse</a></code>
 
 Methods:
 
-- <code title="get /zones/{zone_identifier}/email/routing/dns">client.emailRouting.dns.<a href="./src/resources/email-routing/dns.ts">get</a>(zoneIdentifier) -> DNSGetResponse | null</code>
+- <code title="post /zones/{zone_id}/email/routing/dns">client.emailRouting.dns.<a href="./src/resources/email-routing/dns.ts">create</a>({ ...params }) -> Settings</code>
+- <code title="delete /zones/{zone_id}/email/routing/dns">client.emailRouting.dns.<a href="./src/resources/email-routing/dns.ts">delete</a>({ ...params }) -> DNSDeleteResponse</code>
+- <code title="patch /zones/{zone_id}/email/routing/dns">client.emailRouting.dns.<a href="./src/resources/email-routing/dns.ts">edit</a>({ ...params }) -> Settings</code>
+- <code title="get /zones/{zone_id}/email/routing/dns">client.emailRouting.dns.<a href="./src/resources/email-routing/dns.ts">get</a>({ ...params }) -> DNSGetResponse</code>
 
 ## Rules
 
@@ -1026,11 +1369,11 @@ Types:
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/email/routing/rules">client.emailRouting.rules.<a href="./src/resources/email-routing/rules/rules.ts">create</a>(zoneIdentifier, { ...params }) -> EmailRoutingRule</code>
-- <code title="put /zones/{zone_identifier}/email/routing/rules/{rule_identifier}">client.emailRouting.rules.<a href="./src/resources/email-routing/rules/rules.ts">update</a>(zoneIdentifier, ruleIdentifier, { ...params }) -> EmailRoutingRule</code>
-- <code title="get /zones/{zone_identifier}/email/routing/rules">client.emailRouting.rules.<a href="./src/resources/email-routing/rules/rules.ts">list</a>(zoneIdentifier, { ...params }) -> EmailRoutingRulesV4PagePaginationArray</code>
-- <code title="delete /zones/{zone_identifier}/email/routing/rules/{rule_identifier}">client.emailRouting.rules.<a href="./src/resources/email-routing/rules/rules.ts">delete</a>(zoneIdentifier, ruleIdentifier) -> EmailRoutingRule</code>
-- <code title="get /zones/{zone_identifier}/email/routing/rules/{rule_identifier}">client.emailRouting.rules.<a href="./src/resources/email-routing/rules/rules.ts">get</a>(zoneIdentifier, ruleIdentifier) -> EmailRoutingRule</code>
+- <code title="post /zones/{zone_id}/email/routing/rules">client.emailRouting.rules.<a href="./src/resources/email-routing/rules/rules.ts">create</a>({ ...params }) -> EmailRoutingRule</code>
+- <code title="put /zones/{zone_id}/email/routing/rules/{rule_identifier}">client.emailRouting.rules.<a href="./src/resources/email-routing/rules/rules.ts">update</a>(ruleIdentifier, { ...params }) -> EmailRoutingRule</code>
+- <code title="get /zones/{zone_id}/email/routing/rules">client.emailRouting.rules.<a href="./src/resources/email-routing/rules/rules.ts">list</a>({ ...params }) -> EmailRoutingRulesV4PagePaginationArray</code>
+- <code title="delete /zones/{zone_id}/email/routing/rules/{rule_identifier}">client.emailRouting.rules.<a href="./src/resources/email-routing/rules/rules.ts">delete</a>(ruleIdentifier, { ...params }) -> EmailRoutingRule</code>
+- <code title="get /zones/{zone_id}/email/routing/rules/{rule_identifier}">client.emailRouting.rules.<a href="./src/resources/email-routing/rules/rules.ts">get</a>(ruleIdentifier, { ...params }) -> EmailRoutingRule</code>
 
 ### CatchAlls
 
@@ -1043,8 +1386,8 @@ Types:
 
 Methods:
 
-- <code title="put /zones/{zone_identifier}/email/routing/rules/catch_all">client.emailRouting.rules.catchAlls.<a href="./src/resources/email-routing/rules/catch-alls.ts">update</a>(zoneIdentifier, { ...params }) -> CatchAllUpdateResponse</code>
-- <code title="get /zones/{zone_identifier}/email/routing/rules/catch_all">client.emailRouting.rules.catchAlls.<a href="./src/resources/email-routing/rules/catch-alls.ts">get</a>(zoneIdentifier) -> CatchAllGetResponse</code>
+- <code title="put /zones/{zone_id}/email/routing/rules/catch_all">client.emailRouting.rules.catchAlls.<a href="./src/resources/email-routing/rules/catch-alls.ts">update</a>({ ...params }) -> CatchAllUpdateResponse</code>
+- <code title="get /zones/{zone_id}/email/routing/rules/catch_all">client.emailRouting.rules.catchAlls.<a href="./src/resources/email-routing/rules/catch-alls.ts">get</a>({ ...params }) -> CatchAllGetResponse</code>
 
 ## Addresses
 
@@ -1054,10 +1397,10 @@ Types:
 
 Methods:
 
-- <code title="post /accounts/{account_identifier}/email/routing/addresses">client.emailRouting.addresses.<a href="./src/resources/email-routing/addresses.ts">create</a>(accountIdentifier, { ...params }) -> Address</code>
-- <code title="get /accounts/{account_identifier}/email/routing/addresses">client.emailRouting.addresses.<a href="./src/resources/email-routing/addresses.ts">list</a>(accountIdentifier, { ...params }) -> AddressesV4PagePaginationArray</code>
-- <code title="delete /accounts/{account_identifier}/email/routing/addresses/{destination_address_identifier}">client.emailRouting.addresses.<a href="./src/resources/email-routing/addresses.ts">delete</a>(accountIdentifier, destinationAddressIdentifier) -> Address</code>
-- <code title="get /accounts/{account_identifier}/email/routing/addresses/{destination_address_identifier}">client.emailRouting.addresses.<a href="./src/resources/email-routing/addresses.ts">get</a>(accountIdentifier, destinationAddressIdentifier) -> Address</code>
+- <code title="post /accounts/{account_id}/email/routing/addresses">client.emailRouting.addresses.<a href="./src/resources/email-routing/addresses.ts">create</a>({ ...params }) -> Address</code>
+- <code title="get /accounts/{account_id}/email/routing/addresses">client.emailRouting.addresses.<a href="./src/resources/email-routing/addresses.ts">list</a>({ ...params }) -> AddressesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/email/routing/addresses/{destination_address_identifier}">client.emailRouting.addresses.<a href="./src/resources/email-routing/addresses.ts">delete</a>(destinationAddressIdentifier, { ...params }) -> Address</code>
+- <code title="get /accounts/{account_id}/email/routing/addresses/{destination_address_identifier}">client.emailRouting.addresses.<a href="./src/resources/email-routing/addresses.ts">get</a>(destinationAddressIdentifier, { ...params }) -> Address</code>
 
 # Filters
 
@@ -1065,14 +1408,18 @@ Types:
 
 - <code><a href="./src/resources/filters.ts">FirewallFilter</a></code>
 - <code><a href="./src/resources/filters.ts">FilterCreateResponse</a></code>
+- <code><a href="./src/resources/filters.ts">FilterBulkDeleteResponse</a></code>
+- <code><a href="./src/resources/filters.ts">FilterBulkUpdateResponse</a></code>
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/filters">client.filters.<a href="./src/resources/filters.ts">create</a>(zoneIdentifier, { ...params }) -> FilterCreateResponse | null</code>
-- <code title="put /zones/{zone_identifier}/filters/{id}">client.filters.<a href="./src/resources/filters.ts">update</a>(zoneIdentifier, id, { ...params }) -> FirewallFilter</code>
-- <code title="get /zones/{zone_identifier}/filters">client.filters.<a href="./src/resources/filters.ts">list</a>(zoneIdentifier, { ...params }) -> FirewallFiltersV4PagePaginationArray</code>
-- <code title="delete /zones/{zone_identifier}/filters/{id}">client.filters.<a href="./src/resources/filters.ts">delete</a>(zoneIdentifier, id) -> FirewallFilter</code>
-- <code title="get /zones/{zone_identifier}/filters/{id}">client.filters.<a href="./src/resources/filters.ts">get</a>(zoneIdentifier, id) -> FirewallFilter</code>
+- <code title="post /zones/{zone_id}/filters">client.filters.<a href="./src/resources/filters.ts">create</a>({ ...params }) -> FilterCreateResponse | null</code>
+- <code title="put /zones/{zone_id}/filters/{filter_id}">client.filters.<a href="./src/resources/filters.ts">update</a>(filterId, { ...params }) -> FirewallFilter</code>
+- <code title="get /zones/{zone_id}/filters">client.filters.<a href="./src/resources/filters.ts">list</a>({ ...params }) -> FirewallFiltersV4PagePaginationArray</code>
+- <code title="delete /zones/{zone_id}/filters/{filter_id}">client.filters.<a href="./src/resources/filters.ts">delete</a>(filterId, { ...params }) -> FirewallFilter</code>
+- <code title="delete /zones/{zone_id}/filters">client.filters.<a href="./src/resources/filters.ts">bulkDelete</a>({ ...params }) -> FilterBulkDeleteResponse | null</code>
+- <code title="put /zones/{zone_id}/filters">client.filters.<a href="./src/resources/filters.ts">bulkUpdate</a>({ ...params }) -> FilterBulkUpdateResponse | null</code>
+- <code title="get /zones/{zone_id}/filters/{filter_id}">client.filters.<a href="./src/resources/filters.ts">get</a>(filterId, { ...params }) -> FirewallFilter</code>
 
 # Firewall
 
@@ -1089,30 +1436,36 @@ Types:
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/firewall/lockdowns">client.firewall.lockdowns.<a href="./src/resources/firewall/lockdowns.ts">create</a>(zoneIdentifier, { ...params }) -> Lockdown</code>
-- <code title="put /zones/{zone_identifier}/firewall/lockdowns/{id}">client.firewall.lockdowns.<a href="./src/resources/firewall/lockdowns.ts">update</a>(zoneIdentifier, id, { ...params }) -> Lockdown</code>
-- <code title="get /zones/{zone_identifier}/firewall/lockdowns">client.firewall.lockdowns.<a href="./src/resources/firewall/lockdowns.ts">list</a>(zoneIdentifier, { ...params }) -> LockdownsV4PagePaginationArray</code>
-- <code title="delete /zones/{zone_identifier}/firewall/lockdowns/{id}">client.firewall.lockdowns.<a href="./src/resources/firewall/lockdowns.ts">delete</a>(zoneIdentifier, id) -> LockdownDeleteResponse</code>
-- <code title="get /zones/{zone_identifier}/firewall/lockdowns/{id}">client.firewall.lockdowns.<a href="./src/resources/firewall/lockdowns.ts">get</a>(zoneIdentifier, id) -> Lockdown</code>
+- <code title="post /zones/{zone_id}/firewall/lockdowns">client.firewall.lockdowns.<a href="./src/resources/firewall/lockdowns.ts">create</a>({ ...params }) -> Lockdown</code>
+- <code title="put /zones/{zone_id}/firewall/lockdowns/{lock_downs_id}">client.firewall.lockdowns.<a href="./src/resources/firewall/lockdowns.ts">update</a>(lockDownsId, { ...params }) -> Lockdown</code>
+- <code title="get /zones/{zone_id}/firewall/lockdowns">client.firewall.lockdowns.<a href="./src/resources/firewall/lockdowns.ts">list</a>({ ...params }) -> LockdownsV4PagePaginationArray</code>
+- <code title="delete /zones/{zone_id}/firewall/lockdowns/{lock_downs_id}">client.firewall.lockdowns.<a href="./src/resources/firewall/lockdowns.ts">delete</a>(lockDownsId, { ...params }) -> LockdownDeleteResponse</code>
+- <code title="get /zones/{zone_id}/firewall/lockdowns/{lock_downs_id}">client.firewall.lockdowns.<a href="./src/resources/firewall/lockdowns.ts">get</a>(lockDownsId, { ...params }) -> Lockdown</code>
 
 ## Rules
 
 Types:
 
+- <code><a href="./src/resources/firewall/rules.ts">DeletedFilter</a></code>
 - <code><a href="./src/resources/firewall/rules.ts">FirewallRule</a></code>
 - <code><a href="./src/resources/firewall/rules.ts">Product</a></code>
-- <code><a href="./src/resources/firewall/rules.ts">DeletedFilter</a></code>
 - <code><a href="./src/resources/firewall/rules.ts">RuleCreateResponse</a></code>
+- <code><a href="./src/resources/firewall/rules.ts">RuleBulkDeleteResponse</a></code>
+- <code><a href="./src/resources/firewall/rules.ts">RuleBulkEditResponse</a></code>
+- <code><a href="./src/resources/firewall/rules.ts">RuleBulkUpdateResponse</a></code>
 - <code><a href="./src/resources/firewall/rules.ts">RuleEditResponse</a></code>
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/firewall/rules">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">create</a>(zoneIdentifier, { ...params }) -> RuleCreateResponse | null</code>
-- <code title="put /zones/{zone_identifier}/firewall/rules/{id}">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">update</a>(zoneIdentifier, id, { ...params }) -> FirewallRule</code>
-- <code title="get /zones/{zone_identifier}/firewall/rules">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">list</a>(zoneIdentifier, { ...params }) -> FirewallRulesV4PagePaginationArray</code>
-- <code title="delete /zones/{zone_identifier}/firewall/rules/{id}">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">delete</a>(zoneIdentifier, id) -> FirewallRule</code>
-- <code title="patch /zones/{zone_identifier}/firewall/rules/{id}">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">edit</a>(zoneIdentifier, id, { ...params }) -> RuleEditResponse | null</code>
-- <code title="get /zones/{zone_identifier}/firewall/rules/{id}">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">get</a>(zoneIdentifier, { ...params }) -> FirewallRule</code>
+- <code title="post /zones/{zone_id}/firewall/rules">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">create</a>({ ...params }) -> RuleCreateResponse | null</code>
+- <code title="put /zones/{zone_id}/firewall/rules/{rule_id}">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">update</a>(ruleId, { ...params }) -> FirewallRule</code>
+- <code title="get /zones/{zone_id}/firewall/rules">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">list</a>({ ...params }) -> FirewallRulesV4PagePaginationArray</code>
+- <code title="delete /zones/{zone_id}/firewall/rules/{rule_id}">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">delete</a>(ruleId, { ...params }) -> FirewallRule</code>
+- <code title="delete /zones/{zone_id}/firewall/rules">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">bulkDelete</a>({ ...params }) -> RuleBulkDeleteResponse | null</code>
+- <code title="patch /zones/{zone_id}/firewall/rules">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">bulkEdit</a>({ ...params }) -> RuleBulkEditResponse | null</code>
+- <code title="put /zones/{zone_id}/firewall/rules">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">bulkUpdate</a>({ ...params }) -> RuleBulkUpdateResponse | null</code>
+- <code title="patch /zones/{zone_id}/firewall/rules/{rule_id}">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">edit</a>(ruleId, { ...params }) -> RuleEditResponse | null</code>
+- <code title="get /zones/{zone_id}/firewall/rules/{rule_id}">client.firewall.rules.<a href="./src/resources/firewall/rules.ts">get</a>(ruleId, { ...params }) -> FirewallRule</code>
 
 ## AccessRules
 
@@ -1133,9 +1486,9 @@ Methods:
 
 - <code title="post /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules">client.firewall.accessRules.<a href="./src/resources/firewall/access-rules.ts">create</a>({ ...params }) -> AccessRuleCreateResponse</code>
 - <code title="get /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules">client.firewall.accessRules.<a href="./src/resources/firewall/access-rules.ts">list</a>({ ...params }) -> AccessRuleListResponsesV4PagePaginationArray</code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}">client.firewall.accessRules.<a href="./src/resources/firewall/access-rules.ts">delete</a>(identifier, { ...params }) -> AccessRuleDeleteResponse | null</code>
-- <code title="patch /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}">client.firewall.accessRules.<a href="./src/resources/firewall/access-rules.ts">edit</a>(identifier, { ...params }) -> AccessRuleEditResponse</code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{identifier}">client.firewall.accessRules.<a href="./src/resources/firewall/access-rules.ts">get</a>(identifier, { ...params }) -> AccessRuleGetResponse</code>
+- <code title="delete /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}">client.firewall.accessRules.<a href="./src/resources/firewall/access-rules.ts">delete</a>(ruleId, { ...params }) -> AccessRuleDeleteResponse | null</code>
+- <code title="patch /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}">client.firewall.accessRules.<a href="./src/resources/firewall/access-rules.ts">edit</a>(ruleId, { ...params }) -> AccessRuleEditResponse</code>
+- <code title="get /{account_or_zone}/{account_or_zone_id}/firewall/access_rules/rules/{rule_id}">client.firewall.accessRules.<a href="./src/resources/firewall/access-rules.ts">get</a>(ruleId, { ...params }) -> AccessRuleGetResponse</code>
 
 ## UARules
 
@@ -1149,11 +1502,11 @@ Types:
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/firewall/ua_rules">client.firewall.uaRules.<a href="./src/resources/firewall/ua-rules.ts">create</a>(zoneIdentifier, { ...params }) -> UARuleCreateResponse</code>
-- <code title="put /zones/{zone_identifier}/firewall/ua_rules/{id}">client.firewall.uaRules.<a href="./src/resources/firewall/ua-rules.ts">update</a>(zoneIdentifier, id, { ...params }) -> UARuleUpdateResponse</code>
-- <code title="get /zones/{zone_identifier}/firewall/ua_rules">client.firewall.uaRules.<a href="./src/resources/firewall/ua-rules.ts">list</a>(zoneIdentifier, { ...params }) -> UARuleListResponsesV4PagePaginationArray</code>
-- <code title="delete /zones/{zone_identifier}/firewall/ua_rules/{id}">client.firewall.uaRules.<a href="./src/resources/firewall/ua-rules.ts">delete</a>(zoneIdentifier, id) -> UARuleDeleteResponse</code>
-- <code title="get /zones/{zone_identifier}/firewall/ua_rules/{id}">client.firewall.uaRules.<a href="./src/resources/firewall/ua-rules.ts">get</a>(zoneIdentifier, id) -> UARuleGetResponse</code>
+- <code title="post /zones/{zone_id}/firewall/ua_rules">client.firewall.uaRules.<a href="./src/resources/firewall/ua-rules.ts">create</a>({ ...params }) -> UARuleCreateResponse</code>
+- <code title="put /zones/{zone_id}/firewall/ua_rules/{ua_rule_id}">client.firewall.uaRules.<a href="./src/resources/firewall/ua-rules.ts">update</a>(uaRuleId, { ...params }) -> UARuleUpdateResponse</code>
+- <code title="get /zones/{zone_id}/firewall/ua_rules">client.firewall.uaRules.<a href="./src/resources/firewall/ua-rules.ts">list</a>({ ...params }) -> UARuleListResponsesV4PagePaginationArray</code>
+- <code title="delete /zones/{zone_id}/firewall/ua_rules/{ua_rule_id}">client.firewall.uaRules.<a href="./src/resources/firewall/ua-rules.ts">delete</a>(uaRuleId, { ...params }) -> UARuleDeleteResponse</code>
+- <code title="get /zones/{zone_id}/firewall/ua_rules/{ua_rule_id}">client.firewall.uaRules.<a href="./src/resources/firewall/ua-rules.ts">get</a>(uaRuleId, { ...params }) -> UARuleGetResponse</code>
 
 ## WAF
 
@@ -1169,11 +1522,11 @@ Types:
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/firewall/waf/overrides">client.firewall.waf.overrides.<a href="./src/resources/firewall/waf/overrides.ts">create</a>(zoneIdentifier, { ...params }) -> Override</code>
-- <code title="put /zones/{zone_identifier}/firewall/waf/overrides/{id}">client.firewall.waf.overrides.<a href="./src/resources/firewall/waf/overrides.ts">update</a>(zoneIdentifier, id, { ...params }) -> Override</code>
-- <code title="get /zones/{zone_identifier}/firewall/waf/overrides">client.firewall.waf.overrides.<a href="./src/resources/firewall/waf/overrides.ts">list</a>(zoneIdentifier, { ...params }) -> OverridesV4PagePaginationArray</code>
-- <code title="delete /zones/{zone_identifier}/firewall/waf/overrides/{id}">client.firewall.waf.overrides.<a href="./src/resources/firewall/waf/overrides.ts">delete</a>(zoneIdentifier, id) -> OverrideDeleteResponse</code>
-- <code title="get /zones/{zone_identifier}/firewall/waf/overrides/{id}">client.firewall.waf.overrides.<a href="./src/resources/firewall/waf/overrides.ts">get</a>(zoneIdentifier, id) -> Override</code>
+- <code title="post /zones/{zone_id}/firewall/waf/overrides">client.firewall.waf.overrides.<a href="./src/resources/firewall/waf/overrides.ts">create</a>({ ...params }) -> Override</code>
+- <code title="put /zones/{zone_id}/firewall/waf/overrides/{overrides_id}">client.firewall.waf.overrides.<a href="./src/resources/firewall/waf/overrides.ts">update</a>(overridesId, { ...params }) -> Override</code>
+- <code title="get /zones/{zone_id}/firewall/waf/overrides">client.firewall.waf.overrides.<a href="./src/resources/firewall/waf/overrides.ts">list</a>({ ...params }) -> OverridesV4PagePaginationArray</code>
+- <code title="delete /zones/{zone_id}/firewall/waf/overrides/{overrides_id}">client.firewall.waf.overrides.<a href="./src/resources/firewall/waf/overrides.ts">delete</a>(overridesId, { ...params }) -> OverrideDeleteResponse</code>
+- <code title="get /zones/{zone_id}/firewall/waf/overrides/{overrides_id}">client.firewall.waf.overrides.<a href="./src/resources/firewall/waf/overrides.ts">get</a>(overridesId, { ...params }) -> Override</code>
 
 ### Packages
 
@@ -1184,8 +1537,8 @@ Types:
 
 Methods:
 
-- <code title="get /zones/{zone_identifier}/firewall/waf/packages">client.firewall.waf.packages.<a href="./src/resources/firewall/waf/packages/packages.ts">list</a>(zoneIdentifier, { ...params }) -> PackageListResponsesV4PagePaginationArray</code>
-- <code title="get /zones/{zone_identifier}/firewall/waf/packages/{identifier}">client.firewall.waf.packages.<a href="./src/resources/firewall/waf/packages/packages.ts">get</a>(zoneIdentifier, identifier) -> PackageGetResponse</code>
+- <code title="get /zones/{zone_id}/firewall/waf/packages">client.firewall.waf.packages.<a href="./src/resources/firewall/waf/packages/packages.ts">list</a>({ ...params }) -> PackageListResponsesV4PagePaginationArray</code>
+- <code title="get /zones/{zone_id}/firewall/waf/packages/{package_id}">client.firewall.waf.packages.<a href="./src/resources/firewall/waf/packages/packages.ts">get</a>(packageId, { ...params }) -> PackageGetResponse</code>
 
 #### Groups
 
@@ -1232,7 +1585,7 @@ Methods:
 
 - <code title="post /zones/{zone_id}/healthchecks">client.healthchecks.<a href="./src/resources/healthchecks/healthchecks.ts">create</a>({ ...params }) -> Healthcheck</code>
 - <code title="put /zones/{zone_id}/healthchecks/{healthcheck_id}">client.healthchecks.<a href="./src/resources/healthchecks/healthchecks.ts">update</a>(healthcheckId, { ...params }) -> Healthcheck</code>
-- <code title="get /zones/{zone_id}/healthchecks">client.healthchecks.<a href="./src/resources/healthchecks/healthchecks.ts">list</a>({ ...params }) -> HealthchecksSinglePage</code>
+- <code title="get /zones/{zone_id}/healthchecks">client.healthchecks.<a href="./src/resources/healthchecks/healthchecks.ts">list</a>({ ...params }) -> HealthchecksV4PagePaginationArray</code>
 - <code title="delete /zones/{zone_id}/healthchecks/{healthcheck_id}">client.healthchecks.<a href="./src/resources/healthchecks/healthchecks.ts">delete</a>(healthcheckId, { ...params }) -> HealthcheckDeleteResponse</code>
 - <code title="patch /zones/{zone_id}/healthchecks/{healthcheck_id}">client.healthchecks.<a href="./src/resources/healthchecks/healthchecks.ts">edit</a>(healthcheckId, { ...params }) -> Healthcheck</code>
 - <code title="get /zones/{zone_id}/healthchecks/{healthcheck_id}">client.healthchecks.<a href="./src/resources/healthchecks/healthchecks.ts">get</a>(healthcheckId, { ...params }) -> Healthcheck</code>
@@ -1314,7 +1667,7 @@ Methods:
 - <code title="post /{account_or_zone}/{account_or_zone_id}/logpush/jobs">client.logpush.jobs.<a href="./src/resources/logpush/jobs.ts">create</a>({ ...params }) -> LogpushJob | null</code>
 - <code title="put /{account_or_zone}/{account_or_zone_id}/logpush/jobs/{job_id}">client.logpush.jobs.<a href="./src/resources/logpush/jobs.ts">update</a>(jobId, { ...params }) -> LogpushJob | null</code>
 - <code title="get /{account_or_zone}/{account_or_zone_id}/logpush/jobs">client.logpush.jobs.<a href="./src/resources/logpush/jobs.ts">list</a>({ ...params }) -> LogpushJobsSinglePage</code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/logpush/jobs/{job_id}">client.logpush.jobs.<a href="./src/resources/logpush/jobs.ts">delete</a>(jobId, { ...params }) -> JobDeleteResponse | null</code>
+- <code title="delete /{account_or_zone}/{account_or_zone_id}/logpush/jobs/{job_id}">client.logpush.jobs.<a href="./src/resources/logpush/jobs.ts">delete</a>(jobId, { ...params }) -> JobDeleteResponse</code>
 - <code title="get /{account_or_zone}/{account_or_zone_id}/logpush/jobs/{job_id}">client.logpush.jobs.<a href="./src/resources/logpush/jobs.ts">get</a>(jobId, { ...params }) -> LogpushJob | null</code>
 
 ## Ownership
@@ -1354,8 +1707,8 @@ Types:
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/logs/control/retention/flag">client.logs.control.retention.<a href="./src/resources/logs/control/retention.ts">create</a>(zoneIdentifier, { ...params }) -> RetentionCreateResponse</code>
-- <code title="get /zones/{zone_identifier}/logs/control/retention/flag">client.logs.control.retention.<a href="./src/resources/logs/control/retention.ts">get</a>(zoneIdentifier) -> RetentionGetResponse</code>
+- <code title="post /zones/{zone_id}/logs/control/retention/flag">client.logs.control.retention.<a href="./src/resources/logs/control/retention.ts">create</a>({ ...params }) -> RetentionCreateResponse | null</code>
+- <code title="get /zones/{zone_id}/logs/control/retention/flag">client.logs.control.retention.<a href="./src/resources/logs/control/retention.ts">get</a>({ ...params }) -> RetentionGetResponse | null</code>
 
 ### Cmb
 
@@ -1380,7 +1733,7 @@ Types:
 
 Methods:
 
-- <code title="get /zones/{zone_identifier}/logs/rayids/{ray_identifier}">client.logs.RayID.<a href="./src/resources/logs/rayid.ts">get</a>(zoneIdentifier, rayIdentifier, { ...params }) -> RayIDGetResponse</code>
+- <code title="get /zones/{zone_id}/logs/rayids/{ray_id}">client.logs.RayID.<a href="./src/resources/logs/rayid.ts">get</a>(RayID, { ...params }) -> RayIDGetResponse</code>
 
 ## Received
 
@@ -1390,7 +1743,7 @@ Types:
 
 Methods:
 
-- <code title="get /zones/{zone_identifier}/logs/received">client.logs.received.<a href="./src/resources/logs/received/received.ts">get</a>(zoneIdentifier, { ...params }) -> ReceivedGetResponse</code>
+- <code title="get /zones/{zone_id}/logs/received">client.logs.received.<a href="./src/resources/logs/received/received.ts">get</a>({ ...params }) -> ReceivedGetResponse</code>
 
 ### Fields
 
@@ -1400,7 +1753,7 @@ Types:
 
 Methods:
 
-- <code title="get /zones/{zone_identifier}/logs/received/fields">client.logs.received.fields.<a href="./src/resources/logs/received/fields.ts">get</a>(zoneIdentifier) -> FieldGetResponse</code>
+- <code title="get /zones/{zone_id}/logs/received/fields">client.logs.received.fields.<a href="./src/resources/logs/received/fields.ts">get</a>({ ...params }) -> FieldGetResponse</code>
 
 # OriginTLSClientAuth
 
@@ -1408,13 +1761,14 @@ Types:
 
 - <code><a href="./src/resources/origin-tls-client-auth/origin-tls-client-auth.ts">ZoneAuthenticatedOriginPull</a></code>
 - <code><a href="./src/resources/origin-tls-client-auth/origin-tls-client-auth.ts">OriginTLSClientAuthCreateResponse</a></code>
+- <code><a href="./src/resources/origin-tls-client-auth/origin-tls-client-auth.ts">OriginTLSClientAuthListResponse</a></code>
 - <code><a href="./src/resources/origin-tls-client-auth/origin-tls-client-auth.ts">OriginTLSClientAuthDeleteResponse</a></code>
 - <code><a href="./src/resources/origin-tls-client-auth/origin-tls-client-auth.ts">OriginTLSClientAuthGetResponse</a></code>
 
 Methods:
 
 - <code title="post /zones/{zone_id}/origin_tls_client_auth">client.originTLSClientAuth.<a href="./src/resources/origin-tls-client-auth/origin-tls-client-auth.ts">create</a>({ ...params }) -> OriginTLSClientAuthCreateResponse</code>
-- <code title="get /zones/{zone_id}/origin_tls_client_auth">client.originTLSClientAuth.<a href="./src/resources/origin-tls-client-auth/origin-tls-client-auth.ts">list</a>({ ...params }) -> ZoneAuthenticatedOriginPullsSinglePage</code>
+- <code title="get /zones/{zone_id}/origin_tls_client_auth">client.originTLSClientAuth.<a href="./src/resources/origin-tls-client-auth/origin-tls-client-auth.ts">list</a>({ ...params }) -> OriginTLSClientAuthListResponsesSinglePage</code>
 - <code title="delete /zones/{zone_id}/origin_tls_client_auth/{certificate_id}">client.originTLSClientAuth.<a href="./src/resources/origin-tls-client-auth/origin-tls-client-auth.ts">delete</a>(certificateId, { ...params }) -> OriginTLSClientAuthDeleteResponse</code>
 - <code title="get /zones/{zone_id}/origin_tls_client_auth/{certificate_id}">client.originTLSClientAuth.<a href="./src/resources/origin-tls-client-auth/origin-tls-client-auth.ts">get</a>(certificateId, { ...params }) -> OriginTLSClientAuthGetResponse</code>
 
@@ -1427,7 +1781,7 @@ Types:
 
 Methods:
 
-- <code title="put /zones/{zone_id}/origin_tls_client_auth/hostnames">client.originTLSClientAuth.hostnames.<a href="./src/resources/origin-tls-client-auth/hostnames/hostnames.ts">update</a>({ ...params }) -> HostnameUpdateResponse | null</code>
+- <code title="put /zones/{zone_id}/origin_tls_client_auth/hostnames">client.originTLSClientAuth.hostnames.<a href="./src/resources/origin-tls-client-auth/hostnames/hostnames.ts">update</a>({ ...params }) -> HostnameUpdateResponse</code>
 - <code title="get /zones/{zone_id}/origin_tls_client_auth/hostnames/{hostname}">client.originTLSClientAuth.hostnames.<a href="./src/resources/origin-tls-client-auth/hostnames/hostnames.ts">get</a>(hostname, { ...params }) -> AuthenticatedOriginPull</code>
 
 ### Certificates
@@ -1436,13 +1790,14 @@ Types:
 
 - <code><a href="./src/resources/origin-tls-client-auth/hostnames/certificates.ts">Certificate</a></code>
 - <code><a href="./src/resources/origin-tls-client-auth/hostnames/certificates.ts">CertificateCreateResponse</a></code>
+- <code><a href="./src/resources/origin-tls-client-auth/hostnames/certificates.ts">CertificateListResponse</a></code>
 - <code><a href="./src/resources/origin-tls-client-auth/hostnames/certificates.ts">CertificateDeleteResponse</a></code>
 - <code><a href="./src/resources/origin-tls-client-auth/hostnames/certificates.ts">CertificateGetResponse</a></code>
 
 Methods:
 
 - <code title="post /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates">client.originTLSClientAuth.hostnames.certificates.<a href="./src/resources/origin-tls-client-auth/hostnames/certificates.ts">create</a>({ ...params }) -> CertificateCreateResponse</code>
-- <code title="get /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates">client.originTLSClientAuth.hostnames.certificates.<a href="./src/resources/origin-tls-client-auth/hostnames/certificates.ts">list</a>({ ...params }) -> AuthenticatedOriginPullsSinglePage</code>
+- <code title="get /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates">client.originTLSClientAuth.hostnames.certificates.<a href="./src/resources/origin-tls-client-auth/hostnames/certificates.ts">list</a>({ ...params }) -> CertificateListResponsesSinglePage</code>
 - <code title="delete /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}">client.originTLSClientAuth.hostnames.certificates.<a href="./src/resources/origin-tls-client-auth/hostnames/certificates.ts">delete</a>(certificateId, { ...params }) -> CertificateDeleteResponse</code>
 - <code title="get /zones/{zone_id}/origin_tls_client_auth/hostnames/certificates/{certificate_id}">client.originTLSClientAuth.hostnames.certificates.<a href="./src/resources/origin-tls-client-auth/hostnames/certificates.ts">get</a>(certificateId, { ...params }) -> CertificateGetResponse</code>
 
@@ -1458,38 +1813,23 @@ Methods:
 - <code title="put /zones/{zone_id}/origin_tls_client_auth/settings">client.originTLSClientAuth.settings.<a href="./src/resources/origin-tls-client-auth/settings.ts">update</a>({ ...params }) -> SettingUpdateResponse</code>
 - <code title="get /zones/{zone_id}/origin_tls_client_auth/settings">client.originTLSClientAuth.settings.<a href="./src/resources/origin-tls-client-auth/settings.ts">get</a>({ ...params }) -> SettingGetResponse</code>
 
-# Pagerules
+# PageRules
 
 Types:
 
-- <code><a href="./src/resources/pagerules/pagerules.ts">PageRule</a></code>
-- <code><a href="./src/resources/pagerules/pagerules.ts">Route</a></code>
-- <code><a href="./src/resources/pagerules/pagerules.ts">Target</a></code>
-- <code><a href="./src/resources/pagerules/pagerules.ts">PageruleCreateResponse</a></code>
-- <code><a href="./src/resources/pagerules/pagerules.ts">PageruleUpdateResponse</a></code>
-- <code><a href="./src/resources/pagerules/pagerules.ts">PageruleListResponse</a></code>
-- <code><a href="./src/resources/pagerules/pagerules.ts">PageruleDeleteResponse</a></code>
-- <code><a href="./src/resources/pagerules/pagerules.ts">PageruleEditResponse</a></code>
-- <code><a href="./src/resources/pagerules/pagerules.ts">PageruleGetResponse</a></code>
+- <code><a href="./src/resources/page-rules.ts">PageRule</a></code>
+- <code><a href="./src/resources/page-rules.ts">Target</a></code>
+- <code><a href="./src/resources/page-rules.ts">PageRuleListResponse</a></code>
+- <code><a href="./src/resources/page-rules.ts">PageRuleDeleteResponse</a></code>
 
 Methods:
 
-- <code title="post /zones/{zone_id}/pagerules">client.pagerules.<a href="./src/resources/pagerules/pagerules.ts">create</a>({ ...params }) -> PageruleCreateResponse</code>
-- <code title="put /zones/{zone_id}/pagerules/{pagerule_id}">client.pagerules.<a href="./src/resources/pagerules/pagerules.ts">update</a>(pageruleId, { ...params }) -> PageruleUpdateResponse</code>
-- <code title="get /zones/{zone_id}/pagerules">client.pagerules.<a href="./src/resources/pagerules/pagerules.ts">list</a>({ ...params }) -> PageruleListResponse</code>
-- <code title="delete /zones/{zone_id}/pagerules/{pagerule_id}">client.pagerules.<a href="./src/resources/pagerules/pagerules.ts">delete</a>(pageruleId, { ...params }) -> PageruleDeleteResponse | null</code>
-- <code title="patch /zones/{zone_id}/pagerules/{pagerule_id}">client.pagerules.<a href="./src/resources/pagerules/pagerules.ts">edit</a>(pageruleId, { ...params }) -> PageruleEditResponse</code>
-- <code title="get /zones/{zone_id}/pagerules/{pagerule_id}">client.pagerules.<a href="./src/resources/pagerules/pagerules.ts">get</a>(pageruleId, { ...params }) -> PageruleGetResponse</code>
-
-## Settings
-
-Types:
-
-- <code><a href="./src/resources/pagerules/settings.ts">SettingListResponse</a></code>
-
-Methods:
-
-- <code title="get /zones/{zone_id}/pagerules/settings">client.pagerules.settings.<a href="./src/resources/pagerules/settings.ts">list</a>({ ...params }) -> SettingListResponse</code>
+- <code title="post /zones/{zone_id}/pagerules">client.pageRules.<a href="./src/resources/page-rules.ts">create</a>({ ...params }) -> PageRule</code>
+- <code title="put /zones/{zone_id}/pagerules/{pagerule_id}">client.pageRules.<a href="./src/resources/page-rules.ts">update</a>(pageruleId, { ...params }) -> PageRule</code>
+- <code title="get /zones/{zone_id}/pagerules">client.pageRules.<a href="./src/resources/page-rules.ts">list</a>({ ...params }) -> PageRuleListResponse</code>
+- <code title="delete /zones/{zone_id}/pagerules/{pagerule_id}">client.pageRules.<a href="./src/resources/page-rules.ts">delete</a>(pageruleId, { ...params }) -> PageRuleDeleteResponse | null</code>
+- <code title="patch /zones/{zone_id}/pagerules/{pagerule_id}">client.pageRules.<a href="./src/resources/page-rules.ts">edit</a>(pageruleId, { ...params }) -> PageRule</code>
+- <code title="get /zones/{zone_id}/pagerules/{pagerule_id}">client.pageRules.<a href="./src/resources/page-rules.ts">get</a>(pageruleId, { ...params }) -> PageRule</code>
 
 # RateLimits
 
@@ -1498,122 +1838,15 @@ Types:
 - <code><a href="./src/resources/rate-limits.ts">Action</a></code>
 - <code><a href="./src/resources/rate-limits.ts">Methods</a></code>
 - <code><a href="./src/resources/rate-limits.ts">RateLimit</a></code>
-- <code><a href="./src/resources/rate-limits.ts">RateLimitCreateResponse</a></code>
 - <code><a href="./src/resources/rate-limits.ts">RateLimitDeleteResponse</a></code>
-- <code><a href="./src/resources/rate-limits.ts">RateLimitEditResponse</a></code>
-- <code><a href="./src/resources/rate-limits.ts">RateLimitGetResponse</a></code>
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/rate_limits">client.rateLimits.<a href="./src/resources/rate-limits.ts">create</a>(zoneIdentifier, { ...params }) -> RateLimitCreateResponse</code>
-- <code title="get /zones/{zone_identifier}/rate_limits">client.rateLimits.<a href="./src/resources/rate-limits.ts">list</a>(zoneIdentifier, { ...params }) -> RateLimitsV4PagePaginationArray</code>
-- <code title="delete /zones/{zone_identifier}/rate_limits/{id}">client.rateLimits.<a href="./src/resources/rate-limits.ts">delete</a>(zoneIdentifier, id) -> RateLimitDeleteResponse</code>
-- <code title="put /zones/{zone_identifier}/rate_limits/{id}">client.rateLimits.<a href="./src/resources/rate-limits.ts">edit</a>(zoneIdentifier, id, { ...params }) -> RateLimitEditResponse</code>
-- <code title="get /zones/{zone_identifier}/rate_limits/{id}">client.rateLimits.<a href="./src/resources/rate-limits.ts">get</a>(zoneIdentifier, id) -> RateLimitGetResponse</code>
-
-# SecondaryDNS
-
-## ForceAXFR
-
-Types:
-
-- <code><a href="./src/resources/secondary-dns/force-axfr.ts">ForceAXFR</a></code>
-
-Methods:
-
-- <code title="post /zones/{zone_id}/secondary_dns/force_axfr">client.secondaryDNS.forceAXFR.<a href="./src/resources/secondary-dns/force-axfr.ts">create</a>({ ...params }) -> ForceAXFR</code>
-
-## Incoming
-
-Types:
-
-- <code><a href="./src/resources/secondary-dns/incoming.ts">Incoming</a></code>
-- <code><a href="./src/resources/secondary-dns/incoming.ts">IncomingCreateResponse</a></code>
-- <code><a href="./src/resources/secondary-dns/incoming.ts">IncomingUpdateResponse</a></code>
-- <code><a href="./src/resources/secondary-dns/incoming.ts">IncomingDeleteResponse</a></code>
-- <code><a href="./src/resources/secondary-dns/incoming.ts">IncomingGetResponse</a></code>
-
-Methods:
-
-- <code title="post /zones/{zone_id}/secondary_dns/incoming">client.secondaryDNS.incoming.<a href="./src/resources/secondary-dns/incoming.ts">create</a>({ ...params }) -> IncomingCreateResponse</code>
-- <code title="put /zones/{zone_id}/secondary_dns/incoming">client.secondaryDNS.incoming.<a href="./src/resources/secondary-dns/incoming.ts">update</a>({ ...params }) -> IncomingUpdateResponse</code>
-- <code title="delete /zones/{zone_id}/secondary_dns/incoming">client.secondaryDNS.incoming.<a href="./src/resources/secondary-dns/incoming.ts">delete</a>({ ...params }) -> IncomingDeleteResponse</code>
-- <code title="get /zones/{zone_id}/secondary_dns/incoming">client.secondaryDNS.incoming.<a href="./src/resources/secondary-dns/incoming.ts">get</a>({ ...params }) -> IncomingGetResponse</code>
-
-## Outgoing
-
-Types:
-
-- <code><a href="./src/resources/secondary-dns/outgoing/outgoing.ts">DisableTransfer</a></code>
-- <code><a href="./src/resources/secondary-dns/outgoing/outgoing.ts">EnableTransfer</a></code>
-- <code><a href="./src/resources/secondary-dns/outgoing/outgoing.ts">Outgoing</a></code>
-- <code><a href="./src/resources/secondary-dns/outgoing/outgoing.ts">OutgoingStatus</a></code>
-- <code><a href="./src/resources/secondary-dns/outgoing/outgoing.ts">OutgoingCreateResponse</a></code>
-- <code><a href="./src/resources/secondary-dns/outgoing/outgoing.ts">OutgoingUpdateResponse</a></code>
-- <code><a href="./src/resources/secondary-dns/outgoing/outgoing.ts">OutgoingDeleteResponse</a></code>
-- <code><a href="./src/resources/secondary-dns/outgoing/outgoing.ts">OutgoingForceNotifyResponse</a></code>
-- <code><a href="./src/resources/secondary-dns/outgoing/outgoing.ts">OutgoingGetResponse</a></code>
-
-Methods:
-
-- <code title="post /zones/{zone_id}/secondary_dns/outgoing">client.secondaryDNS.outgoing.<a href="./src/resources/secondary-dns/outgoing/outgoing.ts">create</a>({ ...params }) -> OutgoingCreateResponse</code>
-- <code title="put /zones/{zone_id}/secondary_dns/outgoing">client.secondaryDNS.outgoing.<a href="./src/resources/secondary-dns/outgoing/outgoing.ts">update</a>({ ...params }) -> OutgoingUpdateResponse</code>
-- <code title="delete /zones/{zone_id}/secondary_dns/outgoing">client.secondaryDNS.outgoing.<a href="./src/resources/secondary-dns/outgoing/outgoing.ts">delete</a>({ ...params }) -> OutgoingDeleteResponse</code>
-- <code title="post /zones/{zone_id}/secondary_dns/outgoing/disable">client.secondaryDNS.outgoing.<a href="./src/resources/secondary-dns/outgoing/outgoing.ts">disable</a>({ ...params }) -> DisableTransfer</code>
-- <code title="post /zones/{zone_id}/secondary_dns/outgoing/enable">client.secondaryDNS.outgoing.<a href="./src/resources/secondary-dns/outgoing/outgoing.ts">enable</a>({ ...params }) -> EnableTransfer</code>
-- <code title="post /zones/{zone_id}/secondary_dns/outgoing/force_notify">client.secondaryDNS.outgoing.<a href="./src/resources/secondary-dns/outgoing/outgoing.ts">forceNotify</a>({ ...params }) -> OutgoingForceNotifyResponse</code>
-- <code title="get /zones/{zone_id}/secondary_dns/outgoing">client.secondaryDNS.outgoing.<a href="./src/resources/secondary-dns/outgoing/outgoing.ts">get</a>({ ...params }) -> OutgoingGetResponse</code>
-
-### Status
-
-Methods:
-
-- <code title="get /zones/{zone_id}/secondary_dns/outgoing/status">client.secondaryDNS.outgoing.status.<a href="./src/resources/secondary-dns/outgoing/status.ts">get</a>({ ...params }) -> EnableTransfer</code>
-
-## ACLs
-
-Types:
-
-- <code><a href="./src/resources/secondary-dns/acls.ts">ACL</a></code>
-- <code><a href="./src/resources/secondary-dns/acls.ts">ACLDeleteResponse</a></code>
-
-Methods:
-
-- <code title="post /accounts/{account_id}/secondary_dns/acls">client.secondaryDNS.acls.<a href="./src/resources/secondary-dns/acls.ts">create</a>({ ...params }) -> ACL</code>
-- <code title="put /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.secondaryDNS.acls.<a href="./src/resources/secondary-dns/acls.ts">update</a>(aclId, { ...params }) -> ACL</code>
-- <code title="get /accounts/{account_id}/secondary_dns/acls">client.secondaryDNS.acls.<a href="./src/resources/secondary-dns/acls.ts">list</a>({ ...params }) -> ACLsSinglePage</code>
-- <code title="delete /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.secondaryDNS.acls.<a href="./src/resources/secondary-dns/acls.ts">delete</a>(aclId, { ...params }) -> ACLDeleteResponse</code>
-- <code title="get /accounts/{account_id}/secondary_dns/acls/{acl_id}">client.secondaryDNS.acls.<a href="./src/resources/secondary-dns/acls.ts">get</a>(aclId, { ...params }) -> ACL</code>
-
-## Peers
-
-Types:
-
-- <code><a href="./src/resources/secondary-dns/peers.ts">Peer</a></code>
-- <code><a href="./src/resources/secondary-dns/peers.ts">PeerDeleteResponse</a></code>
-
-Methods:
-
-- <code title="post /accounts/{account_id}/secondary_dns/peers">client.secondaryDNS.peers.<a href="./src/resources/secondary-dns/peers.ts">create</a>({ ...params }) -> Peer</code>
-- <code title="put /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.secondaryDNS.peers.<a href="./src/resources/secondary-dns/peers.ts">update</a>(peerId, { ...params }) -> Peer</code>
-- <code title="get /accounts/{account_id}/secondary_dns/peers">client.secondaryDNS.peers.<a href="./src/resources/secondary-dns/peers.ts">list</a>({ ...params }) -> PeersSinglePage</code>
-- <code title="delete /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.secondaryDNS.peers.<a href="./src/resources/secondary-dns/peers.ts">delete</a>(peerId, { ...params }) -> PeerDeleteResponse</code>
-- <code title="get /accounts/{account_id}/secondary_dns/peers/{peer_id}">client.secondaryDNS.peers.<a href="./src/resources/secondary-dns/peers.ts">get</a>(peerId, { ...params }) -> Peer</code>
-
-## TSIGs
-
-Types:
-
-- <code><a href="./src/resources/secondary-dns/tsigs.ts">TSIG</a></code>
-- <code><a href="./src/resources/secondary-dns/tsigs.ts">TSIGDeleteResponse</a></code>
-
-Methods:
-
-- <code title="post /accounts/{account_id}/secondary_dns/tsigs">client.secondaryDNS.tsigs.<a href="./src/resources/secondary-dns/tsigs.ts">create</a>({ ...params }) -> TSIG</code>
-- <code title="put /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.secondaryDNS.tsigs.<a href="./src/resources/secondary-dns/tsigs.ts">update</a>(tsigId, { ...params }) -> TSIG</code>
-- <code title="get /accounts/{account_id}/secondary_dns/tsigs">client.secondaryDNS.tsigs.<a href="./src/resources/secondary-dns/tsigs.ts">list</a>({ ...params }) -> TSIGsSinglePage</code>
-- <code title="delete /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.secondaryDNS.tsigs.<a href="./src/resources/secondary-dns/tsigs.ts">delete</a>(tsigId, { ...params }) -> TSIGDeleteResponse</code>
-- <code title="get /accounts/{account_id}/secondary_dns/tsigs/{tsig_id}">client.secondaryDNS.tsigs.<a href="./src/resources/secondary-dns/tsigs.ts">get</a>(tsigId, { ...params }) -> TSIG</code>
+- <code title="post /zones/{zone_id}/rate_limits">client.rateLimits.<a href="./src/resources/rate-limits.ts">create</a>({ ...params }) -> RateLimit</code>
+- <code title="get /zones/{zone_id}/rate_limits">client.rateLimits.<a href="./src/resources/rate-limits.ts">list</a>({ ...params }) -> RateLimitsV4PagePaginationArray</code>
+- <code title="delete /zones/{zone_id}/rate_limits/{rate_limit_id}">client.rateLimits.<a href="./src/resources/rate-limits.ts">delete</a>(rateLimitId, { ...params }) -> RateLimitDeleteResponse</code>
+- <code title="put /zones/{zone_id}/rate_limits/{rate_limit_id}">client.rateLimits.<a href="./src/resources/rate-limits.ts">edit</a>(rateLimitId, { ...params }) -> RateLimit</code>
+- <code title="get /zones/{zone_id}/rate_limits/{rate_limit_id}">client.rateLimits.<a href="./src/resources/rate-limits.ts">get</a>(rateLimitId, { ...params }) -> RateLimit</code>
 
 # WaitingRooms
 
@@ -1629,7 +1862,7 @@ Methods:
 
 - <code title="post /zones/{zone_id}/waiting_rooms">client.waitingRooms.<a href="./src/resources/waiting-rooms/waiting-rooms.ts">create</a>({ ...params }) -> WaitingRoom</code>
 - <code title="put /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waitingRooms.<a href="./src/resources/waiting-rooms/waiting-rooms.ts">update</a>(waitingRoomId, { ...params }) -> WaitingRoom</code>
-- <code title="get /zones/{zone_id}/waiting_rooms">client.waitingRooms.<a href="./src/resources/waiting-rooms/waiting-rooms.ts">list</a>({ ...params }) -> WaitingRoomsSinglePage</code>
+- <code title="get /zones/{zone_id}/waiting_rooms">client.waitingRooms.<a href="./src/resources/waiting-rooms/waiting-rooms.ts">list</a>({ ...params }) -> WaitingRoomsV4PagePaginationArray</code>
 - <code title="delete /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waitingRooms.<a href="./src/resources/waiting-rooms/waiting-rooms.ts">delete</a>(waitingRoomId, { ...params }) -> WaitingRoomDeleteResponse</code>
 - <code title="patch /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waitingRooms.<a href="./src/resources/waiting-rooms/waiting-rooms.ts">edit</a>(waitingRoomId, { ...params }) -> WaitingRoom</code>
 - <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}">client.waitingRooms.<a href="./src/resources/waiting-rooms/waiting-rooms.ts">get</a>(waitingRoomId, { ...params }) -> WaitingRoom</code>
@@ -1655,7 +1888,7 @@ Methods:
 
 - <code title="post /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events">client.waitingRooms.events.<a href="./src/resources/waiting-rooms/events/events.ts">create</a>(waitingRoomId, { ...params }) -> Event</code>
 - <code title="put /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}">client.waitingRooms.events.<a href="./src/resources/waiting-rooms/events/events.ts">update</a>(waitingRoomId, eventId, { ...params }) -> Event</code>
-- <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events">client.waitingRooms.events.<a href="./src/resources/waiting-rooms/events/events.ts">list</a>(waitingRoomId, { ...params }) -> EventsSinglePage</code>
+- <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events">client.waitingRooms.events.<a href="./src/resources/waiting-rooms/events/events.ts">list</a>(waitingRoomId, { ...params }) -> EventsV4PagePaginationArray</code>
 - <code title="delete /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}">client.waitingRooms.events.<a href="./src/resources/waiting-rooms/events/events.ts">delete</a>(waitingRoomId, eventId, { ...params }) -> EventDeleteResponse</code>
 - <code title="patch /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}">client.waitingRooms.events.<a href="./src/resources/waiting-rooms/events/events.ts">edit</a>(waitingRoomId, eventId, { ...params }) -> Event</code>
 - <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}/events/{event_id}">client.waitingRooms.events.<a href="./src/resources/waiting-rooms/events/events.ts">get</a>(waitingRoomId, eventId, { ...params }) -> Event</code>
@@ -1680,14 +1913,15 @@ Types:
 - <code><a href="./src/resources/waiting-rooms/rules.ts">RuleUpdateResponse</a></code>
 - <code><a href="./src/resources/waiting-rooms/rules.ts">RuleDeleteResponse</a></code>
 - <code><a href="./src/resources/waiting-rooms/rules.ts">RuleEditResponse</a></code>
+- <code><a href="./src/resources/waiting-rooms/rules.ts">RuleGetResponse</a></code>
 
 Methods:
 
-- <code title="post /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waitingRooms.rules.<a href="./src/resources/waiting-rooms/rules.ts">create</a>(waitingRoomId, { ...params }) -> RuleCreateResponse | null</code>
-- <code title="put /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waitingRooms.rules.<a href="./src/resources/waiting-rooms/rules.ts">update</a>(waitingRoomId, [ ...body ]) -> RuleUpdateResponse | null</code>
-- <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waitingRooms.rules.<a href="./src/resources/waiting-rooms/rules.ts">list</a>(waitingRoomId, { ...params }) -> WaitingRoomRulesSinglePage</code>
-- <code title="delete /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}">client.waitingRooms.rules.<a href="./src/resources/waiting-rooms/rules.ts">delete</a>(waitingRoomId, ruleId, { ...params }) -> RuleDeleteResponse | null</code>
-- <code title="patch /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}">client.waitingRooms.rules.<a href="./src/resources/waiting-rooms/rules.ts">edit</a>(waitingRoomId, ruleId, { ...params }) -> RuleEditResponse | null</code>
+- <code title="post /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waitingRooms.rules.<a href="./src/resources/waiting-rooms/rules.ts">create</a>(waitingRoomId, { ...params }) -> RuleCreateResponse</code>
+- <code title="put /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waitingRooms.rules.<a href="./src/resources/waiting-rooms/rules.ts">update</a>(waitingRoomId, [ ...rules ]) -> RuleUpdateResponse</code>
+- <code title="delete /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}">client.waitingRooms.rules.<a href="./src/resources/waiting-rooms/rules.ts">delete</a>(waitingRoomId, ruleId, { ...params }) -> RuleDeleteResponse</code>
+- <code title="patch /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules/{rule_id}">client.waitingRooms.rules.<a href="./src/resources/waiting-rooms/rules.ts">edit</a>(waitingRoomId, ruleId, { ...params }) -> RuleEditResponse</code>
+- <code title="get /zones/{zone_id}/waiting_rooms/{waiting_room_id}/rules">client.waitingRooms.rules.<a href="./src/resources/waiting-rooms/rules.ts">get</a>(waitingRoomId, { ...params }) -> RuleGetResponse</code>
 
 ## Statuses
 
@@ -1725,11 +1959,11 @@ Types:
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/web3/hostnames">client.web3.hostnames.<a href="./src/resources/web3/hostnames/hostnames.ts">create</a>(zoneIdentifier, { ...params }) -> Hostname</code>
-- <code title="get /zones/{zone_identifier}/web3/hostnames">client.web3.hostnames.<a href="./src/resources/web3/hostnames/hostnames.ts">list</a>(zoneIdentifier) -> HostnamesSinglePage</code>
-- <code title="delete /zones/{zone_identifier}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/resources/web3/hostnames/hostnames.ts">delete</a>(zoneIdentifier, identifier) -> HostnameDeleteResponse | null</code>
-- <code title="patch /zones/{zone_identifier}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/resources/web3/hostnames/hostnames.ts">edit</a>(zoneIdentifier, identifier, { ...params }) -> Hostname</code>
-- <code title="get /zones/{zone_identifier}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/resources/web3/hostnames/hostnames.ts">get</a>(zoneIdentifier, identifier) -> Hostname</code>
+- <code title="post /zones/{zone_id}/web3/hostnames">client.web3.hostnames.<a href="./src/resources/web3/hostnames/hostnames.ts">create</a>({ ...params }) -> Hostname</code>
+- <code title="get /zones/{zone_id}/web3/hostnames">client.web3.hostnames.<a href="./src/resources/web3/hostnames/hostnames.ts">list</a>({ ...params }) -> HostnamesSinglePage</code>
+- <code title="delete /zones/{zone_id}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/resources/web3/hostnames/hostnames.ts">delete</a>(identifier, { ...params }) -> HostnameDeleteResponse | null</code>
+- <code title="patch /zones/{zone_id}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/resources/web3/hostnames/hostnames.ts">edit</a>(identifier, { ...params }) -> Hostname</code>
+- <code title="get /zones/{zone_id}/web3/hostnames/{identifier}">client.web3.hostnames.<a href="./src/resources/web3/hostnames/hostnames.ts">get</a>(identifier, { ...params }) -> Hostname</code>
 
 ### IPFSUniversalPaths
 
@@ -1741,8 +1975,8 @@ Types:
 
 Methods:
 
-- <code title="put /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list">client.web3.hostnames.ipfsUniversalPaths.contentLists.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.ts">update</a>(zoneIdentifier, identifier, { ...params }) -> ContentList</code>
-- <code title="get /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list">client.web3.hostnames.ipfsUniversalPaths.contentLists.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.ts">get</a>(zoneIdentifier, identifier) -> ContentList</code>
+- <code title="put /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list">client.web3.hostnames.ipfsUniversalPaths.contentLists.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.ts">update</a>(identifier, { ...params }) -> ContentList</code>
+- <code title="get /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list">client.web3.hostnames.ipfsUniversalPaths.contentLists.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.ts">get</a>(identifier, { ...params }) -> ContentList</code>
 
 ##### Entries
 
@@ -1756,51 +1990,49 @@ Types:
 
 Methods:
 
-- <code title="post /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries">client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts">create</a>(zoneIdentifier, identifier, { ...params }) -> EntryCreateResponse</code>
-- <code title="put /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts">update</a>(zoneIdentifier, identifier, contentListEntryIdentifier, { ...params }) -> EntryUpdateResponse</code>
-- <code title="get /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries">client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts">list</a>(zoneIdentifier, identifier) -> EntryListResponse | null</code>
-- <code title="delete /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts">delete</a>(zoneIdentifier, identifier, contentListEntryIdentifier) -> EntryDeleteResponse | null</code>
-- <code title="get /zones/{zone_identifier}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts">get</a>(zoneIdentifier, identifier, contentListEntryIdentifier) -> EntryGetResponse</code>
+- <code title="post /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries">client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts">create</a>(identifier, { ...params }) -> EntryCreateResponse</code>
+- <code title="put /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts">update</a>(identifier, contentListEntryIdentifier, { ...params }) -> EntryUpdateResponse</code>
+- <code title="get /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries">client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts">list</a>(identifier, { ...params }) -> EntryListResponse | null</code>
+- <code title="delete /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts">delete</a>(identifier, contentListEntryIdentifier, { ...params }) -> EntryDeleteResponse | null</code>
+- <code title="get /zones/{zone_id}/web3/hostnames/{identifier}/ipfs_universal_path/content_list/entries/{content_list_entry_identifier}">client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.<a href="./src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts">get</a>(identifier, contentListEntryIdentifier, { ...params }) -> EntryGetResponse</code>
 
 # Workers
 
 Types:
 
-- <code><a href="./src/resources/workers/workers.ts">Binding</a></code>
-- <code><a href="./src/resources/workers/workers.ts">D1Binding</a></code>
-- <code><a href="./src/resources/workers/workers.ts">DispatchNamespaceBinding</a></code>
-- <code><a href="./src/resources/workers/workers.ts">DurableObjectBinding</a></code>
-- <code><a href="./src/resources/workers/workers.ts">KVNamespaceBinding</a></code>
 - <code><a href="./src/resources/workers/workers.ts">MigrationStep</a></code>
-- <code><a href="./src/resources/workers/workers.ts">MTLSCERTBinding</a></code>
-- <code><a href="./src/resources/workers/workers.ts">PlacementConfiguration</a></code>
-- <code><a href="./src/resources/workers/workers.ts">R2Binding</a></code>
-- <code><a href="./src/resources/workers/workers.ts">ServiceBinding</a></code>
 - <code><a href="./src/resources/workers/workers.ts">SingleStepMigration</a></code>
-- <code><a href="./src/resources/workers/workers.ts">SteppedMigration</a></code>
 - <code><a href="./src/resources/workers/workers.ts">WorkerMetadata</a></code>
 
-## AI
+## Routes
 
 Types:
 
-- <code><a href="./src/resources/workers/ai/ai.ts">AIRunResponse</a></code>
+- <code><a href="./src/resources/workers/routes.ts">RouteCreateResponse</a></code>
+- <code><a href="./src/resources/workers/routes.ts">RouteUpdateResponse</a></code>
+- <code><a href="./src/resources/workers/routes.ts">RouteListResponse</a></code>
+- <code><a href="./src/resources/workers/routes.ts">RouteDeleteResponse</a></code>
+- <code><a href="./src/resources/workers/routes.ts">RouteGetResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/ai/run/{model_name}">client.workers.ai.<a href="./src/resources/workers/ai/ai.ts">run</a>(modelName, { ...params }) -> AIRunResponse</code>
+- <code title="post /zones/{zone_id}/workers/routes">client.workers.routes.<a href="./src/resources/workers/routes.ts">create</a>({ ...params }) -> RouteCreateResponse</code>
+- <code title="put /zones/{zone_id}/workers/routes/{route_id}">client.workers.routes.<a href="./src/resources/workers/routes.ts">update</a>(routeId, { ...params }) -> RouteUpdateResponse</code>
+- <code title="get /zones/{zone_id}/workers/routes">client.workers.routes.<a href="./src/resources/workers/routes.ts">list</a>({ ...params }) -> RouteListResponsesSinglePage</code>
+- <code title="delete /zones/{zone_id}/workers/routes/{route_id}">client.workers.routes.<a href="./src/resources/workers/routes.ts">delete</a>(routeId, { ...params }) -> RouteDeleteResponse</code>
+- <code title="get /zones/{zone_id}/workers/routes/{route_id}">client.workers.routes.<a href="./src/resources/workers/routes.ts">get</a>(routeId, { ...params }) -> RouteGetResponse</code>
 
-### Models
+## Assets
 
-#### Schema
+### Upload
 
 Types:
 
-- <code><a href="./src/resources/workers/ai/models/schema.ts">SchemaGetResponse</a></code>
+- <code><a href="./src/resources/workers/assets/upload.ts">UploadCreateResponse</a></code>
 
 Methods:
 
-- <code title="get /accounts/{account_id}/ai/models/schema">client.workers.ai.models.schema.<a href="./src/resources/workers/ai/models/schema.ts">get</a>({ ...params }) -> SchemaGetResponse</code>
+- <code title="post /accounts/{account_id}/workers/assets/upload">client.workers.assets.upload.<a href="./src/resources/workers/assets/upload.ts">create</a>({ ...params }) -> UploadCreateResponse</code>
 
 ## Scripts
 
@@ -1808,13 +2040,39 @@ Types:
 
 - <code><a href="./src/resources/workers/scripts/scripts.ts">Script</a></code>
 - <code><a href="./src/resources/workers/scripts/scripts.ts">ScriptSetting</a></code>
+- <code><a href="./src/resources/workers/scripts/scripts.ts">ScriptUpdateResponse</a></code>
+- <code><a href="./src/resources/workers/scripts/scripts.ts">ScriptGetResponse</a></code>
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/scripts/{script_name}">client.workers.scripts.<a href="./src/resources/workers/scripts/scripts.ts">update</a>(scriptName, { ...params }) -> Script</code>
+- <code title="put /accounts/{account_id}/workers/scripts/{script_name}">client.workers.scripts.<a href="./src/resources/workers/scripts/scripts.ts">update</a>(scriptName, { ...params }) -> ScriptUpdateResponse</code>
 - <code title="get /accounts/{account_id}/workers/scripts">client.workers.scripts.<a href="./src/resources/workers/scripts/scripts.ts">list</a>({ ...params }) -> ScriptsSinglePage</code>
 - <code title="delete /accounts/{account_id}/workers/scripts/{script_name}">client.workers.scripts.<a href="./src/resources/workers/scripts/scripts.ts">delete</a>(scriptName, { ...params }) -> void</code>
-- <code title="get /accounts/{account_id}/workers/scripts/{script_name}">client.workers.scripts.<a href="./src/resources/workers/scripts/scripts.ts">get</a>(scriptName, { ...params }) -> Response</code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}">client.workers.scripts.<a href="./src/resources/workers/scripts/scripts.ts">get</a>(scriptName, { ...params }) -> string</code>
+
+### Assets
+
+#### Upload
+
+Types:
+
+- <code><a href="./src/resources/workers/scripts/assets/upload.ts">UploadCreateResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/workers/scripts/{script_name}/assets-upload-session">client.workers.scripts.assets.upload.<a href="./src/resources/workers/scripts/assets/upload.ts">create</a>(scriptName, { ...params }) -> UploadCreateResponse</code>
+
+### Subdomain
+
+Types:
+
+- <code><a href="./src/resources/workers/scripts/subdomain.ts">SubdomainCreateResponse</a></code>
+- <code><a href="./src/resources/workers/scripts/subdomain.ts">SubdomainGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/workers/scripts/{script_name}/subdomain">client.workers.scripts.subdomain.<a href="./src/resources/workers/scripts/subdomain.ts">create</a>(scriptName, { ...params }) -> SubdomainCreateResponse</code>
+- <code title="get /accounts/{account_id}/workers/scripts/{script_name}/subdomain">client.workers.scripts.subdomain.<a href="./src/resources/workers/scripts/subdomain.ts">get</a>(scriptName, { ...params }) -> SubdomainGetResponse</code>
 
 ### Schedules
 
@@ -1826,7 +2084,7 @@ Types:
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/scripts/{script_name}/schedules">client.workers.scripts.schedules.<a href="./src/resources/workers/scripts/schedules.ts">update</a>(scriptName, { ...params }) -> ScheduleUpdateResponse</code>
+- <code title="put /accounts/{account_id}/workers/scripts/{script_name}/schedules">client.workers.scripts.schedules.<a href="./src/resources/workers/scripts/schedules.ts">update</a>(scriptName, [ ...body ]) -> ScheduleUpdateResponse</code>
 - <code title="get /accounts/{account_id}/workers/scripts/{script_name}/schedules">client.workers.scripts.schedules.<a href="./src/resources/workers/scripts/schedules.ts">get</a>(scriptName, { ...params }) -> ScheduleGetResponse</code>
 
 ### Tail
@@ -1931,6 +2189,8 @@ Types:
 - <code><a href="./src/resources/kv/namespaces/namespaces.ts">Namespace</a></code>
 - <code><a href="./src/resources/kv/namespaces/namespaces.ts">NamespaceUpdateResponse</a></code>
 - <code><a href="./src/resources/kv/namespaces/namespaces.ts">NamespaceDeleteResponse</a></code>
+- <code><a href="./src/resources/kv/namespaces/namespaces.ts">NamespaceBulkDeleteResponse</a></code>
+- <code><a href="./src/resources/kv/namespaces/namespaces.ts">NamespaceBulkUpdateResponse</a></code>
 
 Methods:
 
@@ -1938,19 +2198,21 @@ Methods:
 - <code title="put /accounts/{account_id}/storage/kv/namespaces/{namespace_id}">client.kv.namespaces.<a href="./src/resources/kv/namespaces/namespaces.ts">update</a>(namespaceId, { ...params }) -> NamespaceUpdateResponse | null</code>
 - <code title="get /accounts/{account_id}/storage/kv/namespaces">client.kv.namespaces.<a href="./src/resources/kv/namespaces/namespaces.ts">list</a>({ ...params }) -> NamespacesV4PagePaginationArray</code>
 - <code title="delete /accounts/{account_id}/storage/kv/namespaces/{namespace_id}">client.kv.namespaces.<a href="./src/resources/kv/namespaces/namespaces.ts">delete</a>(namespaceId, { ...params }) -> NamespaceDeleteResponse | null</code>
+- <code title="post /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk/delete">client.kv.namespaces.<a href="./src/resources/kv/namespaces/namespaces.ts">bulkDelete</a>(namespaceId, [ ...body ]) -> NamespaceBulkDeleteResponse | null</code>
+- <code title="put /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk">client.kv.namespaces.<a href="./src/resources/kv/namespaces/namespaces.ts">bulkUpdate</a>(namespaceId, [ ...body ]) -> NamespaceBulkUpdateResponse | null</code>
 - <code title="get /accounts/{account_id}/storage/kv/namespaces/{namespace_id}">client.kv.namespaces.<a href="./src/resources/kv/namespaces/namespaces.ts">get</a>(namespaceId, { ...params }) -> Namespace</code>
 
-### Bulk
+### Analytics
 
 Types:
 
-- <code><a href="./src/resources/kv/namespaces/bulk.ts">BulkUpdateResponse</a></code>
-- <code><a href="./src/resources/kv/namespaces/bulk.ts">BulkDeleteResponse</a></code>
+- <code><a href="./src/resources/kv/namespaces/analytics.ts">Components</a></code>
+- <code><a href="./src/resources/kv/namespaces/analytics.ts">Schema</a></code>
 
 Methods:
 
-- <code title="put /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk">client.kv.namespaces.bulk.<a href="./src/resources/kv/namespaces/bulk.ts">update</a>(namespaceId, [ ...body ]) -> BulkUpdateResponse | null</code>
-- <code title="delete /accounts/{account_id}/storage/kv/namespaces/{namespace_id}/bulk">client.kv.namespaces.bulk.<a href="./src/resources/kv/namespaces/bulk.ts">delete</a>(namespaceId, { ...params }) -> BulkDeleteResponse | null</code>
+- <code title="get /accounts/{account_id}/storage/analytics">client.kv.namespaces.analytics.<a href="./src/resources/kv/namespaces/analytics.ts">list</a>({ ...params }) -> Schema</code>
+- <code title="get /accounts/{account_id}/storage/analytics/stored">client.kv.namespaces.analytics.<a href="./src/resources/kv/namespaces/analytics.ts">stored</a>({ ...params }) -> Components</code>
 
 ### Keys
 
@@ -2012,34 +2274,30 @@ Methods:
 Types:
 
 - <code><a href="./src/resources/queues/queues.ts">Queue</a></code>
-- <code><a href="./src/resources/queues/queues.ts">QueueCreated</a></code>
-- <code><a href="./src/resources/queues/queues.ts">QueueUpdated</a></code>
 - <code><a href="./src/resources/queues/queues.ts">QueueDeleteResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/queues">client.queues.<a href="./src/resources/queues/queues.ts">create</a>({ ...params }) -> QueueCreated | null</code>
-- <code title="put /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/resources/queues/queues.ts">update</a>(queueId, { ...params }) -> QueueUpdated | null</code>
+- <code title="post /accounts/{account_id}/queues">client.queues.<a href="./src/resources/queues/queues.ts">create</a>({ ...params }) -> Queue</code>
+- <code title="put /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/resources/queues/queues.ts">update</a>(queueId, { ...params }) -> Queue</code>
 - <code title="get /accounts/{account_id}/queues">client.queues.<a href="./src/resources/queues/queues.ts">list</a>({ ...params }) -> QueuesSinglePage</code>
-- <code title="delete /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/resources/queues/queues.ts">delete</a>(queueId, { ...params }) -> QueueDeleteResponse | null</code>
-- <code title="get /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/resources/queues/queues.ts">get</a>(queueId, { ...params }) -> Queue | null</code>
+- <code title="delete /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/resources/queues/queues.ts">delete</a>(queueId, { ...params }) -> QueueDeleteResponse</code>
+- <code title="get /accounts/{account_id}/queues/{queue_id}">client.queues.<a href="./src/resources/queues/queues.ts">get</a>(queueId, { ...params }) -> Queue</code>
 
 ## Consumers
 
 Types:
 
 - <code><a href="./src/resources/queues/consumers.ts">Consumer</a></code>
-- <code><a href="./src/resources/queues/consumers.ts">ConsumerCreateResponse</a></code>
-- <code><a href="./src/resources/queues/consumers.ts">ConsumerUpdateResponse</a></code>
 - <code><a href="./src/resources/queues/consumers.ts">ConsumerDeleteResponse</a></code>
 - <code><a href="./src/resources/queues/consumers.ts">ConsumerGetResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/queues/{queue_id}/consumers">client.queues.consumers.<a href="./src/resources/queues/consumers.ts">create</a>(queueId, { ...params }) -> ConsumerCreateResponse | null</code>
-- <code title="put /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}">client.queues.consumers.<a href="./src/resources/queues/consumers.ts">update</a>(queueId, consumerId, { ...params }) -> ConsumerUpdateResponse | null</code>
-- <code title="delete /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}">client.queues.consumers.<a href="./src/resources/queues/consumers.ts">delete</a>(queueId, consumerId, { ...params }) -> ConsumerDeleteResponse | null</code>
-- <code title="get /accounts/{account_id}/queues/{queue_id}/consumers">client.queues.consumers.<a href="./src/resources/queues/consumers.ts">get</a>(queueId, { ...params }) -> ConsumerGetResponse | null</code>
+- <code title="post /accounts/{account_id}/queues/{queue_id}/consumers">client.queues.consumers.<a href="./src/resources/queues/consumers.ts">create</a>(queueId, { ...params }) -> Consumer</code>
+- <code title="put /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}">client.queues.consumers.<a href="./src/resources/queues/consumers.ts">update</a>(queueId, consumerId, { ...params }) -> Consumer</code>
+- <code title="delete /accounts/{account_id}/queues/{queue_id}/consumers/{consumer_id}">client.queues.consumers.<a href="./src/resources/queues/consumers.ts">delete</a>(queueId, consumerId, { ...params }) -> ConsumerDeleteResponse</code>
+- <code title="get /accounts/{account_id}/queues/{queue_id}/consumers">client.queues.consumers.<a href="./src/resources/queues/consumers.ts">get</a>(queueId, { ...params }) -> ConsumerGetResponse</code>
 
 ## Messages
 
@@ -2050,8 +2308,8 @@ Types:
 
 Methods:
 
-- <code title="post /accounts/{account_id}/queues/{queue_id}/messages/ack">client.queues.messages.<a href="./src/resources/queues/messages.ts">ack</a>(queueId, { ...params }) -> MessageAckResponse | null</code>
-- <code title="post /accounts/{account_id}/queues/{queue_id}/messages/pull">client.queues.messages.<a href="./src/resources/queues/messages.ts">pull</a>(queueId, { ...params }) -> MessagePullResponse | null</code>
+- <code title="post /accounts/{account_id}/queues/{queue_id}/messages/ack">client.queues.messages.<a href="./src/resources/queues/messages.ts">ack</a>(queueId, { ...params }) -> MessageAckResponse</code>
+- <code title="post /accounts/{account_id}/queues/{queue_id}/messages/pull">client.queues.messages.<a href="./src/resources/queues/messages.ts">pull</a>(queueId, { ...params }) -> MessagePullResponse</code>
 
 # APIGateway
 
@@ -2082,11 +2340,13 @@ Methods:
 
 Types:
 
+- <code><a href="./src/resources/api-gateway/discovery/operations.ts">OperationBulkEditResponse</a></code>
 - <code><a href="./src/resources/api-gateway/discovery/operations.ts">OperationEditResponse</a></code>
 
 Methods:
 
 - <code title="get /zones/{zone_id}/api_gateway/discovery/operations">client.apiGateway.discovery.operations.<a href="./src/resources/api-gateway/discovery/operations.ts">list</a>({ ...params }) -> DiscoveryOperationsV4PagePaginationArray</code>
+- <code title="patch /zones/{zone_id}/api_gateway/discovery/operations">client.apiGateway.discovery.operations.<a href="./src/resources/api-gateway/discovery/operations.ts">bulkEdit</a>({ ...params }) -> OperationBulkEditResponse</code>
 - <code title="patch /zones/{zone_id}/api_gateway/discovery/operations/{operation_id}">client.apiGateway.discovery.operations.<a href="./src/resources/api-gateway/discovery/operations.ts">edit</a>(operationId, { ...params }) -> OperationEditResponse</code>
 
 ## Operations
@@ -2097,13 +2357,17 @@ Types:
 - <code><a href="./src/resources/api-gateway/operations/operations.ts">OperationCreateResponse</a></code>
 - <code><a href="./src/resources/api-gateway/operations/operations.ts">OperationListResponse</a></code>
 - <code><a href="./src/resources/api-gateway/operations/operations.ts">OperationDeleteResponse</a></code>
+- <code><a href="./src/resources/api-gateway/operations/operations.ts">OperationBulkCreateResponse</a></code>
+- <code><a href="./src/resources/api-gateway/operations/operations.ts">OperationBulkDeleteResponse</a></code>
 - <code><a href="./src/resources/api-gateway/operations/operations.ts">OperationGetResponse</a></code>
 
 Methods:
 
-- <code title="post /zones/{zone_id}/api_gateway/operations">client.apiGateway.operations.<a href="./src/resources/api-gateway/operations/operations.ts">create</a>([ ...body ]) -> OperationCreateResponse</code>
+- <code title="post /zones/{zone_id}/api_gateway/operations/item">client.apiGateway.operations.<a href="./src/resources/api-gateway/operations/operations.ts">create</a>({ ...params }) -> OperationCreateResponse</code>
 - <code title="get /zones/{zone_id}/api_gateway/operations">client.apiGateway.operations.<a href="./src/resources/api-gateway/operations/operations.ts">list</a>({ ...params }) -> OperationListResponsesV4PagePaginationArray</code>
 - <code title="delete /zones/{zone_id}/api_gateway/operations/{operation_id}">client.apiGateway.operations.<a href="./src/resources/api-gateway/operations/operations.ts">delete</a>(operationId, { ...params }) -> OperationDeleteResponse</code>
+- <code title="post /zones/{zone_id}/api_gateway/operations">client.apiGateway.operations.<a href="./src/resources/api-gateway/operations/operations.ts">bulkCreate</a>([ ...body ]) -> OperationBulkCreateResponse</code>
+- <code title="delete /zones/{zone_id}/api_gateway/operations">client.apiGateway.operations.<a href="./src/resources/api-gateway/operations/operations.ts">bulkDelete</a>({ ...params }) -> OperationBulkDeleteResponse</code>
 - <code title="get /zones/{zone_id}/api_gateway/operations/{operation_id}">client.apiGateway.operations.<a href="./src/resources/api-gateway/operations/operations.ts">get</a>(operationId, { ...params }) -> OperationGetResponse</code>
 
 ### SchemaValidation
@@ -2171,18 +2435,40 @@ Methods:
 
 - <code title="get /zones/{zone_id}/api_gateway/user_schemas/{schema_id}/operations">client.apiGateway.userSchemas.operations.<a href="./src/resources/api-gateway/user-schemas/operations.ts">list</a>(schemaId, { ...params }) -> OperationListResponsesV4PagePaginationArray</code>
 
-# ManagedHeaders
+### Hosts
+
+Types:
+
+- <code><a href="./src/resources/api-gateway/user-schemas/hosts.ts">HostListResponse</a></code>
+
+Methods:
+
+- <code title="get /zones/{zone_id}/api_gateway/user_schemas/hosts">client.apiGateway.userSchemas.hosts.<a href="./src/resources/api-gateway/user-schemas/hosts.ts">list</a>({ ...params }) -> HostListResponsesV4PagePaginationArray</code>
+
+## ExpressionTemplate
+
+### Fallthrough
+
+Types:
+
+- <code><a href="./src/resources/api-gateway/expression-template/fallthrough.ts">FallthroughCreateResponse</a></code>
+
+Methods:
+
+- <code title="post /zones/{zone_id}/api_gateway/expression-template/fallthrough">client.apiGateway.expressionTemplate.fallthrough.<a href="./src/resources/api-gateway/expression-template/fallthrough.ts">create</a>({ ...params }) -> FallthroughCreateResponse</code>
+
+# ManagedTransforms
 
 Types:
 
-- <code><a href="./src/resources/managed-headers.ts">RequestModel</a></code>
-- <code><a href="./src/resources/managed-headers.ts">ManagedHeaderListResponse</a></code>
-- <code><a href="./src/resources/managed-headers.ts">ManagedHeaderEditResponse</a></code>
+- <code><a href="./src/resources/managed-transforms.ts">ManagedTransformListResponse</a></code>
+- <code><a href="./src/resources/managed-transforms.ts">ManagedTransformEditResponse</a></code>
 
 Methods:
 
-- <code title="get /zones/{zone_id}/managed_headers">client.managedHeaders.<a href="./src/resources/managed-headers.ts">list</a>({ ...params }) -> ManagedHeaderListResponse</code>
-- <code title="patch /zones/{zone_id}/managed_headers">client.managedHeaders.<a href="./src/resources/managed-headers.ts">edit</a>({ ...params }) -> ManagedHeaderEditResponse</code>
+- <code title="get /zones/{zone_id}/managed_headers">client.managedTransforms.<a href="./src/resources/managed-transforms.ts">list</a>({ ...params }) -> ManagedTransformListResponse</code>
+- <code title="delete /zones/{zone_id}/managed_headers">client.managedTransforms.<a href="./src/resources/managed-transforms.ts">delete</a>({ ...params }) -> void</code>
+- <code title="patch /zones/{zone_id}/managed_headers">client.managedTransforms.<a href="./src/resources/managed-transforms.ts">edit</a>({ ...params }) -> ManagedTransformEditResponse</code>
 
 # PageShield
 
@@ -2298,10 +2584,11 @@ Methods:
 Types:
 
 - <code><a href="./src/resources/rulesets/rules.ts">BlockRule</a></code>
-- <code><a href="./src/resources/rulesets/rules.ts">ChallengeRule</a></code>
 - <code><a href="./src/resources/rulesets/rules.ts">CompressResponseRule</a></code>
+- <code><a href="./src/resources/rulesets/rules.ts">DDoSDynamicRule</a></code>
 - <code><a href="./src/resources/rulesets/rules.ts">ExecuteRule</a></code>
-- <code><a href="./src/resources/rulesets/rules.ts">JSChallengeRule</a></code>
+- <code><a href="./src/resources/rulesets/rules.ts">ForceConnectionCloseRule</a></code>
+- <code><a href="./src/resources/rulesets/rules.ts">LogCustomFieldRule</a></code>
 - <code><a href="./src/resources/rulesets/rules.ts">LogRule</a></code>
 - <code><a href="./src/resources/rulesets/rules.ts">Logging</a></code>
 - <code><a href="./src/resources/rulesets/rules.ts">ManagedChallengeRule</a></code>
@@ -2329,24 +2616,14 @@ Methods:
 
 Types:
 
-- <code><a href="./src/resources/rulesets/versions/versions.ts">VersionListResponse</a></code>
-- <code><a href="./src/resources/rulesets/versions/versions.ts">VersionGetResponse</a></code>
+- <code><a href="./src/resources/rulesets/versions.ts">VersionListResponse</a></code>
+- <code><a href="./src/resources/rulesets/versions.ts">VersionGetResponse</a></code>
 
 Methods:
 
-- <code title="get /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions">client.rulesets.versions.<a href="./src/resources/rulesets/versions/versions.ts">list</a>(rulesetId, { ...params }) -> VersionListResponsesSinglePage</code>
-- <code title="delete /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}">client.rulesets.versions.<a href="./src/resources/rulesets/versions/versions.ts">delete</a>(rulesetId, rulesetVersion, { ...params }) -> void</code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}">client.rulesets.versions.<a href="./src/resources/rulesets/versions/versions.ts">get</a>(rulesetId, rulesetVersion, { ...params }) -> VersionGetResponse</code>
-
-### ByTag
-
-Types:
-
-- <code><a href="./src/resources/rulesets/versions/by-tag.ts">ByTagGetResponse</a></code>
-
-Methods:
-
-- <code title="get /accounts/{account_id}/rulesets/{ruleset_id}/versions/{ruleset_version}/by_tag/{rule_tag}">client.rulesets.versions.byTag.<a href="./src/resources/rulesets/versions/by-tag.ts">get</a>(rulesetId, rulesetVersion, ruleTag, { ...params }) -> ByTagGetResponse</code>
+- <code title="get /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions">client.rulesets.versions.<a href="./src/resources/rulesets/versions.ts">list</a>(rulesetId, { ...params }) -> VersionListResponsesSinglePage</code>
+- <code title="delete /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}">client.rulesets.versions.<a href="./src/resources/rulesets/versions.ts">delete</a>(rulesetId, rulesetVersion, { ...params }) -> void</code>
+- <code title="get /{account_or_zone}/{account_or_zone_id}/rulesets/{ruleset_id}/versions/{ruleset_version}">client.rulesets.versions.<a href="./src/resources/rulesets/versions.ts">get</a>(rulesetId, rulesetVersion, { ...params }) -> VersionGetResponse</code>
 
 # URLNormalization
 
@@ -2358,6 +2635,7 @@ Types:
 Methods:
 
 - <code title="put /zones/{zone_id}/url_normalization">client.urlNormalization.<a href="./src/resources/url-normalization.ts">update</a>({ ...params }) -> URLNormalizationUpdateResponse</code>
+- <code title="delete /zones/{zone_id}/url_normalization">client.urlNormalization.<a href="./src/resources/url-normalization.ts">delete</a>({ ...params }) -> void</code>
 - <code title="get /zones/{zone_id}/url_normalization">client.urlNormalization.<a href="./src/resources/url-normalization.ts">get</a>({ ...params }) -> URLNormalizationGetResponse</code>
 
 # Spectrum
@@ -2381,7 +2659,7 @@ Types:
 
 Methods:
 
-- <code title="get /zones/{zone}/spectrum/analytics/aggregate/current">client.spectrum.analytics.aggregates.currents.<a href="./src/resources/spectrum/analytics/aggregates/currents.ts">get</a>(zone, { ...params }) -> CurrentGetResponse</code>
+- <code title="get /zones/{zone_id}/spectrum/analytics/aggregate/current">client.spectrum.analytics.aggregates.currents.<a href="./src/resources/spectrum/analytics/aggregates/currents.ts">get</a>({ ...params }) -> CurrentGetResponse</code>
 
 ### Events
 
@@ -2397,7 +2675,7 @@ Types:
 
 Methods:
 
-- <code title="get /zones/{zone}/spectrum/analytics/events/bytime">client.spectrum.analytics.events.bytimes.<a href="./src/resources/spectrum/analytics/events/bytimes.ts">get</a>(zone, { ...params }) -> BytimeGetResponse | null</code>
+- <code title="get /zones/{zone_id}/spectrum/analytics/events/bytime">client.spectrum.analytics.events.bytimes.<a href="./src/resources/spectrum/analytics/events/bytimes.ts">get</a>({ ...params }) -> BytimeGetResponse</code>
 
 #### Summaries
 
@@ -2407,7 +2685,7 @@ Types:
 
 Methods:
 
-- <code title="get /zones/{zone}/spectrum/analytics/events/summary">client.spectrum.analytics.events.summaries.<a href="./src/resources/spectrum/analytics/events/summaries.ts">get</a>(zone, { ...params }) -> SummaryGetResponse | null</code>
+- <code title="get /zones/{zone_id}/spectrum/analytics/events/summary">client.spectrum.analytics.events.summaries.<a href="./src/resources/spectrum/analytics/events/summaries.ts">get</a>({ ...params }) -> SummaryGetResponse</code>
 
 ## Apps
 
@@ -2421,11 +2699,11 @@ Types:
 
 Methods:
 
-- <code title="post /zones/{zone}/spectrum/apps">client.spectrum.apps.<a href="./src/resources/spectrum/apps.ts">create</a>(zone, { ...params }) -> AppCreateResponse | null</code>
-- <code title="put /zones/{zone}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/resources/spectrum/apps.ts">update</a>(zone, appId, { ...params }) -> AppUpdateResponse | null</code>
-- <code title="get /zones/{zone}/spectrum/apps">client.spectrum.apps.<a href="./src/resources/spectrum/apps.ts">list</a>(zone, { ...params }) -> AppListResponsesV4PagePaginationArray</code>
-- <code title="delete /zones/{zone}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/resources/spectrum/apps.ts">delete</a>(zone, appId) -> AppDeleteResponse | null</code>
-- <code title="get /zones/{zone}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/resources/spectrum/apps.ts">get</a>(zone, appId) -> AppGetResponse</code>
+- <code title="post /zones/{zone_id}/spectrum/apps">client.spectrum.apps.<a href="./src/resources/spectrum/apps.ts">create</a>({ ...params }) -> AppCreateResponse</code>
+- <code title="put /zones/{zone_id}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/resources/spectrum/apps.ts">update</a>(appId, { ...params }) -> AppUpdateResponse</code>
+- <code title="get /zones/{zone_id}/spectrum/apps">client.spectrum.apps.<a href="./src/resources/spectrum/apps.ts">list</a>({ ...params }) -> AppListResponsesV4PagePaginationArray</code>
+- <code title="delete /zones/{zone_id}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/resources/spectrum/apps.ts">delete</a>(appId, { ...params }) -> AppDeleteResponse | null</code>
+- <code title="get /zones/{zone_id}/spectrum/apps/{app_id}">client.spectrum.apps.<a href="./src/resources/spectrum/apps.ts">get</a>(appId, { ...params }) -> AppGetResponse</code>
 
 # Addressing
 
@@ -2481,7 +2759,7 @@ Methods:
 
 - <code title="post /accounts/{account_id}/addressing/address_maps">client.addressing.addressMaps.<a href="./src/resources/addressing/address-maps/address-maps.ts">create</a>({ ...params }) -> AddressMapCreateResponse</code>
 - <code title="get /accounts/{account_id}/addressing/address_maps">client.addressing.addressMaps.<a href="./src/resources/addressing/address-maps/address-maps.ts">list</a>({ ...params }) -> AddressMapsSinglePage</code>
-- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}">client.addressing.addressMaps.<a href="./src/resources/addressing/address-maps/address-maps.ts">delete</a>(addressMapId, { ...params }) -> AddressMapDeleteResponse | null</code>
+- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}">client.addressing.addressMaps.<a href="./src/resources/addressing/address-maps/address-maps.ts">delete</a>(addressMapId, { ...params }) -> AddressMapDeleteResponse</code>
 - <code title="patch /accounts/{account_id}/addressing/address_maps/{address_map_id}">client.addressing.addressMaps.<a href="./src/resources/addressing/address-maps/address-maps.ts">edit</a>(addressMapId, { ...params }) -> AddressMap</code>
 - <code title="get /accounts/{account_id}/addressing/address_maps/{address_map_id}">client.addressing.addressMaps.<a href="./src/resources/addressing/address-maps/address-maps.ts">get</a>(addressMapId, { ...params }) -> AddressMapGetResponse</code>
 
@@ -2494,8 +2772,8 @@ Types:
 
 Methods:
 
-- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}">client.addressing.addressMaps.accounts.<a href="./src/resources/addressing/address-maps/accounts.ts">update</a>(addressMapId, { ...params }) -> AccountUpdateResponse | null</code>
-- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}">client.addressing.addressMaps.accounts.<a href="./src/resources/addressing/address-maps/accounts.ts">delete</a>(addressMapId, { ...params }) -> AccountDeleteResponse | null</code>
+- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}">client.addressing.addressMaps.accounts.<a href="./src/resources/addressing/address-maps/accounts.ts">update</a>(addressMapId, { ...params }) -> AccountUpdateResponse</code>
+- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/accounts/{account_id}">client.addressing.addressMaps.accounts.<a href="./src/resources/addressing/address-maps/accounts.ts">delete</a>(addressMapId, { ...params }) -> AccountDeleteResponse</code>
 
 ### IPs
 
@@ -2506,8 +2784,8 @@ Types:
 
 Methods:
 
-- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}">client.addressing.addressMaps.ips.<a href="./src/resources/addressing/address-maps/ips.ts">update</a>(addressMapId, ipAddress, { ...params }) -> IPUpdateResponse | null</code>
-- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}">client.addressing.addressMaps.ips.<a href="./src/resources/addressing/address-maps/ips.ts">delete</a>(addressMapId, ipAddress, { ...params }) -> IPDeleteResponse | null</code>
+- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}">client.addressing.addressMaps.ips.<a href="./src/resources/addressing/address-maps/ips.ts">update</a>(addressMapId, ipAddress, { ...params }) -> IPUpdateResponse</code>
+- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/ips/{ip_address}">client.addressing.addressMaps.ips.<a href="./src/resources/addressing/address-maps/ips.ts">delete</a>(addressMapId, ipAddress, { ...params }) -> IPDeleteResponse</code>
 
 ### Zones
 
@@ -2518,24 +2796,19 @@ Types:
 
 Methods:
 
-- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}">client.addressing.addressMaps.zones.<a href="./src/resources/addressing/address-maps/zones.ts">update</a>(addressMapId, { ...params }) -> ZoneUpdateResponse | null</code>
-- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}">client.addressing.addressMaps.zones.<a href="./src/resources/addressing/address-maps/zones.ts">delete</a>(addressMapId, { ...params }) -> ZoneDeleteResponse | null</code>
+- <code title="put /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}">client.addressing.addressMaps.zones.<a href="./src/resources/addressing/address-maps/zones.ts">update</a>(addressMapId, { ...params }) -> ZoneUpdateResponse</code>
+- <code title="delete /accounts/{account_id}/addressing/address_maps/{address_map_id}/zones/{zone_id}">client.addressing.addressMaps.zones.<a href="./src/resources/addressing/address-maps/zones.ts">delete</a>(addressMapId, { ...params }) -> ZoneDeleteResponse</code>
 
 ## LOADocuments
 
 Types:
 
-- <code><a href="./src/resources/addressing/loa-documents/loa-documents.ts">LOADocumentCreateResponse</a></code>
-
-Methods:
-
-- <code title="post /accounts/{account_id}/addressing/loa_documents">client.addressing.loaDocuments.<a href="./src/resources/addressing/loa-documents/loa-documents.ts">create</a>({ ...params }) -> LOADocumentCreateResponse</code>
-
-### Downloads
+- <code><a href="./src/resources/addressing/loa-documents.ts">LOADocumentCreateResponse</a></code>
 
 Methods:
 
-- <code title="get /accounts/{account_id}/addressing/loa_documents/{loa_document_id}/download">client.addressing.loaDocuments.downloads.<a href="./src/resources/addressing/loa-documents/downloads.ts">get</a>(loaDocumentId, { ...params }) -> Response</code>
+- <code title="post /accounts/{account_id}/addressing/loa_documents">client.addressing.loaDocuments.<a href="./src/resources/addressing/loa-documents.ts">create</a>({ ...params }) -> LOADocumentCreateResponse</code>
+- <code title="get /accounts/{account_id}/addressing/loa_documents/{loa_document_id}/download">client.addressing.loaDocuments.<a href="./src/resources/addressing/loa-documents.ts">get</a>(loaDocumentId, { ...params }) -> Response</code>
 
 ## Prefixes
 
@@ -2548,49 +2821,48 @@ Methods:
 
 - <code title="post /accounts/{account_id}/addressing/prefixes">client.addressing.prefixes.<a href="./src/resources/addressing/prefixes/prefixes.ts">create</a>({ ...params }) -> Prefix</code>
 - <code title="get /accounts/{account_id}/addressing/prefixes">client.addressing.prefixes.<a href="./src/resources/addressing/prefixes/prefixes.ts">list</a>({ ...params }) -> PrefixesSinglePage</code>
-- <code title="delete /accounts/{account_id}/addressing/prefixes/{prefix_id}">client.addressing.prefixes.<a href="./src/resources/addressing/prefixes/prefixes.ts">delete</a>(prefixId, { ...params }) -> PrefixDeleteResponse | null</code>
+- <code title="delete /accounts/{account_id}/addressing/prefixes/{prefix_id}">client.addressing.prefixes.<a href="./src/resources/addressing/prefixes/prefixes.ts">delete</a>(prefixId, { ...params }) -> PrefixDeleteResponse</code>
 - <code title="patch /accounts/{account_id}/addressing/prefixes/{prefix_id}">client.addressing.prefixes.<a href="./src/resources/addressing/prefixes/prefixes.ts">edit</a>(prefixId, { ...params }) -> Prefix</code>
 - <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}">client.addressing.prefixes.<a href="./src/resources/addressing/prefixes/prefixes.ts">get</a>(prefixId, { ...params }) -> Prefix</code>
 
-### BGP
-
-#### Bindings
+### ServiceBindings
 
 Types:
 
-- <code><a href="./src/resources/addressing/prefixes/bgp/bindings.ts">ServiceBinding</a></code>
-- <code><a href="./src/resources/addressing/prefixes/bgp/bindings.ts">BindingDeleteResponse</a></code>
+- <code><a href="./src/resources/addressing/prefixes/service-bindings.ts">ServiceBinding</a></code>
+- <code><a href="./src/resources/addressing/prefixes/service-bindings.ts">ServiceBindingDeleteResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings">client.addressing.prefixes.bgp.bindings.<a href="./src/resources/addressing/prefixes/bgp/bindings.ts">create</a>(prefixId, { ...params }) -> ServiceBinding</code>
-- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings">client.addressing.prefixes.bgp.bindings.<a href="./src/resources/addressing/prefixes/bgp/bindings.ts">list</a>(prefixId, { ...params }) -> ServiceBindingsSinglePage</code>
-- <code title="delete /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}">client.addressing.prefixes.bgp.bindings.<a href="./src/resources/addressing/prefixes/bgp/bindings.ts">delete</a>(prefixId, bindingId, { ...params }) -> BindingDeleteResponse</code>
-- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}">client.addressing.prefixes.bgp.bindings.<a href="./src/resources/addressing/prefixes/bgp/bindings.ts">get</a>(prefixId, bindingId, { ...params }) -> ServiceBinding</code>
+- <code title="post /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings">client.addressing.prefixes.serviceBindings.<a href="./src/resources/addressing/prefixes/service-bindings.ts">create</a>(prefixId, { ...params }) -> ServiceBinding</code>
+- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings">client.addressing.prefixes.serviceBindings.<a href="./src/resources/addressing/prefixes/service-bindings.ts">list</a>(prefixId, { ...params }) -> ServiceBindingsSinglePage</code>
+- <code title="delete /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}">client.addressing.prefixes.serviceBindings.<a href="./src/resources/addressing/prefixes/service-bindings.ts">delete</a>(prefixId, bindingId, { ...params }) -> ServiceBindingDeleteResponse</code>
+- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bindings/{binding_id}">client.addressing.prefixes.serviceBindings.<a href="./src/resources/addressing/prefixes/service-bindings.ts">get</a>(prefixId, bindingId, { ...params }) -> ServiceBinding</code>
 
-#### Prefixes
+### BGPPrefixes
 
 Types:
 
-- <code><a href="./src/resources/addressing/prefixes/bgp/prefixes.ts">BGPPrefix</a></code>
+- <code><a href="./src/resources/addressing/prefixes/bgp-prefixes.ts">BGPPrefix</a></code>
 
 Methods:
 
-- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes">client.addressing.prefixes.bgp.prefixes.<a href="./src/resources/addressing/prefixes/bgp/prefixes.ts">list</a>(prefixId, { ...params }) -> BGPPrefixesSinglePage</code>
-- <code title="patch /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}">client.addressing.prefixes.bgp.prefixes.<a href="./src/resources/addressing/prefixes/bgp/prefixes.ts">edit</a>(prefixId, bgpPrefixId, { ...params }) -> BGPPrefix</code>
-- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}">client.addressing.prefixes.bgp.prefixes.<a href="./src/resources/addressing/prefixes/bgp/prefixes.ts">get</a>(prefixId, bgpPrefixId, { ...params }) -> BGPPrefix</code>
+- <code title="post /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes">client.addressing.prefixes.bgpPrefixes.<a href="./src/resources/addressing/prefixes/bgp-prefixes.ts">create</a>(prefixId, { ...params }) -> BGPPrefix</code>
+- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes">client.addressing.prefixes.bgpPrefixes.<a href="./src/resources/addressing/prefixes/bgp-prefixes.ts">list</a>(prefixId, { ...params }) -> BGPPrefixesSinglePage</code>
+- <code title="patch /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}">client.addressing.prefixes.bgpPrefixes.<a href="./src/resources/addressing/prefixes/bgp-prefixes.ts">edit</a>(prefixId, bgpPrefixId, { ...params }) -> BGPPrefix</code>
+- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/prefixes/{bgp_prefix_id}">client.addressing.prefixes.bgpPrefixes.<a href="./src/resources/addressing/prefixes/bgp-prefixes.ts">get</a>(prefixId, bgpPrefixId, { ...params }) -> BGPPrefix</code>
 
-#### Statuses
+### AdvertisementStatus
 
 Types:
 
-- <code><a href="./src/resources/addressing/prefixes/bgp/statuses.ts">StatusEditResponse</a></code>
-- <code><a href="./src/resources/addressing/prefixes/bgp/statuses.ts">StatusGetResponse</a></code>
+- <code><a href="./src/resources/addressing/prefixes/advertisement-status.ts">AdvertisementStatusEditResponse</a></code>
+- <code><a href="./src/resources/addressing/prefixes/advertisement-status.ts">AdvertisementStatusGetResponse</a></code>
 
 Methods:
 
-- <code title="patch /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status">client.addressing.prefixes.bgp.statuses.<a href="./src/resources/addressing/prefixes/bgp/statuses.ts">edit</a>(prefixId, { ...params }) -> StatusEditResponse</code>
-- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status">client.addressing.prefixes.bgp.statuses.<a href="./src/resources/addressing/prefixes/bgp/statuses.ts">get</a>(prefixId, { ...params }) -> StatusGetResponse</code>
+- <code title="patch /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status">client.addressing.prefixes.advertisementStatus.<a href="./src/resources/addressing/prefixes/advertisement-status.ts">edit</a>(prefixId, { ...params }) -> AdvertisementStatusEditResponse</code>
+- <code title="get /accounts/{account_id}/addressing/prefixes/{prefix_id}/bgp/status">client.addressing.prefixes.advertisementStatus.<a href="./src/resources/addressing/prefixes/advertisement-status.ts">get</a>(prefixId, { ...params }) -> AdvertisementStatusGetResponse</code>
 
 ### Delegations
 
@@ -2621,7 +2893,7 @@ Types:
 
 Methods:
 
-- <code title="get /accounts/{account_identifier}/billing/profile">client.billing.profiles.<a href="./src/resources/billing/profiles.ts">get</a>(accountIdentifier) -> ProfileGetResponse</code>
+- <code title="get /accounts/{account_id}/billing/profile">client.billing.profiles.<a href="./src/resources/billing/profiles.ts">get</a>({ ...params }) -> ProfileGetResponse</code>
 
 # BrandProtection
 
@@ -2761,11 +3033,10 @@ Methods:
 Types:
 
 - <code><a href="./src/resources/intel/dns.ts">DNS</a></code>
-- <code><a href="./src/resources/intel/dns.ts">DNSListResponse</a></code>
 
 Methods:
 
-- <code title="get /accounts/{account_id}/intel/dns">client.intel.dns.<a href="./src/resources/intel/dns.ts">list</a>({ ...params }) -> DNSListResponsesV4PagePagination</code>
+- <code title="get /accounts/{account_id}/intel/dns">client.intel.dns.<a href="./src/resources/intel/dns.ts">list</a>({ ...params }) -> DNSV4PagePagination</code>
 
 ## Domains
 
@@ -2883,6 +3154,16 @@ Methods:
 - <code title="get /accounts/{account_id}/intel/indicator-feeds/permissions/view">client.intel.indicatorFeeds.permissions.<a href="./src/resources/intel/indicator-feeds/permissions.ts">list</a>({ ...params }) -> PermissionListResponse</code>
 - <code title="put /accounts/{account_id}/intel/indicator-feeds/permissions/remove">client.intel.indicatorFeeds.permissions.<a href="./src/resources/intel/indicator-feeds/permissions.ts">delete</a>({ ...params }) -> PermissionDeleteResponse</code>
 
+### Downloads
+
+Types:
+
+- <code><a href="./src/resources/intel/indicator-feeds/downloads.ts">DownloadGetResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/intel/indicator_feeds/{feed_id}/download">client.intel.indicatorFeeds.downloads.<a href="./src/resources/intel/indicator-feeds/downloads.ts">get</a>(feedId, { ...params }) -> DownloadGetResponse</code>
+
 ## Sinkholes
 
 Types:
@@ -2955,12 +3236,14 @@ Types:
 
 - <code><a href="./src/resources/magic-transit/cf-interconnects.ts">CfInterconnectUpdateResponse</a></code>
 - <code><a href="./src/resources/magic-transit/cf-interconnects.ts">CfInterconnectListResponse</a></code>
+- <code><a href="./src/resources/magic-transit/cf-interconnects.ts">CfInterconnectBulkUpdateResponse</a></code>
 - <code><a href="./src/resources/magic-transit/cf-interconnects.ts">CfInterconnectGetResponse</a></code>
 
 Methods:
 
 - <code title="put /accounts/{account_id}/magic/cf_interconnects/{cf_interconnect_id}">client.magicTransit.cfInterconnects.<a href="./src/resources/magic-transit/cf-interconnects.ts">update</a>(cfInterconnectId, { ...params }) -> CfInterconnectUpdateResponse</code>
 - <code title="get /accounts/{account_id}/magic/cf_interconnects">client.magicTransit.cfInterconnects.<a href="./src/resources/magic-transit/cf-interconnects.ts">list</a>({ ...params }) -> CfInterconnectListResponse</code>
+- <code title="put /accounts/{account_id}/magic/cf_interconnects">client.magicTransit.cfInterconnects.<a href="./src/resources/magic-transit/cf-interconnects.ts">bulkUpdate</a>({ ...params }) -> CfInterconnectBulkUpdateResponse</code>
 - <code title="get /accounts/{account_id}/magic/cf_interconnects/{cf_interconnect_id}">client.magicTransit.cfInterconnects.<a href="./src/resources/magic-transit/cf-interconnects.ts">get</a>(cfInterconnectId, { ...params }) -> CfInterconnectGetResponse</code>
 
 ## GRETunnels
@@ -2971,6 +3254,7 @@ Types:
 - <code><a href="./src/resources/magic-transit/gre-tunnels.ts">GRETunnelUpdateResponse</a></code>
 - <code><a href="./src/resources/magic-transit/gre-tunnels.ts">GRETunnelListResponse</a></code>
 - <code><a href="./src/resources/magic-transit/gre-tunnels.ts">GRETunnelDeleteResponse</a></code>
+- <code><a href="./src/resources/magic-transit/gre-tunnels.ts">GRETunnelBulkUpdateResponse</a></code>
 - <code><a href="./src/resources/magic-transit/gre-tunnels.ts">GRETunnelGetResponse</a></code>
 
 Methods:
@@ -2979,6 +3263,7 @@ Methods:
 - <code title="put /accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}">client.magicTransit.greTunnels.<a href="./src/resources/magic-transit/gre-tunnels.ts">update</a>(greTunnelId, { ...params }) -> GRETunnelUpdateResponse</code>
 - <code title="get /accounts/{account_id}/magic/gre_tunnels">client.magicTransit.greTunnels.<a href="./src/resources/magic-transit/gre-tunnels.ts">list</a>({ ...params }) -> GRETunnelListResponse</code>
 - <code title="delete /accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}">client.magicTransit.greTunnels.<a href="./src/resources/magic-transit/gre-tunnels.ts">delete</a>(greTunnelId, { ...params }) -> GRETunnelDeleteResponse</code>
+- <code title="put /accounts/{account_id}/magic/gre_tunnels">client.magicTransit.greTunnels.<a href="./src/resources/magic-transit/gre-tunnels.ts">bulkUpdate</a>({ ...params }) -> GRETunnelBulkUpdateResponse</code>
 - <code title="get /accounts/{account_id}/magic/gre_tunnels/{gre_tunnel_id}">client.magicTransit.greTunnels.<a href="./src/resources/magic-transit/gre-tunnels.ts">get</a>(greTunnelId, { ...params }) -> GRETunnelGetResponse</code>
 
 ## IPSECTunnels
@@ -2990,6 +3275,7 @@ Types:
 - <code><a href="./src/resources/magic-transit/ipsec-tunnels.ts">IPSECTunnelUpdateResponse</a></code>
 - <code><a href="./src/resources/magic-transit/ipsec-tunnels.ts">IPSECTunnelListResponse</a></code>
 - <code><a href="./src/resources/magic-transit/ipsec-tunnels.ts">IPSECTunnelDeleteResponse</a></code>
+- <code><a href="./src/resources/magic-transit/ipsec-tunnels.ts">IPSECTunnelBulkUpdateResponse</a></code>
 - <code><a href="./src/resources/magic-transit/ipsec-tunnels.ts">IPSECTunnelGetResponse</a></code>
 - <code><a href="./src/resources/magic-transit/ipsec-tunnels.ts">IPSECTunnelPSKGenerateResponse</a></code>
 
@@ -2999,6 +3285,7 @@ Methods:
 - <code title="put /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}">client.magicTransit.ipsecTunnels.<a href="./src/resources/magic-transit/ipsec-tunnels.ts">update</a>(ipsecTunnelId, { ...params }) -> IPSECTunnelUpdateResponse</code>
 - <code title="get /accounts/{account_id}/magic/ipsec_tunnels">client.magicTransit.ipsecTunnels.<a href="./src/resources/magic-transit/ipsec-tunnels.ts">list</a>({ ...params }) -> IPSECTunnelListResponse</code>
 - <code title="delete /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}">client.magicTransit.ipsecTunnels.<a href="./src/resources/magic-transit/ipsec-tunnels.ts">delete</a>(ipsecTunnelId, { ...params }) -> IPSECTunnelDeleteResponse</code>
+- <code title="put /accounts/{account_id}/magic/ipsec_tunnels">client.magicTransit.ipsecTunnels.<a href="./src/resources/magic-transit/ipsec-tunnels.ts">bulkUpdate</a>({ ...params }) -> IPSECTunnelBulkUpdateResponse</code>
 - <code title="get /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}">client.magicTransit.ipsecTunnels.<a href="./src/resources/magic-transit/ipsec-tunnels.ts">get</a>(ipsecTunnelId, { ...params }) -> IPSECTunnelGetResponse</code>
 - <code title="post /accounts/{account_id}/magic/ipsec_tunnels/{ipsec_tunnel_id}/psk_generate">client.magicTransit.ipsecTunnels.<a href="./src/resources/magic-transit/ipsec-tunnels.ts">pskGenerate</a>(ipsecTunnelId, { ...params }) -> IPSECTunnelPSKGenerateResponse</code>
 
@@ -3011,6 +3298,7 @@ Types:
 - <code><a href="./src/resources/magic-transit/routes.ts">RouteUpdateResponse</a></code>
 - <code><a href="./src/resources/magic-transit/routes.ts">RouteListResponse</a></code>
 - <code><a href="./src/resources/magic-transit/routes.ts">RouteDeleteResponse</a></code>
+- <code><a href="./src/resources/magic-transit/routes.ts">RouteBulkUpdateResponse</a></code>
 - <code><a href="./src/resources/magic-transit/routes.ts">RouteEmptyResponse</a></code>
 - <code><a href="./src/resources/magic-transit/routes.ts">RouteGetResponse</a></code>
 
@@ -3020,6 +3308,7 @@ Methods:
 - <code title="put /accounts/{account_id}/magic/routes/{route_id}">client.magicTransit.routes.<a href="./src/resources/magic-transit/routes.ts">update</a>(routeId, { ...params }) -> RouteUpdateResponse</code>
 - <code title="get /accounts/{account_id}/magic/routes">client.magicTransit.routes.<a href="./src/resources/magic-transit/routes.ts">list</a>({ ...params }) -> RouteListResponse</code>
 - <code title="delete /accounts/{account_id}/magic/routes/{route_id}">client.magicTransit.routes.<a href="./src/resources/magic-transit/routes.ts">delete</a>(routeId, { ...params }) -> RouteDeleteResponse</code>
+- <code title="put /accounts/{account_id}/magic/routes">client.magicTransit.routes.<a href="./src/resources/magic-transit/routes.ts">bulkUpdate</a>({ ...params }) -> RouteBulkUpdateResponse</code>
 - <code title="delete /accounts/{account_id}/magic/routes">client.magicTransit.routes.<a href="./src/resources/magic-transit/routes.ts">empty</a>({ ...params }) -> RouteEmptyResponse</code>
 - <code title="get /accounts/{account_id}/magic/routes/{route_id}">client.magicTransit.routes.<a href="./src/resources/magic-transit/routes.ts">get</a>(routeId, { ...params }) -> RouteGetResponse</code>
 
@@ -3111,6 +3400,42 @@ Methods:
 - <code title="patch /accounts/{account_id}/magic/connectors/{connector_id}">client.magicTransit.connectors.<a href="./src/resources/magic-transit/connectors.ts">edit</a>(connectorId, { ...params }) -> ConnectorEditResponse</code>
 - <code title="get /accounts/{account_id}/magic/connectors/{connector_id}">client.magicTransit.connectors.<a href="./src/resources/magic-transit/connectors.ts">get</a>(connectorId, { ...params }) -> ConnectorGetResponse</code>
 
+## PCAPs
+
+Types:
+
+- <code><a href="./src/resources/magic-transit/pcaps/pcaps.ts">PCAP</a></code>
+- <code><a href="./src/resources/magic-transit/pcaps/pcaps.ts">PCAPFilter</a></code>
+- <code><a href="./src/resources/magic-transit/pcaps/pcaps.ts">PCAPCreateResponse</a></code>
+- <code><a href="./src/resources/magic-transit/pcaps/pcaps.ts">PCAPListResponse</a></code>
+- <code><a href="./src/resources/magic-transit/pcaps/pcaps.ts">PCAPGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/pcaps">client.magicTransit.pcaps.<a href="./src/resources/magic-transit/pcaps/pcaps.ts">create</a>({ ...params }) -> PCAPCreateResponse</code>
+- <code title="get /accounts/{account_id}/pcaps">client.magicTransit.pcaps.<a href="./src/resources/magic-transit/pcaps/pcaps.ts">list</a>({ ...params }) -> PCAPListResponsesSinglePage</code>
+- <code title="get /accounts/{account_id}/pcaps/{pcap_id}">client.magicTransit.pcaps.<a href="./src/resources/magic-transit/pcaps/pcaps.ts">get</a>(pcapId, { ...params }) -> PCAPGetResponse</code>
+
+### Ownership
+
+Types:
+
+- <code><a href="./src/resources/magic-transit/pcaps/ownership.ts">Ownership</a></code>
+- <code><a href="./src/resources/magic-transit/pcaps/ownership.ts">OwnershipGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/pcaps/ownership">client.magicTransit.pcaps.ownership.<a href="./src/resources/magic-transit/pcaps/ownership.ts">create</a>({ ...params }) -> Ownership</code>
+- <code title="delete /accounts/{account_id}/pcaps/ownership/{ownership_id}">client.magicTransit.pcaps.ownership.<a href="./src/resources/magic-transit/pcaps/ownership.ts">delete</a>(ownershipId, { ...params }) -> void</code>
+- <code title="get /accounts/{account_id}/pcaps/ownership">client.magicTransit.pcaps.ownership.<a href="./src/resources/magic-transit/pcaps/ownership.ts">get</a>({ ...params }) -> OwnershipGetResponse | null</code>
+- <code title="post /accounts/{account_id}/pcaps/ownership/validate">client.magicTransit.pcaps.ownership.<a href="./src/resources/magic-transit/pcaps/ownership.ts">validate</a>({ ...params }) -> Ownership</code>
+
+### Download
+
+Methods:
+
+- <code title="get /accounts/{account_id}/pcaps/{pcap_id}/download">client.magicTransit.pcaps.download.<a href="./src/resources/magic-transit/pcaps/download.ts">get</a>(pcapId, { ...params }) -> Response</code>
+
 # MagicNetworkMonitoring
 
 ## Configs
@@ -3181,7 +3506,7 @@ Types:
 
 Methods:
 
-- <code title="get /accounts/{account_id}/mtls_certificates/{mtls_certificate_id}/associations">client.mtlsCertificates.associations.<a href="./src/resources/mtls-certificates/associations.ts">get</a>(mtlsCertificateId, { ...params }) -> AssociationGetResponse | null</code>
+- <code title="get /accounts/{account_id}/mtls_certificates/{mtls_certificate_id}/associations">client.mtlsCertificates.associations.<a href="./src/resources/mtls-certificates/associations.ts">get</a>(mtlsCertificateId, { ...params }) -> AssociationGetResponse</code>
 
 # Pages
 
@@ -3192,19 +3517,17 @@ Types:
 - <code><a href="./src/resources/pages/projects/projects.ts">Deployment</a></code>
 - <code><a href="./src/resources/pages/projects/projects.ts">Project</a></code>
 - <code><a href="./src/resources/pages/projects/projects.ts">Stage</a></code>
-- <code><a href="./src/resources/pages/projects/projects.ts">ProjectCreateResponse</a></code>
 - <code><a href="./src/resources/pages/projects/projects.ts">ProjectDeleteResponse</a></code>
-- <code><a href="./src/resources/pages/projects/projects.ts">ProjectEditResponse</a></code>
 - <code><a href="./src/resources/pages/projects/projects.ts">ProjectPurgeBuildCacheResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/pages/projects">client.pages.projects.<a href="./src/resources/pages/projects/projects.ts">create</a>({ ...params }) -> ProjectCreateResponse</code>
+- <code title="post /accounts/{account_id}/pages/projects">client.pages.projects.<a href="./src/resources/pages/projects/projects.ts">create</a>({ ...params }) -> Project</code>
 - <code title="get /accounts/{account_id}/pages/projects">client.pages.projects.<a href="./src/resources/pages/projects/projects.ts">list</a>({ ...params }) -> DeploymentsSinglePage</code>
-- <code title="delete /accounts/{account_id}/pages/projects/{project_name}">client.pages.projects.<a href="./src/resources/pages/projects/projects.ts">delete</a>(projectName, { ...params }) -> unknown</code>
-- <code title="patch /accounts/{account_id}/pages/projects/{project_name}">client.pages.projects.<a href="./src/resources/pages/projects/projects.ts">edit</a>(projectName, { ...params }) -> ProjectEditResponse</code>
+- <code title="delete /accounts/{account_id}/pages/projects/{project_name}">client.pages.projects.<a href="./src/resources/pages/projects/projects.ts">delete</a>(projectName, { ...params }) -> ProjectDeleteResponse | null</code>
+- <code title="patch /accounts/{account_id}/pages/projects/{project_name}">client.pages.projects.<a href="./src/resources/pages/projects/projects.ts">edit</a>(projectName, { ...params }) -> Project</code>
 - <code title="get /accounts/{account_id}/pages/projects/{project_name}">client.pages.projects.<a href="./src/resources/pages/projects/projects.ts">get</a>(projectName, { ...params }) -> Project</code>
-- <code title="post /accounts/{account_id}/pages/projects/{project_name}/purge_build_cache">client.pages.projects.<a href="./src/resources/pages/projects/projects.ts">purgeBuildCache</a>(projectName, { ...params }) -> unknown</code>
+- <code title="post /accounts/{account_id}/pages/projects/{project_name}/purge_build_cache">client.pages.projects.<a href="./src/resources/pages/projects/projects.ts">purgeBuildCache</a>(projectName, { ...params }) -> ProjectPurgeBuildCacheResponse | null</code>
 
 ### Deployments
 
@@ -3216,7 +3539,7 @@ Methods:
 
 - <code title="post /accounts/{account_id}/pages/projects/{project_name}/deployments">client.pages.projects.deployments.<a href="./src/resources/pages/projects/deployments/deployments.ts">create</a>(projectName, { ...params }) -> Deployment</code>
 - <code title="get /accounts/{account_id}/pages/projects/{project_name}/deployments">client.pages.projects.deployments.<a href="./src/resources/pages/projects/deployments/deployments.ts">list</a>(projectName, { ...params }) -> DeploymentsSinglePage</code>
-- <code title="delete /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}">client.pages.projects.deployments.<a href="./src/resources/pages/projects/deployments/deployments.ts">delete</a>(projectName, deploymentId, { ...params }) -> unknown</code>
+- <code title="delete /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}">client.pages.projects.deployments.<a href="./src/resources/pages/projects/deployments/deployments.ts">delete</a>(projectName, deploymentId, { ...params }) -> DeploymentDeleteResponse | null</code>
 - <code title="get /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}">client.pages.projects.deployments.<a href="./src/resources/pages/projects/deployments/deployments.ts">get</a>(projectName, deploymentId, { ...params }) -> Deployment</code>
 - <code title="post /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/retry">client.pages.projects.deployments.<a href="./src/resources/pages/projects/deployments/deployments.ts">retry</a>(projectName, deploymentId, { ...params }) -> Deployment</code>
 - <code title="post /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/rollback">client.pages.projects.deployments.<a href="./src/resources/pages/projects/deployments/deployments.ts">rollback</a>(projectName, deploymentId, { ...params }) -> Deployment</code>
@@ -3227,65 +3550,29 @@ Methods:
 
 Types:
 
-- <code><a href="./src/resources/pages/projects/deployments/history/logs.ts">LogGetResponse</a></code>
-
-Methods:
-
-- <code title="get /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/history/logs">client.pages.projects.deployments.history.logs.<a href="./src/resources/pages/projects/deployments/history/logs.ts">get</a>(projectName, deploymentId, { ...params }) -> LogGetResponse</code>
-
-### Domains
-
-Types:
-
-- <code><a href="./src/resources/pages/projects/domains.ts">DomainCreateResponse</a></code>
-- <code><a href="./src/resources/pages/projects/domains.ts">DomainListResponse</a></code>
-- <code><a href="./src/resources/pages/projects/domains.ts">DomainDeleteResponse</a></code>
-- <code><a href="./src/resources/pages/projects/domains.ts">DomainEditResponse</a></code>
-- <code><a href="./src/resources/pages/projects/domains.ts">DomainGetResponse</a></code>
-
-Methods:
-
-- <code title="post /accounts/{account_id}/pages/projects/{project_name}/domains">client.pages.projects.domains.<a href="./src/resources/pages/projects/domains.ts">create</a>(projectName, { ...params }) -> DomainCreateResponse | null</code>
-- <code title="get /accounts/{account_id}/pages/projects/{project_name}/domains">client.pages.projects.domains.<a href="./src/resources/pages/projects/domains.ts">list</a>(projectName, { ...params }) -> DomainListResponsesSinglePage</code>
-- <code title="delete /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/resources/pages/projects/domains.ts">delete</a>(projectName, domainName, { ...params }) -> unknown</code>
-- <code title="patch /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/resources/pages/projects/domains.ts">edit</a>(projectName, domainName, { ...params }) -> DomainEditResponse | null</code>
-- <code title="get /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/resources/pages/projects/domains.ts">get</a>(projectName, domainName, { ...params }) -> DomainGetResponse | null</code>
-
-# PCAPs
-
-Types:
-
-- <code><a href="./src/resources/pcaps/pcaps.ts">PCAP</a></code>
-- <code><a href="./src/resources/pcaps/pcaps.ts">PCAPFilter</a></code>
-- <code><a href="./src/resources/pcaps/pcaps.ts">PCAPCreateResponse</a></code>
-- <code><a href="./src/resources/pcaps/pcaps.ts">PCAPListResponse</a></code>
-- <code><a href="./src/resources/pcaps/pcaps.ts">PCAPGetResponse</a></code>
-
-Methods:
-
-- <code title="post /accounts/{account_id}/pcaps">client.pcaps.<a href="./src/resources/pcaps/pcaps.ts">create</a>({ ...params }) -> PCAPCreateResponse</code>
-- <code title="get /accounts/{account_id}/pcaps">client.pcaps.<a href="./src/resources/pcaps/pcaps.ts">list</a>({ ...params }) -> PCAPListResponsesSinglePage</code>
-- <code title="get /accounts/{account_id}/pcaps/{pcap_id}">client.pcaps.<a href="./src/resources/pcaps/pcaps.ts">get</a>(pcapId, { ...params }) -> PCAPGetResponse</code>
-
-## Ownership
-
-Types:
-
-- <code><a href="./src/resources/pcaps/ownership.ts">Ownership</a></code>
-- <code><a href="./src/resources/pcaps/ownership.ts">OwnershipGetResponse</a></code>
+- <code><a href="./src/resources/pages/projects/deployments/history/logs.ts">LogGetResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/pcaps/ownership">client.pcaps.ownership.<a href="./src/resources/pcaps/ownership.ts">create</a>({ ...params }) -> Ownership</code>
-- <code title="delete /accounts/{account_id}/pcaps/ownership/{ownership_id}">client.pcaps.ownership.<a href="./src/resources/pcaps/ownership.ts">delete</a>(ownershipId, { ...params }) -> void</code>
-- <code title="get /accounts/{account_id}/pcaps/ownership">client.pcaps.ownership.<a href="./src/resources/pcaps/ownership.ts">get</a>({ ...params }) -> OwnershipGetResponse | null</code>
-- <code title="post /accounts/{account_id}/pcaps/ownership/validate">client.pcaps.ownership.<a href="./src/resources/pcaps/ownership.ts">validate</a>({ ...params }) -> Ownership</code>
+- <code title="get /accounts/{account_id}/pages/projects/{project_name}/deployments/{deployment_id}/history/logs">client.pages.projects.deployments.history.logs.<a href="./src/resources/pages/projects/deployments/history/logs.ts">get</a>(projectName, deploymentId, { ...params }) -> LogGetResponse</code>
+
+### Domains
+
+Types:
 
-## Download
+- <code><a href="./src/resources/pages/projects/domains.ts">DomainCreateResponse</a></code>
+- <code><a href="./src/resources/pages/projects/domains.ts">DomainListResponse</a></code>
+- <code><a href="./src/resources/pages/projects/domains.ts">DomainDeleteResponse</a></code>
+- <code><a href="./src/resources/pages/projects/domains.ts">DomainEditResponse</a></code>
+- <code><a href="./src/resources/pages/projects/domains.ts">DomainGetResponse</a></code>
 
 Methods:
 
-- <code title="get /accounts/{account_id}/pcaps/{pcap_id}/download">client.pcaps.download.<a href="./src/resources/pcaps/download.ts">get</a>(pcapId, { ...params }) -> Response</code>
+- <code title="post /accounts/{account_id}/pages/projects/{project_name}/domains">client.pages.projects.domains.<a href="./src/resources/pages/projects/domains.ts">create</a>(projectName, { ...params }) -> DomainCreateResponse | null</code>
+- <code title="get /accounts/{account_id}/pages/projects/{project_name}/domains">client.pages.projects.domains.<a href="./src/resources/pages/projects/domains.ts">list</a>(projectName, { ...params }) -> DomainListResponsesSinglePage</code>
+- <code title="delete /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/resources/pages/projects/domains.ts">delete</a>(projectName, domainName, { ...params }) -> DomainDeleteResponse | null</code>
+- <code title="patch /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/resources/pages/projects/domains.ts">edit</a>(projectName, domainName, { ...params }) -> DomainEditResponse | null</code>
+- <code title="get /accounts/{account_id}/pages/projects/{project_name}/domains/{domain_name}">client.pages.projects.domains.<a href="./src/resources/pages/projects/domains.ts">get</a>(projectName, domainName, { ...params }) -> DomainGetResponse | null</code>
 
 # Registrar
 
@@ -3330,11 +3617,11 @@ Types:
 
 Methods:
 
-- <code title="post /accounts/{account_id}/rules/lists">client.rules.lists.<a href="./src/resources/rules/lists/lists.ts">create</a>({ ...params }) -> ListsList | null</code>
-- <code title="put /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/resources/rules/lists/lists.ts">update</a>(listId, { ...params }) -> ListsList | null</code>
+- <code title="post /accounts/{account_id}/rules/lists">client.rules.lists.<a href="./src/resources/rules/lists/lists.ts">create</a>({ ...params }) -> ListsList</code>
+- <code title="put /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/resources/rules/lists/lists.ts">update</a>(listId, { ...params }) -> ListsList</code>
 - <code title="get /accounts/{account_id}/rules/lists">client.rules.lists.<a href="./src/resources/rules/lists/lists.ts">list</a>({ ...params }) -> ListsListsSinglePage</code>
-- <code title="delete /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/resources/rules/lists/lists.ts">delete</a>(listId, { ...params }) -> ListDeleteResponse | null</code>
-- <code title="get /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/resources/rules/lists/lists.ts">get</a>(listId, { ...params }) -> ListsList | null</code>
+- <code title="delete /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/resources/rules/lists/lists.ts">delete</a>(listId, { ...params }) -> ListDeleteResponse</code>
+- <code title="get /accounts/{account_id}/rules/lists/{list_id}">client.rules.lists.<a href="./src/resources/rules/lists/lists.ts">get</a>(listId, { ...params }) -> ListsList</code>
 
 ### BulkOperations
 
@@ -3345,7 +3632,7 @@ Types:
 
 Methods:
 
-- <code title="get /accounts/{account_identifier}/rules/lists/bulk_operations/{operation_id}">client.rules.lists.bulkOperations.<a href="./src/resources/rules/lists/bulk-operations.ts">get</a>(accountIdentifier, operationId) -> BulkOperationGetResponse | null</code>
+- <code title="get /accounts/{account_identifier}/rules/lists/bulk_operations/{operation_id}">client.rules.lists.bulkOperations.<a href="./src/resources/rules/lists/bulk-operations.ts">get</a>(accountIdentifier, operationId) -> BulkOperationGetResponse</code>
 
 ### Items
 
@@ -3361,25 +3648,11 @@ Types:
 
 Methods:
 
-- <code title="post /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/resources/rules/lists/items.ts">create</a>(listId, [ ...body ]) -> ItemCreateResponse | null</code>
-- <code title="put /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/resources/rules/lists/items.ts">update</a>(listId, [ ...body ]) -> ItemUpdateResponse | null</code>
+- <code title="post /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/resources/rules/lists/items.ts">create</a>(listId, [ ...body ]) -> ItemCreateResponse</code>
+- <code title="put /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/resources/rules/lists/items.ts">update</a>(listId, [ ...body ]) -> ItemUpdateResponse</code>
 - <code title="get /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/resources/rules/lists/items.ts">list</a>(listId, { ...params }) -> ItemListResponsesCursorPagination</code>
-- <code title="delete /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/resources/rules/lists/items.ts">delete</a>(listId, { ...params }) -> ItemDeleteResponse | null</code>
-- <code title="get /accounts/{account_identifier}/rules/lists/{list_id}/items/{item_id}">client.rules.lists.items.<a href="./src/resources/rules/lists/items.ts">get</a>(accountIdentifier, listId, itemId) -> ItemGetResponse | null</code>
-
-# Storage
-
-## Analytics
-
-Types:
-
-- <code><a href="./src/resources/storage/analytics.ts">Components</a></code>
-- <code><a href="./src/resources/storage/analytics.ts">Schema</a></code>
-
-Methods:
-
-- <code title="get /accounts/{account_id}/storage/analytics">client.storage.analytics.<a href="./src/resources/storage/analytics.ts">list</a>({ ...params }) -> Schema</code>
-- <code title="get /accounts/{account_id}/storage/analytics/stored">client.storage.analytics.<a href="./src/resources/storage/analytics.ts">stored</a>({ ...params }) -> Components</code>
+- <code title="delete /accounts/{account_id}/rules/lists/{list_id}/items">client.rules.lists.items.<a href="./src/resources/rules/lists/items.ts">delete</a>(listId, { ...params }) -> ItemDeleteResponse</code>
+- <code title="get /accounts/{account_identifier}/rules/lists/{list_id}/items/{item_id}">client.rules.lists.items.<a href="./src/resources/rules/lists/items.ts">get</a>(accountIdentifier, listId, itemId) -> ItemGetResponse</code>
 
 # Stream
 
@@ -3393,6 +3666,7 @@ Methods:
 - <code title="post /accounts/{account_id}/stream">client.stream.<a href="./src/resources/stream/stream.ts">create</a>({ ...params }) -> void</code>
 - <code title="get /accounts/{account_id}/stream">client.stream.<a href="./src/resources/stream/stream.ts">list</a>({ ...params }) -> VideosSinglePage</code>
 - <code title="delete /accounts/{account_id}/stream/{identifier}">client.stream.<a href="./src/resources/stream/stream.ts">delete</a>(identifier, { ...params }) -> void</code>
+- <code title="post /accounts/{account_id}/stream/{identifier}">client.stream.<a href="./src/resources/stream/stream.ts">edit</a>(identifier, { ...params }) -> Video</code>
 - <code title="get /accounts/{account_id}/stream/{identifier}">client.stream.<a href="./src/resources/stream/stream.ts">get</a>(identifier, { ...params }) -> Video</code>
 
 ## AudioTracks
@@ -3682,18 +3956,21 @@ Types:
 Types:
 
 - <code><a href="./src/resources/d1/database.ts">QueryResult</a></code>
-- <code><a href="./src/resources/d1/database.ts">DatabaseCreateResponse</a></code>
 - <code><a href="./src/resources/d1/database.ts">DatabaseListResponse</a></code>
 - <code><a href="./src/resources/d1/database.ts">DatabaseDeleteResponse</a></code>
+- <code><a href="./src/resources/d1/database.ts">DatabaseExportResponse</a></code>
+- <code><a href="./src/resources/d1/database.ts">DatabaseImportResponse</a></code>
 - <code><a href="./src/resources/d1/database.ts">DatabaseQueryResponse</a></code>
 - <code><a href="./src/resources/d1/database.ts">DatabaseRawResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/d1/database">client.d1.database.<a href="./src/resources/d1/database.ts">create</a>({ ...params }) -> DatabaseCreateResponse</code>
+- <code title="post /accounts/{account_id}/d1/database">client.d1.database.<a href="./src/resources/d1/database.ts">create</a>({ ...params }) -> D1</code>
 - <code title="get /accounts/{account_id}/d1/database">client.d1.database.<a href="./src/resources/d1/database.ts">list</a>({ ...params }) -> DatabaseListResponsesV4PagePaginationArray</code>
-- <code title="delete /accounts/{account_id}/d1/database/{database_id}">client.d1.database.<a href="./src/resources/d1/database.ts">delete</a>(databaseId, { ...params }) -> DatabaseDeleteResponse</code>
+- <code title="delete /accounts/{account_id}/d1/database/{database_id}">client.d1.database.<a href="./src/resources/d1/database.ts">delete</a>(databaseId, { ...params }) -> DatabaseDeleteResponse | null</code>
+- <code title="post /accounts/{account_id}/d1/database/{database_id}/export">client.d1.database.<a href="./src/resources/d1/database.ts">export</a>(databaseId, { ...params }) -> DatabaseExportResponse</code>
 - <code title="get /accounts/{account_id}/d1/database/{database_id}">client.d1.database.<a href="./src/resources/d1/database.ts">get</a>(databaseId, { ...params }) -> D1</code>
+- <code title="post /accounts/{account_id}/d1/database/{database_id}/import">client.d1.database.<a href="./src/resources/d1/database.ts">import</a>(databaseId, { ...params }) -> DatabaseImportResponse</code>
 - <code title="post /accounts/{account_id}/d1/database/{database_id}/query">client.d1.database.<a href="./src/resources/d1/database.ts">query</a>(databaseId, { ...params }) -> DatabaseQueryResponse</code>
 - <code title="post /accounts/{account_id}/d1/database/{database_id}/raw">client.d1.database.<a href="./src/resources/d1/database.ts">raw</a>(databaseId, { ...params }) -> DatabaseRawResponse</code>
 
@@ -3703,60 +3980,123 @@ Methods:
 
 Types:
 
-- <code><a href="./src/resources/r2/buckets.ts">Bucket</a></code>
-- <code><a href="./src/resources/r2/buckets.ts">BucketDeleteResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/buckets.ts">Bucket</a></code>
+- <code><a href="./src/resources/r2/buckets/buckets.ts">BucketListResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/buckets.ts">BucketDeleteResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/r2/buckets">client.r2.buckets.<a href="./src/resources/r2/buckets.ts">create</a>({ ...params }) -> Bucket</code>
-- <code title="get /accounts/{account_id}/r2/buckets">client.r2.buckets.<a href="./src/resources/r2/buckets.ts">list</a>({ ...params }) -> BucketsCursorPagination</code>
-- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}">client.r2.buckets.<a href="./src/resources/r2/buckets.ts">delete</a>(bucketName, { ...params }) -> BucketDeleteResponse</code>
-- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}">client.r2.buckets.<a href="./src/resources/r2/buckets.ts">get</a>(bucketName, { ...params }) -> Bucket</code>
+- <code title="post /accounts/{account_id}/r2/buckets">client.r2.buckets.<a href="./src/resources/r2/buckets/buckets.ts">create</a>({ ...params }) -> Bucket</code>
+- <code title="get /accounts/{account_id}/r2/buckets">client.r2.buckets.<a href="./src/resources/r2/buckets/buckets.ts">list</a>({ ...params }) -> BucketListResponse</code>
+- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}">client.r2.buckets.<a href="./src/resources/r2/buckets/buckets.ts">delete</a>(bucketName, { ...params }) -> BucketDeleteResponse</code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}">client.r2.buckets.<a href="./src/resources/r2/buckets/buckets.ts">get</a>(bucketName, { ...params }) -> Bucket</code>
 
-## Sippy
+### Lifecycle
 
 Types:
 
-- <code><a href="./src/resources/r2/sippy.ts">Provider</a></code>
-- <code><a href="./src/resources/r2/sippy.ts">Sippy</a></code>
-- <code><a href="./src/resources/r2/sippy.ts">SippyDeleteResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/lifecycle.ts">LifecycleUpdateResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/lifecycle.ts">LifecycleGetResponse</a></code>
 
 Methods:
 
-- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.sippy.<a href="./src/resources/r2/sippy.ts">update</a>(bucketName, { ...params }) -> Sippy</code>
-- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.sippy.<a href="./src/resources/r2/sippy.ts">delete</a>(bucketName, { ...params }) -> SippyDeleteResponse</code>
-- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.sippy.<a href="./src/resources/r2/sippy.ts">get</a>(bucketName, { ...params }) -> Sippy</code>
+- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/lifecycle">client.r2.buckets.lifecycle.<a href="./src/resources/r2/buckets/lifecycle.ts">update</a>(bucketName, { ...params }) -> LifecycleUpdateResponse</code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/lifecycle">client.r2.buckets.lifecycle.<a href="./src/resources/r2/buckets/lifecycle.ts">get</a>(bucketName, { ...params }) -> LifecycleGetResponse</code>
 
-## TemporaryCredentials
+### CORS
 
 Types:
 
-- <code><a href="./src/resources/r2/temporary-credentials.ts">TemporaryCredential</a></code>
-- <code><a href="./src/resources/r2/temporary-credentials.ts">TemporaryCredentialCreateResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/cors.ts">CORSUpdateResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/cors.ts">CORSDeleteResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/cors.ts">CORSGetResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/r2/temp-access-credentials">client.r2.temporaryCredentials.<a href="./src/resources/r2/temporary-credentials.ts">create</a>({ ...params }) -> TemporaryCredentialCreateResponse</code>
+- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/cors">client.r2.buckets.cors.<a href="./src/resources/r2/buckets/cors.ts">update</a>(bucketName, { ...params }) -> CORSUpdateResponse</code>
+- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}/cors">client.r2.buckets.cors.<a href="./src/resources/r2/buckets/cors.ts">delete</a>(bucketName, { ...params }) -> CORSDeleteResponse</code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/cors">client.r2.buckets.cors.<a href="./src/resources/r2/buckets/cors.ts">get</a>(bucketName, { ...params }) -> CORSGetResponse</code>
+
+### Domains
+
+#### Custom
+
+Types:
+
+- <code><a href="./src/resources/r2/buckets/domains/custom.ts">CustomCreateResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/domains/custom.ts">CustomUpdateResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/domains/custom.ts">CustomListResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/domains/custom.ts">CustomDeleteResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/domains/custom.ts">CustomGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom">client.r2.buckets.domains.custom.<a href="./src/resources/r2/buckets/domains/custom.ts">create</a>(bucketName, { ...params }) -> CustomCreateResponse</code>
+- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain_name}">client.r2.buckets.domains.custom.<a href="./src/resources/r2/buckets/domains/custom.ts">update</a>(bucketName, domainName, { ...params }) -> CustomUpdateResponse</code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom">client.r2.buckets.domains.custom.<a href="./src/resources/r2/buckets/domains/custom.ts">list</a>(bucketName, { ...params }) -> CustomListResponse</code>
+- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain_name}">client.r2.buckets.domains.custom.<a href="./src/resources/r2/buckets/domains/custom.ts">delete</a>(bucketName, domainName, { ...params }) -> CustomDeleteResponse</code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/domains/custom/{domain_name}">client.r2.buckets.domains.custom.<a href="./src/resources/r2/buckets/domains/custom.ts">get</a>(bucketName, domainName, { ...params }) -> CustomGetResponse</code>
+
+#### Managed
+
+Types:
+
+- <code><a href="./src/resources/r2/buckets/domains/managed.ts">ManagedUpdateResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/domains/managed.ts">ManagedListResponse</a></code>
+
+Methods:
+
+- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/domains/managed">client.r2.buckets.domains.managed.<a href="./src/resources/r2/buckets/domains/managed.ts">update</a>(bucketName, { ...params }) -> ManagedUpdateResponse</code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/domains/managed">client.r2.buckets.domains.managed.<a href="./src/resources/r2/buckets/domains/managed.ts">list</a>(bucketName, { ...params }) -> ManagedListResponse</code>
+
+### EventNotifications
+
+#### Configuration
+
+Types:
+
+- <code><a href="./src/resources/r2/buckets/event-notifications/configuration/configuration.ts">ConfigurationGetResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration">client.r2.buckets.eventNotifications.configuration.<a href="./src/resources/r2/buckets/event-notifications/configuration/configuration.ts">get</a>(bucketName, { ...params }) -> ConfigurationGetResponse</code>
+
+##### Queues
+
+Types:
+
+- <code><a href="./src/resources/r2/buckets/event-notifications/configuration/queues.ts">QueueUpdateResponse</a></code>
+- <code><a href="./src/resources/r2/buckets/event-notifications/configuration/queues.ts">QueueDeleteResponse</a></code>
+
+Methods:
+
+- <code title="put /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}">client.r2.buckets.eventNotifications.configuration.queues.<a href="./src/resources/r2/buckets/event-notifications/configuration/queues.ts">update</a>(bucketName, queueId, { ...params }) -> QueueUpdateResponse</code>
+- <code title="delete /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}">client.r2.buckets.eventNotifications.configuration.queues.<a href="./src/resources/r2/buckets/event-notifications/configuration/queues.ts">delete</a>(bucketName, queueId, { ...params }) -> QueueDeleteResponse</code>
+
+### Sippy
+
+Types:
+
+- <code><a href="./src/resources/r2/buckets/sippy.ts">Provider</a></code>
+- <code><a href="./src/resources/r2/buckets/sippy.ts">Sippy</a></code>
+- <code><a href="./src/resources/r2/buckets/sippy.ts">SippyDeleteResponse</a></code>
 
-# WARPConnector
+Methods:
+
+- <code title="put /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.buckets.sippy.<a href="./src/resources/r2/buckets/sippy.ts">update</a>(bucketName, { ...params }) -> Sippy</code>
+- <code title="delete /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.buckets.sippy.<a href="./src/resources/r2/buckets/sippy.ts">delete</a>(bucketName, { ...params }) -> SippyDeleteResponse</code>
+- <code title="get /accounts/{account_id}/r2/buckets/{bucket_name}/sippy">client.r2.buckets.sippy.<a href="./src/resources/r2/buckets/sippy.ts">get</a>(bucketName, { ...params }) -> Sippy</code>
+
+## TemporaryCredentials
 
 Types:
 
-- <code><a href="./src/resources/warp-connector.ts">WARPConnectorCreateResponse</a></code>
-- <code><a href="./src/resources/warp-connector.ts">WARPConnectorListResponse</a></code>
-- <code><a href="./src/resources/warp-connector.ts">WARPConnectorDeleteResponse</a></code>
-- <code><a href="./src/resources/warp-connector.ts">WARPConnectorEditResponse</a></code>
-- <code><a href="./src/resources/warp-connector.ts">WARPConnectorGetResponse</a></code>
-- <code><a href="./src/resources/warp-connector.ts">WARPConnectorTokenResponse</a></code>
+- <code><a href="./src/resources/r2/temporary-credentials.ts">TemporaryCredential</a></code>
+- <code><a href="./src/resources/r2/temporary-credentials.ts">TemporaryCredentialCreateResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/warp_connector">client.warpConnector.<a href="./src/resources/warp-connector.ts">create</a>({ ...params }) -> WARPConnectorCreateResponse</code>
-- <code title="get /accounts/{account_id}/warp_connector">client.warpConnector.<a href="./src/resources/warp-connector.ts">list</a>({ ...params }) -> WARPConnectorListResponsesV4PagePaginationArray</code>
-- <code title="delete /accounts/{account_id}/warp_connector/{tunnel_id}">client.warpConnector.<a href="./src/resources/warp-connector.ts">delete</a>(tunnelId, { ...params }) -> WARPConnectorDeleteResponse</code>
-- <code title="patch /accounts/{account_id}/warp_connector/{tunnel_id}">client.warpConnector.<a href="./src/resources/warp-connector.ts">edit</a>(tunnelId, { ...params }) -> WARPConnectorEditResponse</code>
-- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}">client.warpConnector.<a href="./src/resources/warp-connector.ts">get</a>(tunnelId, { ...params }) -> WARPConnectorGetResponse</code>
-- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}/token">client.warpConnector.<a href="./src/resources/warp-connector.ts">token</a>(tunnelId, { ...params }) -> WARPConnectorTokenResponse</code>
+- <code title="post /accounts/{account_id}/r2/temp-access-credentials">client.r2.temporaryCredentials.<a href="./src/resources/r2/temporary-credentials.ts">create</a>({ ...params }) -> TemporaryCredentialCreateResponse</code>
 
 # WorkersForPlatforms
 
@@ -3783,13 +4123,24 @@ Methods:
 Types:
 
 - <code><a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.ts">Script</a></code>
+- <code><a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.ts">ScriptUpdateResponse</a></code>
 
 Methods:
 
-- <code title="put /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}">client.workersForPlatforms.dispatch.namespaces.scripts.<a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.ts">update</a>(dispatchNamespace, scriptName, { ...params }) -> Script</code>
+- <code title="put /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}">client.workersForPlatforms.dispatch.namespaces.scripts.<a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.ts">update</a>(dispatchNamespace, scriptName, { ...params }) -> ScriptUpdateResponse</code>
 - <code title="delete /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}">client.workersForPlatforms.dispatch.namespaces.scripts.<a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.ts">delete</a>(dispatchNamespace, scriptName, { ...params }) -> void</code>
 - <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}">client.workersForPlatforms.dispatch.namespaces.scripts.<a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.ts">get</a>(dispatchNamespace, scriptName, { ...params }) -> Script</code>
 
+##### AssetUpload
+
+Types:
+
+- <code><a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/asset-upload.ts">AssetUploadCreateResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/assets-upload-session">client.workersForPlatforms.dispatch.namespaces.scripts.assetUpload.<a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/asset-upload.ts">create</a>(dispatchNamespace, scriptName, { ...params }) -> AssetUploadCreateResponse</code>
+
 ##### Content
 
 Methods:
@@ -3823,13 +4174,16 @@ Methods:
 
 Types:
 
+- <code><a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.ts">WorkersSecretModel</a></code>
 - <code><a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.ts">SecretUpdateResponse</a></code>
 - <code><a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.ts">SecretListResponse</a></code>
+- <code><a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.ts">SecretGetResponse</a></code>
 
 Methods:
 
 - <code title="put /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets">client.workersForPlatforms.dispatch.namespaces.scripts.secrets.<a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.ts">update</a>(dispatchNamespace, scriptName, { ...params }) -> SecretUpdateResponse</code>
 - <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets">client.workersForPlatforms.dispatch.namespaces.scripts.secrets.<a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.ts">list</a>(dispatchNamespace, scriptName, { ...params }) -> SecretListResponsesSinglePage</code>
+- <code title="get /accounts/{account_id}/workers/dispatch/namespaces/{dispatch_namespace}/scripts/{script_name}/secrets/{secret_name}">client.workersForPlatforms.dispatch.namespaces.scripts.secrets.<a href="./src/resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.ts">get</a>(dispatchNamespace, scriptName, secretName, { ...params }) -> SecretGetResponse</code>
 
 ##### Tags
 
@@ -3857,7 +4211,7 @@ Types:
 Methods:
 
 - <code title="get /accounts/{account_id}/devices">client.zeroTrust.devices.<a href="./src/resources/zero-trust/devices/devices.ts">list</a>({ ...params }) -> DevicesSinglePage</code>
-- <code title="get /accounts/{account_id}/devices/{device_id}">client.zeroTrust.devices.<a href="./src/resources/zero-trust/devices/devices.ts">get</a>(deviceId, { ...params }) -> DeviceGetResponse</code>
+- <code title="get /accounts/{account_id}/devices/{device_id}">client.zeroTrust.devices.<a href="./src/resources/zero-trust/devices/devices.ts">get</a>(deviceId, { ...params }) -> DeviceGetResponse | null</code>
 
 ### DEXTests
 
@@ -3873,7 +4227,7 @@ Methods:
 - <code title="post /accounts/{account_id}/devices/dex_tests">client.zeroTrust.devices.dexTests.<a href="./src/resources/zero-trust/devices/dex-tests.ts">create</a>({ ...params }) -> SchemaHTTP | null</code>
 - <code title="put /accounts/{account_id}/devices/dex_tests/{dex_test_id}">client.zeroTrust.devices.dexTests.<a href="./src/resources/zero-trust/devices/dex-tests.ts">update</a>(dexTestId, { ...params }) -> SchemaHTTP | null</code>
 - <code title="get /accounts/{account_id}/devices/dex_tests">client.zeroTrust.devices.dexTests.<a href="./src/resources/zero-trust/devices/dex-tests.ts">list</a>({ ...params }) -> SchemaHTTPSSinglePage</code>
-- <code title="delete /accounts/{account_id}/devices/dex_tests/{dex_test_id}">client.zeroTrust.devices.dexTests.<a href="./src/resources/zero-trust/devices/dex-tests.ts">delete</a>(dexTestId, { ...params }) -> DEXTestDeleteResponse | null</code>
+- <code title="delete /accounts/{account_id}/devices/dex_tests/{dex_test_id}">client.zeroTrust.devices.dexTests.<a href="./src/resources/zero-trust/devices/dex-tests.ts">delete</a>(dexTestId, { ...params }) -> DEXTestDeleteResponse</code>
 - <code title="get /accounts/{account_id}/devices/dex_tests/{dex_test_id}">client.zeroTrust.devices.dexTests.<a href="./src/resources/zero-trust/devices/dex-tests.ts">get</a>(dexTestId, { ...params }) -> SchemaHTTP | null</code>
 
 ### Networks
@@ -3891,73 +4245,136 @@ Methods:
 - <code title="delete /accounts/{account_id}/devices/networks/{network_id}">client.zeroTrust.devices.networks.<a href="./src/resources/zero-trust/devices/networks.ts">delete</a>(networkId, { ...params }) -> NetworkDeleteResponse | null</code>
 - <code title="get /accounts/{account_id}/devices/networks/{network_id}">client.zeroTrust.devices.networks.<a href="./src/resources/zero-trust/devices/networks.ts">get</a>(networkId, { ...params }) -> DeviceNetwork | null</code>
 
+### FleetStatus
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/devices/fleet-status.ts">FleetStatusGetResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/devices/{device_id}/fleet-status/live">client.zeroTrust.devices.fleetStatus.<a href="./src/resources/zero-trust/devices/fleet-status.ts">get</a>(deviceId, { ...params }) -> FleetStatusGetResponse</code>
+
 ### Policies
 
 Types:
 
+- <code><a href="./src/resources/zero-trust/devices/policies/policies.ts">DevicePolicyCertificates</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/policies.ts">FallbackDomain</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/policies.ts">FallbackDomainPolicy</a></code>
 - <code><a href="./src/resources/zero-trust/devices/policies/policies.ts">SettingsPolicy</a></code>
-- <code><a href="./src/resources/zero-trust/devices/policies/policies.ts">PolicyDeleteResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/policies.ts">SplitTunnelExclude</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/policies.ts">SplitTunnelInclude</a></code>
+
+#### Default
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/devices/policies/default/default.ts">DefaultEditResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/default/default.ts">DefaultGetResponse</a></code>
+
+Methods:
+
+- <code title="patch /accounts/{account_id}/devices/policy">client.zeroTrust.devices.policies.default.<a href="./src/resources/zero-trust/devices/policies/default/default.ts">edit</a>({ ...params }) -> DefaultEditResponse | null</code>
+- <code title="get /accounts/{account_id}/devices/policy">client.zeroTrust.devices.policies.default.<a href="./src/resources/zero-trust/devices/policies/default/default.ts">get</a>({ ...params }) -> DefaultGetResponse | null</code>
+
+##### Excludes
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/devices/policies/default/excludes.ts">ExcludeUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/default/excludes.ts">ExcludeGetResponse</a></code>
+
+Methods:
+
+- <code title="put /accounts/{account_id}/devices/policy/exclude">client.zeroTrust.devices.policies.default.excludes.<a href="./src/resources/zero-trust/devices/policies/default/excludes.ts">update</a>([ ...body ]) -> ExcludeUpdateResponse | null</code>
+- <code title="get /accounts/{account_id}/devices/policy/exclude">client.zeroTrust.devices.policies.default.excludes.<a href="./src/resources/zero-trust/devices/policies/default/excludes.ts">get</a>({ ...params }) -> ExcludeGetResponse | null</code>
+
+##### Includes
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/devices/policies/default/includes.ts">IncludeUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/default/includes.ts">IncludeGetResponse</a></code>
+
+Methods:
+
+- <code title="put /accounts/{account_id}/devices/policy/include">client.zeroTrust.devices.policies.default.includes.<a href="./src/resources/zero-trust/devices/policies/default/includes.ts">update</a>([ ...body ]) -> IncludeUpdateResponse | null</code>
+- <code title="get /accounts/{account_id}/devices/policy/include">client.zeroTrust.devices.policies.default.includes.<a href="./src/resources/zero-trust/devices/policies/default/includes.ts">get</a>({ ...params }) -> IncludeGetResponse | null</code>
+
+##### FallbackDomains
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/devices/policies/default/fallback-domains.ts">FallbackDomainUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/default/fallback-domains.ts">FallbackDomainGetResponse</a></code>
+
+Methods:
+
+- <code title="put /accounts/{account_id}/devices/policy/fallback_domains">client.zeroTrust.devices.policies.default.fallbackDomains.<a href="./src/resources/zero-trust/devices/policies/default/fallback-domains.ts">update</a>([ ...domains ]) -> FallbackDomainUpdateResponse | null</code>
+- <code title="get /accounts/{account_id}/devices/policy/fallback_domains">client.zeroTrust.devices.policies.default.fallbackDomains.<a href="./src/resources/zero-trust/devices/policies/default/fallback-domains.ts">get</a>({ ...params }) -> FallbackDomainGetResponse | null</code>
+
+##### Certificates
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/devices/policies/default/certificates.ts">CertificateEditResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/default/certificates.ts">CertificateGetResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/devices/policy">client.zeroTrust.devices.policies.<a href="./src/resources/zero-trust/devices/policies/policies.ts">create</a>({ ...params }) -> SettingsPolicy | null</code>
-- <code title="get /accounts/{account_id}/devices/policies">client.zeroTrust.devices.policies.<a href="./src/resources/zero-trust/devices/policies/policies.ts">list</a>({ ...params }) -> SettingsPoliciesSinglePage</code>
-- <code title="delete /accounts/{account_id}/devices/policy/{policy_id}">client.zeroTrust.devices.policies.<a href="./src/resources/zero-trust/devices/policies/policies.ts">delete</a>(policyId, { ...params }) -> PolicyDeleteResponse | null</code>
-- <code title="patch /accounts/{account_id}/devices/policy/{policy_id}">client.zeroTrust.devices.policies.<a href="./src/resources/zero-trust/devices/policies/policies.ts">edit</a>(policyId, { ...params }) -> SettingsPolicy | null</code>
-- <code title="get /accounts/{account_id}/devices/policy/{policy_id}">client.zeroTrust.devices.policies.<a href="./src/resources/zero-trust/devices/policies/policies.ts">get</a>(policyId, { ...params }) -> SettingsPolicy | null</code>
+- <code title="patch /zones/{zone_id}/devices/policy/certificates">client.zeroTrust.devices.policies.default.certificates.<a href="./src/resources/zero-trust/devices/policies/default/certificates.ts">edit</a>({ ...params }) -> CertificateEditResponse | null</code>
+- <code title="get /zones/{zone_id}/devices/policy/certificates">client.zeroTrust.devices.policies.default.certificates.<a href="./src/resources/zero-trust/devices/policies/default/certificates.ts">get</a>({ ...params }) -> CertificateGetResponse | null</code>
 
-#### DefaultPolicy
+#### Custom
 
 Types:
 
-- <code><a href="./src/resources/zero-trust/devices/policies/default-policy.ts">DefaultPolicyGetResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/custom/custom.ts">CustomDeleteResponse</a></code>
 
 Methods:
 
-- <code title="get /accounts/{account_id}/devices/policy">client.zeroTrust.devices.policies.defaultPolicy.<a href="./src/resources/zero-trust/devices/policies/default-policy.ts">get</a>({ ...params }) -> DefaultPolicyGetResponse | null</code>
+- <code title="post /accounts/{account_id}/devices/policy">client.zeroTrust.devices.policies.custom.<a href="./src/resources/zero-trust/devices/policies/custom/custom.ts">create</a>({ ...params }) -> SettingsPolicy | null</code>
+- <code title="get /accounts/{account_id}/devices/policies">client.zeroTrust.devices.policies.custom.<a href="./src/resources/zero-trust/devices/policies/custom/custom.ts">list</a>({ ...params }) -> SettingsPoliciesSinglePage</code>
+- <code title="delete /accounts/{account_id}/devices/policy/{policy_id}">client.zeroTrust.devices.policies.custom.<a href="./src/resources/zero-trust/devices/policies/custom/custom.ts">delete</a>(policyId, { ...params }) -> CustomDeleteResponse | null</code>
+- <code title="patch /accounts/{account_id}/devices/policy/{policy_id}">client.zeroTrust.devices.policies.custom.<a href="./src/resources/zero-trust/devices/policies/custom/custom.ts">edit</a>(policyId, { ...params }) -> SettingsPolicy | null</code>
+- <code title="get /accounts/{account_id}/devices/policy/{policy_id}">client.zeroTrust.devices.policies.custom.<a href="./src/resources/zero-trust/devices/policies/custom/custom.ts">get</a>(policyId, { ...params }) -> SettingsPolicy | null</code>
 
-#### Excludes
+##### Excludes
 
 Types:
 
-- <code><a href="./src/resources/zero-trust/devices/policies/excludes.ts">SplitTunnelExclude</a></code>
-- <code><a href="./src/resources/zero-trust/devices/policies/excludes.ts">ExcludeUpdateResponse</a></code>
-- <code><a href="./src/resources/zero-trust/devices/policies/excludes.ts">ExcludeGetResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/custom/excludes.ts">ExcludeUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/custom/excludes.ts">ExcludeGetResponse</a></code>
 
 Methods:
 
-- <code title="put /accounts/{account_id}/devices/policy/exclude">client.zeroTrust.devices.policies.excludes.<a href="./src/resources/zero-trust/devices/policies/excludes.ts">update</a>([ ...body ]) -> ExcludeUpdateResponse | null</code>
-- <code title="get /accounts/{account_id}/devices/policy/exclude">client.zeroTrust.devices.policies.excludes.<a href="./src/resources/zero-trust/devices/policies/excludes.ts">list</a>({ ...params }) -> SplitTunnelExcludesSinglePage</code>
-- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/exclude">client.zeroTrust.devices.policies.excludes.<a href="./src/resources/zero-trust/devices/policies/excludes.ts">get</a>(policyId, { ...params }) -> ExcludeGetResponse | null</code>
+- <code title="put /accounts/{account_id}/devices/policy/{policy_id}/exclude">client.zeroTrust.devices.policies.custom.excludes.<a href="./src/resources/zero-trust/devices/policies/custom/excludes.ts">update</a>(policyId, [ ...body ]) -> ExcludeUpdateResponse | null</code>
+- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/exclude">client.zeroTrust.devices.policies.custom.excludes.<a href="./src/resources/zero-trust/devices/policies/custom/excludes.ts">get</a>(policyId, { ...params }) -> ExcludeGetResponse | null</code>
 
-#### FallbackDomains
+##### Includes
 
 Types:
 
-- <code><a href="./src/resources/zero-trust/devices/policies/fallback-domains.ts">FallbackDomain</a></code>
-- <code><a href="./src/resources/zero-trust/devices/policies/fallback-domains.ts">FallbackDomainPolicy</a></code>
-- <code><a href="./src/resources/zero-trust/devices/policies/fallback-domains.ts">FallbackDomainUpdateResponse</a></code>
-- <code><a href="./src/resources/zero-trust/devices/policies/fallback-domains.ts">FallbackDomainGetResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/custom/includes.ts">IncludeUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/custom/includes.ts">IncludeGetResponse</a></code>
 
 Methods:
 
-- <code title="put /accounts/{account_id}/devices/policy/{policy_id}/fallback_domains">client.zeroTrust.devices.policies.fallbackDomains.<a href="./src/resources/zero-trust/devices/policies/fallback-domains.ts">update</a>(policyId, [ ...body ]) -> FallbackDomainUpdateResponse | null</code>
-- <code title="get /accounts/{account_id}/devices/policy/fallback_domains">client.zeroTrust.devices.policies.fallbackDomains.<a href="./src/resources/zero-trust/devices/policies/fallback-domains.ts">list</a>({ ...params }) -> FallbackDomainsSinglePage</code>
-- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/fallback_domains">client.zeroTrust.devices.policies.fallbackDomains.<a href="./src/resources/zero-trust/devices/policies/fallback-domains.ts">get</a>(policyId, { ...params }) -> FallbackDomainGetResponse | null</code>
+- <code title="put /accounts/{account_id}/devices/policy/{policy_id}/include">client.zeroTrust.devices.policies.custom.includes.<a href="./src/resources/zero-trust/devices/policies/custom/includes.ts">update</a>(policyId, [ ...body ]) -> IncludeUpdateResponse | null</code>
+- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/include">client.zeroTrust.devices.policies.custom.includes.<a href="./src/resources/zero-trust/devices/policies/custom/includes.ts">get</a>(policyId, { ...params }) -> IncludeGetResponse | null</code>
 
-#### Includes
+##### FallbackDomains
 
 Types:
 
-- <code><a href="./src/resources/zero-trust/devices/policies/includes.ts">SplitTunnelInclude</a></code>
-- <code><a href="./src/resources/zero-trust/devices/policies/includes.ts">IncludeUpdateResponse</a></code>
-- <code><a href="./src/resources/zero-trust/devices/policies/includes.ts">IncludeGetResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/custom/fallback-domains.ts">FallbackDomainUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/devices/policies/custom/fallback-domains.ts">FallbackDomainGetResponse</a></code>
 
 Methods:
 
-- <code title="put /accounts/{account_id}/devices/policy/include">client.zeroTrust.devices.policies.includes.<a href="./src/resources/zero-trust/devices/policies/includes.ts">update</a>([ ...body ]) -> IncludeUpdateResponse | null</code>
-- <code title="get /accounts/{account_id}/devices/policy/include">client.zeroTrust.devices.policies.includes.<a href="./src/resources/zero-trust/devices/policies/includes.ts">list</a>({ ...params }) -> SplitTunnelIncludesSinglePage</code>
-- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/include">client.zeroTrust.devices.policies.includes.<a href="./src/resources/zero-trust/devices/policies/includes.ts">get</a>(policyId, { ...params }) -> IncludeGetResponse | null</code>
+- <code title="put /accounts/{account_id}/devices/policy/{policy_id}/fallback_domains">client.zeroTrust.devices.policies.custom.fallbackDomains.<a href="./src/resources/zero-trust/devices/policies/custom/fallback-domains.ts">update</a>(policyId, [ ...domains ]) -> FallbackDomainUpdateResponse | null</code>
+- <code title="get /accounts/{account_id}/devices/policy/{policy_id}/fallback_domains">client.zeroTrust.devices.policies.custom.fallbackDomains.<a href="./src/resources/zero-trust/devices/policies/custom/fallback-domains.ts">get</a>(policyId, { ...params }) -> FallbackDomainGetResponse | null</code>
 
 ### Posture
 
@@ -4002,7 +4419,7 @@ Methods:
 
 - <code title="post /accounts/{account_id}/devices/posture/integration">client.zeroTrust.devices.posture.integrations.<a href="./src/resources/zero-trust/devices/posture/integrations.ts">create</a>({ ...params }) -> Integration | null</code>
 - <code title="get /accounts/{account_id}/devices/posture/integration">client.zeroTrust.devices.posture.integrations.<a href="./src/resources/zero-trust/devices/posture/integrations.ts">list</a>({ ...params }) -> IntegrationsSinglePage</code>
-- <code title="delete /accounts/{account_id}/devices/posture/integration/{integration_id}">client.zeroTrust.devices.posture.integrations.<a href="./src/resources/zero-trust/devices/posture/integrations.ts">delete</a>(integrationId, { ...params }) -> IntegrationDeleteResponse</code>
+- <code title="delete /accounts/{account_id}/devices/posture/integration/{integration_id}">client.zeroTrust.devices.posture.integrations.<a href="./src/resources/zero-trust/devices/posture/integrations.ts">delete</a>(integrationId, { ...params }) -> IntegrationDeleteResponse | null</code>
 - <code title="patch /accounts/{account_id}/devices/posture/integration/{integration_id}">client.zeroTrust.devices.posture.integrations.<a href="./src/resources/zero-trust/devices/posture/integrations.ts">edit</a>(integrationId, { ...params }) -> Integration | null</code>
 - <code title="get /accounts/{account_id}/devices/posture/integration/{integration_id}">client.zeroTrust.devices.posture.integrations.<a href="./src/resources/zero-trust/devices/posture/integrations.ts">get</a>(integrationId, { ...params }) -> Integration | null</code>
 
@@ -4014,7 +4431,7 @@ Types:
 
 Methods:
 
-- <code title="post /accounts/{account_id}/devices/revoke">client.zeroTrust.devices.revoke.<a href="./src/resources/zero-trust/devices/revoke.ts">create</a>([ ...body ]) -> RevokeCreateResponse</code>
+- <code title="post /accounts/{account_id}/devices/revoke">client.zeroTrust.devices.revoke.<a href="./src/resources/zero-trust/devices/revoke.ts">create</a>([ ...body ]) -> RevokeCreateResponse | null</code>
 
 ### Settings
 
@@ -4026,6 +4443,7 @@ Methods:
 
 - <code title="put /accounts/{account_id}/devices/settings">client.zeroTrust.devices.settings.<a href="./src/resources/zero-trust/devices/settings.ts">update</a>({ ...params }) -> DeviceSettings | null</code>
 - <code title="get /accounts/{account_id}/devices/settings">client.zeroTrust.devices.settings.<a href="./src/resources/zero-trust/devices/settings.ts">list</a>({ ...params }) -> DeviceSettings | null</code>
+- <code title="patch /accounts/{account_id}/devices/settings">client.zeroTrust.devices.settings.<a href="./src/resources/zero-trust/devices/settings.ts">edit</a>({ ...params }) -> DeviceSettings | null</code>
 
 ### Unrevoke
 
@@ -4035,7 +4453,7 @@ Types:
 
 Methods:
 
-- <code title="post /accounts/{account_id}/devices/unrevoke">client.zeroTrust.devices.unrevoke.<a href="./src/resources/zero-trust/devices/unrevoke.ts">create</a>([ ...body ]) -> UnrevokeCreateResponse</code>
+- <code title="post /accounts/{account_id}/devices/unrevoke">client.zeroTrust.devices.unrevoke.<a href="./src/resources/zero-trust/devices/unrevoke.ts">create</a>([ ...body ]) -> UnrevokeCreateResponse | null</code>
 
 ### OverrideCodes
 
@@ -4054,8 +4472,8 @@ Types:
 - <code><a href="./src/resources/zero-trust/identity-providers.ts">AzureAD</a></code>
 - <code><a href="./src/resources/zero-trust/identity-providers.ts">GenericOAuthConfig</a></code>
 - <code><a href="./src/resources/zero-trust/identity-providers.ts">IdentityProvider</a></code>
+- <code><a href="./src/resources/zero-trust/identity-providers.ts">IdentityProviderSCIMConfig</a></code>
 - <code><a href="./src/resources/zero-trust/identity-providers.ts">IdentityProviderType</a></code>
-- <code><a href="./src/resources/zero-trust/identity-providers.ts">SCIMConfig</a></code>
 - <code><a href="./src/resources/zero-trust/identity-providers.ts">IdentityProviderListResponse</a></code>
 - <code><a href="./src/resources/zero-trust/identity-providers.ts">IdentityProviderDeleteResponse</a></code>
 
@@ -4071,16 +4489,28 @@ Methods:
 
 Types:
 
-- <code><a href="./src/resources/zero-trust/organizations.ts">LoginDesign</a></code>
-- <code><a href="./src/resources/zero-trust/organizations.ts">Organization</a></code>
-- <code><a href="./src/resources/zero-trust/organizations.ts">OrganizationRevokeUsersResponse</a></code>
+- <code><a href="./src/resources/zero-trust/organizations/organizations.ts">LoginDesign</a></code>
+- <code><a href="./src/resources/zero-trust/organizations/organizations.ts">Organization</a></code>
+- <code><a href="./src/resources/zero-trust/organizations/organizations.ts">OrganizationRevokeUsersResponse</a></code>
+
+Methods:
+
+- <code title="post /{account_or_zone}/{account_or_zone_id}/access/organizations">client.zeroTrust.organizations.<a href="./src/resources/zero-trust/organizations/organizations.ts">create</a>({ ...params }) -> Organization</code>
+- <code title="put /{account_or_zone}/{account_or_zone_id}/access/organizations">client.zeroTrust.organizations.<a href="./src/resources/zero-trust/organizations/organizations.ts">update</a>({ ...params }) -> Organization</code>
+- <code title="get /{account_or_zone}/{account_or_zone_id}/access/organizations">client.zeroTrust.organizations.<a href="./src/resources/zero-trust/organizations/organizations.ts">list</a>({ ...params }) -> Organization</code>
+- <code title="post /{account_or_zone}/{account_or_zone_id}/access/organizations/revoke_user">client.zeroTrust.organizations.<a href="./src/resources/zero-trust/organizations/organizations.ts">revokeUsers</a>({ ...params }) -> OrganizationRevokeUsersResponse</code>
+
+### DOH
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/organizations/doh.ts">DOHUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/organizations/doh.ts">DOHGetResponse</a></code>
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/organizations">client.zeroTrust.organizations.<a href="./src/resources/zero-trust/organizations.ts">create</a>({ ...params }) -> Organization</code>
-- <code title="put /{account_or_zone}/{account_or_zone_id}/access/organizations">client.zeroTrust.organizations.<a href="./src/resources/zero-trust/organizations.ts">update</a>({ ...params }) -> Organization</code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/organizations">client.zeroTrust.organizations.<a href="./src/resources/zero-trust/organizations.ts">list</a>({ ...params }) -> Organization</code>
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/organizations/revoke_user">client.zeroTrust.organizations.<a href="./src/resources/zero-trust/organizations.ts">revokeUsers</a>({ ...params }) -> OrganizationRevokeUsersResponse</code>
+- <code title="put /accounts/{account_id}/access/organizations/doh">client.zeroTrust.organizations.doh.<a href="./src/resources/zero-trust/organizations/doh.ts">update</a>({ ...params }) -> DOHUpdateResponse</code>
+- <code title="get /accounts/{account_id}/access/organizations/doh">client.zeroTrust.organizations.doh.<a href="./src/resources/zero-trust/organizations/doh.ts">get</a>({ ...params }) -> DOHGetResponse</code>
 
 ## Seats
 
@@ -4091,7 +4521,7 @@ Types:
 
 Methods:
 
-- <code title="patch /accounts/{account_id}/access/seats">client.zeroTrust.seats.<a href="./src/resources/zero-trust/seats.ts">edit</a>([ ...body ]) -> SeatEditResponse | null</code>
+- <code title="patch /accounts/{account_id}/access/seats">client.zeroTrust.seats.<a href="./src/resources/zero-trust/seats.ts">edit</a>([ ...body ]) -> SeatEditResponse</code>
 
 ## Access
 
@@ -4118,6 +4548,42 @@ Types:
 - <code><a href="./src/resources/zero-trust/access/access.ts">SAMLGroupRule</a></code>
 - <code><a href="./src/resources/zero-trust/access/access.ts">ServiceTokenRule</a></code>
 
+### GatewayCA
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/access/gateway-ca.ts">GatewayCACreateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/access/gateway-ca.ts">GatewayCAListResponse</a></code>
+- <code><a href="./src/resources/zero-trust/access/gateway-ca.ts">GatewayCADeleteResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/access/gateway_ca">client.zeroTrust.access.gatewayCA.<a href="./src/resources/zero-trust/access/gateway-ca.ts">create</a>({ ...params }) -> GatewayCACreateResponse</code>
+- <code title="get /accounts/{account_id}/access/gateway_ca">client.zeroTrust.access.gatewayCA.<a href="./src/resources/zero-trust/access/gateway-ca.ts">list</a>({ ...params }) -> GatewayCAListResponsesSinglePage</code>
+- <code title="delete /accounts/{account_id}/access/gateway_ca/{certificate_id}">client.zeroTrust.access.gatewayCA.<a href="./src/resources/zero-trust/access/gateway-ca.ts">delete</a>(certificateId, { ...params }) -> GatewayCADeleteResponse</code>
+
+### Infrastructure
+
+#### Targets
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/access/infrastructure/targets.ts">TargetCreateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/access/infrastructure/targets.ts">TargetUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/access/infrastructure/targets.ts">TargetListResponse</a></code>
+- <code><a href="./src/resources/zero-trust/access/infrastructure/targets.ts">TargetBulkUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/access/infrastructure/targets.ts">TargetGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/infrastructure/targets">client.zeroTrust.access.infrastructure.targets.<a href="./src/resources/zero-trust/access/infrastructure/targets.ts">create</a>({ ...params }) -> TargetCreateResponse</code>
+- <code title="put /accounts/{account_id}/infrastructure/targets/{target_id}">client.zeroTrust.access.infrastructure.targets.<a href="./src/resources/zero-trust/access/infrastructure/targets.ts">update</a>(targetId, { ...params }) -> TargetUpdateResponse</code>
+- <code title="get /accounts/{account_id}/infrastructure/targets">client.zeroTrust.access.infrastructure.targets.<a href="./src/resources/zero-trust/access/infrastructure/targets.ts">list</a>({ ...params }) -> TargetListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/infrastructure/targets/{target_id}">client.zeroTrust.access.infrastructure.targets.<a href="./src/resources/zero-trust/access/infrastructure/targets.ts">delete</a>(targetId, { ...params }) -> void</code>
+- <code title="delete /accounts/{account_id}/infrastructure/targets/batch">client.zeroTrust.access.infrastructure.targets.<a href="./src/resources/zero-trust/access/infrastructure/targets.ts">bulkDelete</a>({ ...params }) -> void</code>
+- <code title="put /accounts/{account_id}/infrastructure/targets/batch">client.zeroTrust.access.infrastructure.targets.<a href="./src/resources/zero-trust/access/infrastructure/targets.ts">bulkUpdate</a>([ ...body ]) -> TargetBulkUpdateResponse</code>
+- <code title="get /accounts/{account_id}/infrastructure/targets/{target_id}">client.zeroTrust.access.infrastructure.targets.<a href="./src/resources/zero-trust/access/infrastructure/targets.ts">get</a>(targetId, { ...params }) -> TargetGetResponse</code>
+
 ### Applications
 
 Types:
@@ -4128,13 +4594,18 @@ Types:
 - <code><a href="./src/resources/zero-trust/access/applications/applications.ts">AllowedOrigins</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/applications.ts">AppID</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/applications.ts">Application</a></code>
+- <code><a href="./src/resources/zero-trust/access/applications/applications.ts">ApplicationPolicy</a></code>
+- <code><a href="./src/resources/zero-trust/access/applications/applications.ts">ApplicationSCIMConfig</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/applications.ts">ApplicationType</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/applications.ts">CORSHeaders</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/applications.ts">Decision</a></code>
-- <code><a href="./src/resources/zero-trust/access/applications/applications.ts">SaaSAppNameFormat</a></code>
+- <code><a href="./src/resources/zero-trust/access/applications/applications.ts">OIDCSaaSApp</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/applications.ts">SaaSAppNameIDFormat</a></code>
-- <code><a href="./src/resources/zero-trust/access/applications/applications.ts">SaaSAppSource</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/applications.ts">SAMLSaaSApp</a></code>
+- <code><a href="./src/resources/zero-trust/access/applications/applications.ts">SCIMConfigAuthenticationHTTPBasic</a></code>
+- <code><a href="./src/resources/zero-trust/access/applications/applications.ts">SCIMConfigAuthenticationOAuthBearerToken</a></code>
+- <code><a href="./src/resources/zero-trust/access/applications/applications.ts">SCIMConfigAuthenticationOauth2</a></code>
+- <code><a href="./src/resources/zero-trust/access/applications/applications.ts">SCIMConfigMapping</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/applications.ts">SelfHostedDomains</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/applications.ts">ApplicationCreateResponse</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/applications.ts">ApplicationUpdateResponse</a></code>
@@ -4157,16 +4628,14 @@ Methods:
 Types:
 
 - <code><a href="./src/resources/zero-trust/access/applications/cas.ts">CA</a></code>
-- <code><a href="./src/resources/zero-trust/access/applications/cas.ts">CACreateResponse</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/cas.ts">CADeleteResponse</a></code>
-- <code><a href="./src/resources/zero-trust/access/applications/cas.ts">CAGetResponse</a></code>
 
 Methods:
 
-- <code title="post /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca">client.zeroTrust.access.applications.cas.<a href="./src/resources/zero-trust/access/applications/cas.ts">create</a>(appId, { ...params }) -> CACreateResponse</code>
+- <code title="post /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca">client.zeroTrust.access.applications.cas.<a href="./src/resources/zero-trust/access/applications/cas.ts">create</a>(appId, { ...params }) -> CA</code>
 - <code title="get /{account_or_zone}/{account_or_zone_id}/access/apps/ca">client.zeroTrust.access.applications.cas.<a href="./src/resources/zero-trust/access/applications/cas.ts">list</a>({ ...params }) -> CAsSinglePage</code>
 - <code title="delete /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca">client.zeroTrust.access.applications.cas.<a href="./src/resources/zero-trust/access/applications/cas.ts">delete</a>(appId, { ...params }) -> CADeleteResponse</code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca">client.zeroTrust.access.applications.cas.<a href="./src/resources/zero-trust/access/applications/cas.ts">get</a>(appId, { ...params }) -> CAGetResponse</code>
+- <code title="get /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/ca">client.zeroTrust.access.applications.cas.<a href="./src/resources/zero-trust/access/applications/cas.ts">get</a>(appId, { ...params }) -> CA</code>
 
 #### UserPolicyChecks
 
@@ -4183,8 +4652,6 @@ Methods:
 
 Types:
 
-- <code><a href="./src/resources/zero-trust/access/applications/policies.ts">ApprovalGroup</a></code>
-- <code><a href="./src/resources/zero-trust/access/applications/policies.ts">Policy</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/policies.ts">PolicyCreateResponse</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/policies.ts">PolicyUpdateResponse</a></code>
 - <code><a href="./src/resources/zero-trust/access/applications/policies.ts">PolicyListResponse</a></code>
@@ -4199,6 +4666,28 @@ Methods:
 - <code title="delete /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies/{policy_id}">client.zeroTrust.access.applications.policies.<a href="./src/resources/zero-trust/access/applications/policies.ts">delete</a>(appId, policyId, { ...params }) -> PolicyDeleteResponse</code>
 - <code title="get /{account_or_zone}/{account_or_zone_id}/access/apps/{app_id}/policies/{policy_id}">client.zeroTrust.access.applications.policies.<a href="./src/resources/zero-trust/access/applications/policies.ts">get</a>(appId, policyId, { ...params }) -> PolicyGetResponse</code>
 
+#### PolicyTests
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/access/applications/policy-tests/policy-tests.ts">PolicyTestCreateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/access/applications/policy-tests/policy-tests.ts">PolicyTestGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/access/policy-tests">client.zeroTrust.access.applications.policyTests.<a href="./src/resources/zero-trust/access/applications/policy-tests/policy-tests.ts">create</a>({ ...params }) -> PolicyTestCreateResponse</code>
+- <code title="get /accounts/{account_id}/access/policy-tests/{policy_test_id}">client.zeroTrust.access.applications.policyTests.<a href="./src/resources/zero-trust/access/applications/policy-tests/policy-tests.ts">get</a>(policyTestId, { ...params }) -> PolicyTestGetResponse</code>
+
+##### Users
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/access/applications/policy-tests/users.ts">UserListResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/access/policy-tests/{policy_test_id}/users">client.zeroTrust.access.applications.policyTests.users.<a href="./src/resources/zero-trust/access/applications/policy-tests/users.ts">list</a>(policyTestId, { ...params }) -> UserListResponse</code>
+
 ### Certificates
 
 Types:
@@ -4225,8 +4714,8 @@ Types:
 
 Methods:
 
-- <code title="put /{account_or_zone}/{account_or_zone_id}/access/certificates/settings">client.zeroTrust.access.certificates.settings.<a href="./src/resources/zero-trust/access/certificates/settings.ts">update</a>({ ...params }) -> SettingUpdateResponse | null</code>
-- <code title="get /{account_or_zone}/{account_or_zone_id}/access/certificates/settings">client.zeroTrust.access.certificates.settings.<a href="./src/resources/zero-trust/access/certificates/settings.ts">get</a>({ ...params }) -> SettingGetResponse | null</code>
+- <code title="put /{account_or_zone}/{account_or_zone_id}/access/certificates/settings">client.zeroTrust.access.certificates.settings.<a href="./src/resources/zero-trust/access/certificates/settings.ts">update</a>({ ...params }) -> SettingUpdateResponse</code>
+- <code title="get /{account_or_zone}/{account_or_zone_id}/access/certificates/settings">client.zeroTrust.access.certificates.settings.<a href="./src/resources/zero-trust/access/certificates/settings.ts">get</a>({ ...params }) -> SettingGetResponse</code>
 
 ### Groups
 
@@ -4380,6 +4869,8 @@ Methods:
 
 Types:
 
+- <code><a href="./src/resources/zero-trust/access/policies.ts">ApprovalGroup</a></code>
+- <code><a href="./src/resources/zero-trust/access/policies.ts">Policy</a></code>
 - <code><a href="./src/resources/zero-trust/access/policies.ts">PolicyCreateResponse</a></code>
 - <code><a href="./src/resources/zero-trust/access/policies.ts">PolicyUpdateResponse</a></code>
 - <code><a href="./src/resources/zero-trust/access/policies.ts">PolicyListResponse</a></code>
@@ -4398,11 +4889,59 @@ Methods:
 
 Types:
 
-- <code><a href="./src/resources/zero-trust/dex/dex.ts">DeviceExperienceMonitor</a></code>
+- <code><a href="./src/resources/zero-trust/dex/dex.ts">DigitalExperienceMonitor</a></code>
 - <code><a href="./src/resources/zero-trust/dex/dex.ts">NetworkPath</a></code>
 - <code><a href="./src/resources/zero-trust/dex/dex.ts">NetworkPathResponse</a></code>
 - <code><a href="./src/resources/zero-trust/dex/dex.ts">Percentiles</a></code>
 
+### Commands
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/dex/commands/commands.ts">CommandCreateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/dex/commands/commands.ts">CommandListResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dex/commands">client.zeroTrust.dex.commands.<a href="./src/resources/zero-trust/dex/commands/commands.ts">create</a>({ ...params }) -> CommandCreateResponse</code>
+- <code title="get /accounts/{account_id}/dex/commands">client.zeroTrust.dex.commands.<a href="./src/resources/zero-trust/dex/commands/commands.ts">list</a>({ ...params }) -> CommandListResponsesV4PagePagination</code>
+
+#### Users
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/dex/commands/users.ts">UserListResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/commands/users">client.zeroTrust.dex.commands.users.<a href="./src/resources/zero-trust/dex/commands/users.ts">list</a>({ ...params }) -> UserListResponse</code>
+
+#### Devices
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/dex/commands/devices.ts">DeviceListResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/commands/devices">client.zeroTrust.dex.commands.devices.<a href="./src/resources/zero-trust/dex/commands/devices.ts">list</a>({ ...params }) -> DeviceListResponsesV4PagePagination</code>
+
+#### Downloads
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/commands/{command_id}/downloads/{filename}">client.zeroTrust.dex.commands.downloads.<a href="./src/resources/zero-trust/dex/commands/downloads.ts">get</a>(commandId, filename, { ...params }) -> Response</code>
+
+#### Quota
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/dex/commands/quota.ts">QuotaGetResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dex/commands/quota">client.zeroTrust.dex.commands.quota.<a href="./src/resources/zero-trust/dex/commands/quota.ts">get</a>({ ...params }) -> QuotaGetResponse</code>
+
 ### Colos
 
 Types:
@@ -4462,11 +5001,10 @@ Types:
 
 - <code><a href="./src/resources/zero-trust/dex/tests/tests.ts">AggregateTimePeriod</a></code>
 - <code><a href="./src/resources/zero-trust/dex/tests/tests.ts">Tests</a></code>
-- <code><a href="./src/resources/zero-trust/dex/tests/tests.ts">TestListResponse</a></code>
 
 Methods:
 
-- <code title="get /accounts/{account_id}/dex/tests">client.zeroTrust.dex.tests.<a href="./src/resources/zero-trust/dex/tests/tests.ts">list</a>({ ...params }) -> TestListResponsesV4PagePagination</code>
+- <code title="get /accounts/{account_id}/dex/tests/overview">client.zeroTrust.dex.tests.<a href="./src/resources/zero-trust/dex/tests/tests.ts">list</a>({ ...params }) -> TestsV4PagePagination</code>
 
 #### UniqueDevices
 
@@ -4516,11 +5054,31 @@ Types:
 
 Methods:
 
-- <code title="post /accounts/{account_id}/tunnels">client.zeroTrust.tunnels.<a href="./src/resources/zero-trust/tunnels/tunnels.ts">create</a>({ ...params }) -> TunnelCreateResponse</code>
-- <code title="get /accounts/{account_id}/tunnels">client.zeroTrust.tunnels.<a href="./src/resources/zero-trust/tunnels/tunnels.ts">list</a>({ ...params }) -> TunnelListResponsesV4PagePaginationArray</code>
-- <code title="delete /accounts/{account_id}/tunnels/{tunnel_id}">client.zeroTrust.tunnels.<a href="./src/resources/zero-trust/tunnels/tunnels.ts">delete</a>(tunnelId, { ...params }) -> TunnelDeleteResponse</code>
+- <code title="post /accounts/{account_id}/cfd_tunnel">client.zeroTrust.tunnels.<a href="./src/resources/zero-trust/tunnels/tunnels.ts">create</a>({ ...params }) -> TunnelCreateResponse</code>
+- <code title="get /accounts/{account_id}/cfd_tunnel">client.zeroTrust.tunnels.<a href="./src/resources/zero-trust/tunnels/tunnels.ts">list</a>({ ...params }) -> TunnelListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/cfd_tunnel/{tunnel_id}">client.zeroTrust.tunnels.<a href="./src/resources/zero-trust/tunnels/tunnels.ts">delete</a>(tunnelId, { ...params }) -> TunnelDeleteResponse</code>
 - <code title="patch /accounts/{account_id}/cfd_tunnel/{tunnel_id}">client.zeroTrust.tunnels.<a href="./src/resources/zero-trust/tunnels/tunnels.ts">edit</a>(tunnelId, { ...params }) -> TunnelEditResponse</code>
-- <code title="get /accounts/{account_id}/tunnels/{tunnel_id}">client.zeroTrust.tunnels.<a href="./src/resources/zero-trust/tunnels/tunnels.ts">get</a>(tunnelId, { ...params }) -> TunnelGetResponse</code>
+- <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}">client.zeroTrust.tunnels.<a href="./src/resources/zero-trust/tunnels/tunnels.ts">get</a>(tunnelId, { ...params }) -> TunnelGetResponse</code>
+
+### WARPConnector
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/tunnels/warp-connector.ts">WARPConnectorCreateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/tunnels/warp-connector.ts">WARPConnectorListResponse</a></code>
+- <code><a href="./src/resources/zero-trust/tunnels/warp-connector.ts">WARPConnectorDeleteResponse</a></code>
+- <code><a href="./src/resources/zero-trust/tunnels/warp-connector.ts">WARPConnectorEditResponse</a></code>
+- <code><a href="./src/resources/zero-trust/tunnels/warp-connector.ts">WARPConnectorGetResponse</a></code>
+- <code><a href="./src/resources/zero-trust/tunnels/warp-connector.ts">WARPConnectorTokenResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/warp_connector">client.zeroTrust.tunnels.warpConnector.<a href="./src/resources/zero-trust/tunnels/warp-connector.ts">create</a>({ ...params }) -> WARPConnectorCreateResponse</code>
+- <code title="get /accounts/{account_id}/warp_connector">client.zeroTrust.tunnels.warpConnector.<a href="./src/resources/zero-trust/tunnels/warp-connector.ts">list</a>({ ...params }) -> WARPConnectorListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/warp_connector/{tunnel_id}">client.zeroTrust.tunnels.warpConnector.<a href="./src/resources/zero-trust/tunnels/warp-connector.ts">delete</a>(tunnelId, { ...params }) -> WARPConnectorDeleteResponse</code>
+- <code title="patch /accounts/{account_id}/warp_connector/{tunnel_id}">client.zeroTrust.tunnels.warpConnector.<a href="./src/resources/zero-trust/tunnels/warp-connector.ts">edit</a>(tunnelId, { ...params }) -> WARPConnectorEditResponse</code>
+- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}">client.zeroTrust.tunnels.warpConnector.<a href="./src/resources/zero-trust/tunnels/warp-connector.ts">get</a>(tunnelId, { ...params }) -> WARPConnectorGetResponse</code>
+- <code title="get /accounts/{account_id}/warp_connector/{tunnel_id}/token">client.zeroTrust.tunnels.warpConnector.<a href="./src/resources/zero-trust/tunnels/warp-connector.ts">token</a>(tunnelId, { ...params }) -> WARPConnectorTokenResponse</code>
 
 ### Configurations
 
@@ -4544,7 +5102,7 @@ Types:
 
 Methods:
 
-- <code title="delete /accounts/{account_id}/tunnels/{tunnel_id}/connections">client.zeroTrust.tunnels.connections.<a href="./src/resources/zero-trust/tunnels/connections.ts">delete</a>(tunnelId, { ...params }) -> ConnectionDeleteResponse</code>
+- <code title="delete /accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections">client.zeroTrust.tunnels.connections.<a href="./src/resources/zero-trust/tunnels/connections.ts">delete</a>(tunnelId, { ...params }) -> ConnectionDeleteResponse | null</code>
 - <code title="get /accounts/{account_id}/cfd_tunnel/{tunnel_id}/connections">client.zeroTrust.tunnels.connections.<a href="./src/resources/zero-trust/tunnels/connections.ts">get</a>(tunnelId, { ...params }) -> ConnectionGetResponse | null</code>
 
 ### Token
@@ -4614,11 +5172,35 @@ Methods:
 - <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/upload">client.zeroTrust.dlp.datasets.upload.<a href="./src/resources/zero-trust/dlp/datasets/upload.ts">create</a>(datasetId, { ...params }) -> NewVersion</code>
 - <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/upload/{version}">client.zeroTrust.dlp.datasets.upload.<a href="./src/resources/zero-trust/dlp/datasets/upload.ts">edit</a>(datasetId, version, { ...params }) -> Dataset</code>
 
+#### Versions
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/dlp/datasets/versions/versions.ts">VersionCreateResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}">client.zeroTrust.dlp.datasets.versions.<a href="./src/resources/zero-trust/dlp/datasets/versions/versions.ts">create</a>(datasetId, version, [ ...body ]) -> VersionCreateResponse</code>
+
+##### Entries
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/dlp/datasets/versions/entries.ts">EntryCreateResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/datasets/{dataset_id}/versions/{version}/entries/{entry_id}">client.zeroTrust.dlp.datasets.versions.entries.<a href="./src/resources/zero-trust/dlp/datasets/versions/entries.ts">create</a>(datasetId, version, entryId, { ...params }) -> EntryCreateResponse</code>
+
 ### Patterns
 
+Types:
+
+- <code><a href="./src/resources/zero-trust/dlp/patterns.ts">PatternValidateResponse</a></code>
+
 Methods:
 
-- <code title="post /accounts/{account_id}/dlp/patterns/validate">client.zeroTrust.dlp.patterns.<a href="./src/resources/zero-trust/dlp/patterns.ts">validate</a>({ ...params }) -> OwnershipValidation | null</code>
+- <code title="post /accounts/{account_id}/dlp/patterns/validate">client.zeroTrust.dlp.patterns.<a href="./src/resources/zero-trust/dlp/patterns.ts">validate</a>({ ...params }) -> PatternValidateResponse</code>
 
 ### PayloadLogs
 
@@ -4632,6 +5214,40 @@ Methods:
 - <code title="put /accounts/{account_id}/dlp/payload_log">client.zeroTrust.dlp.payloadLogs.<a href="./src/resources/zero-trust/dlp/payload-logs.ts">update</a>({ ...params }) -> PayloadLogUpdateResponse</code>
 - <code title="get /accounts/{account_id}/dlp/payload_log">client.zeroTrust.dlp.payloadLogs.<a href="./src/resources/zero-trust/dlp/payload-logs.ts">get</a>({ ...params }) -> PayloadLogGetResponse</code>
 
+### Email
+
+#### AccountMapping
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/dlp/email/account-mapping.ts">AccountMappingCreateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/dlp/email/account-mapping.ts">AccountMappingGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/email/account_mapping">client.zeroTrust.dlp.email.accountMapping.<a href="./src/resources/zero-trust/dlp/email/account-mapping.ts">create</a>({ ...params }) -> AccountMappingCreateResponse</code>
+- <code title="get /accounts/{account_id}/dlp/email/account_mapping">client.zeroTrust.dlp.email.accountMapping.<a href="./src/resources/zero-trust/dlp/email/account-mapping.ts">get</a>({ ...params }) -> AccountMappingGetResponse</code>
+
+#### Rules
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/dlp/email/rules.ts">RuleCreateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/dlp/email/rules.ts">RuleUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/dlp/email/rules.ts">RuleListResponse</a></code>
+- <code><a href="./src/resources/zero-trust/dlp/email/rules.ts">RuleDeleteResponse</a></code>
+- <code><a href="./src/resources/zero-trust/dlp/email/rules.ts">RuleBulkEditResponse</a></code>
+- <code><a href="./src/resources/zero-trust/dlp/email/rules.ts">RuleGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/email/rules">client.zeroTrust.dlp.email.rules.<a href="./src/resources/zero-trust/dlp/email/rules.ts">create</a>({ ...params }) -> RuleCreateResponse</code>
+- <code title="put /accounts/{account_id}/dlp/email/rules/{rule_id}">client.zeroTrust.dlp.email.rules.<a href="./src/resources/zero-trust/dlp/email/rules.ts">update</a>(ruleId, { ...params }) -> RuleUpdateResponse</code>
+- <code title="get /accounts/{account_id}/dlp/email/rules">client.zeroTrust.dlp.email.rules.<a href="./src/resources/zero-trust/dlp/email/rules.ts">list</a>({ ...params }) -> RuleListResponsesSinglePage</code>
+- <code title="delete /accounts/{account_id}/dlp/email/rules/{rule_id}">client.zeroTrust.dlp.email.rules.<a href="./src/resources/zero-trust/dlp/email/rules.ts">delete</a>(ruleId, { ...params }) -> RuleDeleteResponse</code>
+- <code title="patch /accounts/{account_id}/dlp/email/rules">client.zeroTrust.dlp.email.rules.<a href="./src/resources/zero-trust/dlp/email/rules.ts">bulkEdit</a>({ ...params }) -> RuleBulkEditResponse</code>
+- <code title="get /accounts/{account_id}/dlp/email/rules/{rule_id}">client.zeroTrust.dlp.email.rules.<a href="./src/resources/zero-trust/dlp/email/rules.ts">get</a>(ruleId, { ...params }) -> RuleGetResponse</code>
+
 ### Profiles
 
 Types:
@@ -4639,12 +5255,11 @@ Types:
 - <code><a href="./src/resources/zero-trust/dlp/profiles/profiles.ts">ContextAwareness</a></code>
 - <code><a href="./src/resources/zero-trust/dlp/profiles/profiles.ts">Profile</a></code>
 - <code><a href="./src/resources/zero-trust/dlp/profiles/profiles.ts">SkipConfiguration</a></code>
-- <code><a href="./src/resources/zero-trust/dlp/profiles/profiles.ts">ProfileGetResponse</a></code>
 
 Methods:
 
 - <code title="get /accounts/{account_id}/dlp/profiles">client.zeroTrust.dlp.profiles.<a href="./src/resources/zero-trust/dlp/profiles/profiles.ts">list</a>({ ...params }) -> ProfilesSinglePage</code>
-- <code title="get /accounts/{account_id}/dlp/profiles/{profile_id}">client.zeroTrust.dlp.profiles.<a href="./src/resources/zero-trust/dlp/profiles/profiles.ts">get</a>(profileId, { ...params }) -> ProfileGetResponse</code>
+- <code title="get /accounts/{account_id}/dlp/profiles/{profile_id}">client.zeroTrust.dlp.profiles.<a href="./src/resources/zero-trust/dlp/profiles/profiles.ts">get</a>(profileId, { ...params }) -> Profile</code>
 
 #### Custom
 
@@ -4657,10 +5272,10 @@ Types:
 
 Methods:
 
-- <code title="post /accounts/{account_id}/dlp/profiles/custom">client.zeroTrust.dlp.profiles.custom.<a href="./src/resources/zero-trust/dlp/profiles/custom.ts">create</a>({ ...params }) -> CustomCreateResponse | null</code>
-- <code title="put /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zeroTrust.dlp.profiles.custom.<a href="./src/resources/zero-trust/dlp/profiles/custom.ts">update</a>(profileId, { ...params }) -> CustomProfile</code>
-- <code title="delete /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zeroTrust.dlp.profiles.custom.<a href="./src/resources/zero-trust/dlp/profiles/custom.ts">delete</a>(profileId, { ...params }) -> CustomDeleteResponse</code>
-- <code title="get /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zeroTrust.dlp.profiles.custom.<a href="./src/resources/zero-trust/dlp/profiles/custom.ts">get</a>(profileId, { ...params }) -> CustomProfile</code>
+- <code title="post /accounts/{account_id}/dlp/profiles/custom">client.zeroTrust.dlp.profiles.custom.<a href="./src/resources/zero-trust/dlp/profiles/custom.ts">create</a>({ ...params }) -> CustomCreateResponse</code>
+- <code title="put /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zeroTrust.dlp.profiles.custom.<a href="./src/resources/zero-trust/dlp/profiles/custom.ts">update</a>(profileId, { ...params }) -> Profile</code>
+- <code title="delete /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zeroTrust.dlp.profiles.custom.<a href="./src/resources/zero-trust/dlp/profiles/custom.ts">delete</a>(profileId, { ...params }) -> CustomDeleteResponse | null</code>
+- <code title="get /accounts/{account_id}/dlp/profiles/custom/{profile_id}">client.zeroTrust.dlp.profiles.custom.<a href="./src/resources/zero-trust/dlp/profiles/custom.ts">get</a>(profileId, { ...params }) -> Profile</code>
 
 #### Predefined
 
@@ -4670,8 +5285,36 @@ Types:
 
 Methods:
 
-- <code title="put /accounts/{account_id}/dlp/profiles/predefined/{profile_id}">client.zeroTrust.dlp.profiles.predefined.<a href="./src/resources/zero-trust/dlp/profiles/predefined.ts">update</a>(profileId, { ...params }) -> PredefinedProfile</code>
-- <code title="get /accounts/{account_id}/dlp/profiles/predefined/{profile_id}">client.zeroTrust.dlp.profiles.predefined.<a href="./src/resources/zero-trust/dlp/profiles/predefined.ts">get</a>(profileId, { ...params }) -> PredefinedProfile</code>
+- <code title="put /accounts/{account_id}/dlp/profiles/predefined/{profile_id}">client.zeroTrust.dlp.profiles.predefined.<a href="./src/resources/zero-trust/dlp/profiles/predefined.ts">update</a>(profileId, { ...params }) -> Profile</code>
+- <code title="get /accounts/{account_id}/dlp/profiles/predefined/{profile_id}">client.zeroTrust.dlp.profiles.predefined.<a href="./src/resources/zero-trust/dlp/profiles/predefined.ts">get</a>(profileId, { ...params }) -> Profile</code>
+
+### Limits
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/dlp/limits.ts">LimitListResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/dlp/limits">client.zeroTrust.dlp.limits.<a href="./src/resources/zero-trust/dlp/limits.ts">list</a>({ ...params }) -> LimitListResponse</code>
+
+### Entries
+
+Types:
+
+- <code><a href="./src/resources/zero-trust/dlp/entries.ts">EntryCreateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/dlp/entries.ts">EntryUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/dlp/entries.ts">EntryListResponse</a></code>
+- <code><a href="./src/resources/zero-trust/dlp/entries.ts">EntryDeleteResponse</a></code>
+- <code><a href="./src/resources/zero-trust/dlp/entries.ts">EntryGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/dlp/entries">client.zeroTrust.dlp.entries.<a href="./src/resources/zero-trust/dlp/entries.ts">create</a>({ ...params }) -> EntryCreateResponse</code>
+- <code title="put /accounts/{account_id}/dlp/entries/{entry_id}">client.zeroTrust.dlp.entries.<a href="./src/resources/zero-trust/dlp/entries.ts">update</a>(entryId, { ...params }) -> EntryUpdateResponse</code>
+- <code title="get /accounts/{account_id}/dlp/entries">client.zeroTrust.dlp.entries.<a href="./src/resources/zero-trust/dlp/entries.ts">list</a>({ ...params }) -> EntryListResponsesSinglePage</code>
+- <code title="delete /accounts/{account_id}/dlp/entries/{entry_id}">client.zeroTrust.dlp.entries.<a href="./src/resources/zero-trust/dlp/entries.ts">delete</a>(entryId, { ...params }) -> EntryDeleteResponse | null</code>
+- <code title="get /accounts/{account_id}/dlp/entries/{entry_id}">client.zeroTrust.dlp.entries.<a href="./src/resources/zero-trust/dlp/entries.ts">get</a>(entryId, { ...params }) -> EntryGetResponse</code>
 
 ## Gateway
 
@@ -4695,6 +5338,7 @@ Methods:
 
 - <code title="put /accounts/{account_id}/gateway/audit_ssh_settings">client.zeroTrust.gateway.auditSSHSettings.<a href="./src/resources/zero-trust/gateway/audit-ssh-settings.ts">update</a>({ ...params }) -> GatewaySettings</code>
 - <code title="get /accounts/{account_id}/gateway/audit_ssh_settings">client.zeroTrust.gateway.auditSSHSettings.<a href="./src/resources/zero-trust/gateway/audit-ssh-settings.ts">get</a>({ ...params }) -> GatewaySettings</code>
+- <code title="post /accounts/{account_id}/gateway/audit_ssh_settings/rotate_seed">client.zeroTrust.gateway.auditSSHSettings.<a href="./src/resources/zero-trust/gateway/audit-ssh-settings.ts">rotateSeed</a>({ ...params }) -> GatewaySettings</code>
 
 ### Categories
 
@@ -4720,27 +5364,33 @@ Methods:
 
 Types:
 
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">ActivityLogSettings</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">AntiVirusSettings</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">BlockPageSettings</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">BodyScanningSettings</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">BrowserIsolationSettings</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">CustomCertificateSettings</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">ExtendedEmailMatching</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">FipsSettings</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">GatewayConfigurationSettings</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">NotificationSettings</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">ProtocolDetection</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">TLSSettings</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">ConfigurationUpdateResponse</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">ConfigurationEditResponse</a></code>
-- <code><a href="./src/resources/zero-trust/gateway/configurations.ts">ConfigurationGetResponse</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">ActivityLogSettings</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">AntiVirusSettings</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">BlockPageSettings</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">BodyScanningSettings</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">BrowserIsolationSettings</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">CustomCertificateSettings</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">ExtendedEmailMatching</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">FipsSettings</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">GatewayConfigurationSettings</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">NotificationSettings</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">ProtocolDetection</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">TLSSettings</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">ConfigurationUpdateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">ConfigurationEditResponse</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">ConfigurationGetResponse</a></code>
+
+Methods:
+
+- <code title="put /accounts/{account_id}/gateway/configuration">client.zeroTrust.gateway.configurations.<a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">update</a>({ ...params }) -> ConfigurationUpdateResponse</code>
+- <code title="patch /accounts/{account_id}/gateway/configuration">client.zeroTrust.gateway.configurations.<a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">edit</a>({ ...params }) -> ConfigurationEditResponse</code>
+- <code title="get /accounts/{account_id}/gateway/configuration">client.zeroTrust.gateway.configurations.<a href="./src/resources/zero-trust/gateway/configurations/configurations.ts">get</a>({ ...params }) -> ConfigurationGetResponse</code>
+
+#### CustomCertificate
 
 Methods:
 
-- <code title="put /accounts/{account_id}/gateway/configuration">client.zeroTrust.gateway.configurations.<a href="./src/resources/zero-trust/gateway/configurations.ts">update</a>({ ...params }) -> ConfigurationUpdateResponse</code>
-- <code title="patch /accounts/{account_id}/gateway/configuration">client.zeroTrust.gateway.configurations.<a href="./src/resources/zero-trust/gateway/configurations.ts">edit</a>({ ...params }) -> ConfigurationEditResponse</code>
-- <code title="get /accounts/{account_id}/gateway/configuration">client.zeroTrust.gateway.configurations.<a href="./src/resources/zero-trust/gateway/configurations.ts">get</a>({ ...params }) -> ConfigurationGetResponse</code>
+- <code title="get /accounts/{account_id}/gateway/configuration/custom_certificate">client.zeroTrust.gateway.configurations.customCertificate.<a href="./src/resources/zero-trust/gateway/configurations/custom-certificate.ts">get</a>({ ...params }) -> CustomCertificateSettings</code>
 
 ### Lists
 
@@ -4774,6 +5424,13 @@ Methods:
 
 Types:
 
+- <code><a href="./src/resources/zero-trust/gateway/locations.ts">DOHEndpoint</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/locations.ts">DOTEndpoint</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/locations.ts">Endpoint</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/locations.ts">IPNetwork</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/locations.ts">IPV4Endpoint</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/locations.ts">IPV6Endpoint</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/locations.ts">IPV6Network</a></code>
 - <code><a href="./src/resources/zero-trust/gateway/locations.ts">Location</a></code>
 - <code><a href="./src/resources/zero-trust/gateway/locations.ts">LocationDeleteResponse</a></code>
 
@@ -4811,7 +5468,7 @@ Methods:
 - <code title="get /accounts/{account_id}/gateway/proxy_endpoints">client.zeroTrust.gateway.proxyEndpoints.<a href="./src/resources/zero-trust/gateway/proxy-endpoints.ts">list</a>({ ...params }) -> ProxyEndpoint</code>
 - <code title="delete /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}">client.zeroTrust.gateway.proxyEndpoints.<a href="./src/resources/zero-trust/gateway/proxy-endpoints.ts">delete</a>(proxyEndpointId, { ...params }) -> ProxyEndpointDeleteResponse</code>
 - <code title="patch /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}">client.zeroTrust.gateway.proxyEndpoints.<a href="./src/resources/zero-trust/gateway/proxy-endpoints.ts">edit</a>(proxyEndpointId, { ...params }) -> ProxyEndpoint</code>
-- <code title="get /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}">client.zeroTrust.gateway.proxyEndpoints.<a href="./src/resources/zero-trust/gateway/proxy-endpoints.ts">get</a>(proxyEndpointId, { ...params }) -> ProxyEndpointGetResponse | null</code>
+- <code title="get /accounts/{account_id}/gateway/proxy_endpoints/{proxy_endpoint_id}">client.zeroTrust.gateway.proxyEndpoints.<a href="./src/resources/zero-trust/gateway/proxy-endpoints.ts">get</a>(proxyEndpointId, { ...params }) -> ProxyEndpointGetResponse</code>
 
 ### Rules
 
@@ -4832,6 +5489,7 @@ Methods:
 - <code title="get /accounts/{account_id}/gateway/rules">client.zeroTrust.gateway.rules.<a href="./src/resources/zero-trust/gateway/rules.ts">list</a>({ ...params }) -> GatewayRulesSinglePage</code>
 - <code title="delete /accounts/{account_id}/gateway/rules/{rule_id}">client.zeroTrust.gateway.rules.<a href="./src/resources/zero-trust/gateway/rules.ts">delete</a>(ruleId, { ...params }) -> RuleDeleteResponse</code>
 - <code title="get /accounts/{account_id}/gateway/rules/{rule_id}">client.zeroTrust.gateway.rules.<a href="./src/resources/zero-trust/gateway/rules.ts">get</a>(ruleId, { ...params }) -> GatewayRule</code>
+- <code title="post /accounts/{account_id}/gateway/rules/{rule_id}/reset_expiration">client.zeroTrust.gateway.rules.<a href="./src/resources/zero-trust/gateway/rules.ts">resetExpiration</a>(ruleId, { ...params }) -> GatewayRule</code>
 
 ### Certificates
 
@@ -4840,6 +5498,8 @@ Types:
 - <code><a href="./src/resources/zero-trust/gateway/certificates.ts">CertificateCreateResponse</a></code>
 - <code><a href="./src/resources/zero-trust/gateway/certificates.ts">CertificateListResponse</a></code>
 - <code><a href="./src/resources/zero-trust/gateway/certificates.ts">CertificateDeleteResponse</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/certificates.ts">CertificateActivateResponse</a></code>
+- <code><a href="./src/resources/zero-trust/gateway/certificates.ts">CertificateDeactivateResponse</a></code>
 - <code><a href="./src/resources/zero-trust/gateway/certificates.ts">CertificateGetResponse</a></code>
 
 Methods:
@@ -4847,6 +5507,8 @@ Methods:
 - <code title="post /accounts/{account_id}/gateway/certificates">client.zeroTrust.gateway.certificates.<a href="./src/resources/zero-trust/gateway/certificates.ts">create</a>({ ...params }) -> CertificateCreateResponse</code>
 - <code title="get /accounts/{account_id}/gateway/certificates">client.zeroTrust.gateway.certificates.<a href="./src/resources/zero-trust/gateway/certificates.ts">list</a>({ ...params }) -> CertificateListResponsesSinglePage</code>
 - <code title="delete /accounts/{account_id}/gateway/certificates/{certificate_id}">client.zeroTrust.gateway.certificates.<a href="./src/resources/zero-trust/gateway/certificates.ts">delete</a>(certificateId, { ...params }) -> CertificateDeleteResponse</code>
+- <code title="post /accounts/{account_id}/gateway/certificates/{certificate_id}/activate">client.zeroTrust.gateway.certificates.<a href="./src/resources/zero-trust/gateway/certificates.ts">activate</a>(certificateId, { ...params }) -> CertificateActivateResponse</code>
+- <code title="post /accounts/{account_id}/gateway/certificates/{certificate_id}/deactivate">client.zeroTrust.gateway.certificates.<a href="./src/resources/zero-trust/gateway/certificates.ts">deactivate</a>(certificateId, { ...params }) -> CertificateDeactivateResponse</code>
 - <code title="get /accounts/{account_id}/gateway/certificates/{certificate_id}">client.zeroTrust.gateway.certificates.<a href="./src/resources/zero-trust/gateway/certificates.ts">get</a>(certificateId, { ...params }) -> CertificateGetResponse</code>
 
 ## Networks
@@ -4865,6 +5527,7 @@ Methods:
 - <code title="get /accounts/{account_id}/teamnet/routes">client.zeroTrust.networks.routes.<a href="./src/resources/zero-trust/networks/routes/routes.ts">list</a>({ ...params }) -> TeamnetsV4PagePaginationArray</code>
 - <code title="delete /accounts/{account_id}/teamnet/routes/{route_id}">client.zeroTrust.networks.routes.<a href="./src/resources/zero-trust/networks/routes/routes.ts">delete</a>(routeId, { ...params }) -> Route</code>
 - <code title="patch /accounts/{account_id}/teamnet/routes/{route_id}">client.zeroTrust.networks.routes.<a href="./src/resources/zero-trust/networks/routes/routes.ts">edit</a>(routeId, { ...params }) -> Route</code>
+- <code title="get /accounts/{account_id}/teamnet/routes/{route_id}">client.zeroTrust.networks.routes.<a href="./src/resources/zero-trust/networks/routes/routes.ts">get</a>(routeId, { ...params }) -> Route</code>
 
 #### IPs
 
@@ -4885,16 +5548,14 @@ Methods:
 Types:
 
 - <code><a href="./src/resources/zero-trust/networks/virtual-networks.ts">VirtualNetwork</a></code>
-- <code><a href="./src/resources/zero-trust/networks/virtual-networks.ts">VirtualNetworkCreateResponse</a></code>
-- <code><a href="./src/resources/zero-trust/networks/virtual-networks.ts">VirtualNetworkDeleteResponse</a></code>
-- <code><a href="./src/resources/zero-trust/networks/virtual-networks.ts">VirtualNetworkEditResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/teamnet/virtual_networks">client.zeroTrust.networks.virtualNetworks.<a href="./src/resources/zero-trust/networks/virtual-networks.ts">create</a>({ ...params }) -> VirtualNetworkCreateResponse</code>
+- <code title="post /accounts/{account_id}/teamnet/virtual_networks">client.zeroTrust.networks.virtualNetworks.<a href="./src/resources/zero-trust/networks/virtual-networks.ts">create</a>({ ...params }) -> VirtualNetwork</code>
 - <code title="get /accounts/{account_id}/teamnet/virtual_networks">client.zeroTrust.networks.virtualNetworks.<a href="./src/resources/zero-trust/networks/virtual-networks.ts">list</a>({ ...params }) -> VirtualNetworksSinglePage</code>
-- <code title="delete /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}">client.zeroTrust.networks.virtualNetworks.<a href="./src/resources/zero-trust/networks/virtual-networks.ts">delete</a>(virtualNetworkId, { ...params }) -> VirtualNetworkDeleteResponse</code>
-- <code title="patch /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}">client.zeroTrust.networks.virtualNetworks.<a href="./src/resources/zero-trust/networks/virtual-networks.ts">edit</a>(virtualNetworkId, { ...params }) -> VirtualNetworkEditResponse</code>
+- <code title="delete /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}">client.zeroTrust.networks.virtualNetworks.<a href="./src/resources/zero-trust/networks/virtual-networks.ts">delete</a>(virtualNetworkId, { ...params }) -> VirtualNetwork</code>
+- <code title="patch /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}">client.zeroTrust.networks.virtualNetworks.<a href="./src/resources/zero-trust/networks/virtual-networks.ts">edit</a>(virtualNetworkId, { ...params }) -> VirtualNetwork</code>
+- <code title="get /accounts/{account_id}/teamnet/virtual_networks/{virtual_network_id}">client.zeroTrust.networks.virtualNetworks.<a href="./src/resources/zero-trust/networks/virtual-networks.ts">get</a>(virtualNetworkId, { ...params }) -> VirtualNetwork</code>
 
 ## RiskScoring
 
@@ -4905,8 +5566,8 @@ Types:
 
 Methods:
 
-- <code title="get /accounts/{account_identifier}/zt_risk_scoring/{user_id}">client.zeroTrust.riskScoring.<a href="./src/resources/zero-trust/risk-scoring/risk-scoring.ts">get</a>(accountIdentifier, userId, { ...params }) -> RiskScoringGetResponse</code>
-- <code title="post /accounts/{account_identifier}/zt_risk_scoring/{user_id}/reset">client.zeroTrust.riskScoring.<a href="./src/resources/zero-trust/risk-scoring/risk-scoring.ts">reset</a>(accountIdentifier, userId) -> RiskScoringResetResponse</code>
+- <code title="get /accounts/{account_id}/zt_risk_scoring/{user_id}">client.zeroTrust.riskScoring.<a href="./src/resources/zero-trust/risk-scoring/risk-scoring.ts">get</a>(userId, { ...params }) -> RiskScoringGetResponse</code>
+- <code title="post /accounts/{account_id}/zt_risk_scoring/{user_id}/reset">client.zeroTrust.riskScoring.<a href="./src/resources/zero-trust/risk-scoring/risk-scoring.ts">reset</a>(userId, { ...params }) -> RiskScoringResetResponse | null</code>
 
 ### Behaviours
 
@@ -4917,8 +5578,8 @@ Types:
 
 Methods:
 
-- <code title="put /accounts/{account_identifier}/zt_risk_scoring/behaviors">client.zeroTrust.riskScoring.behaviours.<a href="./src/resources/zero-trust/risk-scoring/behaviours.ts">update</a>(accountIdentifier, { ...params }) -> BehaviourUpdateResponse</code>
-- <code title="get /accounts/{account_identifier}/zt_risk_scoring/behaviors">client.zeroTrust.riskScoring.behaviours.<a href="./src/resources/zero-trust/risk-scoring/behaviours.ts">get</a>(accountIdentifier) -> BehaviourGetResponse</code>
+- <code title="put /accounts/{account_id}/zt_risk_scoring/behaviors">client.zeroTrust.riskScoring.behaviours.<a href="./src/resources/zero-trust/risk-scoring/behaviours.ts">update</a>({ ...params }) -> BehaviourUpdateResponse</code>
+- <code title="get /accounts/{account_id}/zt_risk_scoring/behaviors">client.zeroTrust.riskScoring.behaviours.<a href="./src/resources/zero-trust/risk-scoring/behaviours.ts">get</a>({ ...params }) -> BehaviourGetResponse</code>
 
 ### Summary
 
@@ -4928,7 +5589,7 @@ Types:
 
 Methods:
 
-- <code title="get /accounts/{account_identifier}/zt_risk_scoring/summary">client.zeroTrust.riskScoring.summary.<a href="./src/resources/zero-trust/risk-scoring/summary.ts">get</a>(accountIdentifier, { ...params }) -> SummaryGetResponse</code>
+- <code title="get /accounts/{account_id}/zt_risk_scoring/summary">client.zeroTrust.riskScoring.summary.<a href="./src/resources/zero-trust/risk-scoring/summary.ts">get</a>({ ...params }) -> SummaryGetResponse</code>
 
 ### Integrations
 
@@ -4945,7 +5606,7 @@ Methods:
 - <code title="post /accounts/{account_id}/zt_risk_scoring/integrations">client.zeroTrust.riskScoring.integrations.<a href="./src/resources/zero-trust/risk-scoring/integrations/integrations.ts">create</a>({ ...params }) -> IntegrationCreateResponse</code>
 - <code title="put /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}">client.zeroTrust.riskScoring.integrations.<a href="./src/resources/zero-trust/risk-scoring/integrations/integrations.ts">update</a>(integrationId, { ...params }) -> IntegrationUpdateResponse</code>
 - <code title="get /accounts/{account_id}/zt_risk_scoring/integrations">client.zeroTrust.riskScoring.integrations.<a href="./src/resources/zero-trust/risk-scoring/integrations/integrations.ts">list</a>({ ...params }) -> IntegrationListResponsesSinglePage</code>
-- <code title="delete /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}">client.zeroTrust.riskScoring.integrations.<a href="./src/resources/zero-trust/risk-scoring/integrations/integrations.ts">delete</a>(integrationId, { ...params }) -> IntegrationDeleteResponse</code>
+- <code title="delete /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}">client.zeroTrust.riskScoring.integrations.<a href="./src/resources/zero-trust/risk-scoring/integrations/integrations.ts">delete</a>(integrationId, { ...params }) -> IntegrationDeleteResponse | null</code>
 - <code title="get /accounts/{account_id}/zt_risk_scoring/integrations/{integration_id}">client.zeroTrust.riskScoring.integrations.<a href="./src/resources/zero-trust/risk-scoring/integrations/integrations.ts">get</a>(integrationId, { ...params }) -> IntegrationGetResponse</code>
 
 #### References
@@ -4958,24 +5619,24 @@ Methods:
 
 - <code title="get /accounts/{account_id}/zt_risk_scoring/integrations/reference_id/{reference_id}">client.zeroTrust.riskScoring.integrations.references.<a href="./src/resources/zero-trust/risk-scoring/integrations/references.ts">get</a>(referenceId, { ...params }) -> ReferenceGetResponse</code>
 
-# Challenges
+# Turnstile
 
 ## Widgets
 
 Types:
 
-- <code><a href="./src/resources/challenges/widgets.ts">Widget</a></code>
-- <code><a href="./src/resources/challenges/widgets.ts">WidgetDomain</a></code>
-- <code><a href="./src/resources/challenges/widgets.ts">WidgetListResponse</a></code>
+- <code><a href="./src/resources/turnstile/widgets.ts">Widget</a></code>
+- <code><a href="./src/resources/turnstile/widgets.ts">WidgetDomain</a></code>
+- <code><a href="./src/resources/turnstile/widgets.ts">WidgetListResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/challenges/widgets">client.challenges.widgets.<a href="./src/resources/challenges/widgets.ts">create</a>({ ...params }) -> Widget</code>
-- <code title="put /accounts/{account_id}/challenges/widgets/{sitekey}">client.challenges.widgets.<a href="./src/resources/challenges/widgets.ts">update</a>(sitekey, { ...params }) -> Widget</code>
-- <code title="get /accounts/{account_id}/challenges/widgets">client.challenges.widgets.<a href="./src/resources/challenges/widgets.ts">list</a>({ ...params }) -> WidgetListResponsesV4PagePaginationArray</code>
-- <code title="delete /accounts/{account_id}/challenges/widgets/{sitekey}">client.challenges.widgets.<a href="./src/resources/challenges/widgets.ts">delete</a>(sitekey, { ...params }) -> Widget</code>
-- <code title="get /accounts/{account_id}/challenges/widgets/{sitekey}">client.challenges.widgets.<a href="./src/resources/challenges/widgets.ts">get</a>(sitekey, { ...params }) -> Widget</code>
-- <code title="post /accounts/{account_id}/challenges/widgets/{sitekey}/rotate_secret">client.challenges.widgets.<a href="./src/resources/challenges/widgets.ts">rotateSecret</a>(sitekey, { ...params }) -> Widget</code>
+- <code title="post /accounts/{account_id}/challenges/widgets">client.turnstile.widgets.<a href="./src/resources/turnstile/widgets.ts">create</a>({ ...params }) -> Widget</code>
+- <code title="put /accounts/{account_id}/challenges/widgets/{sitekey}">client.turnstile.widgets.<a href="./src/resources/turnstile/widgets.ts">update</a>(sitekey, { ...params }) -> Widget</code>
+- <code title="get /accounts/{account_id}/challenges/widgets">client.turnstile.widgets.<a href="./src/resources/turnstile/widgets.ts">list</a>({ ...params }) -> WidgetListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/challenges/widgets/{sitekey}">client.turnstile.widgets.<a href="./src/resources/turnstile/widgets.ts">delete</a>(sitekey, { ...params }) -> Widget</code>
+- <code title="get /accounts/{account_id}/challenges/widgets/{sitekey}">client.turnstile.widgets.<a href="./src/resources/turnstile/widgets.ts">get</a>(sitekey, { ...params }) -> Widget</code>
+- <code title="post /accounts/{account_id}/challenges/widgets/{sitekey}/rotate_secret">client.turnstile.widgets.<a href="./src/resources/turnstile/widgets.ts">rotateSecret</a>(sitekey, { ...params }) -> Widget</code>
 
 # Hyperdrive
 
@@ -4992,12 +5653,12 @@ Types:
 
 Methods:
 
-- <code title="post /accounts/{account_id}/hyperdrive/configs">client.hyperdrive.configs.<a href="./src/resources/hyperdrive/configs.ts">create</a>({ ...params }) -> Hyperdrive | null</code>
-- <code title="put /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/resources/hyperdrive/configs.ts">update</a>(hyperdriveId, { ...params }) -> Hyperdrive | null</code>
+- <code title="post /accounts/{account_id}/hyperdrive/configs">client.hyperdrive.configs.<a href="./src/resources/hyperdrive/configs.ts">create</a>({ ...params }) -> Hyperdrive</code>
+- <code title="put /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/resources/hyperdrive/configs.ts">update</a>(hyperdriveId, { ...params }) -> Hyperdrive</code>
 - <code title="get /accounts/{account_id}/hyperdrive/configs">client.hyperdrive.configs.<a href="./src/resources/hyperdrive/configs.ts">list</a>({ ...params }) -> HyperdrivesSinglePage</code>
-- <code title="delete /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/resources/hyperdrive/configs.ts">delete</a>(hyperdriveId, { ...params }) -> ConfigDeleteResponse</code>
-- <code title="patch /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/resources/hyperdrive/configs.ts">edit</a>(hyperdriveId, { ...params }) -> Hyperdrive | null</code>
-- <code title="get /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/resources/hyperdrive/configs.ts">get</a>(hyperdriveId, { ...params }) -> Hyperdrive | null</code>
+- <code title="delete /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/resources/hyperdrive/configs.ts">delete</a>(hyperdriveId, { ...params }) -> ConfigDeleteResponse | null</code>
+- <code title="patch /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/resources/hyperdrive/configs.ts">edit</a>(hyperdriveId, { ...params }) -> Hyperdrive</code>
+- <code title="get /accounts/{account_id}/hyperdrive/configs/{hyperdrive_id}">client.hyperdrive.configs.<a href="./src/resources/hyperdrive/configs.ts">get</a>(hyperdriveId, { ...params }) -> Hyperdrive</code>
 
 # RUM
 
@@ -5023,6 +5684,7 @@ Types:
 - <code><a href="./src/resources/rum/rules.ts">RUMRule</a></code>
 - <code><a href="./src/resources/rum/rules.ts">RuleListResponse</a></code>
 - <code><a href="./src/resources/rum/rules.ts">RuleDeleteResponse</a></code>
+- <code><a href="./src/resources/rum/rules.ts">RuleBulkCreateResponse</a></code>
 
 Methods:
 
@@ -5030,66 +5692,129 @@ Methods:
 - <code title="put /accounts/{account_id}/rum/v2/{ruleset_id}/rule/{rule_id}">client.rum.rules.<a href="./src/resources/rum/rules.ts">update</a>(rulesetId, ruleId, { ...params }) -> RUMRule</code>
 - <code title="get /accounts/{account_id}/rum/v2/{ruleset_id}/rules">client.rum.rules.<a href="./src/resources/rum/rules.ts">list</a>(rulesetId, { ...params }) -> RuleListResponse</code>
 - <code title="delete /accounts/{account_id}/rum/v2/{ruleset_id}/rule/{rule_id}">client.rum.rules.<a href="./src/resources/rum/rules.ts">delete</a>(rulesetId, ruleId, { ...params }) -> RuleDeleteResponse</code>
+- <code title="post /accounts/{account_id}/rum/v2/{ruleset_id}/rules">client.rum.rules.<a href="./src/resources/rum/rules.ts">bulkCreate</a>(rulesetId, { ...params }) -> RuleBulkCreateResponse</code>
+
+# Vectorize
+
+## Indexes
+
+Types:
+
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">CreateIndex</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexDeleteVectorsByID</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexDimensionConfiguration</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexInsert</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexQuery</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexUpsert</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexDeleteResponse</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexDeleteByIDsResponse</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexGetByIDsResponse</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexInfoResponse</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexInsertResponse</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexQueryResponse</a></code>
+- <code><a href="./src/resources/vectorize/indexes/indexes.ts">IndexUpsertResponse</a></code>
+
+Methods:
 
-# Vectorize
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes/indexes.ts">create</a>({ ...params }) -> CreateIndex | null</code>
+- <code title="get /accounts/{account_id}/vectorize/v2/indexes">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes/indexes.ts">list</a>({ ...params }) -> CreateIndicesSinglePage</code>
+- <code title="delete /accounts/{account_id}/vectorize/v2/indexes/{index_name}">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes/indexes.ts">delete</a>(indexName, { ...params }) -> IndexDeleteResponse | null</code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/delete_by_ids">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes/indexes.ts">deleteByIds</a>(indexName, { ...params }) -> IndexDeleteByIDsResponse | null</code>
+- <code title="get /accounts/{account_id}/vectorize/v2/indexes/{index_name}">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes/indexes.ts">get</a>(indexName, { ...params }) -> CreateIndex | null</code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/get_by_ids">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes/indexes.ts">getByIds</a>(indexName, { ...params }) -> IndexGetByIDsResponse | null</code>
+- <code title="get /accounts/{account_id}/vectorize/v2/indexes/{index_name}/info">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes/indexes.ts">info</a>(indexName, { ...params }) -> IndexInfoResponse | null</code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/insert">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes/indexes.ts">insert</a>(indexName, { ...params }) -> IndexInsertResponse | null</code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/query">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes/indexes.ts">query</a>(indexName, { ...params }) -> IndexQueryResponse | null</code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/upsert">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes/indexes.ts">upsert</a>(indexName, { ...params }) -> IndexUpsertResponse | null</code>
 
-## Indexes
+### MetadataIndex
 
 Types:
 
-- <code><a href="./src/resources/vectorize/indexes.ts">CreateIndex</a></code>
-- <code><a href="./src/resources/vectorize/indexes.ts">IndexDeleteVectorsByID</a></code>
-- <code><a href="./src/resources/vectorize/indexes.ts">IndexDimensionConfiguration</a></code>
-- <code><a href="./src/resources/vectorize/indexes.ts">IndexInsert</a></code>
-- <code><a href="./src/resources/vectorize/indexes.ts">IndexQuery</a></code>
-- <code><a href="./src/resources/vectorize/indexes.ts">IndexUpsert</a></code>
-- <code><a href="./src/resources/vectorize/indexes.ts">IndexDeleteResponse</a></code>
-- <code><a href="./src/resources/vectorize/indexes.ts">IndexGetByIDsResponse</a></code>
+- <code><a href="./src/resources/vectorize/indexes/metadata-index.ts">MetadataIndexCreateResponse</a></code>
+- <code><a href="./src/resources/vectorize/indexes/metadata-index.ts">MetadataIndexListResponse</a></code>
+- <code><a href="./src/resources/vectorize/indexes/metadata-index.ts">MetadataIndexDeleteResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/vectorize/indexes">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes.ts">create</a>({ ...params }) -> CreateIndex | null</code>
-- <code title="put /accounts/{account_id}/vectorize/indexes/{index_name}">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes.ts">update</a>(indexName, { ...params }) -> CreateIndex | null</code>
-- <code title="get /accounts/{account_id}/vectorize/indexes">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes.ts">list</a>({ ...params }) -> CreateIndicesSinglePage</code>
-- <code title="delete /accounts/{account_id}/vectorize/indexes/{index_name}">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes.ts">delete</a>(indexName, { ...params }) -> IndexDeleteResponse</code>
-- <code title="post /accounts/{account_id}/vectorize/indexes/{index_name}/delete-by-ids">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes.ts">deleteByIds</a>(indexName, { ...params }) -> IndexDeleteVectorsByID | null</code>
-- <code title="get /accounts/{account_id}/vectorize/indexes/{index_name}">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes.ts">get</a>(indexName, { ...params }) -> CreateIndex | null</code>
-- <code title="post /accounts/{account_id}/vectorize/indexes/{index_name}/get-by-ids">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes.ts">getByIds</a>(indexName, { ...params }) -> IndexGetByIDsResponse | null</code>
-- <code title="post /accounts/{account_id}/vectorize/indexes/{index_name}/insert">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes.ts">insert</a>(indexName, { ...params }) -> IndexInsert | null</code>
-- <code title="post /accounts/{account_id}/vectorize/indexes/{index_name}/query">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes.ts">query</a>(indexName, { ...params }) -> IndexQuery | null</code>
-- <code title="post /accounts/{account_id}/vectorize/indexes/{index_name}/upsert">client.vectorize.indexes.<a href="./src/resources/vectorize/indexes.ts">upsert</a>(indexName, { ...params }) -> IndexUpsert | null</code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/create">client.vectorize.indexes.metadataIndex.<a href="./src/resources/vectorize/indexes/metadata-index.ts">create</a>(indexName, { ...params }) -> MetadataIndexCreateResponse | null</code>
+- <code title="get /accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/list">client.vectorize.indexes.metadataIndex.<a href="./src/resources/vectorize/indexes/metadata-index.ts">list</a>(indexName, { ...params }) -> MetadataIndexListResponse | null</code>
+- <code title="post /accounts/{account_id}/vectorize/v2/indexes/{index_name}/metadata_index/delete">client.vectorize.indexes.metadataIndex.<a href="./src/resources/vectorize/indexes/metadata-index.ts">delete</a>(indexName, { ...params }) -> MetadataIndexDeleteResponse | null</code>
 
 # URLScanner
 
 Types:
 
-- <code><a href="./src/resources/url-scanner/url-scanner.ts">URLScannerScanResponse</a></code>
+- <code><a href="./src/resources/url-scanner/url-scanner.ts">URLScannerDomain</a></code>
+- <code><a href="./src/resources/url-scanner/url-scanner.ts">URLScannerTask</a></code>
+
+## Responses
+
+Types:
+
+- <code><a href="./src/resources/url-scanner/responses.ts">ResponseGetResponse</a></code>
 
 Methods:
 
-- <code title="get /accounts/{accountId}/urlscanner/scan">client.urlScanner.<a href="./src/resources/url-scanner/url-scanner.ts">scan</a>(accountId, { ...params }) -> URLScannerScanResponse</code>
+- <code title="get /accounts/{account_id}/urlscanner/v2/responses/{response_id}">client.urlScanner.responses.<a href="./src/resources/url-scanner/responses.ts">get</a>(responseId, { ...params }) -> string</code>
 
 ## Scans
 
 Types:
 
-- <code><a href="./src/resources/url-scanner/scans.ts">URLScannerDomain</a></code>
-- <code><a href="./src/resources/url-scanner/scans.ts">URLScannerTask</a></code>
 - <code><a href="./src/resources/url-scanner/scans.ts">ScanCreateResponse</a></code>
+- <code><a href="./src/resources/url-scanner/scans.ts">ScanListResponse</a></code>
+- <code><a href="./src/resources/url-scanner/scans.ts">ScanBulkCreateResponse</a></code>
+- <code><a href="./src/resources/url-scanner/scans.ts">ScanDOMResponse</a></code>
 - <code><a href="./src/resources/url-scanner/scans.ts">ScanGetResponse</a></code>
-- <code><a href="./src/resources/url-scanner/scans.ts">ScanHarResponse</a></code>
+- <code><a href="./src/resources/url-scanner/scans.ts">ScanHARResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{accountId}/urlscanner/scan">client.urlScanner.scans.<a href="./src/resources/url-scanner/scans.ts">create</a>(accountId, { ...params }) -> ScanCreateResponse</code>
-- <code title="get /accounts/{accountId}/urlscanner/scan/{scanId}">client.urlScanner.scans.<a href="./src/resources/url-scanner/scans.ts">get</a>(accountId, scanId, { ...params }) -> ScanGetResponse</code>
-- <code title="get /accounts/{accountId}/urlscanner/scan/{scanId}/har">client.urlScanner.scans.<a href="./src/resources/url-scanner/scans.ts">har</a>(accountId, scanId) -> ScanHarResponse</code>
-- <code title="get /accounts/{accountId}/urlscanner/scan/{scanId}/screenshot">client.urlScanner.scans.<a href="./src/resources/url-scanner/scans.ts">screenshot</a>(accountId, scanId, { ...params }) -> Response</code>
+- <code title="post /accounts/{account_id}/urlscanner/v2/scan">client.urlScanner.scans.<a href="./src/resources/url-scanner/scans.ts">create</a>({ ...params }) -> ScanCreateResponse</code>
+- <code title="get /accounts/{account_id}/urlscanner/v2/search">client.urlScanner.scans.<a href="./src/resources/url-scanner/scans.ts">list</a>({ ...params }) -> ScanListResponse</code>
+- <code title="post /accounts/{account_id}/urlscanner/v2/bulk">client.urlScanner.scans.<a href="./src/resources/url-scanner/scans.ts">bulkCreate</a>([ ...body ]) -> ScanBulkCreateResponse</code>
+- <code title="get /accounts/{account_id}/urlscanner/v2/dom/{scan_id}">client.urlScanner.scans.<a href="./src/resources/url-scanner/scans.ts">dom</a>(scanId, { ...params }) -> string</code>
+- <code title="get /accounts/{account_id}/urlscanner/v2/result/{scan_id}">client.urlScanner.scans.<a href="./src/resources/url-scanner/scans.ts">get</a>(scanId, { ...params }) -> ScanGetResponse</code>
+- <code title="get /accounts/{account_id}/urlscanner/v2/har/{scan_id}">client.urlScanner.scans.<a href="./src/resources/url-scanner/scans.ts">har</a>(scanId, { ...params }) -> ScanHARResponse</code>
+- <code title="get /accounts/{account_id}/urlscanner/v2/screenshots/{scan_id}.png">client.urlScanner.scans.<a href="./src/resources/url-scanner/scans.ts">screenshot</a>(scanId, { ...params }) -> Response</code>
 
 # Radar
 
+## AI
+
+### Bots
+
+#### Summary
+
+Types:
+
+- <code><a href="./src/resources/radar/ai/bots/summary.ts">SummaryUserAgentResponse</a></code>
+
+Methods:
+
+- <code title="get /radar/ai/bots/summary/user_agent">client.radar.ai.bots.summary.<a href="./src/resources/radar/ai/bots/summary.ts">userAgent</a>({ ...params }) -> SummaryUserAgentResponse</code>
+
+### TimeseriesGroups
+
+Types:
+
+- <code><a href="./src/resources/radar/ai/timeseries-groups.ts">TimeseriesGroupUserAgentResponse</a></code>
+
+Methods:
+
+- <code title="get /radar/ai/bots/timeseries_groups/user_agent">client.radar.ai.timeseriesGroups.<a href="./src/resources/radar/ai/timeseries-groups.ts">userAgent</a>({ ...params }) -> TimeseriesGroupUserAgentResponse</code>
+
 ## Annotations
 
+Types:
+
+- <code><a href="./src/resources/radar/annotations/annotations.ts">AnnotationListResponse</a></code>
+
+Methods:
+
+- <code title="get /radar/annotations">client.radar.annotations.<a href="./src/resources/radar/annotations/annotations.ts">list</a>({ ...params }) -> AnnotationListResponse</code>
+
 ### Outages
 
 Types:
@@ -5216,10 +5941,12 @@ Methods:
 
 Types:
 
+- <code><a href="./src/resources/radar/netflows/netflows.ts">NetflowSummaryResponse</a></code>
 - <code><a href="./src/resources/radar/netflows/netflows.ts">NetflowTimeseriesResponse</a></code>
 
 Methods:
 
+- <code title="get /radar/netflows/summary">client.radar.netflows.<a href="./src/resources/radar/netflows/netflows.ts">summary</a>({ ...params }) -> NetflowSummaryResponse</code>
 - <code title="get /radar/netflows/timeseries">client.radar.netflows.<a href="./src/resources/radar/netflows/netflows.ts">timeseries</a>({ ...params }) -> NetflowTimeseriesResponse</code>
 
 ### Top
@@ -5689,19 +6416,6 @@ Methods:
 
 - <code title="get /radar/http/timeseries">client.radar.http.<a href="./src/resources/radar/http/http.ts">timeseries</a>({ ...params }) -> HTTPTimeseriesResponse</code>
 
-### Top
-
-Types:
-
-- <code><a href="./src/resources/radar/http/top.ts">Browser</a></code>
-- <code><a href="./src/resources/radar/http/top.ts">TopBrowserFamiliesResponse</a></code>
-- <code><a href="./src/resources/radar/http/top.ts">TopBrowsersResponse</a></code>
-
-Methods:
-
-- <code title="get /radar/http/top/browser_families">client.radar.http.top.<a href="./src/resources/radar/http/top.ts">browserFamilies</a>({ ...params }) -> TopBrowserFamiliesResponse</code>
-- <code title="get /radar/http/top/browsers">client.radar.http.top.<a href="./src/resources/radar/http/top.ts">browsers</a>({ ...params }) -> TopBrowsersResponse</code>
-
 ### Locations
 
 Types:
@@ -5934,6 +6648,18 @@ Methods:
 - <code title="get /radar/http/timeseries_groups/post_quantum">client.radar.http.timeseriesGroups.<a href="./src/resources/radar/http/timeseries-groups.ts">postQuantum</a>({ ...params }) -> TimeseriesGroupPostQuantumResponse</code>
 - <code title="get /radar/http/timeseries_groups/tls_version">client.radar.http.timeseriesGroups.<a href="./src/resources/radar/http/timeseries-groups.ts">tlsVersion</a>({ ...params }) -> TimeseriesGroupTLSVersionResponse</code>
 
+### Top
+
+Types:
+
+- <code><a href="./src/resources/radar/http/top.ts">TopBrowserResponse</a></code>
+- <code><a href="./src/resources/radar/http/top.ts">TopBrowserFamilyResponse</a></code>
+
+Methods:
+
+- <code title="get /radar/http/top/browser">client.radar.http.top.<a href="./src/resources/radar/http/top.ts">browser</a>({ ...params }) -> TopBrowserResponse</code>
+- <code title="get /radar/http/top/browser_family">client.radar.http.top.<a href="./src/resources/radar/http/top.ts">browserFamily</a>({ ...params }) -> TopBrowserFamilyResponse</code>
+
 ## Quality
 
 ### IQI
@@ -6102,13 +6828,12 @@ Methods:
 Types:
 
 - <code><a href="./src/resources/speed/pages/tests.ts">Test</a></code>
-- <code><a href="./src/resources/speed/pages/tests.ts">TestListResponse</a></code>
 - <code><a href="./src/resources/speed/pages/tests.ts">TestDeleteResponse</a></code>
 
 Methods:
 
 - <code title="post /zones/{zone_id}/speed_api/pages/{url}/tests">client.speed.pages.tests.<a href="./src/resources/speed/pages/tests.ts">create</a>(url, { ...params }) -> Test</code>
-- <code title="get /zones/{zone_id}/speed_api/pages/{url}/tests">client.speed.pages.tests.<a href="./src/resources/speed/pages/tests.ts">list</a>(url, { ...params }) -> TestListResponse</code>
+- <code title="get /zones/{zone_id}/speed_api/pages/{url}/tests">client.speed.pages.tests.<a href="./src/resources/speed/pages/tests.ts">list</a>(url, { ...params }) -> TestsV4PagePaginationArray</code>
 - <code title="delete /zones/{zone_id}/speed_api/pages/{url}/tests">client.speed.pages.tests.<a href="./src/resources/speed/pages/tests.ts">delete</a>(url, { ...params }) -> TestDeleteResponse</code>
 - <code title="get /zones/{zone_id}/speed_api/pages/{url}/tests/{test_id}">client.speed.pages.tests.<a href="./src/resources/speed/pages/tests.ts">get</a>(url, testId, { ...params }) -> Test</code>
 
@@ -6139,7 +6864,7 @@ Methods:
 
 - <code title="put /zones/{zone_id}/hostnames/settings/{setting_id}/{hostname}">client.hostnames.settings.tls.<a href="./src/resources/hostnames/settings/tls.ts">update</a>(settingId, hostname, { ...params }) -> Setting</code>
 - <code title="delete /zones/{zone_id}/hostnames/settings/{setting_id}/{hostname}">client.hostnames.settings.tls.<a href="./src/resources/hostnames/settings/tls.ts">delete</a>(settingId, hostname, { ...params }) -> TLSDeleteResponse</code>
-- <code title="get /zones/{zone_id}/hostnames/settings/{setting_id}">client.hostnames.settings.tls.<a href="./src/resources/hostnames/settings/tls.ts">get</a>(settingId, { ...params }) -> TLSGetResponse | null</code>
+- <code title="get /zones/{zone_id}/hostnames/settings/{setting_id}">client.hostnames.settings.tls.<a href="./src/resources/hostnames/settings/tls.ts">get</a>(settingId, { ...params }) -> TLSGetResponse</code>
 
 # Snippets
 
@@ -6167,47 +6892,51 @@ Types:
 
 - <code><a href="./src/resources/snippets/rules.ts">RuleUpdateResponse</a></code>
 - <code><a href="./src/resources/snippets/rules.ts">RuleListResponse</a></code>
+- <code><a href="./src/resources/snippets/rules.ts">RuleDeleteResponse</a></code>
 
 Methods:
 
 - <code title="put /zones/{zone_id}/snippets/snippet_rules">client.snippets.rules.<a href="./src/resources/snippets/rules.ts">update</a>({ ...params }) -> RuleUpdateResponse</code>
 - <code title="get /zones/{zone_id}/snippets/snippet_rules">client.snippets.rules.<a href="./src/resources/snippets/rules.ts">list</a>({ ...params }) -> RuleListResponsesSinglePage</code>
+- <code title="delete /zones/{zone_id}/snippets/snippet_rules">client.snippets.rules.<a href="./src/resources/snippets/rules.ts">delete</a>({ ...params }) -> RuleDeleteResponse</code>
 
 # Calls
 
+## SFU
+
 Types:
 
-- <code><a href="./src/resources/calls/calls.ts">CallsApp</a></code>
-- <code><a href="./src/resources/calls/calls.ts">CallsAppWithSecret</a></code>
-- <code><a href="./src/resources/calls/calls.ts">CallListResponse</a></code>
+- <code><a href="./src/resources/calls/sfu.ts">SFUCreateResponse</a></code>
+- <code><a href="./src/resources/calls/sfu.ts">SFUUpdateResponse</a></code>
+- <code><a href="./src/resources/calls/sfu.ts">SFUListResponse</a></code>
+- <code><a href="./src/resources/calls/sfu.ts">SFUDeleteResponse</a></code>
+- <code><a href="./src/resources/calls/sfu.ts">SFUGetResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/calls/apps">client.calls.<a href="./src/resources/calls/calls.ts">create</a>({ ...params }) -> CallsAppWithSecret</code>
-- <code title="put /accounts/{account_id}/calls/apps/{app_id}">client.calls.<a href="./src/resources/calls/calls.ts">update</a>(appId, { ...params }) -> CallsApp</code>
-- <code title="get /accounts/{account_id}/calls/apps">client.calls.<a href="./src/resources/calls/calls.ts">list</a>({ ...params }) -> CallListResponsesSinglePage</code>
-- <code title="delete /accounts/{account_id}/calls/apps/{app_id}">client.calls.<a href="./src/resources/calls/calls.ts">delete</a>(appId, { ...params }) -> CallsApp</code>
-- <code title="get /accounts/{account_id}/calls/apps/{app_id}">client.calls.<a href="./src/resources/calls/calls.ts">get</a>(appId, { ...params }) -> CallsApp</code>
+- <code title="post /accounts/{account_id}/calls/apps">client.calls.sfu.<a href="./src/resources/calls/sfu.ts">create</a>({ ...params }) -> SFUCreateResponse</code>
+- <code title="put /accounts/{account_id}/calls/apps/{app_id}">client.calls.sfu.<a href="./src/resources/calls/sfu.ts">update</a>(appId, { ...params }) -> SFUUpdateResponse</code>
+- <code title="get /accounts/{account_id}/calls/apps">client.calls.sfu.<a href="./src/resources/calls/sfu.ts">list</a>({ ...params }) -> SFUListResponsesSinglePage</code>
+- <code title="delete /accounts/{account_id}/calls/apps/{app_id}">client.calls.sfu.<a href="./src/resources/calls/sfu.ts">delete</a>(appId, { ...params }) -> SFUDeleteResponse</code>
+- <code title="get /accounts/{account_id}/calls/apps/{app_id}">client.calls.sfu.<a href="./src/resources/calls/sfu.ts">get</a>(appId, { ...params }) -> SFUGetResponse</code>
 
 ## TURN
 
-### Keys
-
 Types:
 
-- <code><a href="./src/resources/calls/turn/keys.ts">KeyCreateResponse</a></code>
-- <code><a href="./src/resources/calls/turn/keys.ts">KeyUpdateResponse</a></code>
-- <code><a href="./src/resources/calls/turn/keys.ts">KeyListResponse</a></code>
-- <code><a href="./src/resources/calls/turn/keys.ts">KeyDeleteResponse</a></code>
-- <code><a href="./src/resources/calls/turn/keys.ts">KeyGetResponse</a></code>
+- <code><a href="./src/resources/calls/turn.ts">TURNCreateResponse</a></code>
+- <code><a href="./src/resources/calls/turn.ts">TURNUpdateResponse</a></code>
+- <code><a href="./src/resources/calls/turn.ts">TURNListResponse</a></code>
+- <code><a href="./src/resources/calls/turn.ts">TURNDeleteResponse</a></code>
+- <code><a href="./src/resources/calls/turn.ts">TURNGetResponse</a></code>
 
 Methods:
 
-- <code title="post /accounts/{account_id}/calls/turn_keys">client.calls.turn.keys.<a href="./src/resources/calls/turn/keys.ts">create</a>({ ...params }) -> KeyCreateResponse</code>
-- <code title="put /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.keys.<a href="./src/resources/calls/turn/keys.ts">update</a>(keyId, { ...params }) -> KeyUpdateResponse</code>
-- <code title="get /accounts/{account_id}/calls/turn_keys">client.calls.turn.keys.<a href="./src/resources/calls/turn/keys.ts">list</a>({ ...params }) -> KeyListResponsesSinglePage</code>
-- <code title="delete /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.keys.<a href="./src/resources/calls/turn/keys.ts">delete</a>(keyId, { ...params }) -> KeyDeleteResponse</code>
-- <code title="get /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.keys.<a href="./src/resources/calls/turn/keys.ts">get</a>(keyId, { ...params }) -> KeyGetResponse</code>
+- <code title="post /accounts/{account_id}/calls/turn_keys">client.calls.turn.<a href="./src/resources/calls/turn.ts">create</a>({ ...params }) -> TURNCreateResponse</code>
+- <code title="put /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.<a href="./src/resources/calls/turn.ts">update</a>(keyId, { ...params }) -> TURNUpdateResponse</code>
+- <code title="get /accounts/{account_id}/calls/turn_keys">client.calls.turn.<a href="./src/resources/calls/turn.ts">list</a>({ ...params }) -> TURNListResponsesSinglePage</code>
+- <code title="delete /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.<a href="./src/resources/calls/turn.ts">delete</a>(keyId, { ...params }) -> TURNDeleteResponse</code>
+- <code title="get /accounts/{account_id}/calls/turn_keys/{key_id}">client.calls.turn.<a href="./src/resources/calls/turn.ts">get</a>(keyId, { ...params }) -> TURNGetResponse</code>
 
 # CloudforceOne
 
@@ -6265,31 +6994,21 @@ Methods:
 - <code title="get /accounts/{account_identifier}/cloudforce-one/requests/priority/{priority_identifer}">client.cloudforceOne.requests.priority.<a href="./src/resources/cloudforce-one/requests/priority.ts">get</a>(accountIdentifier, priorityIdentifer) -> Item</code>
 - <code title="get /accounts/{account_identifier}/cloudforce-one/requests/priority/quota">client.cloudforceOne.requests.priority.<a href="./src/resources/cloudforce-one/requests/priority.ts">quota</a>(accountIdentifier) -> Quota</code>
 
-# EventNotifications
-
-## R2
-
-### Configuration
-
-Types:
-
-- <code><a href="./src/resources/event-notifications/r2/configuration/configuration.ts">ConfigurationGetResponse</a></code>
-
-Methods:
-
-- <code title="get /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration">client.eventNotifications.r2.configuration.<a href="./src/resources/event-notifications/r2/configuration/configuration.ts">get</a>(bucketName, { ...params }) -> ConfigurationGetResponse</code>
-
-#### Queues
+### Assets
 
 Types:
 
-- <code><a href="./src/resources/event-notifications/r2/configuration/queues.ts">QueueUpdateResponse</a></code>
-- <code><a href="./src/resources/event-notifications/r2/configuration/queues.ts">QueueDeleteResponse</a></code>
+- <code><a href="./src/resources/cloudforce-one/requests/assets.ts">AssetCreateResponse</a></code>
+- <code><a href="./src/resources/cloudforce-one/requests/assets.ts">AssetUpdateResponse</a></code>
+- <code><a href="./src/resources/cloudforce-one/requests/assets.ts">AssetDeleteResponse</a></code>
+- <code><a href="./src/resources/cloudforce-one/requests/assets.ts">AssetGetResponse</a></code>
 
 Methods:
 
-- <code title="put /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}">client.eventNotifications.r2.configuration.queues.<a href="./src/resources/event-notifications/r2/configuration/queues.ts">update</a>(bucketName, queueId, { ...params }) -> QueueUpdateResponse</code>
-- <code title="delete /accounts/{account_id}/event_notifications/r2/{bucket_name}/configuration/queues/{queue_id}">client.eventNotifications.r2.configuration.queues.<a href="./src/resources/event-notifications/r2/configuration/queues.ts">delete</a>(bucketName, queueId, { ...params }) -> QueueDeleteResponse</code>
+- <code title="post /accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/asset">client.cloudforceOne.requests.assets.<a href="./src/resources/cloudforce-one/requests/assets.ts">create</a>(accountIdentifier, requestIdentifier, { ...params }) -> AssetCreateResponse</code>
+- <code title="put /accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/asset/{asset_identifer}">client.cloudforceOne.requests.assets.<a href="./src/resources/cloudforce-one/requests/assets.ts">update</a>(accountIdentifier, requestIdentifier, assetIdentifer, { ...params }) -> AssetUpdateResponse</code>
+- <code title="delete /accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/asset/{asset_identifer}">client.cloudforceOne.requests.assets.<a href="./src/resources/cloudforce-one/requests/assets.ts">delete</a>(accountIdentifier, requestIdentifier, assetIdentifer) -> AssetDeleteResponse</code>
+- <code title="get /accounts/{account_identifier}/cloudforce-one/requests/{request_identifier}/asset/{asset_identifer}">client.cloudforceOne.requests.assets.<a href="./src/resources/cloudforce-one/requests/assets.ts">get</a>(accountIdentifier, requestIdentifier, assetIdentifer) -> AssetGetResponse</code>
 
 # AIGateway
 
@@ -6309,15 +7028,69 @@ Methods:
 - <code title="delete /accounts/{account_id}/ai-gateway/gateways/{id}">client.aiGateway.<a href="./src/resources/ai-gateway/ai-gateway.ts">delete</a>(id, { ...params }) -> AIGatewayDeleteResponse</code>
 - <code title="get /accounts/{account_id}/ai-gateway/gateways/{id}">client.aiGateway.<a href="./src/resources/ai-gateway/ai-gateway.ts">get</a>(id, { ...params }) -> AIGatewayGetResponse</code>
 
+## EvaluationTypes
+
+Types:
+
+- <code><a href="./src/resources/ai-gateway/evaluation-types.ts">EvaluationTypeGetResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/ai-gateway/evaluation-types">client.aiGateway.evaluationTypes.<a href="./src/resources/ai-gateway/evaluation-types.ts">get</a>({ ...params }) -> EvaluationTypeGetResponse</code>
+
 ## Logs
 
 Types:
 
 - <code><a href="./src/resources/ai-gateway/logs.ts">LogListResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/logs.ts">LogDeleteResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/logs.ts">LogEditResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/logs.ts">LogGetResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/logs.ts">LogRequestResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/logs.ts">LogResponseResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs">client.aiGateway.logs.<a href="./src/resources/ai-gateway/logs.ts">list</a>(gatewayId, { ...params }) -> LogListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs">client.aiGateway.logs.<a href="./src/resources/ai-gateway/logs.ts">delete</a>(gatewayId, { ...params }) -> LogDeleteResponse</code>
+- <code title="patch /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}">client.aiGateway.logs.<a href="./src/resources/ai-gateway/logs.ts">edit</a>(gatewayId, id, { ...params }) -> LogEditResponse</code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}">client.aiGateway.logs.<a href="./src/resources/ai-gateway/logs.ts">get</a>(gatewayId, id, { ...params }) -> LogGetResponse</code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}/request">client.aiGateway.logs.<a href="./src/resources/ai-gateway/logs.ts">request</a>(gatewayId, id, { ...params }) -> unknown</code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/logs/{id}/response">client.aiGateway.logs.<a href="./src/resources/ai-gateway/logs.ts">response</a>(gatewayId, id, { ...params }) -> unknown</code>
+
+## Datasets
+
+Types:
+
+- <code><a href="./src/resources/ai-gateway/datasets.ts">DatasetCreateResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/datasets.ts">DatasetUpdateResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/datasets.ts">DatasetListResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/datasets.ts">DatasetDeleteResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/datasets.ts">DatasetGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets">client.aiGateway.datasets.<a href="./src/resources/ai-gateway/datasets.ts">create</a>(gatewayId, { ...params }) -> DatasetCreateResponse</code>
+- <code title="put /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}">client.aiGateway.datasets.<a href="./src/resources/ai-gateway/datasets.ts">update</a>(gatewayId, id, { ...params }) -> DatasetUpdateResponse</code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets">client.aiGateway.datasets.<a href="./src/resources/ai-gateway/datasets.ts">list</a>(gatewayId, { ...params }) -> DatasetListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}">client.aiGateway.datasets.<a href="./src/resources/ai-gateway/datasets.ts">delete</a>(gatewayId, id, { ...params }) -> DatasetDeleteResponse</code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/datasets/{id}">client.aiGateway.datasets.<a href="./src/resources/ai-gateway/datasets.ts">get</a>(gatewayId, id, { ...params }) -> DatasetGetResponse</code>
+
+## Evaluations
+
+Types:
+
+- <code><a href="./src/resources/ai-gateway/evaluations.ts">EvaluationCreateResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/evaluations.ts">EvaluationListResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/evaluations.ts">EvaluationDeleteResponse</a></code>
+- <code><a href="./src/resources/ai-gateway/evaluations.ts">EvaluationGetResponse</a></code>
 
 Methods:
 
-- <code title="get /accounts/{account_id}/ai-gateway/gateways/{id}/logs">client.aiGateway.logs.<a href="./src/resources/ai-gateway/logs.ts">list</a>(id, { ...params }) -> LogListResponsesV4PagePaginationArray</code>
+- <code title="post /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations">client.aiGateway.evaluations.<a href="./src/resources/ai-gateway/evaluations.ts">create</a>(gatewayId, { ...params }) -> EvaluationCreateResponse</code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations">client.aiGateway.evaluations.<a href="./src/resources/ai-gateway/evaluations.ts">list</a>(gatewayId, { ...params }) -> EvaluationListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations/{id}">client.aiGateway.evaluations.<a href="./src/resources/ai-gateway/evaluations.ts">delete</a>(gatewayId, id, { ...params }) -> EvaluationDeleteResponse</code>
+- <code title="get /accounts/{account_id}/ai-gateway/gateways/{gateway_id}/evaluations/{id}">client.aiGateway.evaluations.<a href="./src/resources/ai-gateway/evaluations.ts">get</a>(gatewayId, id, { ...params }) -> EvaluationGetResponse</code>
 
 # IAM
 
@@ -6362,5 +7135,305 @@ Types:
 
 Methods:
 
-- <code title="put /zones/{zone_id}/cloud_connector/rules">client.cloudConnector.rules.<a href="./src/resources/cloud-connector/rules.ts">update</a>([ ...body ]) -> RuleUpdateResponse</code>
+- <code title="put /zones/{zone_id}/cloud_connector/rules">client.cloudConnector.rules.<a href="./src/resources/cloud-connector/rules.ts">update</a>([ ...rules ]) -> RuleUpdateResponse</code>
 - <code title="get /zones/{zone_id}/cloud_connector/rules">client.cloudConnector.rules.<a href="./src/resources/cloud-connector/rules.ts">list</a>({ ...params }) -> RuleListResponsesSinglePage</code>
+
+# BotnetFeed
+
+## ASN
+
+Types:
+
+- <code><a href="./src/resources/botnet-feed/asn.ts">ASNDayReportResponse</a></code>
+- <code><a href="./src/resources/botnet-feed/asn.ts">ASNFullReportResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/botnet_feed/asn/{asn_id}/day_report">client.botnetFeed.asn.<a href="./src/resources/botnet-feed/asn.ts">dayReport</a>(asnId, { ...params }) -> ASNDayReportResponse</code>
+- <code title="get /accounts/{account_id}/botnet_feed/asn/{asn_id}/full_report">client.botnetFeed.asn.<a href="./src/resources/botnet-feed/asn.ts">fullReport</a>(asnId, { ...params }) -> ASNFullReportResponse</code>
+
+## Configs
+
+### ASN
+
+Types:
+
+- <code><a href="./src/resources/botnet-feed/configs/asn.ts">ASNDeleteResponse</a></code>
+- <code><a href="./src/resources/botnet-feed/configs/asn.ts">ASNGetResponse</a></code>
+
+Methods:
+
+- <code title="delete /accounts/{account_id}/botnet_feed/configs/asn/{asn_id}">client.botnetFeed.configs.asn.<a href="./src/resources/botnet-feed/configs/asn.ts">delete</a>(asnId, { ...params }) -> ASNDeleteResponse</code>
+- <code title="get /accounts/{account_id}/botnet_feed/configs/asn">client.botnetFeed.configs.asn.<a href="./src/resources/botnet-feed/configs/asn.ts">get</a>({ ...params }) -> ASNGetResponse</code>
+
+# SecurityTXT
+
+Types:
+
+- <code><a href="./src/resources/security-txt.ts">SecurityTXTUpdateResponse</a></code>
+- <code><a href="./src/resources/security-txt.ts">SecurityTXTDeleteResponse</a></code>
+- <code><a href="./src/resources/security-txt.ts">SecurityTXTGetResponse</a></code>
+
+Methods:
+
+- <code title="put /zones/{zone_id}/security-center/securitytxt">client.securityTXT.<a href="./src/resources/security-txt.ts">update</a>({ ...params }) -> SecurityTXTUpdateResponse</code>
+- <code title="delete /zones/{zone_id}/security-center/securitytxt">client.securityTXT.<a href="./src/resources/security-txt.ts">delete</a>({ ...params }) -> SecurityTXTDeleteResponse</code>
+- <code title="get /zones/{zone_id}/security-center/securitytxt">client.securityTXT.<a href="./src/resources/security-txt.ts">get</a>({ ...params }) -> SecurityTXTGetResponse</code>
+
+# Workflows
+
+Types:
+
+- <code><a href="./src/resources/workflows/workflows.ts">WorkflowUpdateResponse</a></code>
+- <code><a href="./src/resources/workflows/workflows.ts">WorkflowListResponse</a></code>
+- <code><a href="./src/resources/workflows/workflows.ts">WorkflowGetResponse</a></code>
+
+Methods:
+
+- <code title="put /accounts/{account_id}/workflows/{workflow_name}">client.workflows.<a href="./src/resources/workflows/workflows.ts">update</a>(workflowName, { ...params }) -> WorkflowUpdateResponse</code>
+- <code title="get /accounts/{account_id}/workflows">client.workflows.<a href="./src/resources/workflows/workflows.ts">list</a>({ ...params }) -> WorkflowListResponsesV4PagePaginationArray</code>
+- <code title="get /accounts/{account_id}/workflows/{workflow_name}">client.workflows.<a href="./src/resources/workflows/workflows.ts">get</a>(workflowName, { ...params }) -> WorkflowGetResponse</code>
+
+## Instances
+
+Types:
+
+- <code><a href="./src/resources/workflows/instances/instances.ts">InstanceCreateResponse</a></code>
+- <code><a href="./src/resources/workflows/instances/instances.ts">InstanceListResponse</a></code>
+- <code><a href="./src/resources/workflows/instances/instances.ts">InstanceGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/workflows/{workflow_name}/instances">client.workflows.instances.<a href="./src/resources/workflows/instances/instances.ts">create</a>(workflowName, { ...params }) -> InstanceCreateResponse</code>
+- <code title="get /accounts/{account_id}/workflows/{workflow_name}/instances">client.workflows.instances.<a href="./src/resources/workflows/instances/instances.ts">list</a>(workflowName, { ...params }) -> InstanceListResponsesV4PagePaginationArray</code>
+- <code title="get /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}">client.workflows.instances.<a href="./src/resources/workflows/instances/instances.ts">get</a>(workflowName, instanceId, { ...params }) -> InstanceGetResponse</code>
+
+### Status
+
+Types:
+
+- <code><a href="./src/resources/workflows/instances/status.ts">StatusEditResponse</a></code>
+
+Methods:
+
+- <code title="patch /accounts/{account_id}/workflows/{workflow_name}/instances/{instance_id}/status">client.workflows.instances.status.<a href="./src/resources/workflows/instances/status.ts">edit</a>(workflowName, instanceId, { ...params }) -> StatusEditResponse</code>
+
+## Versions
+
+Types:
+
+- <code><a href="./src/resources/workflows/versions.ts">VersionListResponse</a></code>
+- <code><a href="./src/resources/workflows/versions.ts">VersionGetResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/workflows/{workflow_name}/versions">client.workflows.versions.<a href="./src/resources/workflows/versions.ts">list</a>(workflowName, { ...params }) -> VersionListResponsesV4PagePaginationArray</code>
+- <code title="get /accounts/{account_id}/workflows/{workflow_name}/versions/{version_id}">client.workflows.versions.<a href="./src/resources/workflows/versions.ts">get</a>(workflowName, versionId, { ...params }) -> VersionGetResponse</code>
+
+# ResourceSharing
+
+Types:
+
+- <code><a href="./src/resources/resource-sharing/resource-sharing.ts">ResourceSharingCreateResponse</a></code>
+- <code><a href="./src/resources/resource-sharing/resource-sharing.ts">ResourceSharingUpdateResponse</a></code>
+- <code><a href="./src/resources/resource-sharing/resource-sharing.ts">ResourceSharingListResponse</a></code>
+- <code><a href="./src/resources/resource-sharing/resource-sharing.ts">ResourceSharingDeleteResponse</a></code>
+- <code><a href="./src/resources/resource-sharing/resource-sharing.ts">ResourceSharingGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/shares">client.resourceSharing.<a href="./src/resources/resource-sharing/resource-sharing.ts">create</a>({ ...params }) -> ResourceSharingCreateResponse</code>
+- <code title="put /accounts/{account_id}/shares/{share_id}">client.resourceSharing.<a href="./src/resources/resource-sharing/resource-sharing.ts">update</a>(shareId, { ...params }) -> ResourceSharingUpdateResponse</code>
+- <code title="get /accounts/{account_id}/shares">client.resourceSharing.<a href="./src/resources/resource-sharing/resource-sharing.ts">list</a>({ ...params }) -> ResourceSharingListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/shares/{share_id}">client.resourceSharing.<a href="./src/resources/resource-sharing/resource-sharing.ts">delete</a>(shareId, { ...params }) -> ResourceSharingDeleteResponse</code>
+- <code title="get /accounts/{account_id}/shares/{share_id}">client.resourceSharing.<a href="./src/resources/resource-sharing/resource-sharing.ts">get</a>(shareId, { ...params }) -> ResourceSharingGetResponse</code>
+
+## Recipients
+
+Types:
+
+- <code><a href="./src/resources/resource-sharing/recipients.ts">RecipientCreateResponse</a></code>
+- <code><a href="./src/resources/resource-sharing/recipients.ts">RecipientListResponse</a></code>
+- <code><a href="./src/resources/resource-sharing/recipients.ts">RecipientDeleteResponse</a></code>
+- <code><a href="./src/resources/resource-sharing/recipients.ts">RecipientGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/shares/{share_id}/recipients">client.resourceSharing.recipients.<a href="./src/resources/resource-sharing/recipients.ts">create</a>(shareId, { ...params }) -> RecipientCreateResponse</code>
+- <code title="get /accounts/{account_id}/shares/{share_id}/recipients">client.resourceSharing.recipients.<a href="./src/resources/resource-sharing/recipients.ts">list</a>(shareId, { ...params }) -> RecipientListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}">client.resourceSharing.recipients.<a href="./src/resources/resource-sharing/recipients.ts">delete</a>(shareId, recipientId, { ...params }) -> RecipientDeleteResponse</code>
+- <code title="get /accounts/{account_id}/shares/{share_id}/recipients/{recipient_id}">client.resourceSharing.recipients.<a href="./src/resources/resource-sharing/recipients.ts">get</a>(shareId, recipientId, { ...params }) -> RecipientGetResponse</code>
+
+## Resources
+
+Types:
+
+- <code><a href="./src/resources/resource-sharing/resources.ts">ResourceCreateResponse</a></code>
+- <code><a href="./src/resources/resource-sharing/resources.ts">ResourceUpdateResponse</a></code>
+- <code><a href="./src/resources/resource-sharing/resources.ts">ResourceListResponse</a></code>
+- <code><a href="./src/resources/resource-sharing/resources.ts">ResourceDeleteResponse</a></code>
+- <code><a href="./src/resources/resource-sharing/resources.ts">ResourceGetResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/shares/{share_id}/resources">client.resourceSharing.resources.<a href="./src/resources/resource-sharing/resources.ts">create</a>(shareId, { ...params }) -> ResourceCreateResponse</code>
+- <code title="put /accounts/{account_id}/shares/{share_id}/resources/{resource_id}">client.resourceSharing.resources.<a href="./src/resources/resource-sharing/resources.ts">update</a>(shareId, resourceId, { ...params }) -> ResourceUpdateResponse</code>
+- <code title="get /accounts/{account_id}/shares/{share_id}/resources">client.resourceSharing.resources.<a href="./src/resources/resource-sharing/resources.ts">list</a>(shareId, { ...params }) -> ResourceListResponsesV4PagePaginationArray</code>
+- <code title="delete /accounts/{account_id}/shares/{share_id}/resources/{resource_id}">client.resourceSharing.resources.<a href="./src/resources/resource-sharing/resources.ts">delete</a>(shareId, resourceId, { ...params }) -> ResourceDeleteResponse</code>
+- <code title="get /accounts/{account_id}/shares/{share_id}/resources/{resource_id}">client.resourceSharing.resources.<a href="./src/resources/resource-sharing/resources.ts">get</a>(shareId, resourceId, { ...params }) -> ResourceGetResponse</code>
+
+# LeakedCredentialChecks
+
+Types:
+
+- <code><a href="./src/resources/leaked-credential-checks/leaked-credential-checks.ts">LeakedCredentialCheckCreateResponse</a></code>
+- <code><a href="./src/resources/leaked-credential-checks/leaked-credential-checks.ts">LeakedCredentialCheckGetResponse</a></code>
+
+Methods:
+
+- <code title="post /zones/{zone_id}/leaked-credential-checks">client.leakedCredentialChecks.<a href="./src/resources/leaked-credential-checks/leaked-credential-checks.ts">create</a>({ ...params }) -> LeakedCredentialCheckCreateResponse</code>
+- <code title="get /zones/{zone_id}/leaked-credential-checks">client.leakedCredentialChecks.<a href="./src/resources/leaked-credential-checks/leaked-credential-checks.ts">get</a>({ ...params }) -> LeakedCredentialCheckGetResponse</code>
+
+## Detections
+
+Types:
+
+- <code><a href="./src/resources/leaked-credential-checks/detections.ts">DetectionCreateResponse</a></code>
+- <code><a href="./src/resources/leaked-credential-checks/detections.ts">DetectionUpdateResponse</a></code>
+- <code><a href="./src/resources/leaked-credential-checks/detections.ts">DetectionListResponse</a></code>
+- <code><a href="./src/resources/leaked-credential-checks/detections.ts">DetectionDeleteResponse</a></code>
+
+Methods:
+
+- <code title="post /zones/{zone_id}/leaked-credential-checks/detections">client.leakedCredentialChecks.detections.<a href="./src/resources/leaked-credential-checks/detections.ts">create</a>({ ...params }) -> DetectionCreateResponse</code>
+- <code title="put /zones/{zone_id}/leaked-credential-checks/detections/{detection_id}">client.leakedCredentialChecks.detections.<a href="./src/resources/leaked-credential-checks/detections.ts">update</a>(detectionId, { ...params }) -> DetectionUpdateResponse</code>
+- <code title="get /zones/{zone_id}/leaked-credential-checks/detections">client.leakedCredentialChecks.detections.<a href="./src/resources/leaked-credential-checks/detections.ts">list</a>({ ...params }) -> DetectionListResponsesSinglePage</code>
+- <code title="delete /zones/{zone_id}/leaked-credential-checks/detections/{detection_id}">client.leakedCredentialChecks.detections.<a href="./src/resources/leaked-credential-checks/detections.ts">delete</a>(detectionId, { ...params }) -> DetectionDeleteResponse</code>
+
+# ContentScanning
+
+Types:
+
+- <code><a href="./src/resources/content-scanning/content-scanning.ts">ContentScanningDisableResponse</a></code>
+- <code><a href="./src/resources/content-scanning/content-scanning.ts">ContentScanningEnableResponse</a></code>
+
+Methods:
+
+- <code title="post /zones/{zone_id}/content-upload-scan/disable">client.contentScanning.<a href="./src/resources/content-scanning/content-scanning.ts">disable</a>({ ...params }) -> ContentScanningDisableResponse</code>
+- <code title="post /zones/{zone_id}/content-upload-scan/enable">client.contentScanning.<a href="./src/resources/content-scanning/content-scanning.ts">enable</a>({ ...params }) -> ContentScanningEnableResponse</code>
+
+## Payloads
+
+Types:
+
+- <code><a href="./src/resources/content-scanning/payloads.ts">PayloadCreateResponse</a></code>
+- <code><a href="./src/resources/content-scanning/payloads.ts">PayloadListResponse</a></code>
+- <code><a href="./src/resources/content-scanning/payloads.ts">PayloadDeleteResponse</a></code>
+
+Methods:
+
+- <code title="post /zones/{zone_id}/content-upload-scan/payloads">client.contentScanning.payloads.<a href="./src/resources/content-scanning/payloads.ts">create</a>([ ...body ]) -> PayloadCreateResponse | null</code>
+- <code title="get /zones/{zone_id}/content-upload-scan/payloads">client.contentScanning.payloads.<a href="./src/resources/content-scanning/payloads.ts">list</a>({ ...params }) -> PayloadListResponsesSinglePage</code>
+- <code title="delete /zones/{zone_id}/content-upload-scan/payloads/{expression_id}">client.contentScanning.payloads.<a href="./src/resources/content-scanning/payloads.ts">delete</a>(expressionId, { ...params }) -> PayloadDeleteResponse | null</code>
+
+## Settings
+
+Types:
+
+- <code><a href="./src/resources/content-scanning/settings.ts">SettingGetResponse</a></code>
+
+Methods:
+
+- <code title="get /zones/{zone_id}/content-upload-scan/settings">client.contentScanning.settings.<a href="./src/resources/content-scanning/settings.ts">get</a>({ ...params }) -> SettingGetResponse</code>
+
+# AbuseReports
+
+Types:
+
+- <code><a href="./src/resources/abuse-reports.ts">AbuseReportCreateResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/abuse-reports/{report_type}">client.abuseReports.<a href="./src/resources/abuse-reports.ts">create</a>(reportType, { ...params }) -> AbuseReportCreateResponse</code>
+
+# AI
+
+Types:
+
+- <code><a href="./src/resources/ai/ai.ts">AIRunResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/ai/run/{model_name}">client.ai.<a href="./src/resources/ai/ai.ts">run</a>(modelName, { ...params }) -> AIRunResponse</code>
+
+## Finetunes
+
+Types:
+
+- <code><a href="./src/resources/ai/finetunes/finetunes.ts">FinetuneCreateResponse</a></code>
+- <code><a href="./src/resources/ai/finetunes/finetunes.ts">FinetuneListResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/ai/finetunes">client.ai.finetunes.<a href="./src/resources/ai/finetunes/finetunes.ts">create</a>({ ...params }) -> FinetuneCreateResponse</code>
+- <code title="get /accounts/{account_id}/ai/finetunes">client.ai.finetunes.<a href="./src/resources/ai/finetunes/finetunes.ts">list</a>({ ...params }) -> FinetuneListResponse</code>
+
+### Assets
+
+Types:
+
+- <code><a href="./src/resources/ai/finetunes/assets.ts">AssetCreateResponse</a></code>
+
+Methods:
+
+- <code title="post /accounts/{account_id}/ai/finetunes/{finetune_id}/finetune-assets">client.ai.finetunes.assets.<a href="./src/resources/ai/finetunes/assets.ts">create</a>(finetuneId, { ...params }) -> AssetCreateResponse</code>
+
+### Public
+
+Types:
+
+- <code><a href="./src/resources/ai/finetunes/public.ts">PublicListResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/ai/finetunes/public">client.ai.finetunes.public.<a href="./src/resources/ai/finetunes/public.ts">list</a>({ ...params }) -> PublicListResponsesSinglePage</code>
+
+## Authors
+
+Types:
+
+- <code><a href="./src/resources/ai/authors.ts">AuthorListResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/ai/authors/search">client.ai.authors.<a href="./src/resources/ai/authors.ts">list</a>({ ...params }) -> AuthorListResponsesSinglePage</code>
+
+## Tasks
+
+Types:
+
+- <code><a href="./src/resources/ai/tasks.ts">TaskListResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/ai/tasks/search">client.ai.tasks.<a href="./src/resources/ai/tasks.ts">list</a>({ ...params }) -> TaskListResponsesSinglePage</code>
+
+## Models
+
+Types:
+
+- <code><a href="./src/resources/ai/models/models.ts">ModelListResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/ai/models/search">client.ai.models.<a href="./src/resources/ai/models/models.ts">list</a>({ ...params }) -> ModelListResponsesV4PagePaginationArray</code>
+
+### Schema
+
+Types:
+
+- <code><a href="./src/resources/ai/models/schema.ts">SchemaGetResponse</a></code>
+
+Methods:
+
+- <code title="get /accounts/{account_id}/ai/models/schema">client.ai.models.schema.<a href="./src/resources/ai/models/schema.ts">get</a>({ ...params }) -> SchemaGetResponse</code>
diff --git a/bin/check-release-environment b/bin/check-release-environment
index 624db5612a..40ffb77f52 100644
--- a/bin/check-release-environment
+++ b/bin/check-release-environment
@@ -19,3 +19,4 @@ if [[ lenErrors -gt 0 ]]; then
 fi
 
 echo "The environment is ready to push releases!"
+
diff --git a/bin/publish-npm b/bin/publish-npm
index 4d6c9f3572..4c21181bb9 100644
--- a/bin/publish-npm
+++ b/bin/publish-npm
@@ -2,8 +2,24 @@
 
 set -eux
 
-npm config set //registry.npmjs.org/:_authToken $NPM_TOKEN
+npm config set '//registry.npmjs.org/:_authToken' "$NPM_TOKEN"
 
+# Build the project
 yarn build
+
+# Navigate to the dist directory
 cd dist
-yarn publish --access public
+
+# Get the version from package.json
+VERSION="$(node -p "require('./package.json').version")"
+
+# Extract the pre-release tag if it exists
+if [[ "$VERSION" =~ -([a-zA-Z]+) ]]; then
+  # Extract the part before any dot in the pre-release identifier
+  TAG="${BASH_REMATCH[1]}"
+else
+  TAG="latest"
+fi
+
+# Publish with the appropriate tag
+yarn publish --access public --tag "$TAG"
diff --git a/examples/.keep b/examples/.keep
deleted file mode 100644
index 0651c89c0c..0000000000
--- a/examples/.keep
+++ /dev/null
@@ -1,4 +0,0 @@
-File generated from our OpenAPI spec by Stainless.
-
-This directory can be used to store example files demonstrating usage of this SDK.
-It is ignored by Stainless code generation and its content (other than this keep file) won't be touched.
diff --git a/examples/workers/ai/demo.ts b/examples/ai/demo.ts
similarity index 80%
rename from examples/workers/ai/demo.ts
rename to examples/ai/demo.ts
index c72869bc0c..1a027b2b87 100644
--- a/examples/workers/ai/demo.ts
+++ b/examples/ai/demo.ts
@@ -6,7 +6,7 @@ import Cloudflare from 'cloudflare';
 const client = new Cloudflare();
 
 async function main() {
-  const response = await client.workers.ai.run('@cf/meta/llama-2-7b-chat-int8', {
+  const response = await client.ai.run('@cf/meta/llama-2-7b-chat-int8', {
     account_id: process.env['CLOUDFLARE_ACCOUNT_ID']!,
     prompt: 'Tell me about Workers AI',
   });
diff --git a/package.json b/package.json
index 1367f49898..3ccbb81843 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "cloudflare",
-  "version": "3.5.0",
+  "version": "4.0.0",
   "description": "The official TypeScript library for the Cloudflare API",
   "author": "Cloudflare <api@cloudflare.com>",
   "types": "dist/index.d.ts",
@@ -10,7 +10,7 @@
   "license": "Apache-2.0",
   "packageManager": "yarn@1.22.22",
   "files": [
-    "*"
+    "**/*"
   ],
   "private": false,
   "scripts": {
@@ -18,22 +18,19 @@
     "build": "./scripts/build",
     "prepublishOnly": "echo 'to publish, run yarn build && (cd dist; yarn publish)' && exit 1",
     "format": "prettier --write --cache --cache-strategy metadata . !dist",
-    "prepare": "if ./scripts/utils/check-is-in-git-install.sh; then ./scripts/build; fi",
+    "prepare": "if ./scripts/utils/check-is-in-git-install.sh; then ./scripts/build && ./scripts/utils/git-swap.sh; fi",
     "tsn": "ts-node -r tsconfig-paths/register",
     "lint": "./scripts/lint",
-    "fix": "eslint --fix --ext ts,js ."
+    "fix": "./scripts/format"
   },
   "dependencies": {
     "@types/node": "^18.11.18",
     "@types/node-fetch": "^2.6.4",
-    "@types/qs": "^6.9.7",
     "abort-controller": "^3.0.0",
     "agentkeepalive": "^4.2.1",
     "form-data-encoder": "1.7.2",
     "formdata-node": "^4.3.2",
-    "node-fetch": "^2.6.7",
-    "qs": "^6.10.3",
-    "web-streams-polyfill": "^3.2.1"
+    "node-fetch": "^2.6.7"
   },
   "devDependencies": {
     "@swc/core": "^1.3.102",
@@ -44,10 +41,10 @@
     "eslint": "^8.49.0",
     "eslint-plugin-prettier": "^5.0.1",
     "eslint-plugin-unused-imports": "^3.0.0",
+    "iconv-lite": "^0.6.3",
     "jest": "^29.4.0",
     "prettier": "^3.0.0",
     "ts-jest": "^29.1.0",
-    "ts-morph": "^19.0.0",
     "ts-node": "^10.5.0",
     "tsc-multi": "^1.1.0",
     "tsconfig-paths": "^4.0.0",
diff --git a/scripts/build b/scripts/build
index f3ed9ba2bd..4925d5addb 100755
--- a/scripts/build
+++ b/scripts/build
@@ -32,7 +32,7 @@ npm exec tsc-multi
 # copy over handwritten .js/.mjs/.d.ts files
 cp src/_shims/*.{d.ts,js,mjs,md} dist/_shims
 cp src/_shims/auto/*.{d.ts,js,mjs} dist/_shims/auto
-# we need to add exports = module.exports = Cloudflare Node to index.js;
+# we need to add exports = module.exports = Cloudflare to index.js;
 # No way to get that from index.ts because it would cause compile errors
 # when building .mjs
 node scripts/utils/fix-index-exports.cjs
@@ -50,7 +50,7 @@ node scripts/utils/postprocess-files.cjs
 (cd dist && node -e 'require("cloudflare")')
 (cd dist && node -e 'import("cloudflare")' --input-type=module)
 
-if command -v deno &> /dev/null && [ -e ./scripts/build-deno ]
+if [ -e ./scripts/build-deno ]
 then
   ./scripts/build-deno
 fi
diff --git a/scripts/format b/scripts/format
index d297e762f6..a6bb9d03ae 100755
--- a/scripts/format
+++ b/scripts/format
@@ -5,4 +5,4 @@ set -e
 cd "$(dirname "$0")/.."
 
 echo "==> Running eslint --fix"
-./node_modules/.bin/eslint --fix --ext ts,js .
+ESLINT_USE_FLAT_CONFIG="false" ./node_modules/.bin/eslint --fix --ext ts,js .
diff --git a/scripts/lint b/scripts/lint
index 6b0e5dc3eb..6ba75dfb55 100755
--- a/scripts/lint
+++ b/scripts/lint
@@ -5,4 +5,7 @@ set -e
 cd "$(dirname "$0")/.."
 
 echo "==> Running eslint"
-./node_modules/.bin/eslint --ext ts,js .
+ESLINT_USE_FLAT_CONFIG="false" ./node_modules/.bin/eslint --ext ts,js .
+
+echo "==> Running tsc"
+./node_modules/.bin/tsc --noEmit
diff --git a/scripts/mock b/scripts/mock
index fe89a1d084..d2814ae6a0 100755
--- a/scripts/mock
+++ b/scripts/mock
@@ -21,7 +21,7 @@ echo "==> Starting mock server with URL ${URL}"
 
 # Run prism mock on the given spec
 if [ "$1" == "--daemon" ]; then
-  npm exec --package=@stoplight/prism-cli@~5.8 -- prism mock "$URL" &> .prism.log &
+  npm exec --package=@stainless-api/prism-cli@5.8.5 -- prism mock "$URL" &> .prism.log &
 
   # Wait for server to come online
   echo -n "Waiting for server"
@@ -37,5 +37,5 @@ if [ "$1" == "--daemon" ]; then
 
   echo
 else
-  npm exec  --package=@stoplight/prism-cli@~5.8 -- prism mock "$URL"
+  npm exec --package=@stainless-api/prism-cli@5.8.5 -- prism mock "$URL"
 fi
diff --git a/scripts/utils/check-is-in-git-install.sh b/scripts/utils/check-is-in-git-install.sh
index 36bcedc206..1354eb4329 100755
--- a/scripts/utils/check-is-in-git-install.sh
+++ b/scripts/utils/check-is-in-git-install.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Check if you happen to call prepare for a repository that's already in node_modules.
 [ "$(basename "$(dirname "$PWD")")" = 'node_modules' ] ||
 # The name of the containing directory that 'npm` uses, which looks like
diff --git a/scripts/utils/git-swap.sh b/scripts/utils/git-swap.sh
new file mode 100755
index 0000000000..79d1888eb2
--- /dev/null
+++ b/scripts/utils/git-swap.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+set -exuo pipefail
+# the package is published to NPM from ./dist
+# we want the final file structure for git installs to match the npm installs, so we
+
+# delete everything except ./dist and ./node_modules
+find . -maxdepth 1 -mindepth 1 ! -name 'dist' ! -name 'node_modules' -exec rm -rf '{}' +
+
+# move everything from ./dist to .
+mv dist/* .
+
+# delete the now-empty ./dist
+rmdir dist
diff --git a/src/_shims/node-runtime.ts b/src/_shims/node-runtime.ts
index a9c42ebeb6..ab9f2ab5c4 100644
--- a/src/_shims/node-runtime.ts
+++ b/src/_shims/node-runtime.ts
@@ -13,9 +13,7 @@ import { Readable } from 'node:stream';
 import { type RequestOptions } from '../core';
 import { MultipartBody } from './MultipartBody';
 import { type Shims } from './registry';
-
-// @ts-ignore (this package does not have proper export maps for this export)
-import { ReadableStream } from 'web-streams-polyfill/dist/ponyfill.es2018.js';
+import { ReadableStream } from 'node:stream/web';
 
 type FileFromPathOptions = Omit<FilePropertyBag, 'lastModified'>;
 
diff --git a/src/_shims/node-types.d.ts b/src/_shims/node-types.d.ts
index b31698f780..c159e5fa74 100644
--- a/src/_shims/node-types.d.ts
+++ b/src/_shims/node-types.d.ts
@@ -7,7 +7,7 @@ import * as fd from 'formdata-node';
 export { type Agent } from 'node:http';
 export { type Readable } from 'node:stream';
 export { type ReadStream as FsReadStream } from 'node:fs';
-export { ReadableStream } from 'web-streams-polyfill';
+export { ReadableStream } from 'node:stream/web';
 
 export const fetch: typeof nf.default;
 
diff --git a/src/core.ts b/src/core.ts
index 2a6ff76440..aaf763797d 100644
--- a/src/core.ts
+++ b/src/core.ts
@@ -84,8 +84,10 @@ export class APIPromise<T> extends Promise<T> {
     });
   }
 
-  _thenUnwrap<U>(transform: (data: T) => U): APIPromise<U> {
-    return new APIPromise(this.responsePromise, async (props) => transform(await this.parseResponse(props)));
+  _thenUnwrap<U>(transform: (data: T, props: APIResponseProps) => U): APIPromise<U> {
+    return new APIPromise(this.responsePromise, async (props) =>
+      transform(await this.parseResponse(props), props),
+    );
   }
 
   /**
@@ -161,7 +163,7 @@ export abstract class APIClient {
     maxRetries = 2,
     timeout = 60000, // 1 minute
     httpAgent,
-    fetch: overridenFetch,
+    fetch: overriddenFetch,
   }: {
     baseURL: string;
     maxRetries?: number | undefined;
@@ -174,7 +176,7 @@ export abstract class APIClient {
     this.timeout = validatePositiveInteger('timeout', timeout);
     this.httpAgent = httpAgent;
 
-    this.fetch = overridenFetch ?? fetch;
+    this.fetch = overriddenFetch ?? fetch;
   }
 
   protected authHeaders(opts: FinalRequestOptions): Headers {
@@ -274,7 +276,10 @@ export abstract class APIClient {
     return null;
   }
 
-  buildRequest<Req>(options: FinalRequestOptions<Req>): { req: RequestInit; url: string; timeout: number } {
+  buildRequest<Req>(
+    options: FinalRequestOptions<Req>,
+    { retryCount = 0 }: { retryCount?: number } = {},
+  ): { req: RequestInit; url: string; timeout: number } {
     const { method, path, query, headers: headers = {} } = options;
 
     const body =
@@ -306,7 +311,7 @@ export abstract class APIClient {
       headers[this.idempotencyHeader] = options.idempotencyKey;
     }
 
-    const reqHeaders = this.buildHeaders({ options, headers, contentLength });
+    const reqHeaders = this.buildHeaders({ options, headers, contentLength, retryCount });
 
     const req: RequestInit = {
       method,
@@ -325,10 +330,12 @@ export abstract class APIClient {
     options,
     headers,
     contentLength,
+    retryCount,
   }: {
     options: FinalRequestOptions;
     headers: Record<string, string | null | undefined>;
     contentLength: string | null | undefined;
+    retryCount: number;
   }): Record<string, string> {
     const reqHeaders: Record<string, string> = {};
     if (contentLength) {
@@ -344,6 +351,16 @@ export abstract class APIClient {
       delete reqHeaders['content-type'];
     }
 
+    // Don't set the retry count header if it was already set or removed through default headers or by the
+    // caller. We check `defaultHeaders` and `headers`, which can contain nulls, instead of `reqHeaders` to
+    // account for the removal case.
+    if (
+      getHeader(defaultHeaders, 'x-stainless-retry-count') === undefined &&
+      getHeader(headers, 'x-stainless-retry-count') === undefined
+    ) {
+      reqHeaders['x-stainless-retry-count'] = String(retryCount);
+    }
+
     this.validateHeaders(reqHeaders, headers);
 
     return reqHeaders;
@@ -379,7 +396,7 @@ export abstract class APIClient {
     error: Object | undefined,
     message: string | undefined,
     headers: Headers | undefined,
-  ) {
+  ): APIError {
     return APIError.generate(status, error, message, headers);
   }
 
@@ -395,13 +412,14 @@ export abstract class APIClient {
     retriesRemaining: number | null,
   ): Promise<APIResponseProps> {
     const options = await optionsInput;
+    const maxRetries = options.maxRetries ?? this.maxRetries;
     if (retriesRemaining == null) {
-      retriesRemaining = options.maxRetries ?? this.maxRetries;
+      retriesRemaining = maxRetries;
     }
 
     await this.prepareOptions(options);
 
-    const { req, url, timeout } = this.buildRequest(options);
+    const { req, url, timeout } = this.buildRequest(options, { retryCount: maxRetries - retriesRemaining });
 
     await this.prepareRequest(req, { url, options });
 
@@ -504,20 +522,24 @@ export abstract class APIClient {
 
     const timeout = setTimeout(() => controller.abort(), ms);
 
+    const fetchOptions = {
+      signal: controller.signal as any,
+      ...options,
+    };
+    if (fetchOptions.method) {
+      // Custom methods like 'patch' need to be uppercased
+      // See https://github.com/nodejs/undici/issues/2294
+      fetchOptions.method = fetchOptions.method.toUpperCase();
+    }
+
     return (
-      this.getRequestClient()
-        // use undefined this binding; fetch errors if bound to something else in browser/cloudflare
-        .fetch.call(undefined, url, { signal: controller.signal as any, ...options })
-        .finally(() => {
-          clearTimeout(timeout);
-        })
+      // use undefined this binding; fetch errors if bound to something else in browser/cloudflare
+      this.fetch.call(undefined, url, fetchOptions).finally(() => {
+        clearTimeout(timeout);
+      })
     );
   }
 
-  protected getRequestClient(): RequestClient {
-    return { fetch: this.fetch };
-  }
-
   private shouldRetry(response: Response): boolean {
     // Note this is not a standard header.
     const shouldRetryHeader = response.headers.get('x-should-retry');
@@ -650,9 +672,9 @@ export abstract class AbstractPage<Item> implements AsyncIterable<Item> {
     return await this.#client.requestAPIList(this.constructor as any, nextOptions);
   }
 
-  async *iterPages() {
+  async *iterPages(): AsyncGenerator<this> {
     // eslint-disable-next-line @typescript-eslint/no-this-alias
-    let page: AbstractPage<Item> = this;
+    let page: this = this;
     yield page;
     while (page.hasNextPage()) {
       page = await page.getNextPage();
@@ -660,7 +682,7 @@ export abstract class AbstractPage<Item> implements AsyncIterable<Item> {
     }
   }
 
-  async *[Symbol.asyncIterator]() {
+  async *[Symbol.asyncIterator](): AsyncGenerator<Item> {
     for await (const page of this.iterPages()) {
       for (const item of page.getPaginatedItems()) {
         yield item;
@@ -703,7 +725,7 @@ export class PagePromise<
    *      console.log(item)
    *    }
    */
-  async *[Symbol.asyncIterator]() {
+  async *[Symbol.asyncIterator](): AsyncGenerator<Item> {
     const page = await this;
     for await (const item of page) {
       yield item;
@@ -958,8 +980,8 @@ export const safeJSON = (text: string) => {
   }
 };
 
-// https://stackoverflow.com/a/19709846
-const startsWithSchemeRegexp = new RegExp('^(?:[a-z]+:)?//', 'i');
+// https://url.spec.whatwg.org/#url-scheme-string
+const startsWithSchemeRegexp = /^[a-z][a-z0-9+.-]*:/i;
 const isAbsoluteURL = (url: string): boolean => {
   return startsWithSchemeRegexp.test(url);
 };
@@ -978,6 +1000,11 @@ const validatePositiveInteger = (name: string, n: unknown): number => {
 
 export const castToError = (err: any): Error => {
   if (err instanceof Error) return err;
+  if (typeof err === 'object' && err !== null) {
+    try {
+      return new Error(JSON.stringify(err));
+    } catch {}
+  }
   return new Error(err);
 };
 
@@ -1115,7 +1142,15 @@ export const isHeadersProtocol = (headers: any): headers is HeadersProtocol => {
   return typeof headers?.get === 'function';
 };
 
-export const getRequiredHeader = (headers: HeadersLike, header: string): string => {
+export const getRequiredHeader = (headers: HeadersLike | Headers, header: string): string => {
+  const foundHeader = getHeader(headers, header);
+  if (foundHeader === undefined) {
+    throw new Error(`Could not find ${header} header`);
+  }
+  return foundHeader;
+};
+
+export const getHeader = (headers: HeadersLike | Headers, header: string): string | undefined => {
   const lowerCasedHeader = header.toLowerCase();
   if (isHeadersProtocol(headers)) {
     // to deal with the case where the header looks like Stainless-Event-Id
@@ -1141,7 +1176,7 @@ export const getRequiredHeader = (headers: HeadersLike, header: string): string
     }
   }
 
-  throw new Error(`Could not find ${header} header`);
+  return undefined;
 };
 
 /**
diff --git a/src/error.ts b/src/error.ts
index 481076817d..2c74bf0342 100644
--- a/src/error.ts
+++ b/src/error.ts
@@ -5,25 +5,27 @@ import * as Shared from './resources/shared';
 
 export class CloudflareError extends Error {}
 
-export class APIError extends CloudflareError {
-  readonly status: number | undefined;
-  readonly headers: Headers | undefined;
-  readonly error: Object | undefined;
+export class APIError<
+  TStatus extends number | undefined = number | undefined,
+  THeaders extends Headers | undefined = Headers | undefined,
+  TError extends Object | undefined = Object | undefined,
+> extends CloudflareError {
+  /** HTTP status for the response that caused the error */
+  readonly status: TStatus;
+  /** HTTP headers for the response that caused the error */
+  readonly headers: THeaders;
+  /** JSON body of the response that caused the error */
+  readonly error: TError;
 
   readonly errors: Array<Shared.ErrorData>;
 
-  constructor(
-    status: number | undefined,
-    error: Object | undefined,
-    message: string | undefined,
-    headers: Headers | undefined,
-  ) {
+  constructor(status: TStatus, error: TError, message: string | undefined, headers: THeaders) {
     super(`${APIError.makeMessage(status, error, message)}`);
     this.status = status;
     this.headers = headers;
+    this.error = error;
 
     const data = error as Record<string, any>;
-    this.error = data;
     this.errors = data?.['errors'] ?? [];
   }
 
@@ -53,9 +55,9 @@ export class APIError extends CloudflareError {
     errorResponse: Object | undefined,
     message: string | undefined,
     headers: Headers | undefined,
-  ) {
-    if (!status) {
-      return new APIConnectionError({ cause: castToError(errorResponse) });
+  ): APIError {
+    if (!status || !headers) {
+      return new APIConnectionError({ message, cause: castToError(errorResponse) });
     }
 
     const error = errorResponse as Record<string, any>;
@@ -96,18 +98,14 @@ export class APIError extends CloudflareError {
   }
 }
 
-export class APIUserAbortError extends APIError {
-  override readonly status: undefined = undefined;
-
+export class APIUserAbortError extends APIError<undefined, undefined, undefined> {
   constructor({ message }: { message?: string } = {}) {
     super(undefined, undefined, message || 'Request was aborted.', undefined);
   }
 }
 
-export class APIConnectionError extends APIError {
-  override readonly status: undefined = undefined;
-
-  constructor({ message, cause }: { message?: string; cause?: Error | undefined }) {
+export class APIConnectionError extends APIError<undefined, undefined, undefined> {
+  constructor({ message, cause }: { message?: string | undefined; cause?: Error | undefined }) {
     super(undefined, undefined, message || 'Connection error.', undefined);
     // in some environments the 'cause' property is already declared
     // @ts-ignore
@@ -121,32 +119,18 @@ export class APIConnectionTimeoutError extends APIConnectionError {
   }
 }
 
-export class BadRequestError extends APIError {
-  override readonly status: 400 = 400;
-}
+export class BadRequestError extends APIError<400, Headers> {}
 
-export class AuthenticationError extends APIError {
-  override readonly status: 401 = 401;
-}
+export class AuthenticationError extends APIError<401, Headers> {}
 
-export class PermissionDeniedError extends APIError {
-  override readonly status: 403 = 403;
-}
+export class PermissionDeniedError extends APIError<403, Headers> {}
 
-export class NotFoundError extends APIError {
-  override readonly status: 404 = 404;
-}
+export class NotFoundError extends APIError<404, Headers> {}
 
-export class ConflictError extends APIError {
-  override readonly status: 409 = 409;
-}
+export class ConflictError extends APIError<409, Headers> {}
 
-export class UnprocessableEntityError extends APIError {
-  override readonly status: 422 = 422;
-}
+export class UnprocessableEntityError extends APIError<422, Headers> {}
 
-export class RateLimitError extends APIError {
-  override readonly status: 429 = 429;
-}
+export class RateLimitError extends APIError<429, Headers> {}
 
-export class InternalServerError extends APIError {}
+export class InternalServerError extends APIError<number, Headers> {}
diff --git a/src/index.ts b/src/index.ts
index 27056ebbce..f68d33b3e4 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -1,31 +1,128 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import * as Errors from './error';
-import * as Uploads from './uploads';
 import { type Agent } from './_shims/index';
-import * as qs from 'qs';
+import * as qs from './internal/qs';
 import * as Core from './core';
+import * as Errors from './error';
 import * as Pagination from './pagination';
+import {
+  type CursorLimitPaginationParams,
+  CursorLimitPaginationResponse,
+  type CursorPaginationParams,
+  CursorPaginationResponse,
+  SinglePageResponse,
+  type V4PagePaginationArrayParams,
+  V4PagePaginationArrayResponse,
+  type V4PagePaginationParams,
+  V4PagePaginationResponse,
+} from './pagination';
+import * as Uploads from './uploads';
 import * as API from './resources/index';
+import { AbuseReports } from './resources/abuse-reports';
+import { AuditLogs } from './resources/audit-logs';
+import { BotManagement } from './resources/bot-management';
+import { BrandProtection } from './resources/brand-protection';
+import { ClientCertificates } from './resources/client-certificates';
+import { CustomNameservers } from './resources/custom-nameservers';
+import { DCVDelegation } from './resources/dcv-delegation';
+import { Filters } from './resources/filters';
+import { IPs } from './resources/ips';
+import { KeylessCertificates } from './resources/keyless-certificates';
+import { ManagedTransforms } from './resources/managed-transforms';
+import { Memberships } from './resources/memberships';
+import { OriginCACertificates } from './resources/origin-ca-certificates';
+import { OriginPostQuantumEncryption } from './resources/origin-post-quantum-encryption';
+import { PageRules } from './resources/page-rules';
+import { RateLimits } from './resources/rate-limits';
+import { SecurityTXT } from './resources/security-txt';
+import { URLNormalization } from './resources/url-normalization';
+import { Accounts } from './resources/accounts/accounts';
+import { ACM } from './resources/acm/acm';
+import { Addressing } from './resources/addressing/addressing';
+import { AIGateway } from './resources/ai-gateway/ai-gateway';
+import { AI } from './resources/ai/ai';
+import { Alerting } from './resources/alerting/alerting';
+import { APIGateway } from './resources/api-gateway/api-gateway';
+import { Argo } from './resources/argo/argo';
+import { Billing } from './resources/billing/billing';
+import { BotnetFeed } from './resources/botnet-feed/botnet-feed';
+import { Cache } from './resources/cache/cache';
+import { Calls } from './resources/calls/calls';
+import { CertificateAuthorities } from './resources/certificate-authorities/certificate-authorities';
+import { CloudConnector } from './resources/cloud-connector/cloud-connector';
+import { CloudforceOne } from './resources/cloudforce-one/cloudforce-one';
+import { ContentScanning } from './resources/content-scanning/content-scanning';
+import { CustomCertificates } from './resources/custom-certificates/custom-certificates';
+import { CustomHostnames } from './resources/custom-hostnames/custom-hostnames';
+import { D1Resource } from './resources/d1/d1';
+import { Diagnostics } from './resources/diagnostics/diagnostics';
+import { DNSFirewall } from './resources/dns-firewall/dns-firewall';
+import { DNS } from './resources/dns/dns';
+import { DurableObjects } from './resources/durable-objects/durable-objects';
+import { EmailRouting } from './resources/email-routing/email-routing';
+import { EmailSecurity } from './resources/email-security/email-security';
+import { Firewall } from './resources/firewall/firewall';
+import { Healthchecks } from './resources/healthchecks/healthchecks';
+import { Hostnames } from './resources/hostnames/hostnames';
+import { HyperdriveResource } from './resources/hyperdrive/hyperdrive';
+import { IAM } from './resources/iam/iam';
+import { Images } from './resources/images/images';
+import { Intel } from './resources/intel/intel';
+import { KV } from './resources/kv/kv';
+import { LeakedCredentialChecks } from './resources/leaked-credential-checks/leaked-credential-checks';
+import { LoadBalancers } from './resources/load-balancers/load-balancers';
+import { Logpush } from './resources/logpush/logpush';
+import { Logs } from './resources/logs/logs';
+import { MagicNetworkMonitoring } from './resources/magic-network-monitoring/magic-network-monitoring';
+import { MagicTransit } from './resources/magic-transit/magic-transit';
+import { MTLSCertificates } from './resources/mtls-certificates/mtls-certificates';
+import { OriginTLSClientAuth } from './resources/origin-tls-client-auth/origin-tls-client-auth';
+import { PageShield } from './resources/page-shield/page-shield';
+import { Pages } from './resources/pages/pages';
+import { Queues } from './resources/queues/queues';
+import { R2 } from './resources/r2/r2';
+import { Radar } from './resources/radar/radar';
+import { Registrar } from './resources/registrar/registrar';
+import { RequestTracers } from './resources/request-tracers/request-tracers';
+import { ResourceSharing } from './resources/resource-sharing/resource-sharing';
+import { Rules } from './resources/rules/rules';
+import { Rulesets } from './resources/rulesets/rulesets';
+import { RUM } from './resources/rum/rum';
+import { Snippets } from './resources/snippets/snippets';
+import { Spectrum } from './resources/spectrum/spectrum';
+import { Speed } from './resources/speed/speed';
+import { SSL } from './resources/ssl/ssl';
+import { Stream } from './resources/stream/stream';
+import { Turnstile } from './resources/turnstile/turnstile';
+import { URLScanner } from './resources/url-scanner/url-scanner';
+import { User } from './resources/user/user';
+import { Vectorize } from './resources/vectorize/vectorize';
+import { WaitingRooms } from './resources/waiting-rooms/waiting-rooms';
+import { Web3 } from './resources/web3/web3';
+import { WorkersForPlatforms } from './resources/workers-for-platforms/workers-for-platforms';
+import { Workers } from './resources/workers/workers';
+import { Workflows } from './resources/workflows/workflows';
+import { ZeroTrust } from './resources/zero-trust/zero-trust';
+import { Zones } from './resources/zones/zones';
 
 export interface ClientOptions {
   /**
-   * Defaults to process.env['CLOUDFLARE_API_TOKEN'].
+   * The preferred authorization scheme for interacting with the Cloudflare API. [Create a token](https://developers.cloudflare.com/fundamentals/api/get-started/create-token/).
    */
   apiToken?: string | null | undefined;
 
   /**
-   * Defaults to process.env['CLOUDFLARE_API_KEY'].
+   * The previous authorization scheme for interacting with the Cloudflare API. When possible, use API tokens instead of Global API keys.
    */
   apiKey?: string | null | undefined;
 
   /**
-   * Defaults to process.env['CLOUDFLARE_EMAIL'].
+   * The previous authorization scheme for interacting with the Cloudflare API, used in conjunction with a Global API key.
    */
   apiEmail?: string | null | undefined;
 
   /**
-   * Defaults to process.env['CLOUDFLARE_API_USER_SERVICE_KEY'].
+   * Used when interacting with the Origin CA certificates API. [View/change your key](https://developers.cloudflare.com/fundamentals/api/get-started/ca-keys/#viewchange-your-origin-ca-keys).
    */
   userServiceKey?: string | null | undefined;
 
@@ -154,18 +251,16 @@ export class Cloudflare extends Core.APIClient {
   loadBalancers: API.LoadBalancers = new API.LoadBalancers(this);
   cache: API.Cache = new API.Cache(this);
   ssl: API.SSL = new API.SSL(this);
-  subscriptions: API.Subscriptions = new API.Subscriptions(this);
   acm: API.ACM = new API.ACM(this);
   argo: API.Argo = new API.Argo(this);
-  plans: API.Plans = new API.Plans(this);
-  ratePlans: API.RatePlans = new API.RatePlans(this);
   certificateAuthorities: API.CertificateAuthorities = new API.CertificateAuthorities(this);
   clientCertificates: API.ClientCertificates = new API.ClientCertificates(this);
   customCertificates: API.CustomCertificates = new API.CustomCertificates(this);
   customHostnames: API.CustomHostnames = new API.CustomHostnames(this);
   customNameservers: API.CustomNameservers = new API.CustomNameservers(this);
+  dnsFirewall: API.DNSFirewall = new API.DNSFirewall(this);
   dns: API.DNS = new API.DNS(this);
-  dnssec: API.DNSSECResource = new API.DNSSECResource(this);
+  emailSecurity: API.EmailSecurity = new API.EmailSecurity(this);
   emailRouting: API.EmailRouting = new API.EmailRouting(this);
   filters: API.Filters = new API.Filters(this);
   firewall: API.Firewall = new API.Firewall(this);
@@ -174,9 +269,8 @@ export class Cloudflare extends Core.APIClient {
   logpush: API.Logpush = new API.Logpush(this);
   logs: API.Logs = new API.Logs(this);
   originTLSClientAuth: API.OriginTLSClientAuth = new API.OriginTLSClientAuth(this);
-  pagerules: API.Pagerules = new API.Pagerules(this);
+  pageRules: API.PageRules = new API.PageRules(this);
   rateLimits: API.RateLimits = new API.RateLimits(this);
-  secondaryDNS: API.SecondaryDNS = new API.SecondaryDNS(this);
   waitingRooms: API.WaitingRooms = new API.WaitingRooms(this);
   web3: API.Web3 = new API.Web3(this);
   workers: API.Workers = new API.Workers(this);
@@ -184,7 +278,7 @@ export class Cloudflare extends Core.APIClient {
   durableObjects: API.DurableObjects = new API.DurableObjects(this);
   queues: API.Queues = new API.Queues(this);
   apiGateway: API.APIGateway = new API.APIGateway(this);
-  managedHeaders: API.ManagedHeaders = new API.ManagedHeaders(this);
+  managedTransforms: API.ManagedTransforms = new API.ManagedTransforms(this);
   pageShield: API.PageShield = new API.PageShield(this);
   rulesets: API.Rulesets = new API.Rulesets(this);
   urlNormalization: API.URLNormalization = new API.URLNormalization(this);
@@ -200,19 +294,16 @@ export class Cloudflare extends Core.APIClient {
   magicNetworkMonitoring: API.MagicNetworkMonitoring = new API.MagicNetworkMonitoring(this);
   mtlsCertificates: API.MTLSCertificates = new API.MTLSCertificates(this);
   pages: API.Pages = new API.Pages(this);
-  pcaps: API.PCAPs = new API.PCAPs(this);
   registrar: API.Registrar = new API.Registrar(this);
   requestTracers: API.RequestTracers = new API.RequestTracers(this);
   rules: API.Rules = new API.Rules(this);
-  storage: API.Storage = new API.Storage(this);
   stream: API.Stream = new API.Stream(this);
   alerting: API.Alerting = new API.Alerting(this);
   d1: API.D1Resource = new API.D1Resource(this);
   r2: API.R2 = new API.R2(this);
-  warpConnector: API.WARPConnector = new API.WARPConnector(this);
   workersForPlatforms: API.WorkersForPlatforms = new API.WorkersForPlatforms(this);
   zeroTrust: API.ZeroTrust = new API.ZeroTrust(this);
-  challenges: API.Challenges = new API.Challenges(this);
+  turnstile: API.Turnstile = new API.Turnstile(this);
   hyperdrive: API.HyperdriveResource = new API.HyperdriveResource(this);
   rum: API.RUM = new API.RUM(this);
   vectorize: API.Vectorize = new API.Vectorize(this);
@@ -226,10 +317,17 @@ export class Cloudflare extends Core.APIClient {
   snippets: API.Snippets = new API.Snippets(this);
   calls: API.Calls = new API.Calls(this);
   cloudforceOne: API.CloudforceOne = new API.CloudforceOne(this);
-  eventNotifications: API.EventNotifications = new API.EventNotifications(this);
   aiGateway: API.AIGateway = new API.AIGateway(this);
   iam: API.IAM = new API.IAM(this);
   cloudConnector: API.CloudConnector = new API.CloudConnector(this);
+  botnetFeed: API.BotnetFeed = new API.BotnetFeed(this);
+  securityTXT: API.SecurityTXT = new API.SecurityTXT(this);
+  workflows: API.Workflows = new API.Workflows(this);
+  resourceSharing: API.ResourceSharing = new API.ResourceSharing(this);
+  leakedCredentialChecks: API.LeakedCredentialChecks = new API.LeakedCredentialChecks(this);
+  contentScanning: API.ContentScanning = new API.ContentScanning(this);
+  abuseReports: API.AbuseReports = new API.AbuseReports(this);
+  ai: API.AI = new API.AI(this);
 
   protected override defaultQuery(): Core.DefaultQuery | undefined {
     return this._options.defaultQuery;
@@ -336,6 +434,7 @@ export class Cloudflare extends Core.APIClient {
   }
 
   static Cloudflare = this;
+  static DEFAULT_TIMEOUT = 60000; // 1 minute
 
   static CloudflareError = Errors.CloudflareError;
   static APIError = Errors.APIError;
@@ -355,233 +454,335 @@ export class Cloudflare extends Core.APIClient {
   static fileFromPath = Uploads.fileFromPath;
 }
 
-export const {
-  CloudflareError,
-  APIError,
-  APIConnectionError,
-  APIConnectionTimeoutError,
-  APIUserAbortError,
-  NotFoundError,
-  ConflictError,
-  RateLimitError,
-  BadRequestError,
-  AuthenticationError,
-  InternalServerError,
-  PermissionDeniedError,
-  UnprocessableEntityError,
-} = Errors;
-
-export import toFile = Uploads.toFile;
-export import fileFromPath = Uploads.fileFromPath;
-
-export namespace Cloudflare {
-  export import RequestOptions = Core.RequestOptions;
+Cloudflare.Accounts = Accounts;
+Cloudflare.OriginCACertificates = OriginCACertificates;
+Cloudflare.IPs = IPs;
+Cloudflare.Memberships = Memberships;
+Cloudflare.User = User;
+Cloudflare.Zones = Zones;
+Cloudflare.LoadBalancers = LoadBalancers;
+Cloudflare.Cache = Cache;
+Cloudflare.SSL = SSL;
+Cloudflare.ACM = ACM;
+Cloudflare.Argo = Argo;
+Cloudflare.CertificateAuthorities = CertificateAuthorities;
+Cloudflare.ClientCertificates = ClientCertificates;
+Cloudflare.CustomCertificates = CustomCertificates;
+Cloudflare.CustomHostnames = CustomHostnames;
+Cloudflare.CustomNameservers = CustomNameservers;
+Cloudflare.DNSFirewall = DNSFirewall;
+Cloudflare.DNS = DNS;
+Cloudflare.EmailSecurity = EmailSecurity;
+Cloudflare.EmailRouting = EmailRouting;
+Cloudflare.Filters = Filters;
+Cloudflare.Firewall = Firewall;
+Cloudflare.Healthchecks = Healthchecks;
+Cloudflare.KeylessCertificates = KeylessCertificates;
+Cloudflare.Logpush = Logpush;
+Cloudflare.Logs = Logs;
+Cloudflare.OriginTLSClientAuth = OriginTLSClientAuth;
+Cloudflare.PageRules = PageRules;
+Cloudflare.RateLimits = RateLimits;
+Cloudflare.WaitingRooms = WaitingRooms;
+Cloudflare.Web3 = Web3;
+Cloudflare.Workers = Workers;
+Cloudflare.KV = KV;
+Cloudflare.DurableObjects = DurableObjects;
+Cloudflare.Queues = Queues;
+Cloudflare.APIGateway = APIGateway;
+Cloudflare.ManagedTransforms = ManagedTransforms;
+Cloudflare.PageShield = PageShield;
+Cloudflare.Rulesets = Rulesets;
+Cloudflare.URLNormalization = URLNormalization;
+Cloudflare.Spectrum = Spectrum;
+Cloudflare.Addressing = Addressing;
+Cloudflare.AuditLogs = AuditLogs;
+Cloudflare.Billing = Billing;
+Cloudflare.BrandProtection = BrandProtection;
+Cloudflare.Diagnostics = Diagnostics;
+Cloudflare.Images = Images;
+Cloudflare.Intel = Intel;
+Cloudflare.MagicTransit = MagicTransit;
+Cloudflare.MagicNetworkMonitoring = MagicNetworkMonitoring;
+Cloudflare.MTLSCertificates = MTLSCertificates;
+Cloudflare.Pages = Pages;
+Cloudflare.Registrar = Registrar;
+Cloudflare.RequestTracers = RequestTracers;
+Cloudflare.Rules = Rules;
+Cloudflare.Stream = Stream;
+Cloudflare.Alerting = Alerting;
+Cloudflare.D1Resource = D1Resource;
+Cloudflare.R2 = R2;
+Cloudflare.WorkersForPlatforms = WorkersForPlatforms;
+Cloudflare.ZeroTrust = ZeroTrust;
+Cloudflare.Turnstile = Turnstile;
+Cloudflare.HyperdriveResource = HyperdriveResource;
+Cloudflare.RUM = RUM;
+Cloudflare.Vectorize = Vectorize;
+Cloudflare.URLScanner = URLScanner;
+Cloudflare.Radar = Radar;
+Cloudflare.BotManagement = BotManagement;
+Cloudflare.OriginPostQuantumEncryption = OriginPostQuantumEncryption;
+Cloudflare.Speed = Speed;
+Cloudflare.DCVDelegation = DCVDelegation;
+Cloudflare.Hostnames = Hostnames;
+Cloudflare.Snippets = Snippets;
+Cloudflare.Calls = Calls;
+Cloudflare.CloudforceOne = CloudforceOne;
+Cloudflare.AIGateway = AIGateway;
+Cloudflare.IAM = IAM;
+Cloudflare.CloudConnector = CloudConnector;
+Cloudflare.BotnetFeed = BotnetFeed;
+Cloudflare.SecurityTXT = SecurityTXT;
+Cloudflare.Workflows = Workflows;
+Cloudflare.ResourceSharing = ResourceSharing;
+Cloudflare.LeakedCredentialChecks = LeakedCredentialChecks;
+Cloudflare.ContentScanning = ContentScanning;
+Cloudflare.AbuseReports = AbuseReports;
+Cloudflare.AI = AI;
+export declare namespace Cloudflare {
+  export type RequestOptions = Core.RequestOptions;
 
   export import V4PagePagination = Pagination.V4PagePagination;
-  export import V4PagePaginationParams = Pagination.V4PagePaginationParams;
-  export import V4PagePaginationResponse = Pagination.V4PagePaginationResponse;
+  export {
+    type V4PagePaginationParams as V4PagePaginationParams,
+    type V4PagePaginationResponse as V4PagePaginationResponse,
+  };
 
   export import V4PagePaginationArray = Pagination.V4PagePaginationArray;
-  export import V4PagePaginationArrayParams = Pagination.V4PagePaginationArrayParams;
-  export import V4PagePaginationArrayResponse = Pagination.V4PagePaginationArrayResponse;
+  export {
+    type V4PagePaginationArrayParams as V4PagePaginationArrayParams,
+    type V4PagePaginationArrayResponse as V4PagePaginationArrayResponse,
+  };
 
   export import CursorPagination = Pagination.CursorPagination;
-  export import CursorPaginationParams = Pagination.CursorPaginationParams;
-  export import CursorPaginationResponse = Pagination.CursorPaginationResponse;
+  export {
+    type CursorPaginationParams as CursorPaginationParams,
+    type CursorPaginationResponse as CursorPaginationResponse,
+  };
 
   export import CursorLimitPagination = Pagination.CursorLimitPagination;
-  export import CursorLimitPaginationParams = Pagination.CursorLimitPaginationParams;
-  export import CursorLimitPaginationResponse = Pagination.CursorLimitPaginationResponse;
+  export {
+    type CursorLimitPaginationParams as CursorLimitPaginationParams,
+    type CursorLimitPaginationResponse as CursorLimitPaginationResponse,
+  };
 
   export import SinglePage = Pagination.SinglePage;
-  export import SinglePageResponse = Pagination.SinglePageResponse;
+  export { type SinglePageResponse as SinglePageResponse };
+
+  export { Accounts as Accounts };
 
-  export import Accounts = API.Accounts;
+  export { OriginCACertificates as OriginCACertificates };
 
-  export import OriginCACertificates = API.OriginCACertificates;
+  export { IPs as IPs };
 
-  export import IPs = API.IPs;
+  export { Memberships as Memberships };
 
-  export import Memberships = API.Memberships;
+  export { User as User };
 
-  export import User = API.User;
+  export { Zones as Zones };
 
-  export import Zones = API.Zones;
+  export { LoadBalancers as LoadBalancers };
 
-  export import LoadBalancers = API.LoadBalancers;
+  export { Cache as Cache };
 
-  export import Cache = API.Cache;
+  export { SSL as SSL };
 
-  export import SSL = API.SSL;
+  export { ACM as ACM };
 
-  export import Subscriptions = API.Subscriptions;
+  export { Argo as Argo };
 
-  export import ACM = API.ACM;
+  export { CertificateAuthorities as CertificateAuthorities };
 
-  export import Argo = API.Argo;
+  export { ClientCertificates as ClientCertificates };
 
-  export import Plans = API.Plans;
+  export { CustomCertificates as CustomCertificates };
 
-  export import RatePlans = API.RatePlans;
+  export { CustomHostnames as CustomHostnames };
 
-  export import CertificateAuthorities = API.CertificateAuthorities;
+  export { CustomNameservers as CustomNameservers };
 
-  export import ClientCertificates = API.ClientCertificates;
+  export { DNSFirewall as DNSFirewall };
 
-  export import CustomCertificates = API.CustomCertificates;
+  export { DNS as DNS };
 
-  export import CustomHostnames = API.CustomHostnames;
+  export { EmailSecurity as EmailSecurity };
 
-  export import CustomNameservers = API.CustomNameservers;
+  export { EmailRouting as EmailRouting };
 
-  export import DNS = API.DNS;
+  export { Filters as Filters };
 
-  export import DNSSECResource = API.DNSSECResource;
+  export { Firewall as Firewall };
 
-  export import EmailRouting = API.EmailRouting;
+  export { Healthchecks as Healthchecks };
 
-  export import Filters = API.Filters;
+  export { KeylessCertificates as KeylessCertificates };
 
-  export import Firewall = API.Firewall;
+  export { Logpush as Logpush };
 
-  export import Healthchecks = API.Healthchecks;
+  export { Logs as Logs };
 
-  export import KeylessCertificates = API.KeylessCertificates;
+  export { OriginTLSClientAuth as OriginTLSClientAuth };
 
-  export import Logpush = API.Logpush;
+  export { PageRules as PageRules };
 
-  export import Logs = API.Logs;
+  export { RateLimits as RateLimits };
 
-  export import OriginTLSClientAuth = API.OriginTLSClientAuth;
+  export { WaitingRooms as WaitingRooms };
 
-  export import Pagerules = API.Pagerules;
+  export { Web3 as Web3 };
 
-  export import RateLimits = API.RateLimits;
+  export { Workers as Workers };
 
-  export import SecondaryDNS = API.SecondaryDNS;
+  export { KV as KV };
 
-  export import WaitingRooms = API.WaitingRooms;
+  export { DurableObjects as DurableObjects };
 
-  export import Web3 = API.Web3;
+  export { Queues as Queues };
 
-  export import Workers = API.Workers;
+  export { APIGateway as APIGateway };
 
-  export import KV = API.KV;
+  export { ManagedTransforms as ManagedTransforms };
 
-  export import DurableObjects = API.DurableObjects;
+  export { PageShield as PageShield };
 
-  export import Queues = API.Queues;
+  export { Rulesets as Rulesets };
 
-  export import APIGateway = API.APIGateway;
+  export { URLNormalization as URLNormalization };
 
-  export import ManagedHeaders = API.ManagedHeaders;
+  export { Spectrum as Spectrum };
 
-  export import PageShield = API.PageShield;
+  export { Addressing as Addressing };
 
-  export import Rulesets = API.Rulesets;
+  export { AuditLogs as AuditLogs };
 
-  export import URLNormalization = API.URLNormalization;
+  export { Billing as Billing };
 
-  export import Spectrum = API.Spectrum;
+  export { BrandProtection as BrandProtection };
 
-  export import Addressing = API.Addressing;
+  export { Diagnostics as Diagnostics };
 
-  export import AuditLogs = API.AuditLogs;
+  export { Images as Images };
 
-  export import Billing = API.Billing;
+  export { Intel as Intel };
 
-  export import BrandProtection = API.BrandProtection;
+  export { MagicTransit as MagicTransit };
 
-  export import Diagnostics = API.Diagnostics;
+  export { MagicNetworkMonitoring as MagicNetworkMonitoring };
 
-  export import Images = API.Images;
+  export { MTLSCertificates as MTLSCertificates };
 
-  export import Intel = API.Intel;
+  export { Pages as Pages };
 
-  export import MagicTransit = API.MagicTransit;
+  export { Registrar as Registrar };
 
-  export import MagicNetworkMonitoring = API.MagicNetworkMonitoring;
+  export { RequestTracers as RequestTracers };
 
-  export import MTLSCertificates = API.MTLSCertificates;
+  export { Rules as Rules };
 
-  export import Pages = API.Pages;
+  export { Stream as Stream };
 
-  export import PCAPs = API.PCAPs;
+  export { Alerting as Alerting };
 
-  export import Registrar = API.Registrar;
+  export { D1Resource as D1Resource };
 
-  export import RequestTracers = API.RequestTracers;
+  export { R2 as R2 };
 
-  export import Rules = API.Rules;
+  export { WorkersForPlatforms as WorkersForPlatforms };
 
-  export import Storage = API.Storage;
+  export { ZeroTrust as ZeroTrust };
 
-  export import Stream = API.Stream;
+  export { Turnstile as Turnstile };
 
-  export import Alerting = API.Alerting;
+  export { HyperdriveResource as HyperdriveResource };
 
-  export import D1Resource = API.D1Resource;
+  export { RUM as RUM };
 
-  export import R2 = API.R2;
+  export { Vectorize as Vectorize };
 
-  export import WARPConnector = API.WARPConnector;
+  export { URLScanner as URLScanner };
 
-  export import WorkersForPlatforms = API.WorkersForPlatforms;
+  export { Radar as Radar };
 
-  export import ZeroTrust = API.ZeroTrust;
+  export { BotManagement as BotManagement };
 
-  export import Challenges = API.Challenges;
+  export { OriginPostQuantumEncryption as OriginPostQuantumEncryption };
 
-  export import HyperdriveResource = API.HyperdriveResource;
+  export { Speed as Speed };
 
-  export import RUM = API.RUM;
+  export { DCVDelegation as DCVDelegation };
 
-  export import Vectorize = API.Vectorize;
+  export { Hostnames as Hostnames };
 
-  export import URLScanner = API.URLScanner;
+  export { Snippets as Snippets };
 
-  export import Radar = API.Radar;
+  export { Calls as Calls };
 
-  export import BotManagement = API.BotManagement;
+  export { CloudforceOne as CloudforceOne };
 
-  export import OriginPostQuantumEncryption = API.OriginPostQuantumEncryption;
+  export { AIGateway as AIGateway };
 
-  export import Speed = API.Speed;
+  export { IAM as IAM };
 
-  export import DCVDelegation = API.DCVDelegation;
+  export { CloudConnector as CloudConnector };
 
-  export import Hostnames = API.Hostnames;
+  export { BotnetFeed as BotnetFeed };
 
-  export import Snippets = API.Snippets;
+  export { SecurityTXT as SecurityTXT };
 
-  export import Calls = API.Calls;
+  export { Workflows as Workflows };
 
-  export import CloudforceOne = API.CloudforceOne;
+  export { ResourceSharing as ResourceSharing };
 
-  export import EventNotifications = API.EventNotifications;
+  export { LeakedCredentialChecks as LeakedCredentialChecks };
 
-  export import AIGateway = API.AIGateway;
+  export { ContentScanning as ContentScanning };
 
-  export import IAM = API.IAM;
+  export { AbuseReports as AbuseReports };
 
-  export import CloudConnector = API.CloudConnector;
+  export { AI as AI };
 
-  export import ASN = API.ASN;
-  export import AuditLog = API.AuditLog;
-  export import CertificateCA = API.CertificateCA;
-  export import CertificateRequestType = API.CertificateRequestType;
-  export import CloudflareTunnel = API.CloudflareTunnel;
-  export import ErrorData = API.ErrorData;
-  export import Identifier = API.Identifier;
-  export import LoadBalancerPreview = API.LoadBalancerPreview;
-  export import Member = API.Member;
-  export import PaginationInfo = API.PaginationInfo;
-  export import Permission = API.Permission;
-  export import PermissionGrant = API.PermissionGrant;
-  export import ResponseInfo = API.ResponseInfo;
-  export import Result = API.Result;
-  export import Role = API.Role;
-  export import SortDirection = API.SortDirection;
+  export type ASN = API.ASN;
+  export type AuditLog = API.AuditLog;
+  export type CertificateCA = API.CertificateCA;
+  export type CertificateRequestType = API.CertificateRequestType;
+  export type CloudflareTunnel = API.CloudflareTunnel;
+  export type ErrorData = API.ErrorData;
+  export type Identifier = API.Identifier;
+  export type LoadBalancerPreview = API.LoadBalancerPreview;
+  export type Member = API.Member;
+  export type PaginationInfo = API.PaginationInfo;
+  export type Permission = API.Permission;
+  export type PermissionGrant = API.PermissionGrant;
+  export type RatePlan = API.RatePlan;
+  export type ResponseInfo = API.ResponseInfo;
+  export type Result = API.Result;
+  export type Role = API.Role;
+  export type SortDirection = API.SortDirection;
+  export type Subscription = API.Subscription;
+  export type SubscriptionComponent = API.SubscriptionComponent;
+  export type SubscriptionZone = API.SubscriptionZone;
+  export type Token = API.Token;
+  export type TokenConditionCIDRList = API.TokenConditionCIDRList;
+  export type TokenPolicy = API.TokenPolicy;
+  export type TokenValue = API.TokenValue;
 }
 
+export { toFile, fileFromPath } from './uploads';
+export {
+  CloudflareError,
+  APIError,
+  APIConnectionError,
+  APIConnectionTimeoutError,
+  APIUserAbortError,
+  NotFoundError,
+  ConflictError,
+  RateLimitError,
+  BadRequestError,
+  AuthenticationError,
+  InternalServerError,
+  PermissionDeniedError,
+  UnprocessableEntityError,
+} from './error';
+
 export default Cloudflare;
diff --git a/src/internal/qs/LICENSE.md b/src/internal/qs/LICENSE.md
new file mode 100644
index 0000000000..3fda1573bb
--- /dev/null
+++ b/src/internal/qs/LICENSE.md
@@ -0,0 +1,13 @@
+BSD 3-Clause License
+
+Copyright (c) 2014, Nathan LaFreniere and other [contributors](https://github.com/puruvj/neoqs/graphs/contributors) All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/src/internal/qs/README.md b/src/internal/qs/README.md
new file mode 100644
index 0000000000..67ae04ecd5
--- /dev/null
+++ b/src/internal/qs/README.md
@@ -0,0 +1,3 @@
+# qs
+
+This is a vendored version of [neoqs](https://github.com/PuruVJ/neoqs) which is a TypeScript rewrite of [qs](https://github.com/ljharb/qs), a query string library.
diff --git a/src/internal/qs/formats.ts b/src/internal/qs/formats.ts
new file mode 100644
index 0000000000..1cf9e2cde5
--- /dev/null
+++ b/src/internal/qs/formats.ts
@@ -0,0 +1,9 @@
+import type { Format } from './types';
+
+export const default_format: Format = 'RFC3986';
+export const formatters: Record<Format, (str: PropertyKey) => string> = {
+  RFC1738: (v: PropertyKey) => String(v).replace(/%20/g, '+'),
+  RFC3986: (v: PropertyKey) => String(v),
+};
+export const RFC1738 = 'RFC1738';
+export const RFC3986 = 'RFC3986';
diff --git a/src/internal/qs/index.ts b/src/internal/qs/index.ts
new file mode 100644
index 0000000000..c3a3620d01
--- /dev/null
+++ b/src/internal/qs/index.ts
@@ -0,0 +1,13 @@
+import { default_format, formatters, RFC1738, RFC3986 } from './formats';
+
+const formats = {
+  formatters,
+  RFC1738,
+  RFC3986,
+  default: default_format,
+};
+
+export { stringify } from './stringify';
+export { formats };
+
+export type { DefaultDecoder, DefaultEncoder, Format, ParseOptions, StringifyOptions } from './types';
diff --git a/src/internal/qs/stringify.ts b/src/internal/qs/stringify.ts
new file mode 100644
index 0000000000..67497561a4
--- /dev/null
+++ b/src/internal/qs/stringify.ts
@@ -0,0 +1,388 @@
+import { encode, is_buffer, maybe_map } from './utils';
+import { default_format, formatters } from './formats';
+import type { NonNullableProperties, StringifyOptions } from './types';
+
+const has = Object.prototype.hasOwnProperty;
+
+const array_prefix_generators = {
+  brackets(prefix: PropertyKey) {
+    return String(prefix) + '[]';
+  },
+  comma: 'comma',
+  indices(prefix: PropertyKey, key: string) {
+    return String(prefix) + '[' + key + ']';
+  },
+  repeat(prefix: PropertyKey) {
+    return String(prefix);
+  },
+};
+
+const is_array = Array.isArray;
+const push = Array.prototype.push;
+const push_to_array = function (arr: any[], value_or_array: any) {
+  push.apply(arr, is_array(value_or_array) ? value_or_array : [value_or_array]);
+};
+
+const to_ISO = Date.prototype.toISOString;
+
+const defaults = {
+  addQueryPrefix: false,
+  allowDots: false,
+  allowEmptyArrays: false,
+  arrayFormat: 'indices',
+  charset: 'utf-8',
+  charsetSentinel: false,
+  delimiter: '&',
+  encode: true,
+  encodeDotInKeys: false,
+  encoder: encode,
+  encodeValuesOnly: false,
+  format: default_format,
+  formatter: formatters[default_format],
+  /** @deprecated */
+  indices: false,
+  serializeDate(date) {
+    return to_ISO.call(date);
+  },
+  skipNulls: false,
+  strictNullHandling: false,
+} as NonNullableProperties<StringifyOptions & { formatter: (typeof formatters)['RFC1738'] }>;
+
+function is_non_nullish_primitive(v: unknown): v is string | number | boolean | symbol | bigint {
+  return (
+    typeof v === 'string' ||
+    typeof v === 'number' ||
+    typeof v === 'boolean' ||
+    typeof v === 'symbol' ||
+    typeof v === 'bigint'
+  );
+}
+
+const sentinel = {};
+
+function inner_stringify(
+  object: any,
+  prefix: PropertyKey,
+  generateArrayPrefix: StringifyOptions['arrayFormat'] | ((prefix: string, key: string) => string),
+  commaRoundTrip: boolean,
+  allowEmptyArrays: boolean,
+  strictNullHandling: boolean,
+  skipNulls: boolean,
+  encodeDotInKeys: boolean,
+  encoder: StringifyOptions['encoder'],
+  filter: StringifyOptions['filter'],
+  sort: StringifyOptions['sort'],
+  allowDots: StringifyOptions['allowDots'],
+  serializeDate: StringifyOptions['serializeDate'],
+  format: StringifyOptions['format'],
+  formatter: StringifyOptions['formatter'],
+  encodeValuesOnly: boolean,
+  charset: StringifyOptions['charset'],
+  sideChannel: WeakMap<any, any>,
+) {
+  let obj = object;
+
+  let tmp_sc = sideChannel;
+  let step = 0;
+  let find_flag = false;
+  while ((tmp_sc = tmp_sc.get(sentinel)) !== void undefined && !find_flag) {
+    // Where object last appeared in the ref tree
+    const pos = tmp_sc.get(object);
+    step += 1;
+    if (typeof pos !== 'undefined') {
+      if (pos === step) {
+        throw new RangeError('Cyclic object value');
+      } else {
+        find_flag = true; // Break while
+      }
+    }
+    if (typeof tmp_sc.get(sentinel) === 'undefined') {
+      step = 0;
+    }
+  }
+
+  if (typeof filter === 'function') {
+    obj = filter(prefix, obj);
+  } else if (obj instanceof Date) {
+    obj = serializeDate?.(obj);
+  } else if (generateArrayPrefix === 'comma' && is_array(obj)) {
+    obj = maybe_map(obj, function (value) {
+      if (value instanceof Date) {
+        return serializeDate?.(value);
+      }
+      return value;
+    });
+  }
+
+  if (obj === null) {
+    if (strictNullHandling) {
+      return encoder && !encodeValuesOnly ?
+          // @ts-expect-error
+          encoder(prefix, defaults.encoder, charset, 'key', format)
+        : prefix;
+    }
+
+    obj = '';
+  }
+
+  if (is_non_nullish_primitive(obj) || is_buffer(obj)) {
+    if (encoder) {
+      const key_value =
+        encodeValuesOnly ? prefix
+          // @ts-expect-error
+        : encoder(prefix, defaults.encoder, charset, 'key', format);
+      return [
+        formatter?.(key_value) +
+          '=' +
+          // @ts-expect-error
+          formatter?.(encoder(obj, defaults.encoder, charset, 'value', format)),
+      ];
+    }
+    return [formatter?.(prefix) + '=' + formatter?.(String(obj))];
+  }
+
+  const values: string[] = [];
+
+  if (typeof obj === 'undefined') {
+    return values;
+  }
+
+  let obj_keys;
+  if (generateArrayPrefix === 'comma' && is_array(obj)) {
+    // we need to join elements in
+    if (encodeValuesOnly && encoder) {
+      // @ts-expect-error values only
+      obj = maybe_map(obj, encoder);
+    }
+    obj_keys = [{ value: obj.length > 0 ? obj.join(',') || null : void undefined }];
+  } else if (is_array(filter)) {
+    obj_keys = filter;
+  } else {
+    const keys = Object.keys(obj);
+    obj_keys = sort ? keys.sort(sort) : keys;
+  }
+
+  const encoded_prefix = encodeDotInKeys ? String(prefix).replace(/\./g, '%2E') : String(prefix);
+
+  const adjusted_prefix =
+    commaRoundTrip && is_array(obj) && obj.length === 1 ? encoded_prefix + '[]' : encoded_prefix;
+
+  if (allowEmptyArrays && is_array(obj) && obj.length === 0) {
+    return adjusted_prefix + '[]';
+  }
+
+  for (let j = 0; j < obj_keys.length; ++j) {
+    const key = obj_keys[j];
+    const value =
+      // @ts-ignore
+      typeof key === 'object' && typeof key.value !== 'undefined' ? key.value : obj[key as any];
+
+    if (skipNulls && value === null) {
+      continue;
+    }
+
+    // @ts-ignore
+    const encoded_key = allowDots && encodeDotInKeys ? (key as any).replace(/\./g, '%2E') : key;
+    const key_prefix =
+      is_array(obj) ?
+        typeof generateArrayPrefix === 'function' ?
+          generateArrayPrefix(adjusted_prefix, encoded_key)
+        : adjusted_prefix
+      : adjusted_prefix + (allowDots ? '.' + encoded_key : '[' + encoded_key + ']');
+
+    sideChannel.set(object, step);
+    const valueSideChannel = new WeakMap();
+    valueSideChannel.set(sentinel, sideChannel);
+    push_to_array(
+      values,
+      inner_stringify(
+        value,
+        key_prefix,
+        generateArrayPrefix,
+        commaRoundTrip,
+        allowEmptyArrays,
+        strictNullHandling,
+        skipNulls,
+        encodeDotInKeys,
+        // @ts-ignore
+        generateArrayPrefix === 'comma' && encodeValuesOnly && is_array(obj) ? null : encoder,
+        filter,
+        sort,
+        allowDots,
+        serializeDate,
+        format,
+        formatter,
+        encodeValuesOnly,
+        charset,
+        valueSideChannel,
+      ),
+    );
+  }
+
+  return values;
+}
+
+function normalize_stringify_options(
+  opts: StringifyOptions = defaults,
+): NonNullableProperties<Omit<StringifyOptions, 'indices'>> & { indices?: boolean } {
+  if (typeof opts.allowEmptyArrays !== 'undefined' && typeof opts.allowEmptyArrays !== 'boolean') {
+    throw new TypeError('`allowEmptyArrays` option can only be `true` or `false`, when provided');
+  }
+
+  if (typeof opts.encodeDotInKeys !== 'undefined' && typeof opts.encodeDotInKeys !== 'boolean') {
+    throw new TypeError('`encodeDotInKeys` option can only be `true` or `false`, when provided');
+  }
+
+  if (opts.encoder !== null && typeof opts.encoder !== 'undefined' && typeof opts.encoder !== 'function') {
+    throw new TypeError('Encoder has to be a function.');
+  }
+
+  const charset = opts.charset || defaults.charset;
+  if (typeof opts.charset !== 'undefined' && opts.charset !== 'utf-8' && opts.charset !== 'iso-8859-1') {
+    throw new TypeError('The charset option must be either utf-8, iso-8859-1, or undefined');
+  }
+
+  let format = default_format;
+  if (typeof opts.format !== 'undefined') {
+    if (!has.call(formatters, opts.format)) {
+      throw new TypeError('Unknown format option provided.');
+    }
+    format = opts.format;
+  }
+  const formatter = formatters[format];
+
+  let filter = defaults.filter;
+  if (typeof opts.filter === 'function' || is_array(opts.filter)) {
+    filter = opts.filter;
+  }
+
+  let arrayFormat: StringifyOptions['arrayFormat'];
+  if (opts.arrayFormat && opts.arrayFormat in array_prefix_generators) {
+    arrayFormat = opts.arrayFormat;
+  } else if ('indices' in opts) {
+    arrayFormat = opts.indices ? 'indices' : 'repeat';
+  } else {
+    arrayFormat = defaults.arrayFormat;
+  }
+
+  if ('commaRoundTrip' in opts && typeof opts.commaRoundTrip !== 'boolean') {
+    throw new TypeError('`commaRoundTrip` must be a boolean, or absent');
+  }
+
+  const allowDots =
+    typeof opts.allowDots === 'undefined' ?
+      !!opts.encodeDotInKeys === true ?
+        true
+      : defaults.allowDots
+    : !!opts.allowDots;
+
+  return {
+    addQueryPrefix: typeof opts.addQueryPrefix === 'boolean' ? opts.addQueryPrefix : defaults.addQueryPrefix,
+    // @ts-ignore
+    allowDots: allowDots,
+    allowEmptyArrays:
+      typeof opts.allowEmptyArrays === 'boolean' ? !!opts.allowEmptyArrays : defaults.allowEmptyArrays,
+    arrayFormat: arrayFormat,
+    charset: charset,
+    charsetSentinel:
+      typeof opts.charsetSentinel === 'boolean' ? opts.charsetSentinel : defaults.charsetSentinel,
+    commaRoundTrip: !!opts.commaRoundTrip,
+    delimiter: typeof opts.delimiter === 'undefined' ? defaults.delimiter : opts.delimiter,
+    encode: typeof opts.encode === 'boolean' ? opts.encode : defaults.encode,
+    encodeDotInKeys:
+      typeof opts.encodeDotInKeys === 'boolean' ? opts.encodeDotInKeys : defaults.encodeDotInKeys,
+    encoder: typeof opts.encoder === 'function' ? opts.encoder : defaults.encoder,
+    encodeValuesOnly:
+      typeof opts.encodeValuesOnly === 'boolean' ? opts.encodeValuesOnly : defaults.encodeValuesOnly,
+    filter: filter,
+    format: format,
+    formatter: formatter,
+    serializeDate: typeof opts.serializeDate === 'function' ? opts.serializeDate : defaults.serializeDate,
+    skipNulls: typeof opts.skipNulls === 'boolean' ? opts.skipNulls : defaults.skipNulls,
+    // @ts-ignore
+    sort: typeof opts.sort === 'function' ? opts.sort : null,
+    strictNullHandling:
+      typeof opts.strictNullHandling === 'boolean' ? opts.strictNullHandling : defaults.strictNullHandling,
+  };
+}
+
+export function stringify(object: any, opts: StringifyOptions = {}) {
+  let obj = object;
+  const options = normalize_stringify_options(opts);
+
+  let obj_keys: PropertyKey[] | undefined;
+  let filter;
+
+  if (typeof options.filter === 'function') {
+    filter = options.filter;
+    obj = filter('', obj);
+  } else if (is_array(options.filter)) {
+    filter = options.filter;
+    obj_keys = filter;
+  }
+
+  const keys: string[] = [];
+
+  if (typeof obj !== 'object' || obj === null) {
+    return '';
+  }
+
+  const generateArrayPrefix = array_prefix_generators[options.arrayFormat];
+  const commaRoundTrip = generateArrayPrefix === 'comma' && options.commaRoundTrip;
+
+  if (!obj_keys) {
+    obj_keys = Object.keys(obj);
+  }
+
+  if (options.sort) {
+    obj_keys.sort(options.sort);
+  }
+
+  const sideChannel = new WeakMap();
+  for (let i = 0; i < obj_keys.length; ++i) {
+    const key = obj_keys[i]!;
+
+    if (options.skipNulls && obj[key] === null) {
+      continue;
+    }
+    push_to_array(
+      keys,
+      inner_stringify(
+        obj[key],
+        key,
+        // @ts-expect-error
+        generateArrayPrefix,
+        commaRoundTrip,
+        options.allowEmptyArrays,
+        options.strictNullHandling,
+        options.skipNulls,
+        options.encodeDotInKeys,
+        options.encode ? options.encoder : null,
+        options.filter,
+        options.sort,
+        options.allowDots,
+        options.serializeDate,
+        options.format,
+        options.formatter,
+        options.encodeValuesOnly,
+        options.charset,
+        sideChannel,
+      ),
+    );
+  }
+
+  const joined = keys.join(options.delimiter);
+  let prefix = options.addQueryPrefix === true ? '?' : '';
+
+  if (options.charsetSentinel) {
+    if (options.charset === 'iso-8859-1') {
+      // encodeURIComponent('&#10003;'), the "numeric entity" representation of a checkmark
+      prefix += 'utf8=%26%2310003%3B&';
+    } else {
+      // encodeURIComponent('✓')
+      prefix += 'utf8=%E2%9C%93&';
+    }
+  }
+
+  return joined.length > 0 ? prefix + joined : '';
+}
diff --git a/src/internal/qs/types.ts b/src/internal/qs/types.ts
new file mode 100644
index 0000000000..7c28dbb46f
--- /dev/null
+++ b/src/internal/qs/types.ts
@@ -0,0 +1,71 @@
+export type Format = 'RFC1738' | 'RFC3986';
+
+export type DefaultEncoder = (str: any, defaultEncoder?: any, charset?: string) => string;
+export type DefaultDecoder = (str: string, decoder?: any, charset?: string) => string;
+
+export type BooleanOptional = boolean | undefined;
+
+export type StringifyBaseOptions = {
+  delimiter?: string;
+  allowDots?: boolean;
+  encodeDotInKeys?: boolean;
+  strictNullHandling?: boolean;
+  skipNulls?: boolean;
+  encode?: boolean;
+  encoder?: (
+    str: any,
+    defaultEncoder: DefaultEncoder,
+    charset: string,
+    type: 'key' | 'value',
+    format?: Format,
+  ) => string;
+  filter?: Array<PropertyKey> | ((prefix: PropertyKey, value: any) => any);
+  arrayFormat?: 'indices' | 'brackets' | 'repeat' | 'comma';
+  indices?: boolean;
+  sort?: ((a: PropertyKey, b: PropertyKey) => number) | null;
+  serializeDate?: (d: Date) => string;
+  format?: 'RFC1738' | 'RFC3986';
+  formatter?: (str: PropertyKey) => string;
+  encodeValuesOnly?: boolean;
+  addQueryPrefix?: boolean;
+  charset?: 'utf-8' | 'iso-8859-1';
+  charsetSentinel?: boolean;
+  allowEmptyArrays?: boolean;
+  commaRoundTrip?: boolean;
+};
+
+export type StringifyOptions = StringifyBaseOptions;
+
+export type ParseBaseOptions = {
+  comma?: boolean;
+  delimiter?: string | RegExp;
+  depth?: number | false;
+  decoder?: (str: string, defaultDecoder: DefaultDecoder, charset: string, type: 'key' | 'value') => any;
+  arrayLimit?: number;
+  parseArrays?: boolean;
+  plainObjects?: boolean;
+  allowPrototypes?: boolean;
+  allowSparse?: boolean;
+  parameterLimit?: number;
+  strictDepth?: boolean;
+  strictNullHandling?: boolean;
+  ignoreQueryPrefix?: boolean;
+  charset?: 'utf-8' | 'iso-8859-1';
+  charsetSentinel?: boolean;
+  interpretNumericEntities?: boolean;
+  allowEmptyArrays?: boolean;
+  duplicates?: 'combine' | 'first' | 'last';
+  allowDots?: boolean;
+  decodeDotInKeys?: boolean;
+};
+
+export type ParseOptions = ParseBaseOptions;
+
+export type ParsedQs = {
+  [key: string]: undefined | string | string[] | ParsedQs | ParsedQs[];
+};
+
+// Type to remove null or undefined union from each property
+export type NonNullableProperties<T> = {
+  [K in keyof T]-?: Exclude<T[K], undefined | null>;
+};
diff --git a/src/internal/qs/utils.ts b/src/internal/qs/utils.ts
new file mode 100644
index 0000000000..113b18fb9b
--- /dev/null
+++ b/src/internal/qs/utils.ts
@@ -0,0 +1,265 @@
+import { RFC1738 } from './formats';
+import type { DefaultEncoder, Format } from './types';
+
+const has = Object.prototype.hasOwnProperty;
+const is_array = Array.isArray;
+
+const hex_table = (() => {
+  const array = [];
+  for (let i = 0; i < 256; ++i) {
+    array.push('%' + ((i < 16 ? '0' : '') + i.toString(16)).toUpperCase());
+  }
+
+  return array;
+})();
+
+function compact_queue<T extends Record<string, any>>(queue: Array<{ obj: T; prop: string }>) {
+  while (queue.length > 1) {
+    const item = queue.pop();
+    if (!item) continue;
+
+    const obj = item.obj[item.prop];
+
+    if (is_array(obj)) {
+      const compacted: unknown[] = [];
+
+      for (let j = 0; j < obj.length; ++j) {
+        if (typeof obj[j] !== 'undefined') {
+          compacted.push(obj[j]);
+        }
+      }
+
+      // @ts-ignore
+      item.obj[item.prop] = compacted;
+    }
+  }
+}
+
+function array_to_object(source: any[], options: { plainObjects: boolean }) {
+  const obj = options && options.plainObjects ? Object.create(null) : {};
+  for (let i = 0; i < source.length; ++i) {
+    if (typeof source[i] !== 'undefined') {
+      obj[i] = source[i];
+    }
+  }
+
+  return obj;
+}
+
+export function merge(
+  target: any,
+  source: any,
+  options: { plainObjects?: boolean; allowPrototypes?: boolean } = {},
+) {
+  if (!source) {
+    return target;
+  }
+
+  if (typeof source !== 'object') {
+    if (is_array(target)) {
+      target.push(source);
+    } else if (target && typeof target === 'object') {
+      if (
+        (options && (options.plainObjects || options.allowPrototypes)) ||
+        !has.call(Object.prototype, source)
+      ) {
+        target[source] = true;
+      }
+    } else {
+      return [target, source];
+    }
+
+    return target;
+  }
+
+  if (!target || typeof target !== 'object') {
+    return [target].concat(source);
+  }
+
+  let mergeTarget = target;
+  if (is_array(target) && !is_array(source)) {
+    // @ts-ignore
+    mergeTarget = array_to_object(target, options);
+  }
+
+  if (is_array(target) && is_array(source)) {
+    source.forEach(function (item, i) {
+      if (has.call(target, i)) {
+        const targetItem = target[i];
+        if (targetItem && typeof targetItem === 'object' && item && typeof item === 'object') {
+          target[i] = merge(targetItem, item, options);
+        } else {
+          target.push(item);
+        }
+      } else {
+        target[i] = item;
+      }
+    });
+    return target;
+  }
+
+  return Object.keys(source).reduce(function (acc, key) {
+    const value = source[key];
+
+    if (has.call(acc, key)) {
+      acc[key] = merge(acc[key], value, options);
+    } else {
+      acc[key] = value;
+    }
+    return acc;
+  }, mergeTarget);
+}
+
+export function assign_single_source(target: any, source: any) {
+  return Object.keys(source).reduce(function (acc, key) {
+    acc[key] = source[key];
+    return acc;
+  }, target);
+}
+
+export function decode(str: string, _: any, charset: string) {
+  const strWithoutPlus = str.replace(/\+/g, ' ');
+  if (charset === 'iso-8859-1') {
+    // unescape never throws, no try...catch needed:
+    return strWithoutPlus.replace(/%[0-9a-f]{2}/gi, unescape);
+  }
+  // utf-8
+  try {
+    return decodeURIComponent(strWithoutPlus);
+  } catch (e) {
+    return strWithoutPlus;
+  }
+}
+
+const limit = 1024;
+
+export const encode: (
+  str: any,
+  defaultEncoder: DefaultEncoder,
+  charset: string,
+  type: 'key' | 'value',
+  format: Format,
+) => string = (str, _defaultEncoder, charset, _kind, format: Format) => {
+  // This code was originally written by Brian White for the io.js core querystring library.
+  // It has been adapted here for stricter adherence to RFC 3986
+  if (str.length === 0) {
+    return str;
+  }
+
+  let string = str;
+  if (typeof str === 'symbol') {
+    string = Symbol.prototype.toString.call(str);
+  } else if (typeof str !== 'string') {
+    string = String(str);
+  }
+
+  if (charset === 'iso-8859-1') {
+    return escape(string).replace(/%u[0-9a-f]{4}/gi, function ($0) {
+      return '%26%23' + parseInt($0.slice(2), 16) + '%3B';
+    });
+  }
+
+  let out = '';
+  for (let j = 0; j < string.length; j += limit) {
+    const segment = string.length >= limit ? string.slice(j, j + limit) : string;
+    const arr = [];
+
+    for (let i = 0; i < segment.length; ++i) {
+      let c = segment.charCodeAt(i);
+      if (
+        c === 0x2d || // -
+        c === 0x2e || // .
+        c === 0x5f || // _
+        c === 0x7e || // ~
+        (c >= 0x30 && c <= 0x39) || // 0-9
+        (c >= 0x41 && c <= 0x5a) || // a-z
+        (c >= 0x61 && c <= 0x7a) || // A-Z
+        (format === RFC1738 && (c === 0x28 || c === 0x29)) // ( )
+      ) {
+        arr[arr.length] = segment.charAt(i);
+        continue;
+      }
+
+      if (c < 0x80) {
+        arr[arr.length] = hex_table[c];
+        continue;
+      }
+
+      if (c < 0x800) {
+        arr[arr.length] = hex_table[0xc0 | (c >> 6)]! + hex_table[0x80 | (c & 0x3f)];
+        continue;
+      }
+
+      if (c < 0xd800 || c >= 0xe000) {
+        arr[arr.length] =
+          hex_table[0xe0 | (c >> 12)]! + hex_table[0x80 | ((c >> 6) & 0x3f)] + hex_table[0x80 | (c & 0x3f)];
+        continue;
+      }
+
+      i += 1;
+      c = 0x10000 + (((c & 0x3ff) << 10) | (segment.charCodeAt(i) & 0x3ff));
+
+      arr[arr.length] =
+        hex_table[0xf0 | (c >> 18)]! +
+        hex_table[0x80 | ((c >> 12) & 0x3f)] +
+        hex_table[0x80 | ((c >> 6) & 0x3f)] +
+        hex_table[0x80 | (c & 0x3f)];
+    }
+
+    out += arr.join('');
+  }
+
+  return out;
+};
+
+export function compact(value: any) {
+  const queue = [{ obj: { o: value }, prop: 'o' }];
+  const refs = [];
+
+  for (let i = 0; i < queue.length; ++i) {
+    const item = queue[i];
+    // @ts-ignore
+    const obj = item.obj[item.prop];
+
+    const keys = Object.keys(obj);
+    for (let j = 0; j < keys.length; ++j) {
+      const key = keys[j]!;
+      const val = obj[key];
+      if (typeof val === 'object' && val !== null && refs.indexOf(val) === -1) {
+        queue.push({ obj: obj, prop: key });
+        refs.push(val);
+      }
+    }
+  }
+
+  compact_queue(queue);
+
+  return value;
+}
+
+export function is_regexp(obj: any) {
+  return Object.prototype.toString.call(obj) === '[object RegExp]';
+}
+
+export function is_buffer(obj: any) {
+  if (!obj || typeof obj !== 'object') {
+    return false;
+  }
+
+  return !!(obj.constructor && obj.constructor.isBuffer && obj.constructor.isBuffer(obj));
+}
+
+export function combine(a: any, b: any) {
+  return [].concat(a, b);
+}
+
+export function maybe_map<T>(val: T[], fn: (v: T) => T) {
+  if (is_array(val)) {
+    const mapped = [];
+    for (let i = 0; i < val.length; i += 1) {
+      mapped.push(fn(val[i]!));
+    }
+    return mapped;
+  }
+  return fn(val);
+}
diff --git a/src/resources/abuse-reports.ts b/src/resources/abuse-reports.ts
new file mode 100644
index 0000000000..dfa8eb0b1e
--- /dev/null
+++ b/src/resources/abuse-reports.ts
@@ -0,0 +1,209 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../resource';
+import * as Core from '../core';
+
+export class AbuseReports extends APIResource {
+  /**
+   * Submit the Abuse Report of a particular type
+   */
+  create(
+    reportType:
+      | 'abuse_dmca'
+      | 'abuse_trademark'
+      | 'abuse_general'
+      | 'abuse_phishing'
+      | 'abuse_children'
+      | 'abuse_threat'
+      | 'abuse_registrar_whois'
+      | 'abuse_ncsei',
+    params: AbuseReportCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AbuseReportCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/abuse-reports/${reportType}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: AbuseReportCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+/**
+ * The result should be 'success' for successful response
+ */
+export type AbuseReportCreateResponse = string;
+
+export interface AbuseReportCreateParams {
+  /**
+   * Path param: The account ID of the submitter.
+   */
+  account_id: string;
+
+  /**
+   * Body param: The abuse report type
+   */
+  act:
+    | 'abuse_dmca'
+    | 'abuse_trademark'
+    | 'abuse_general'
+    | 'abuse_phishing'
+    | 'abuse_children'
+    | 'abuse_threat'
+    | 'abuse_registrar_whois'
+    | 'abuse_ncsei';
+
+  /**
+   * Body param: A valid email of the abuse reporter
+   */
+  email: string;
+
+  /**
+   * Body param: Should match the value provided in `email`
+   */
+  email2: string;
+
+  /**
+   * Body param: Notification type based on the abuse type. NOTE: Copyright (DMCA)
+   * and Trademark reports cannot be anonymous.
+   */
+  host_notification: 'send' | 'send-anon' | 'none';
+
+  /**
+   * Body param: Notification type based on the abuse type. NOTE: Copyright (DMCA)
+   * and Trademark reports cannot be anonymous.
+   */
+  ncmec_notification: 'send' | 'send-anon' | 'none';
+
+  /**
+   * Body param: Notification type based on the abuse type. NOTE: Copyright (DMCA)
+   * and Trademark reports cannot be anonymous.
+   */
+  owner_notification: 'send' | 'send-anon' | 'none';
+
+  /**
+   * Body param: A list of valid URLs separated by ‘ ’ (new line character). The list
+   * of the URLs should not exceed 250 URLs. All URLs should have the same hostname.
+   * Each URL should be unique
+   */
+  urls: string;
+
+  /**
+   * Body param: Text not exceeding 100 characters
+   */
+  address1?: string;
+
+  /**
+   * Body param: The name of the copyright holder. Text not exceeding 60 characters.
+   */
+  agent_name?: string;
+
+  /**
+   * Body param: Can be 0 or 1
+   */
+  agree?: 0 | 1;
+
+  /**
+   * Body param: Text not exceeding 255 characters
+   */
+  city?: string;
+
+  /**
+   * Body param: Any additional comments about the infringement not exceeding 2000
+   * characters
+   */
+  comments?: string;
+
+  /**
+   * Body param: Text not exceeding 100 characters
+   */
+  company?: string;
+
+  /**
+   * Body param: Text not exceeding 255 characters
+   */
+  country?: string;
+
+  /**
+   * Body param: A list of IP addresses separated by ‘ ’ (new line character). The
+   * list of destination IPs should not exceed 30 IP addresses. Each one of the IP
+   * addresses ought to be unique
+   */
+  destination_ips?: string;
+
+  /**
+   * Body param: A detailed description of the infringement, including any necessary
+   * access details and the exact steps needed to view the content, not exceeding
+   * 5000 characters
+   */
+  justification?: string;
+
+  /**
+   * Body param: Text not exceeding 255 characters
+   */
+  name?: string;
+
+  /**
+   * Body param: If the submitter is the target of NCSEI in the URLs of the abuse
+   * report
+   */
+  ncsei_subject_representation?: boolean;
+
+  /**
+   * Body param: Text not exceeding 255 characters
+   */
+  original_work?: string;
+
+  /**
+   * Body param: A comma separated list of ports and protocols e.g. 80/TCP, 22/UDP.
+   * The total size of the field should not exceed 2000 characters. Each individual
+   * port/protocol should not exceed 100 characters. The list should not have more
+   * than 30 unique ports and protocols.
+   */
+  ports_protocols?: string;
+
+  /**
+   * Body param: Required for DMCA reports, should be same as Name. An affirmation
+   * that all information in the report is true and accurate while agreeing to the
+   * policies of Cloudflare's abuse reports
+   */
+  signature?: string;
+
+  /**
+   * Body param: A list of IP addresses separated by ‘ ’ (new line character). The
+   * list of source IPs should not exceed 30 IP addresses. Each one of the IP
+   * addresses ought to be unique
+   */
+  source_ips?: string;
+
+  /**
+   * Body param: Text not exceeding 255 characters
+   */
+  state?: string;
+
+  /**
+   * Body param: Text not exceeding 20 characters
+   */
+  tele?: string;
+
+  /**
+   * Body param: Text not exceeding 255 characters
+   */
+  title?: string;
+
+  /**
+   * Body param: Text not exceeding 1000 characters
+   */
+  trademark_number?: string;
+
+  /**
+   * Body param: Text not exceeding 1000 characters
+   */
+  trademark_office?: string;
+
+  /**
+   * Body param: Text not exceeding 1000 characters
+   */
+  trademark_symbol?: string;
+}
diff --git a/src/resources/accounts/accounts.ts b/src/resources/accounts/accounts.ts
index 7196067e2b..06526e1f05 100644
--- a/src/resources/accounts/accounts.ts
+++ b/src/resources/accounts/accounts.ts
@@ -4,21 +4,71 @@ import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
 import * as MembersAPI from './members';
+import {
+  MemberCreateParams,
+  MemberDeleteParams,
+  MemberDeleteResponse,
+  MemberGetParams,
+  MemberListParams,
+  MemberUpdateParams,
+  Members,
+  Status,
+} from './members';
 import * as RolesAPI from './roles';
+import { RoleGetParams, RoleListParams, Roles } from './roles';
+import * as SubscriptionsAPI from './subscriptions';
+import {
+  SubscriptionCreateParams,
+  SubscriptionCreateResponse,
+  SubscriptionDeleteParams,
+  SubscriptionDeleteResponse,
+  SubscriptionGetParams,
+  SubscriptionGetResponse,
+  SubscriptionUpdateParams,
+  SubscriptionUpdateResponse,
+  Subscriptions,
+} from './subscriptions';
+import * as LogsAPI from './logs/logs';
+import { Logs } from './logs/logs';
+import * as TokensAPI from './tokens/tokens';
+import {
+  TokenCreateParams,
+  TokenCreateResponse,
+  TokenDeleteParams,
+  TokenDeleteResponse,
+  TokenGetParams,
+  TokenListParams,
+  TokenUpdateParams,
+  TokenVerifyParams,
+  TokenVerifyResponse,
+  Tokens,
+} from './tokens/tokens';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class Accounts extends APIResource {
   members: MembersAPI.Members = new MembersAPI.Members(this._client);
   roles: RolesAPI.Roles = new RolesAPI.Roles(this._client);
+  subscriptions: SubscriptionsAPI.Subscriptions = new SubscriptionsAPI.Subscriptions(this._client);
+  tokens: TokensAPI.Tokens = new TokensAPI.Tokens(this._client);
+  logs: LogsAPI.Logs = new LogsAPI.Logs(this._client);
+
+  /**
+   * Create an account (only available for tenant admins at this time)
+   */
+  create(body: AccountCreateParams, options?: Core.RequestOptions): Core.APIPromise<Account> {
+    return (
+      this._client.post('/accounts', { body, ...options }) as Core.APIPromise<{ result: Account }>
+    )._thenUnwrap((obj) => obj.result);
+  }
 
   /**
    * Update an existing account.
    */
-  update(params: AccountUpdateParams, options?: Core.RequestOptions): Core.APIPromise<AccountUpdateResponse> {
+  update(params: AccountUpdateParams, options?: Core.RequestOptions): Core.APIPromise<Account> {
     const { account_id, ...body } = params;
     return (
       this._client.put(`/accounts/${account_id}`, { body, ...options }) as Core.APIPromise<{
-        result: AccountUpdateResponse;
+        result: Account;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -29,35 +79,47 @@ export class Accounts extends APIResource {
   list(
     query?: AccountListParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<AccountListResponsesV4PagePaginationArray, AccountListResponse>;
-  list(
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<AccountListResponsesV4PagePaginationArray, AccountListResponse>;
+  ): Core.PagePromise<AccountsV4PagePaginationArray, Account>;
+  list(options?: Core.RequestOptions): Core.PagePromise<AccountsV4PagePaginationArray, Account>;
   list(
     query: AccountListParams | Core.RequestOptions = {},
     options?: Core.RequestOptions,
-  ): Core.PagePromise<AccountListResponsesV4PagePaginationArray, AccountListResponse> {
+  ): Core.PagePromise<AccountsV4PagePaginationArray, Account> {
     if (isRequestOptions(query)) {
       return this.list({}, query);
     }
-    return this._client.getAPIList('/accounts', AccountListResponsesV4PagePaginationArray, {
-      query,
-      ...options,
-    });
+    return this._client.getAPIList('/accounts', AccountsV4PagePaginationArray, { query, ...options });
+  }
+
+  /**
+   * Delete a specific account (only available for tenant admins at this time). This
+   * is a permanent operation that will delete any zones or other resources under the
+   * account
+   */
+  delete(
+    params: AccountDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AccountDeleteResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}`, options) as Core.APIPromise<{
+        result: AccountDeleteResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
   }
 
   /**
    * Get information about a specific account that you are a member of.
    */
-  get(params: AccountGetParams, options?: Core.RequestOptions): Core.APIPromise<AccountGetResponse> {
+  get(params: AccountGetParams, options?: Core.RequestOptions): Core.APIPromise<Account> {
     const { account_id } = params;
     return (
-      this._client.get(`/accounts/${account_id}`, options) as Core.APIPromise<{ result: AccountGetResponse }>
+      this._client.get(`/accounts/${account_id}`, options) as Core.APIPromise<{ result: Account }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export class AccountListResponsesV4PagePaginationArray extends V4PagePaginationArray<AccountListResponse> {}
+export class AccountsV4PagePaginationArray extends V4PagePaginationArray<Account> {}
 
 export interface Account {
   /**
@@ -92,8 +154,8 @@ export namespace Account {
     abuse_contact_email?: string;
 
     /**
-     * Specifies the default nameservers to be used for new zones added to this
-     * account.
+     * @deprecated: Specifies the default nameservers to be used for new zones added to
+     * this account.
      *
      * - `cloudflare.standard` for Cloudflare-branded nameservers
      * - `custom.account` for account custom nameservers
@@ -102,6 +164,9 @@ export namespace Account {
      * See
      * [Custom Nameservers](https://developers.cloudflare.com/dns/additional-options/custom-nameservers/)
      * for more information.
+     *
+     * Deprecated in favor of
+     * [DNS Settings](https://developers.cloudflare.com/api/operations/dns-settings-for-an-account-update-dns-settings).
      */
     default_nameservers?: 'cloudflare.standard' | 'custom.account' | 'custom.tenant';
 
@@ -115,23 +180,59 @@ export namespace Account {
      * @deprecated: Indicates whether new zones should use the account-level custom
      * nameservers by default.
      *
-     * Deprecated in favor of `default_nameservers`.
+     * Deprecated in favor of
+     * [DNS Settings](https://developers.cloudflare.com/api/operations/dns-settings-for-an-account-update-dns-settings).
      */
     use_account_custom_ns_by_default?: boolean;
   }
 }
 
-export type AccountUpdateResponse = unknown;
+export interface AccountDeleteResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+}
+
+export interface AccountCreateParams {
+  /**
+   * Account name
+   */
+  name: string;
+
+  /**
+   * the type of account being created. For self-serve customers, use standard. for
+   * enterprise customers, use enterprise.
+   */
+  type: 'standard' | 'enterprise';
 
-export type AccountListResponse = unknown;
+  /**
+   * information related to the tenant unit, and optionally, an id of the unit to
+   * create the account on. see
+   * https://developers.cloudflare.com/tenant/how-to/manage-accounts/
+   */
+  unit?: AccountCreateParams.Unit;
+}
 
-export type AccountGetResponse = unknown;
+export namespace AccountCreateParams {
+  /**
+   * information related to the tenant unit, and optionally, an id of the unit to
+   * create the account on. see
+   * https://developers.cloudflare.com/tenant/how-to/manage-accounts/
+   */
+  export interface Unit {
+    /**
+     * Tenant unit ID
+     */
+    id?: string;
+  }
+}
 
 export interface AccountUpdateParams {
   /**
-   * Path param:
+   * Path param: Account identifier tag.
    */
-  account_id: unknown;
+  account_id: string;
 
   /**
    * Body param: Account name
@@ -155,8 +256,8 @@ export namespace AccountUpdateParams {
     abuse_contact_email?: string;
 
     /**
-     * Specifies the default nameservers to be used for new zones added to this
-     * account.
+     * @deprecated: Specifies the default nameservers to be used for new zones added to
+     * this account.
      *
      * - `cloudflare.standard` for Cloudflare-branded nameservers
      * - `custom.account` for account custom nameservers
@@ -165,6 +266,9 @@ export namespace AccountUpdateParams {
      * See
      * [Custom Nameservers](https://developers.cloudflare.com/dns/additional-options/custom-nameservers/)
      * for more information.
+     *
+     * Deprecated in favor of
+     * [DNS Settings](https://developers.cloudflare.com/api/operations/dns-settings-for-an-account-update-dns-settings).
      */
     default_nameservers?: 'cloudflare.standard' | 'custom.account' | 'custom.tenant';
 
@@ -178,7 +282,8 @@ export namespace AccountUpdateParams {
      * @deprecated: Indicates whether new zones should use the account-level custom
      * nameservers by default.
      *
-     * Deprecated in favor of `default_nameservers`.
+     * Deprecated in favor of
+     * [DNS Settings](https://developers.cloudflare.com/api/operations/dns-settings-for-an-account-update-dns-settings).
      */
     use_account_custom_ns_by_default?: boolean;
   }
@@ -196,27 +301,64 @@ export interface AccountListParams extends V4PagePaginationArrayParams {
   name?: string;
 }
 
+export interface AccountDeleteParams {
+  /**
+   * The account ID of the account to be deleted
+   */
+  account_id: string;
+}
+
 export interface AccountGetParams {
-  account_id: unknown;
+  /**
+   * Account identifier tag.
+   */
+  account_id: string;
 }
 
-export namespace Accounts {
-  export import Members = MembersAPI.Members;
-  export import Status = MembersAPI.Status;
-  export import UserWithInviteCode = MembersAPI.UserWithInviteCode;
-  export import MemberCreateResponse = MembersAPI.MemberCreateResponse;
-  export import MemberUpdateResponse = MembersAPI.MemberUpdateResponse;
-  export import MemberListResponse = MembersAPI.MemberListResponse;
-  export import MemberDeleteResponse = MembersAPI.MemberDeleteResponse;
-  export import MemberGetResponse = MembersAPI.MemberGetResponse;
-  export import MemberListResponsesV4PagePaginationArray = MembersAPI.MemberListResponsesV4PagePaginationArray;
-  export import MemberCreateParams = MembersAPI.MemberCreateParams;
-  export import MemberUpdateParams = MembersAPI.MemberUpdateParams;
-  export import MemberListParams = MembersAPI.MemberListParams;
-  export import MemberDeleteParams = MembersAPI.MemberDeleteParams;
-  export import MemberGetParams = MembersAPI.MemberGetParams;
-  export import Roles = RolesAPI.Roles;
-  export import RoleGetResponse = RolesAPI.RoleGetResponse;
-  export import RoleListParams = RolesAPI.RoleListParams;
-  export import RoleGetParams = RolesAPI.RoleGetParams;
+Accounts.Members = Members;
+Accounts.Roles = Roles;
+Accounts.Subscriptions = Subscriptions;
+Accounts.Tokens = Tokens;
+Accounts.Logs = Logs;
+
+export declare namespace Accounts {
+  export {
+    Members as Members,
+    type Status as Status,
+    type MemberDeleteResponse as MemberDeleteResponse,
+    type MemberCreateParams as MemberCreateParams,
+    type MemberUpdateParams as MemberUpdateParams,
+    type MemberListParams as MemberListParams,
+    type MemberDeleteParams as MemberDeleteParams,
+    type MemberGetParams as MemberGetParams,
+  };
+
+  export { Roles as Roles, type RoleListParams as RoleListParams, type RoleGetParams as RoleGetParams };
+
+  export {
+    Subscriptions as Subscriptions,
+    type SubscriptionCreateResponse as SubscriptionCreateResponse,
+    type SubscriptionUpdateResponse as SubscriptionUpdateResponse,
+    type SubscriptionDeleteResponse as SubscriptionDeleteResponse,
+    type SubscriptionGetResponse as SubscriptionGetResponse,
+    type SubscriptionCreateParams as SubscriptionCreateParams,
+    type SubscriptionUpdateParams as SubscriptionUpdateParams,
+    type SubscriptionDeleteParams as SubscriptionDeleteParams,
+    type SubscriptionGetParams as SubscriptionGetParams,
+  };
+
+  export {
+    Tokens as Tokens,
+    type TokenCreateResponse as TokenCreateResponse,
+    type TokenDeleteResponse as TokenDeleteResponse,
+    type TokenVerifyResponse as TokenVerifyResponse,
+    type TokenCreateParams as TokenCreateParams,
+    type TokenUpdateParams as TokenUpdateParams,
+    type TokenListParams as TokenListParams,
+    type TokenDeleteParams as TokenDeleteParams,
+    type TokenGetParams as TokenGetParams,
+    type TokenVerifyParams as TokenVerifyParams,
+  };
+
+  export { Logs as Logs };
 }
diff --git a/src/resources/accounts/index.ts b/src/resources/accounts/index.ts
index 9651605ee3..e27d659bf3 100644
--- a/src/resources/accounts/index.ts
+++ b/src/resources/accounts/index.ts
@@ -1,20 +1,38 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Accounts } from './accounts';
-export { RoleGetResponse, RoleListParams, RoleGetParams, Roles } from './roles';
+export { Logs } from './logs/index';
 export {
-  Status,
-  UserWithInviteCode,
-  MemberCreateResponse,
-  MemberUpdateResponse,
-  MemberListResponse,
-  MemberDeleteResponse,
-  MemberGetResponse,
-  MemberCreateParams,
-  MemberUpdateParams,
-  MemberListParams,
-  MemberDeleteParams,
-  MemberGetParams,
-  MemberListResponsesV4PagePaginationArray,
   Members,
+  type Status,
+  type MemberDeleteResponse,
+  type MemberCreateParams,
+  type MemberUpdateParams,
+  type MemberListParams,
+  type MemberDeleteParams,
+  type MemberGetParams,
 } from './members';
+export { Roles, type RoleListParams, type RoleGetParams } from './roles';
+export {
+  Subscriptions,
+  type SubscriptionCreateResponse,
+  type SubscriptionUpdateResponse,
+  type SubscriptionDeleteResponse,
+  type SubscriptionGetResponse,
+  type SubscriptionCreateParams,
+  type SubscriptionUpdateParams,
+  type SubscriptionDeleteParams,
+  type SubscriptionGetParams,
+} from './subscriptions';
+export {
+  Tokens,
+  type TokenCreateResponse,
+  type TokenDeleteResponse,
+  type TokenVerifyResponse,
+  type TokenCreateParams,
+  type TokenUpdateParams,
+  type TokenListParams,
+  type TokenDeleteParams,
+  type TokenGetParams,
+  type TokenVerifyParams,
+} from './tokens/index';
diff --git a/src/resources/accounts/logs/audit.ts b/src/resources/accounts/logs/audit.ts
new file mode 100644
index 0000000000..b396a10369
--- /dev/null
+++ b/src/resources/accounts/logs/audit.ts
@@ -0,0 +1,364 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { CursorLimitPagination, type CursorLimitPaginationParams } from '../../../pagination';
+
+export class Audit extends APIResource {
+  /**
+   * Gets a list of audit logs for an account. <br /> <br /> This is the beta release
+   * of Audit Logs Version 2. Since this is a beta version, there may be gaps or
+   * missing entries in the available audit logs. Be aware of the following
+   * limitations. <br /> <ul> <li>Audit logs are available only for the past 30 days.
+   * <br /></li> <li>Error handling is not yet implemented. <br /> </li> </ul>
+   */
+  list(
+    params: AuditListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<AuditListResponsesCursorLimitPagination, AuditListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/logs/audit`,
+      AuditListResponsesCursorLimitPagination,
+      { query, ...options },
+    );
+  }
+}
+
+export class AuditListResponsesCursorLimitPagination extends CursorLimitPagination<AuditListResponse> {}
+
+export interface AuditListResponse {
+  /**
+   * A unique identifier for the audit log entry.
+   */
+  id?: string;
+
+  /**
+   * Contains account related information.
+   */
+  account?: AuditListResponse.Account;
+
+  /**
+   * Provides information about the action performed.
+   */
+  action?: AuditListResponse.Action;
+
+  /**
+   * Provides details about the actor who performed the action.
+   */
+  actor?: AuditListResponse.Actor;
+
+  /**
+   * Provides raw information about the request and response.
+   */
+  raw?: AuditListResponse.Raw;
+
+  /**
+   * Provides details about the affected resource.
+   */
+  resource?: AuditListResponse.Resource;
+
+  /**
+   * Provides details about the zone affected by the action.
+   */
+  zone?: AuditListResponse.Zone;
+}
+
+export namespace AuditListResponse {
+  /**
+   * Contains account related information.
+   */
+  export interface Account {
+    /**
+     * A unique identifier for the account.
+     */
+    id?: string;
+
+    /**
+     * A string that identifies the account name.
+     */
+    name?: string;
+  }
+
+  /**
+   * Provides information about the action performed.
+   */
+  export interface Action {
+    /**
+     * A short description of the action performed.
+     */
+    description?: string;
+
+    /**
+     * The result of the action, indicating success or failure.
+     */
+    result?: string;
+
+    /**
+     * A timestamp indicating when the action was logged.
+     */
+    time?: string;
+
+    /**
+     * A short string that describes the action that was performed.
+     */
+    type?: string;
+  }
+
+  /**
+   * Provides details about the actor who performed the action.
+   */
+  export interface Actor {
+    /**
+     * The ID of the actor who performed the action. If a user performed the action,
+     * this will be their User ID.
+     */
+    id?: string;
+
+    context?: 'api_key' | 'api_token' | 'dash' | 'oauth' | 'origin_ca_key';
+
+    /**
+     * The email of the actor who performed the action.
+     */
+    email?: string;
+
+    /**
+     * The IP address of the request that performed the action.
+     */
+    ip_address?: string;
+
+    /**
+     * Filters by the API token ID when the actor context is an api_token.
+     */
+    token_id?: string;
+
+    /**
+     * Filters by the API token name when the actor context is an api_token.
+     */
+    token_name?: string;
+
+    /**
+     * The type of actor.
+     */
+    type?: 'user' | 'account' | 'cloudflare-admin';
+  }
+
+  /**
+   * Provides raw information about the request and response.
+   */
+  export interface Raw {
+    /**
+     * The Cloudflare Ray ID for the request.
+     */
+    cf_ray_id?: string;
+
+    /**
+     * The HTTP method of the request.
+     */
+    method?: string;
+
+    /**
+     * The HTTP response status code returned by the API.
+     */
+    status_code?: number;
+
+    /**
+     * The URI of the request.
+     */
+    uri?: string;
+
+    /**
+     * The client's user agent string sent with the request.
+     */
+    user_agent?: string;
+  }
+
+  /**
+   * Provides details about the affected resource.
+   */
+  export interface Resource {
+    /**
+     * The unique identifier for the affected resource.
+     */
+    id?: string;
+
+    /**
+     * The Cloudflare product associated with the resource.
+     */
+    product?: string;
+
+    request?: unknown;
+
+    response?: unknown;
+
+    /**
+     * The scope of the resource.
+     */
+    scope?: unknown;
+
+    /**
+     * The type of the resource.
+     */
+    type?: string;
+  }
+
+  /**
+   * Provides details about the zone affected by the action.
+   */
+  export interface Zone {
+    /**
+     * A string that identifies the zone id.
+     */
+    id?: string;
+
+    /**
+     * A string that identifies the zone name.
+     */
+    name?: string;
+  }
+}
+
+export interface AuditListParams extends CursorLimitPaginationParams {
+  /**
+   * Path param: The unique id that identifies the account.
+   */
+  account_id: string;
+
+  /**
+   * Query param: Filters actions based on a given timestamp in the format
+   * yyyy-mm-dd, returning only logs that occurred on and before the specified date.
+   */
+  before: string;
+
+  /**
+   * Query param: Filters actions based on a given timestamp in the format
+   * yyyy-mm-dd, returning only logs that occurred on and after the specified date.
+   */
+  since: string;
+
+  /**
+   * Query param: Filters by the account name.
+   */
+  account_name?: string;
+
+  /**
+   * Query param: Whether the action was successful or not.
+   */
+  action_result?: 'success' | 'failure';
+
+  /**
+   * Query param: Filters by the action type.
+   */
+  action_type?: 'create' | 'delete' | 'view' | 'update';
+
+  /**
+   * Query param: Filters by the actor context.
+   */
+  actor_context?: 'api_key' | 'api_token' | 'dash' | 'oauth' | 'origin_ca_key';
+
+  /**
+   * Query param: Filters by the actor's email address.
+   */
+  actor_email?: string;
+
+  /**
+   * Query param: Filters by the actor ID. This can be either the Account ID or User
+   * ID.
+   */
+  actor_id?: string;
+
+  /**
+   * Query param: The IP address where the action was initiated.
+   */
+  actor_ip_address?: string;
+
+  /**
+   * Query param: Filters by the API token ID when the actor context is an api_token
+   * or oauth.
+   */
+  actor_token_id?: string;
+
+  /**
+   * Query param: Filters by the API token name when the actor context is an
+   * api_token or oauth.
+   */
+  actor_token_name?: string;
+
+  /**
+   * Query param: Filters by the actor type.
+   */
+  actor_type?: 'cloudflare_admin' | 'account' | 'user';
+
+  /**
+   * Query param: Finds a specific log by its ID.
+   */
+  audit_log_id?: string;
+
+  /**
+   * Query param: Sets sorting order.
+   */
+  direction?: 'desc' | 'asc';
+
+  /**
+   * Query param: Filters by the response CF Ray ID.
+   */
+  raw_cf_ray_id?: string;
+
+  /**
+   * Query param: The HTTP method for the API call.
+   */
+  raw_method?: string;
+
+  /**
+   * Query param: The response status code that was returned.
+   */
+  raw_status_code?: number;
+
+  /**
+   * Query param: Filters by the request URI.
+   */
+  raw_uri?: string;
+
+  /**
+   * Query param: Filters by the resource ID.
+   */
+  resource_id?: string;
+
+  /**
+   * Query param: Filters audit logs by the Cloudflare product associated with the
+   * changed resource.
+   */
+  resource_product?: string;
+
+  /**
+   * Query param: Filters by the resource scope, specifying whether the resource is
+   * associated with an user, an account, or a zone.
+   */
+  resource_scope?: 'accounts' | 'user' | 'zones';
+
+  /**
+   * Query param: Filters audit logs based on the unique type of resource changed by
+   * the action.
+   */
+  resource_type?: string;
+
+  /**
+   * Query param: Filters by the zone ID.
+   */
+  zone_id?: string;
+
+  /**
+   * Query param: Filters by the zone name associated with the change.
+   */
+  zone_name?: string;
+}
+
+Audit.AuditListResponsesCursorLimitPagination = AuditListResponsesCursorLimitPagination;
+
+export declare namespace Audit {
+  export {
+    type AuditListResponse as AuditListResponse,
+    AuditListResponsesCursorLimitPagination as AuditListResponsesCursorLimitPagination,
+    type AuditListParams as AuditListParams,
+  };
+}
diff --git a/src/resources/accounts/logs/index.ts b/src/resources/accounts/logs/index.ts
new file mode 100644
index 0000000000..92a21aa38b
--- /dev/null
+++ b/src/resources/accounts/logs/index.ts
@@ -0,0 +1,9 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  AuditListResponsesCursorLimitPagination,
+  Audit,
+  type AuditListResponse,
+  type AuditListParams,
+} from './audit';
+export { Logs } from './logs';
diff --git a/src/resources/accounts/logs/logs.ts b/src/resources/accounts/logs/logs.ts
new file mode 100644
index 0000000000..0966ebbb45
--- /dev/null
+++ b/src/resources/accounts/logs/logs.ts
@@ -0,0 +1,21 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as AuditAPI from './audit';
+import { Audit, AuditListParams, AuditListResponse, AuditListResponsesCursorLimitPagination } from './audit';
+
+export class Logs extends APIResource {
+  audit: AuditAPI.Audit = new AuditAPI.Audit(this._client);
+}
+
+Logs.Audit = Audit;
+Logs.AuditListResponsesCursorLimitPagination = AuditListResponsesCursorLimitPagination;
+
+export declare namespace Logs {
+  export {
+    Audit as Audit,
+    type AuditListResponse as AuditListResponse,
+    AuditListResponsesCursorLimitPagination as AuditListResponsesCursorLimitPagination,
+    type AuditListParams as AuditListParams,
+  };
+}
diff --git a/src/resources/accounts/members.ts b/src/resources/accounts/members.ts
index b5d1e0df68..c7cf9ca499 100644
--- a/src/resources/accounts/members.ts
+++ b/src/resources/accounts/members.ts
@@ -2,19 +2,19 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as MembersAPI from './members';
 import * as Shared from '../shared';
-import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
+import { MembersV4PagePaginationArray } from '../shared';
+import { type V4PagePaginationArrayParams } from '../../pagination';
 
 export class Members extends APIResource {
   /**
    * Add a user to the list of members for this account.
    */
-  create(params: MemberCreateParams, options?: Core.RequestOptions): Core.APIPromise<MemberCreateResponse> {
+  create(params: MemberCreateParams, options?: Core.RequestOptions): Core.APIPromise<Shared.Member> {
     const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/members`, { body, ...options }) as Core.APIPromise<{
-        result: MemberCreateResponse;
+        result: Shared.Member;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -26,13 +26,13 @@ export class Members extends APIResource {
     memberId: string,
     params: MemberUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<MemberUpdateResponse> {
+  ): Core.APIPromise<Shared.Member> {
     const { account_id, ...body } = params;
     return (
       this._client.put(`/accounts/${account_id}/members/${memberId}`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: MemberUpdateResponse }>
+      }) as Core.APIPromise<{ result: Shared.Member }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -42,13 +42,12 @@ export class Members extends APIResource {
   list(
     params: MemberListParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<MemberListResponsesV4PagePaginationArray, MemberListResponse> {
+  ): Core.PagePromise<MembersV4PagePaginationArray, Shared.Member> {
     const { account_id, ...query } = params;
-    return this._client.getAPIList(
-      `/accounts/${account_id}/members`,
-      MemberListResponsesV4PagePaginationArray,
-      { query, ...options },
-    );
+    return this._client.getAPIList(`/accounts/${account_id}/members`, MembersV4PagePaginationArray, {
+      query,
+      ...options,
+    });
   }
 
   /**
@@ -74,616 +73,21 @@ export class Members extends APIResource {
     memberId: string,
     params: MemberGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<MemberGetResponse> {
+  ): Core.APIPromise<Shared.Member> {
     const { account_id } = params;
     return (
       this._client.get(`/accounts/${account_id}/members/${memberId}`, options) as Core.APIPromise<{
-        result: MemberGetResponse;
+        result: Shared.Member;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export class MemberListResponsesV4PagePaginationArray extends V4PagePaginationArray<MemberListResponse> {}
-
 /**
  * Whether the user is a member of the organization or has an invitation pending.
  */
 export type Status = 'member' | 'invited';
 
-export interface UserWithInviteCode {
-  /**
-   * Membership identifier tag.
-   */
-  id?: string;
-
-  /**
-   * The unique activation code for the account membership.
-   */
-  code?: string;
-
-  /**
-   * Roles assigned to this member.
-   */
-  roles?: Array<UserWithInviteCode.Role>;
-
-  /**
-   * A member's status in the account.
-   */
-  status?: 'accepted' | 'pending';
-
-  /**
-   * Details of the user associated to the membership.
-   */
-  user?: UserWithInviteCode.User;
-}
-
-export namespace UserWithInviteCode {
-  export interface Role {
-    /**
-     * Role identifier tag.
-     */
-    id: string;
-
-    /**
-     * Description of role's permissions.
-     */
-    description: string;
-
-    /**
-     * Role name.
-     */
-    name: string;
-
-    permissions: Role.Permissions;
-  }
-
-  export namespace Role {
-    export interface Permissions {
-      analytics?: Shared.PermissionGrant;
-
-      billing?: Shared.PermissionGrant;
-
-      cache_purge?: Shared.PermissionGrant;
-
-      dns?: Shared.PermissionGrant;
-
-      dns_records?: Shared.PermissionGrant;
-
-      lb?: Shared.PermissionGrant;
-
-      logs?: Shared.PermissionGrant;
-
-      organization?: Shared.PermissionGrant;
-
-      ssl?: Shared.PermissionGrant;
-
-      waf?: Shared.PermissionGrant;
-
-      zone_settings?: Shared.PermissionGrant;
-
-      zones?: Shared.PermissionGrant;
-    }
-  }
-
-  /**
-   * Details of the user associated to the membership.
-   */
-  export interface User {
-    /**
-     * The contact email address of the user.
-     */
-    email: string;
-
-    /**
-     * Identifier
-     */
-    id?: string;
-
-    /**
-     * User's first name
-     */
-    first_name?: string | null;
-
-    /**
-     * User's last name
-     */
-    last_name?: string | null;
-
-    /**
-     * Indicates whether two-factor authentication is enabled for the user account.
-     * Does not apply to API authentication.
-     */
-    two_factor_authentication_enabled?: boolean;
-  }
-}
-
-export interface MemberCreateResponse {
-  /**
-   * Membership identifier tag.
-   */
-  id?: string;
-
-  /**
-   * Access policy for the membership
-   */
-  policies?: Array<MemberCreateResponse.Policy>;
-
-  /**
-   * Roles assigned to this Member.
-   */
-  roles?: Array<Shared.Role>;
-
-  /**
-   * A member's status in the account.
-   */
-  status?: 'accepted' | 'pending';
-
-  /**
-   * Details of the user associated to the membership.
-   */
-  user?: MemberCreateResponse.User;
-}
-
-export namespace MemberCreateResponse {
-  export interface Policy {
-    /**
-     * Policy identifier.
-     */
-    id?: string;
-
-    /**
-     * Allow or deny operations against the resources.
-     */
-    access?: 'allow' | 'deny';
-
-    /**
-     * A set of permission groups that are specified to the policy.
-     */
-    permission_groups?: Array<Policy.PermissionGroup>;
-
-    /**
-     * A list of resource groups that the policy applies to.
-     */
-    resource_groups?: Array<Policy.ResourceGroup>;
-  }
-
-  export namespace Policy {
-    /**
-     * A named group of permissions that map to a group of operations against
-     * resources.
-     */
-    export interface PermissionGroup {
-      /**
-       * Identifier of the group.
-       */
-      id: string;
-
-      /**
-       * Attributes associated to the permission group.
-       */
-      meta?: unknown;
-
-      /**
-       * Name of the group.
-       */
-      name?: string;
-    }
-
-    /**
-     * A group of scoped resources.
-     */
-    export interface ResourceGroup {
-      /**
-       * Identifier of the group.
-       */
-      id: string;
-
-      /**
-       * The scope associated to the resource group
-       */
-      scope: Array<ResourceGroup.Scope>;
-
-      /**
-       * Attributes associated to the resource group.
-       */
-      meta?: unknown;
-
-      /**
-       * Name of the resource group.
-       */
-      name?: string;
-    }
-
-    export namespace ResourceGroup {
-      /**
-       * A scope is a combination of scope objects which provides additional context.
-       */
-      export interface Scope {
-        /**
-         * This is a combination of pre-defined resource name and identifier (like Account
-         * ID etc.)
-         */
-        key: string;
-
-        /**
-         * A list of scope objects for additional context.
-         */
-        objects: Array<Scope.Object>;
-      }
-
-      export namespace Scope {
-        /**
-         * A scope object represents any resource that can have actions applied against
-         * invite.
-         */
-        export interface Object {
-          /**
-           * This is a combination of pre-defined resource name and identifier (like Zone ID
-           * etc.)
-           */
-          key: string;
-        }
-      }
-    }
-  }
-
-  /**
-   * Details of the user associated to the membership.
-   */
-  export interface User {
-    /**
-     * The contact email address of the user.
-     */
-    email: string;
-
-    /**
-     * Identifier
-     */
-    id?: string;
-
-    /**
-     * User's first name
-     */
-    first_name?: string | null;
-
-    /**
-     * User's last name
-     */
-    last_name?: string | null;
-
-    /**
-     * Indicates whether two-factor authentication is enabled for the user account.
-     * Does not apply to API authentication.
-     */
-    two_factor_authentication_enabled?: boolean;
-  }
-}
-
-export interface MemberUpdateResponse {
-  /**
-   * Membership identifier tag.
-   */
-  id?: string;
-
-  /**
-   * Access policy for the membership
-   */
-  policies?: Array<MemberUpdateResponse.Policy>;
-
-  /**
-   * Roles assigned to this Member.
-   */
-  roles?: Array<Shared.Role>;
-
-  /**
-   * A member's status in the account.
-   */
-  status?: 'accepted' | 'pending';
-
-  /**
-   * Details of the user associated to the membership.
-   */
-  user?: MemberUpdateResponse.User;
-}
-
-export namespace MemberUpdateResponse {
-  export interface Policy {
-    /**
-     * Policy identifier.
-     */
-    id?: string;
-
-    /**
-     * Allow or deny operations against the resources.
-     */
-    access?: 'allow' | 'deny';
-
-    /**
-     * A set of permission groups that are specified to the policy.
-     */
-    permission_groups?: Array<Policy.PermissionGroup>;
-
-    /**
-     * A list of resource groups that the policy applies to.
-     */
-    resource_groups?: Array<Policy.ResourceGroup>;
-  }
-
-  export namespace Policy {
-    /**
-     * A named group of permissions that map to a group of operations against
-     * resources.
-     */
-    export interface PermissionGroup {
-      /**
-       * Identifier of the group.
-       */
-      id: string;
-
-      /**
-       * Attributes associated to the permission group.
-       */
-      meta?: unknown;
-
-      /**
-       * Name of the group.
-       */
-      name?: string;
-    }
-
-    /**
-     * A group of scoped resources.
-     */
-    export interface ResourceGroup {
-      /**
-       * Identifier of the group.
-       */
-      id: string;
-
-      /**
-       * The scope associated to the resource group
-       */
-      scope: Array<ResourceGroup.Scope>;
-
-      /**
-       * Attributes associated to the resource group.
-       */
-      meta?: unknown;
-
-      /**
-       * Name of the resource group.
-       */
-      name?: string;
-    }
-
-    export namespace ResourceGroup {
-      /**
-       * A scope is a combination of scope objects which provides additional context.
-       */
-      export interface Scope {
-        /**
-         * This is a combination of pre-defined resource name and identifier (like Account
-         * ID etc.)
-         */
-        key: string;
-
-        /**
-         * A list of scope objects for additional context.
-         */
-        objects: Array<Scope.Object>;
-      }
-
-      export namespace Scope {
-        /**
-         * A scope object represents any resource that can have actions applied against
-         * invite.
-         */
-        export interface Object {
-          /**
-           * This is a combination of pre-defined resource name and identifier (like Zone ID
-           * etc.)
-           */
-          key: string;
-        }
-      }
-    }
-  }
-
-  /**
-   * Details of the user associated to the membership.
-   */
-  export interface User {
-    /**
-     * The contact email address of the user.
-     */
-    email: string;
-
-    /**
-     * Identifier
-     */
-    id?: string;
-
-    /**
-     * User's first name
-     */
-    first_name?: string | null;
-
-    /**
-     * User's last name
-     */
-    last_name?: string | null;
-
-    /**
-     * Indicates whether two-factor authentication is enabled for the user account.
-     * Does not apply to API authentication.
-     */
-    two_factor_authentication_enabled?: boolean;
-  }
-}
-
-export interface MemberListResponse {
-  /**
-   * Membership identifier tag.
-   */
-  id?: string;
-
-  /**
-   * Access policy for the membership
-   */
-  policies?: Array<MemberListResponse.Policy>;
-
-  /**
-   * Roles assigned to this Member.
-   */
-  roles?: Array<Shared.Role>;
-
-  /**
-   * A member's status in the account.
-   */
-  status?: 'accepted' | 'pending';
-
-  /**
-   * Details of the user associated to the membership.
-   */
-  user?: MemberListResponse.User;
-}
-
-export namespace MemberListResponse {
-  export interface Policy {
-    /**
-     * Policy identifier.
-     */
-    id?: string;
-
-    /**
-     * Allow or deny operations against the resources.
-     */
-    access?: 'allow' | 'deny';
-
-    /**
-     * A set of permission groups that are specified to the policy.
-     */
-    permission_groups?: Array<Policy.PermissionGroup>;
-
-    /**
-     * A list of resource groups that the policy applies to.
-     */
-    resource_groups?: Array<Policy.ResourceGroup>;
-  }
-
-  export namespace Policy {
-    /**
-     * A named group of permissions that map to a group of operations against
-     * resources.
-     */
-    export interface PermissionGroup {
-      /**
-       * Identifier of the group.
-       */
-      id: string;
-
-      /**
-       * Attributes associated to the permission group.
-       */
-      meta?: unknown;
-
-      /**
-       * Name of the group.
-       */
-      name?: string;
-    }
-
-    /**
-     * A group of scoped resources.
-     */
-    export interface ResourceGroup {
-      /**
-       * Identifier of the group.
-       */
-      id: string;
-
-      /**
-       * The scope associated to the resource group
-       */
-      scope: Array<ResourceGroup.Scope>;
-
-      /**
-       * Attributes associated to the resource group.
-       */
-      meta?: unknown;
-
-      /**
-       * Name of the resource group.
-       */
-      name?: string;
-    }
-
-    export namespace ResourceGroup {
-      /**
-       * A scope is a combination of scope objects which provides additional context.
-       */
-      export interface Scope {
-        /**
-         * This is a combination of pre-defined resource name and identifier (like Account
-         * ID etc.)
-         */
-        key: string;
-
-        /**
-         * A list of scope objects for additional context.
-         */
-        objects: Array<Scope.Object>;
-      }
-
-      export namespace Scope {
-        /**
-         * A scope object represents any resource that can have actions applied against
-         * invite.
-         */
-        export interface Object {
-          /**
-           * This is a combination of pre-defined resource name and identifier (like Zone ID
-           * etc.)
-           */
-          key: string;
-        }
-      }
-    }
-  }
-
-  /**
-   * Details of the user associated to the membership.
-   */
-  export interface User {
-    /**
-     * The contact email address of the user.
-     */
-    email: string;
-
-    /**
-     * Identifier
-     */
-    id?: string;
-
-    /**
-     * User's first name
-     */
-    first_name?: string | null;
-
-    /**
-     * User's last name
-     */
-    last_name?: string | null;
-
-    /**
-     * Indicates whether two-factor authentication is enabled for the user account.
-     * Does not apply to API authentication.
-     */
-    two_factor_authentication_enabled?: boolean;
-  }
-}
-
 export interface MemberDeleteResponse {
   /**
    * Identifier
@@ -691,173 +95,11 @@ export interface MemberDeleteResponse {
   id: string;
 }
 
-export interface MemberGetResponse {
-  /**
-   * Membership identifier tag.
-   */
-  id?: string;
-
-  /**
-   * Access policy for the membership
-   */
-  policies?: Array<MemberGetResponse.Policy>;
-
-  /**
-   * Roles assigned to this Member.
-   */
-  roles?: Array<Shared.Role>;
-
-  /**
-   * A member's status in the account.
-   */
-  status?: 'accepted' | 'pending';
-
-  /**
-   * Details of the user associated to the membership.
-   */
-  user?: MemberGetResponse.User;
-}
-
-export namespace MemberGetResponse {
-  export interface Policy {
-    /**
-     * Policy identifier.
-     */
-    id?: string;
-
-    /**
-     * Allow or deny operations against the resources.
-     */
-    access?: 'allow' | 'deny';
-
-    /**
-     * A set of permission groups that are specified to the policy.
-     */
-    permission_groups?: Array<Policy.PermissionGroup>;
-
-    /**
-     * A list of resource groups that the policy applies to.
-     */
-    resource_groups?: Array<Policy.ResourceGroup>;
-  }
-
-  export namespace Policy {
-    /**
-     * A named group of permissions that map to a group of operations against
-     * resources.
-     */
-    export interface PermissionGroup {
-      /**
-       * Identifier of the group.
-       */
-      id: string;
-
-      /**
-       * Attributes associated to the permission group.
-       */
-      meta?: unknown;
-
-      /**
-       * Name of the group.
-       */
-      name?: string;
-    }
-
-    /**
-     * A group of scoped resources.
-     */
-    export interface ResourceGroup {
-      /**
-       * Identifier of the group.
-       */
-      id: string;
-
-      /**
-       * The scope associated to the resource group
-       */
-      scope: Array<ResourceGroup.Scope>;
-
-      /**
-       * Attributes associated to the resource group.
-       */
-      meta?: unknown;
-
-      /**
-       * Name of the resource group.
-       */
-      name?: string;
-    }
-
-    export namespace ResourceGroup {
-      /**
-       * A scope is a combination of scope objects which provides additional context.
-       */
-      export interface Scope {
-        /**
-         * This is a combination of pre-defined resource name and identifier (like Account
-         * ID etc.)
-         */
-        key: string;
-
-        /**
-         * A list of scope objects for additional context.
-         */
-        objects: Array<Scope.Object>;
-      }
-
-      export namespace Scope {
-        /**
-         * A scope object represents any resource that can have actions applied against
-         * invite.
-         */
-        export interface Object {
-          /**
-           * This is a combination of pre-defined resource name and identifier (like Zone ID
-           * etc.)
-           */
-          key: string;
-        }
-      }
-    }
-  }
-
-  /**
-   * Details of the user associated to the membership.
-   */
-  export interface User {
-    /**
-     * The contact email address of the user.
-     */
-    email: string;
-
-    /**
-     * Identifier
-     */
-    id?: string;
-
-    /**
-     * User's first name
-     */
-    first_name?: string | null;
-
-    /**
-     * User's last name
-     */
-    last_name?: string | null;
-
-    /**
-     * Indicates whether two-factor authentication is enabled for the user account.
-     * Does not apply to API authentication.
-     */
-    two_factor_authentication_enabled?: boolean;
-  }
-}
-
 export type MemberCreateParams =
   | MemberCreateParams.IAMCreateMemberWithRoles
   | MemberCreateParams.IAMCreateMemberWithPolicies;
 
-export namespace MemberCreateParams {
+export declare namespace MemberCreateParams {
   export interface IAMCreateMemberWithRoles {
     /**
      * Path param: Account identifier tag.
@@ -944,10 +186,12 @@ export namespace MemberCreateParams {
   }
 }
 
-export type MemberUpdateParams = MemberUpdateParams.Member | MemberUpdateParams.IAMUpdateMemberWithPolicies;
+export type MemberUpdateParams =
+  | MemberUpdateParams.IAMUpdateMemberWithRoles
+  | MemberUpdateParams.IAMUpdateMemberWithPolicies;
 
-export namespace MemberUpdateParams {
-  export interface Member {
+export declare namespace MemberUpdateParams {
+  export interface IAMUpdateMemberWithRoles {
     /**
      * Path param: Account identifier tag.
      */
@@ -956,16 +200,7 @@ export namespace MemberUpdateParams {
     /**
      * Body param: Roles assigned to this member.
      */
-    roles?: Array<MemberUpdateParams.Member.Role>;
-  }
-
-  export namespace Member {
-    export interface Role {
-      /**
-       * Role identifier tag.
-       */
-      id: string;
-    }
+    roles?: Array<Shared.RoleParam>;
   }
 
   export interface IAMUpdateMemberWithPolicies {
@@ -1058,18 +293,16 @@ export interface MemberGetParams {
   account_id: string;
 }
 
-export namespace Members {
-  export import Status = MembersAPI.Status;
-  export import UserWithInviteCode = MembersAPI.UserWithInviteCode;
-  export import MemberCreateResponse = MembersAPI.MemberCreateResponse;
-  export import MemberUpdateResponse = MembersAPI.MemberUpdateResponse;
-  export import MemberListResponse = MembersAPI.MemberListResponse;
-  export import MemberDeleteResponse = MembersAPI.MemberDeleteResponse;
-  export import MemberGetResponse = MembersAPI.MemberGetResponse;
-  export import MemberListResponsesV4PagePaginationArray = MembersAPI.MemberListResponsesV4PagePaginationArray;
-  export import MemberCreateParams = MembersAPI.MemberCreateParams;
-  export import MemberUpdateParams = MembersAPI.MemberUpdateParams;
-  export import MemberListParams = MembersAPI.MemberListParams;
-  export import MemberDeleteParams = MembersAPI.MemberDeleteParams;
-  export import MemberGetParams = MembersAPI.MemberGetParams;
+export declare namespace Members {
+  export {
+    type Status as Status,
+    type MemberDeleteResponse as MemberDeleteResponse,
+    type MemberCreateParams as MemberCreateParams,
+    type MemberUpdateParams as MemberUpdateParams,
+    type MemberListParams as MemberListParams,
+    type MemberDeleteParams as MemberDeleteParams,
+    type MemberGetParams as MemberGetParams,
+  };
 }
+
+export { MembersV4PagePaginationArray };
diff --git a/src/resources/accounts/roles.ts b/src/resources/accounts/roles.ts
index 56ef76649f..ab35bff975 100644
--- a/src/resources/accounts/roles.ts
+++ b/src/resources/accounts/roles.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as RolesAPI from './roles';
 import * as Shared from '../shared';
 import { RolesSinglePage } from '../shared';
 
@@ -21,22 +20,16 @@ export class Roles extends APIResource {
   /**
    * Get information about a specific role for an account.
    */
-  get(
-    roleId: unknown,
-    params: RoleGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<RoleGetResponse> {
+  get(roleId: string, params: RoleGetParams, options?: Core.RequestOptions): Core.APIPromise<Shared.Role> {
     const { account_id } = params;
     return (
       this._client.get(`/accounts/${account_id}/roles/${roleId}`, options) as Core.APIPromise<{
-        result: RoleGetResponse;
+        result: Shared.Role;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export type RoleGetResponse = unknown;
-
 export interface RoleListParams {
   /**
    * Account identifier tag.
@@ -51,10 +44,8 @@ export interface RoleGetParams {
   account_id: string;
 }
 
-export namespace Roles {
-  export import RoleGetResponse = RolesAPI.RoleGetResponse;
-  export import RoleListParams = RolesAPI.RoleListParams;
-  export import RoleGetParams = RolesAPI.RoleGetParams;
+export declare namespace Roles {
+  export { type RoleListParams as RoleListParams, type RoleGetParams as RoleGetParams };
 }
 
 export { RolesSinglePage };
diff --git a/src/resources/accounts/subscriptions.ts b/src/resources/accounts/subscriptions.ts
new file mode 100644
index 0000000000..2f37c42613
--- /dev/null
+++ b/src/resources/accounts/subscriptions.ts
@@ -0,0 +1,145 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import * as Shared from '../shared';
+
+export class Subscriptions extends APIResource {
+  /**
+   * Creates an account subscription.
+   */
+  create(
+    params: SubscriptionCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SubscriptionCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/subscriptions`, { body, ...options }) as Core.APIPromise<{
+        result: SubscriptionCreateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Updates an account subscription.
+   */
+  update(
+    subscriptionIdentifier: string,
+    params: SubscriptionUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SubscriptionUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/subscriptions/${subscriptionIdentifier}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: SubscriptionUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Deletes an account's subscription.
+   */
+  delete(
+    subscriptionIdentifier: string,
+    params: SubscriptionDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SubscriptionDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/subscriptions/${subscriptionIdentifier}`,
+        options,
+      ) as Core.APIPromise<{ result: SubscriptionDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists all of an account's subscriptions.
+   */
+  get(
+    params: SubscriptionGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SubscriptionGetResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/subscriptions`, options) as Core.APIPromise<{
+        result: SubscriptionGetResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type SubscriptionCreateResponse = unknown | string | null;
+
+export type SubscriptionUpdateResponse = unknown | string | null;
+
+export interface SubscriptionDeleteResponse {
+  /**
+   * Subscription identifier tag.
+   */
+  subscription_id?: string;
+}
+
+export type SubscriptionGetResponse = Array<Shared.Subscription>;
+
+export interface SubscriptionCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: How often the subscription is renewed automatically.
+   */
+  frequency?: 'weekly' | 'monthly' | 'quarterly' | 'yearly';
+
+  /**
+   * Body param: The rate plan applied to the subscription.
+   */
+  rate_plan?: Shared.RatePlanParam;
+}
+
+export interface SubscriptionUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: How often the subscription is renewed automatically.
+   */
+  frequency?: 'weekly' | 'monthly' | 'quarterly' | 'yearly';
+
+  /**
+   * Body param: The rate plan applied to the subscription.
+   */
+  rate_plan?: Shared.RatePlanParam;
+}
+
+export interface SubscriptionDeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface SubscriptionGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace Subscriptions {
+  export {
+    type SubscriptionCreateResponse as SubscriptionCreateResponse,
+    type SubscriptionUpdateResponse as SubscriptionUpdateResponse,
+    type SubscriptionDeleteResponse as SubscriptionDeleteResponse,
+    type SubscriptionGetResponse as SubscriptionGetResponse,
+    type SubscriptionCreateParams as SubscriptionCreateParams,
+    type SubscriptionUpdateParams as SubscriptionUpdateParams,
+    type SubscriptionDeleteParams as SubscriptionDeleteParams,
+    type SubscriptionGetParams as SubscriptionGetParams,
+  };
+}
diff --git a/src/resources/accounts/tokens/index.ts b/src/resources/accounts/tokens/index.ts
new file mode 100644
index 0000000000..82d6105efa
--- /dev/null
+++ b/src/resources/accounts/tokens/index.ts
@@ -0,0 +1,21 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  PermissionGroupListResponsesSinglePage,
+  PermissionGroups,
+  type PermissionGroupListResponse,
+  type PermissionGroupListParams,
+} from './permission-groups';
+export {
+  Tokens,
+  type TokenCreateResponse,
+  type TokenDeleteResponse,
+  type TokenVerifyResponse,
+  type TokenCreateParams,
+  type TokenUpdateParams,
+  type TokenListParams,
+  type TokenDeleteParams,
+  type TokenGetParams,
+  type TokenVerifyParams,
+} from './tokens';
+export { Value, type ValueUpdateParams } from './value';
diff --git a/src/resources/accounts/tokens/permission-groups.ts b/src/resources/accounts/tokens/permission-groups.ts
new file mode 100644
index 0000000000..bc548ee0fb
--- /dev/null
+++ b/src/resources/accounts/tokens/permission-groups.ts
@@ -0,0 +1,43 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { SinglePage } from '../../../pagination';
+
+export class PermissionGroups extends APIResource {
+  /**
+   * Find all available permission groups for Account Owned API Tokens
+   */
+  list(
+    params: PermissionGroupListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<PermissionGroupListResponsesSinglePage, PermissionGroupListResponse> {
+    const { account_id } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/tokens/permission_groups`,
+      PermissionGroupListResponsesSinglePage,
+      options,
+    );
+  }
+}
+
+export class PermissionGroupListResponsesSinglePage extends SinglePage<PermissionGroupListResponse> {}
+
+export type PermissionGroupListResponse = unknown;
+
+export interface PermissionGroupListParams {
+  /**
+   * Account identifier tag.
+   */
+  account_id: string;
+}
+
+PermissionGroups.PermissionGroupListResponsesSinglePage = PermissionGroupListResponsesSinglePage;
+
+export declare namespace PermissionGroups {
+  export {
+    type PermissionGroupListResponse as PermissionGroupListResponse,
+    PermissionGroupListResponsesSinglePage as PermissionGroupListResponsesSinglePage,
+    type PermissionGroupListParams as PermissionGroupListParams,
+  };
+}
diff --git a/src/resources/accounts/tokens/tokens.ts b/src/resources/accounts/tokens/tokens.ts
new file mode 100644
index 0000000000..c2bd95ca0c
--- /dev/null
+++ b/src/resources/accounts/tokens/tokens.ts
@@ -0,0 +1,401 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as Shared from '../../shared';
+import { TokensV4PagePaginationArray } from '../../shared';
+import * as PermissionGroupsAPI from './permission-groups';
+import {
+  PermissionGroupListParams,
+  PermissionGroupListResponse,
+  PermissionGroupListResponsesSinglePage,
+  PermissionGroups,
+} from './permission-groups';
+import * as ValueAPI from './value';
+import { Value, ValueUpdateParams } from './value';
+import { type V4PagePaginationArrayParams } from '../../../pagination';
+
+export class Tokens extends APIResource {
+  permissionGroups: PermissionGroupsAPI.PermissionGroups = new PermissionGroupsAPI.PermissionGroups(
+    this._client,
+  );
+  value: ValueAPI.Value = new ValueAPI.Value(this._client);
+
+  /**
+   * Create a new Account Owned API token.
+   */
+  create(params: TokenCreateParams, options?: Core.RequestOptions): Core.APIPromise<TokenCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/tokens`, { body, ...options }) as Core.APIPromise<{
+        result: TokenCreateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update an existing token.
+   */
+  update(
+    tokenId: string,
+    params: TokenUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<Shared.Token> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/tokens/${tokenId}`, { body, ...options }) as Core.APIPromise<{
+        result: Shared.Token;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List all Account Owned API tokens created for this account.
+   */
+  list(
+    params: TokenListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<TokensV4PagePaginationArray, Shared.Token> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(`/accounts/${account_id}/tokens`, TokensV4PagePaginationArray, {
+      query,
+      ...options,
+    });
+  }
+
+  /**
+   * Destroy an Account Owned API token.
+   */
+  delete(
+    tokenId: string,
+    params: TokenDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TokenDeleteResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}/tokens/${tokenId}`, options) as Core.APIPromise<{
+        result: TokenDeleteResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get information about a specific Account Owned API token.
+   */
+  get(tokenId: string, params: TokenGetParams, options?: Core.RequestOptions): Core.APIPromise<Shared.Token> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/tokens/${tokenId}`, options) as Core.APIPromise<{
+        result: Shared.Token;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Test whether a token works.
+   */
+  verify(params: TokenVerifyParams, options?: Core.RequestOptions): Core.APIPromise<TokenVerifyResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/tokens/verify`, options) as Core.APIPromise<{
+        result: TokenVerifyResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface TokenCreateResponse {
+  /**
+   * Token identifier tag.
+   */
+  id?: string;
+
+  condition?: TokenCreateResponse.Condition;
+
+  /**
+   * The expiration time on or after which the JWT MUST NOT be accepted for
+   * processing.
+   */
+  expires_on?: string;
+
+  /**
+   * The time on which the token was created.
+   */
+  issued_on?: string;
+
+  /**
+   * Last time the token was used.
+   */
+  last_used_on?: string;
+
+  /**
+   * Last time the token was modified.
+   */
+  modified_on?: string;
+
+  /**
+   * Token name.
+   */
+  name?: string;
+
+  /**
+   * The time before which the token MUST NOT be accepted for processing.
+   */
+  not_before?: string;
+
+  /**
+   * List of access policies assigned to the token.
+   */
+  policies?: Array<Shared.TokenPolicy>;
+
+  /**
+   * Status of the token.
+   */
+  status?: 'active' | 'disabled' | 'expired';
+
+  /**
+   * The token value.
+   */
+  value?: Shared.TokenValue;
+}
+
+export namespace TokenCreateResponse {
+  export interface Condition {
+    /**
+     * Client IP restrictions.
+     */
+    request_ip?: Condition.RequestIP;
+  }
+
+  export namespace Condition {
+    /**
+     * Client IP restrictions.
+     */
+    export interface RequestIP {
+      /**
+       * List of IPv4/IPv6 CIDR addresses.
+       */
+      in?: Array<Shared.TokenConditionCIDRList>;
+
+      /**
+       * List of IPv4/IPv6 CIDR addresses.
+       */
+      not_in?: Array<Shared.TokenConditionCIDRList>;
+    }
+  }
+}
+
+export interface TokenDeleteResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+}
+
+export interface TokenVerifyResponse {
+  /**
+   * Token identifier tag.
+   */
+  id: string;
+
+  /**
+   * Status of the token.
+   */
+  status: 'active' | 'disabled' | 'expired';
+
+  /**
+   * The expiration time on or after which the JWT MUST NOT be accepted for
+   * processing.
+   */
+  expires_on?: string;
+
+  /**
+   * The time before which the token MUST NOT be accepted for processing.
+   */
+  not_before?: string;
+}
+
+export interface TokenCreateParams {
+  /**
+   * Path param: Account identifier tag.
+   */
+  account_id: string;
+
+  /**
+   * Body param: Token name.
+   */
+  name: string;
+
+  /**
+   * Body param: List of access policies assigned to the token.
+   */
+  policies: Array<Shared.TokenPolicyParam>;
+
+  /**
+   * Body param:
+   */
+  condition?: TokenCreateParams.Condition;
+
+  /**
+   * Body param: The expiration time on or after which the JWT MUST NOT be accepted
+   * for processing.
+   */
+  expires_on?: string;
+
+  /**
+   * Body param: The time before which the token MUST NOT be accepted for processing.
+   */
+  not_before?: string;
+}
+
+export namespace TokenCreateParams {
+  export interface Condition {
+    /**
+     * Client IP restrictions.
+     */
+    request_ip?: Condition.RequestIP;
+  }
+
+  export namespace Condition {
+    /**
+     * Client IP restrictions.
+     */
+    export interface RequestIP {
+      /**
+       * List of IPv4/IPv6 CIDR addresses.
+       */
+      in?: Array<Shared.TokenConditionCIDRListParam>;
+
+      /**
+       * List of IPv4/IPv6 CIDR addresses.
+       */
+      not_in?: Array<Shared.TokenConditionCIDRListParam>;
+    }
+  }
+}
+
+export interface TokenUpdateParams {
+  /**
+   * Path param: Account identifier tag.
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  condition?: TokenUpdateParams.Condition;
+
+  /**
+   * Body param: The expiration time on or after which the JWT MUST NOT be accepted
+   * for processing.
+   */
+  expires_on?: string;
+
+  /**
+   * Body param: Token name.
+   */
+  name?: string;
+
+  /**
+   * Body param: The time before which the token MUST NOT be accepted for processing.
+   */
+  not_before?: string;
+
+  /**
+   * Body param: List of access policies assigned to the token.
+   */
+  policies?: Array<Shared.TokenPolicyParam>;
+
+  /**
+   * Body param: Status of the token.
+   */
+  status?: 'active' | 'disabled' | 'expired';
+}
+
+export namespace TokenUpdateParams {
+  export interface Condition {
+    /**
+     * Client IP restrictions.
+     */
+    request_ip?: Condition.RequestIP;
+  }
+
+  export namespace Condition {
+    /**
+     * Client IP restrictions.
+     */
+    export interface RequestIP {
+      /**
+       * List of IPv4/IPv6 CIDR addresses.
+       */
+      in?: Array<Shared.TokenConditionCIDRListParam>;
+
+      /**
+       * List of IPv4/IPv6 CIDR addresses.
+       */
+      not_in?: Array<Shared.TokenConditionCIDRListParam>;
+    }
+  }
+}
+
+export interface TokenListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account identifier tag.
+   */
+  account_id: string;
+
+  /**
+   * Query param: Direction to order results.
+   */
+  direction?: 'asc' | 'desc';
+}
+
+export interface TokenDeleteParams {
+  /**
+   * Account identifier tag.
+   */
+  account_id: string;
+}
+
+export interface TokenGetParams {
+  /**
+   * Account identifier tag.
+   */
+  account_id: string;
+}
+
+export interface TokenVerifyParams {
+  /**
+   * Account identifier tag.
+   */
+  account_id: string;
+}
+
+Tokens.PermissionGroups = PermissionGroups;
+Tokens.PermissionGroupListResponsesSinglePage = PermissionGroupListResponsesSinglePage;
+Tokens.Value = Value;
+
+export declare namespace Tokens {
+  export {
+    type TokenCreateResponse as TokenCreateResponse,
+    type TokenDeleteResponse as TokenDeleteResponse,
+    type TokenVerifyResponse as TokenVerifyResponse,
+    type TokenCreateParams as TokenCreateParams,
+    type TokenUpdateParams as TokenUpdateParams,
+    type TokenListParams as TokenListParams,
+    type TokenDeleteParams as TokenDeleteParams,
+    type TokenGetParams as TokenGetParams,
+    type TokenVerifyParams as TokenVerifyParams,
+  };
+
+  export {
+    PermissionGroups as PermissionGroups,
+    type PermissionGroupListResponse as PermissionGroupListResponse,
+    PermissionGroupListResponsesSinglePage as PermissionGroupListResponsesSinglePage,
+    type PermissionGroupListParams as PermissionGroupListParams,
+  };
+
+  export { Value as Value, type ValueUpdateParams as ValueUpdateParams };
+}
+
+export { TokensV4PagePaginationArray };
diff --git a/src/resources/accounts/tokens/value.ts b/src/resources/accounts/tokens/value.ts
new file mode 100644
index 0000000000..fc9b58dfd9
--- /dev/null
+++ b/src/resources/accounts/tokens/value.ts
@@ -0,0 +1,40 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as Shared from '../../shared';
+
+export class Value extends APIResource {
+  /**
+   * Roll the Account Owned API token secret.
+   */
+  update(
+    tokenId: string,
+    params: ValueUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<Shared.TokenValue> {
+    const { account_id, body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/tokens/${tokenId}/value`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: Shared.TokenValue }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface ValueUpdateParams {
+  /**
+   * Path param: Account identifier tag.
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+}
+
+export declare namespace Value {
+  export { type ValueUpdateParams as ValueUpdateParams };
+}
diff --git a/src/resources/acm/acm.ts b/src/resources/acm/acm.ts
index d6c5e8b41d..eb27fa949d 100644
--- a/src/resources/acm/acm.ts
+++ b/src/resources/acm/acm.ts
@@ -2,16 +2,28 @@
 
 import { APIResource } from '../../resource';
 import * as TotalTLSAPI from './total-tls';
+import {
+  CertificateAuthority,
+  TotalTLS,
+  TotalTLSCreateParams,
+  TotalTLSCreateResponse,
+  TotalTLSGetParams,
+  TotalTLSGetResponse,
+} from './total-tls';
 
 export class ACM extends APIResource {
   totalTLS: TotalTLSAPI.TotalTLS = new TotalTLSAPI.TotalTLS(this._client);
 }
 
-export namespace ACM {
-  export import TotalTLS = TotalTLSAPI.TotalTLS;
-  export import CertificateAuthority = TotalTLSAPI.CertificateAuthority;
-  export import TotalTLSCreateResponse = TotalTLSAPI.TotalTLSCreateResponse;
-  export import TotalTLSGetResponse = TotalTLSAPI.TotalTLSGetResponse;
-  export import TotalTLSCreateParams = TotalTLSAPI.TotalTLSCreateParams;
-  export import TotalTLSGetParams = TotalTLSAPI.TotalTLSGetParams;
+ACM.TotalTLS = TotalTLS;
+
+export declare namespace ACM {
+  export {
+    TotalTLS as TotalTLS,
+    type CertificateAuthority as CertificateAuthority,
+    type TotalTLSCreateResponse as TotalTLSCreateResponse,
+    type TotalTLSGetResponse as TotalTLSGetResponse,
+    type TotalTLSCreateParams as TotalTLSCreateParams,
+    type TotalTLSGetParams as TotalTLSGetParams,
+  };
 }
diff --git a/src/resources/acm/index.ts b/src/resources/acm/index.ts
index 1602f61a20..d4dd566321 100644
--- a/src/resources/acm/index.ts
+++ b/src/resources/acm/index.ts
@@ -2,10 +2,10 @@
 
 export { ACM } from './acm';
 export {
-  CertificateAuthority,
-  TotalTLSCreateResponse,
-  TotalTLSGetResponse,
-  TotalTLSCreateParams,
-  TotalTLSGetParams,
   TotalTLS,
+  type CertificateAuthority,
+  type TotalTLSCreateResponse,
+  type TotalTLSGetResponse,
+  type TotalTLSCreateParams,
+  type TotalTLSGetParams,
 } from './total-tls';
diff --git a/src/resources/acm/total-tls.ts b/src/resources/acm/total-tls.ts
index d095ae071a..07d170f690 100644
--- a/src/resources/acm/total-tls.ts
+++ b/src/resources/acm/total-tls.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as TotalTLSAPI from './total-tls';
 
 export class TotalTLS extends APIResource {
   /**
@@ -36,12 +35,12 @@ export class TotalTLS extends APIResource {
 /**
  * The Certificate Authority that Total TLS certificates will be issued through.
  */
-export type CertificateAuthority = 'google' | 'lets_encrypt';
+export type CertificateAuthority = 'google' | 'lets_encrypt' | 'ssl_com';
 
 /**
  * The Certificate Authority that Total TLS certificates will be issued through.
  */
-export type CertificateAuthorityParam = 'google' | 'lets_encrypt';
+export type CertificateAuthorityParam = 'google' | 'lets_encrypt' | 'ssl_com';
 
 export interface TotalTLSCreateResponse {
   /**
@@ -58,7 +57,7 @@ export interface TotalTLSCreateResponse {
   /**
    * The validity period in days for the certificates ordered via Total TLS.
    */
-  validity_days?: 90;
+  validity_period?: 90;
 }
 
 export interface TotalTLSGetResponse {
@@ -76,7 +75,7 @@ export interface TotalTLSGetResponse {
   /**
    * The validity period in days for the certificates ordered via Total TLS.
    */
-  validity_days?: 90;
+  validity_period?: 90;
 }
 
 export interface TotalTLSCreateParams {
@@ -105,10 +104,12 @@ export interface TotalTLSGetParams {
   zone_id: string;
 }
 
-export namespace TotalTLS {
-  export import CertificateAuthority = TotalTLSAPI.CertificateAuthority;
-  export import TotalTLSCreateResponse = TotalTLSAPI.TotalTLSCreateResponse;
-  export import TotalTLSGetResponse = TotalTLSAPI.TotalTLSGetResponse;
-  export import TotalTLSCreateParams = TotalTLSAPI.TotalTLSCreateParams;
-  export import TotalTLSGetParams = TotalTLSAPI.TotalTLSGetParams;
+export declare namespace TotalTLS {
+  export {
+    type CertificateAuthority as CertificateAuthority,
+    type TotalTLSCreateResponse as TotalTLSCreateResponse,
+    type TotalTLSGetResponse as TotalTLSGetResponse,
+    type TotalTLSCreateParams as TotalTLSCreateParams,
+    type TotalTLSGetParams as TotalTLSGetParams,
+  };
 }
diff --git a/src/resources/addressing/address-maps/accounts.ts b/src/resources/addressing/address-maps/accounts.ts
index 9d2d72417a..589190d231 100644
--- a/src/resources/addressing/address-maps/accounts.ts
+++ b/src/resources/addressing/address-maps/accounts.ts
@@ -2,7 +2,7 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as AccountsAPI from './accounts';
+import * as Shared from '../../shared';
 
 export class Accounts extends APIResource {
   /**
@@ -12,14 +12,12 @@ export class Accounts extends APIResource {
     addressMapId: string,
     params: AccountUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<AccountUpdateResponse | null> {
+  ): Core.APIPromise<AccountUpdateResponse> {
     const { account_id, body } = params;
-    return (
-      this._client.put(
-        `/accounts/${account_id}/addressing/address_maps/${addressMapId}/accounts/${account_id}`,
-        { body: body, ...options },
-      ) as Core.APIPromise<{ result: AccountUpdateResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.put(
+      `/accounts/${account_id}/addressing/address_maps/${addressMapId}/accounts/${account_id}`,
+      { body: body, ...options },
+    );
   }
 
   /**
@@ -29,24 +27,92 @@ export class Accounts extends APIResource {
     addressMapId: string,
     params: AccountDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<AccountDeleteResponse | null> {
+  ): Core.APIPromise<AccountDeleteResponse> {
     const { account_id } = params;
-    return (
-      this._client.delete(
-        `/accounts/${account_id}/addressing/address_maps/${addressMapId}/accounts/${account_id}`,
-        options,
-      ) as Core.APIPromise<{ result: AccountDeleteResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.delete(
+      `/accounts/${account_id}/addressing/address_maps/${addressMapId}/accounts/${account_id}`,
+      options,
+    );
   }
 }
 
-export type AccountUpdateResponse = Array<unknown>;
+export interface AccountUpdateResponse {
+  errors: Array<Shared.ResponseInfo>;
 
-export type AccountDeleteResponse = Array<unknown>;
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+
+  result_info?: AccountUpdateResponse.ResultInfo;
+}
+
+export namespace AccountUpdateResponse {
+  export interface ResultInfo {
+    /**
+     * Total number of results for the requested service
+     */
+    count?: number;
+
+    /**
+     * Current page within paginated list of results
+     */
+    page?: number;
+
+    /**
+     * Number of results per page of results
+     */
+    per_page?: number;
+
+    /**
+     * Total results available without any search parameters
+     */
+    total_count?: number;
+  }
+}
+
+export interface AccountDeleteResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+
+  result_info?: AccountDeleteResponse.ResultInfo;
+}
+
+export namespace AccountDeleteResponse {
+  export interface ResultInfo {
+    /**
+     * Total number of results for the requested service
+     */
+    count?: number;
+
+    /**
+     * Current page within paginated list of results
+     */
+    page?: number;
+
+    /**
+     * Number of results per page of results
+     */
+    per_page?: number;
+
+    /**
+     * Total results available without any search parameters
+     */
+    total_count?: number;
+  }
+}
 
 export interface AccountUpdateParams {
   /**
-   * Path param: Identifier
+   * Path param: Identifier of a Cloudflare account.
    */
   account_id: string;
 
@@ -58,14 +124,16 @@ export interface AccountUpdateParams {
 
 export interface AccountDeleteParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export namespace Accounts {
-  export import AccountUpdateResponse = AccountsAPI.AccountUpdateResponse;
-  export import AccountDeleteResponse = AccountsAPI.AccountDeleteResponse;
-  export import AccountUpdateParams = AccountsAPI.AccountUpdateParams;
-  export import AccountDeleteParams = AccountsAPI.AccountDeleteParams;
+export declare namespace Accounts {
+  export {
+    type AccountUpdateResponse as AccountUpdateResponse,
+    type AccountDeleteResponse as AccountDeleteResponse,
+    type AccountUpdateParams as AccountUpdateParams,
+    type AccountDeleteParams as AccountDeleteParams,
+  };
 }
diff --git a/src/resources/addressing/address-maps/address-maps.ts b/src/resources/addressing/address-maps/address-maps.ts
index 7f6c87302f..c179e49a71 100644
--- a/src/resources/addressing/address-maps/address-maps.ts
+++ b/src/resources/addressing/address-maps/address-maps.ts
@@ -3,9 +3,19 @@
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
 import * as AddressMapsAPI from './address-maps';
+import * as Shared from '../../shared';
 import * as AccountsAPI from './accounts';
+import {
+  AccountDeleteParams,
+  AccountDeleteResponse,
+  AccountUpdateParams,
+  AccountUpdateResponse,
+  Accounts,
+} from './accounts';
 import * as IPsAPI from './ips';
+import { IPDeleteParams, IPDeleteResponse, IPUpdateParams, IPUpdateResponse, IPs } from './ips';
 import * as ZonesAPI from './zones';
+import { ZoneDeleteParams, ZoneDeleteResponse, ZoneUpdateParams, ZoneUpdateResponse, Zones } from './zones';
 import { SinglePage } from '../../../pagination';
 
 export class AddressMaps extends APIResource {
@@ -52,14 +62,9 @@ export class AddressMaps extends APIResource {
     addressMapId: string,
     params: AddressMapDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<AddressMapDeleteResponse | null> {
+  ): Core.APIPromise<AddressMapDeleteResponse> {
     const { account_id } = params;
-    return (
-      this._client.delete(
-        `/accounts/${account_id}/addressing/address_maps/${addressMapId}`,
-        options,
-      ) as Core.APIPromise<{ result: AddressMapDeleteResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.delete(`/accounts/${account_id}/addressing/address_maps/${addressMapId}`, options);
   }
 
   /**
@@ -101,7 +106,7 @@ export class AddressMapsSinglePage extends SinglePage<AddressMap> {}
 
 export interface AddressMap {
   /**
-   * Identifier
+   * Identifier of an Address Map.
    */
   id?: string;
 
@@ -155,7 +160,7 @@ export type KindParam = 'zone' | 'account';
 
 export interface AddressMapCreateResponse {
   /**
-   * Identifier
+   * Identifier of an Address Map.
    */
   id?: string;
 
@@ -238,11 +243,46 @@ export namespace AddressMapCreateResponse {
   }
 }
 
-export type AddressMapDeleteResponse = Array<unknown>;
+export interface AddressMapDeleteResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+
+  result_info?: AddressMapDeleteResponse.ResultInfo;
+}
+
+export namespace AddressMapDeleteResponse {
+  export interface ResultInfo {
+    /**
+     * Total number of results for the requested service
+     */
+    count?: number;
+
+    /**
+     * Current page within paginated list of results
+     */
+    page?: number;
+
+    /**
+     * Number of results per page of results
+     */
+    per_page?: number;
+
+    /**
+     * Total results available without any search parameters
+     */
+    total_count?: number;
+  }
+}
 
 export interface AddressMapGetResponse {
   /**
-   * Identifier
+   * Identifier of an Address Map.
    */
   id?: string;
 
@@ -327,7 +367,7 @@ export namespace AddressMapGetResponse {
 
 export interface AddressMapCreateParams {
   /**
-   * Path param: Identifier
+   * Path param: Identifier of a Cloudflare account.
    */
   account_id: string;
 
@@ -357,8 +397,6 @@ export interface AddressMapCreateParams {
 
 export namespace AddressMapCreateParams {
   export interface Membership {
-    created_at?: string;
-
     /**
      * The identifier for the membership (eg. a zone or account tag).
      */
@@ -373,21 +411,21 @@ export namespace AddressMapCreateParams {
 
 export interface AddressMapListParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
 export interface AddressMapDeleteParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
 export interface AddressMapEditParams {
   /**
-   * Path param: Identifier
+   * Path param: Identifier of a Cloudflare account.
    */
   account_id: string;
 
@@ -415,36 +453,52 @@ export interface AddressMapEditParams {
 
 export interface AddressMapGetParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export namespace AddressMaps {
-  export import AddressMap = AddressMapsAPI.AddressMap;
-  export import Kind = AddressMapsAPI.Kind;
-  export import AddressMapCreateResponse = AddressMapsAPI.AddressMapCreateResponse;
-  export import AddressMapDeleteResponse = AddressMapsAPI.AddressMapDeleteResponse;
-  export import AddressMapGetResponse = AddressMapsAPI.AddressMapGetResponse;
-  export import AddressMapsSinglePage = AddressMapsAPI.AddressMapsSinglePage;
-  export import AddressMapCreateParams = AddressMapsAPI.AddressMapCreateParams;
-  export import AddressMapListParams = AddressMapsAPI.AddressMapListParams;
-  export import AddressMapDeleteParams = AddressMapsAPI.AddressMapDeleteParams;
-  export import AddressMapEditParams = AddressMapsAPI.AddressMapEditParams;
-  export import AddressMapGetParams = AddressMapsAPI.AddressMapGetParams;
-  export import Accounts = AccountsAPI.Accounts;
-  export import AccountUpdateResponse = AccountsAPI.AccountUpdateResponse;
-  export import AccountDeleteResponse = AccountsAPI.AccountDeleteResponse;
-  export import AccountUpdateParams = AccountsAPI.AccountUpdateParams;
-  export import AccountDeleteParams = AccountsAPI.AccountDeleteParams;
-  export import IPs = IPsAPI.IPs;
-  export import IPUpdateResponse = IPsAPI.IPUpdateResponse;
-  export import IPDeleteResponse = IPsAPI.IPDeleteResponse;
-  export import IPUpdateParams = IPsAPI.IPUpdateParams;
-  export import IPDeleteParams = IPsAPI.IPDeleteParams;
-  export import Zones = ZonesAPI.Zones;
-  export import ZoneUpdateResponse = ZonesAPI.ZoneUpdateResponse;
-  export import ZoneDeleteResponse = ZonesAPI.ZoneDeleteResponse;
-  export import ZoneUpdateParams = ZonesAPI.ZoneUpdateParams;
-  export import ZoneDeleteParams = ZonesAPI.ZoneDeleteParams;
+AddressMaps.AddressMapsSinglePage = AddressMapsSinglePage;
+AddressMaps.Accounts = Accounts;
+AddressMaps.IPs = IPs;
+AddressMaps.Zones = Zones;
+
+export declare namespace AddressMaps {
+  export {
+    type AddressMap as AddressMap,
+    type Kind as Kind,
+    type AddressMapCreateResponse as AddressMapCreateResponse,
+    type AddressMapDeleteResponse as AddressMapDeleteResponse,
+    type AddressMapGetResponse as AddressMapGetResponse,
+    AddressMapsSinglePage as AddressMapsSinglePage,
+    type AddressMapCreateParams as AddressMapCreateParams,
+    type AddressMapListParams as AddressMapListParams,
+    type AddressMapDeleteParams as AddressMapDeleteParams,
+    type AddressMapEditParams as AddressMapEditParams,
+    type AddressMapGetParams as AddressMapGetParams,
+  };
+
+  export {
+    Accounts as Accounts,
+    type AccountUpdateResponse as AccountUpdateResponse,
+    type AccountDeleteResponse as AccountDeleteResponse,
+    type AccountUpdateParams as AccountUpdateParams,
+    type AccountDeleteParams as AccountDeleteParams,
+  };
+
+  export {
+    IPs as IPs,
+    type IPUpdateResponse as IPUpdateResponse,
+    type IPDeleteResponse as IPDeleteResponse,
+    type IPUpdateParams as IPUpdateParams,
+    type IPDeleteParams as IPDeleteParams,
+  };
+
+  export {
+    Zones as Zones,
+    type ZoneUpdateResponse as ZoneUpdateResponse,
+    type ZoneDeleteResponse as ZoneDeleteResponse,
+    type ZoneUpdateParams as ZoneUpdateParams,
+    type ZoneDeleteParams as ZoneDeleteParams,
+  };
 }
diff --git a/src/resources/addressing/address-maps/index.ts b/src/resources/addressing/address-maps/index.ts
index b53d4b9edc..091fdac225 100644
--- a/src/resources/addressing/address-maps/index.ts
+++ b/src/resources/addressing/address-maps/index.ts
@@ -1,25 +1,37 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AccountUpdateResponse,
-  AccountDeleteResponse,
-  AccountUpdateParams,
-  AccountDeleteParams,
   Accounts,
+  type AccountUpdateResponse,
+  type AccountDeleteResponse,
+  type AccountUpdateParams,
+  type AccountDeleteParams,
 } from './accounts';
 export {
-  AddressMap,
-  Kind,
-  AddressMapCreateResponse,
-  AddressMapDeleteResponse,
-  AddressMapGetResponse,
-  AddressMapCreateParams,
-  AddressMapListParams,
-  AddressMapDeleteParams,
-  AddressMapEditParams,
-  AddressMapGetParams,
   AddressMapsSinglePage,
   AddressMaps,
+  type AddressMap,
+  type Kind,
+  type AddressMapCreateResponse,
+  type AddressMapDeleteResponse,
+  type AddressMapGetResponse,
+  type AddressMapCreateParams,
+  type AddressMapListParams,
+  type AddressMapDeleteParams,
+  type AddressMapEditParams,
+  type AddressMapGetParams,
 } from './address-maps';
-export { IPUpdateResponse, IPDeleteResponse, IPUpdateParams, IPDeleteParams, IPs } from './ips';
-export { ZoneUpdateResponse, ZoneDeleteResponse, ZoneUpdateParams, ZoneDeleteParams, Zones } from './zones';
+export {
+  IPs,
+  type IPUpdateResponse,
+  type IPDeleteResponse,
+  type IPUpdateParams,
+  type IPDeleteParams,
+} from './ips';
+export {
+  Zones,
+  type ZoneUpdateResponse,
+  type ZoneDeleteResponse,
+  type ZoneUpdateParams,
+  type ZoneDeleteParams,
+} from './zones';
diff --git a/src/resources/addressing/address-maps/ips.ts b/src/resources/addressing/address-maps/ips.ts
index 0ee3c21d52..b68855f9bb 100644
--- a/src/resources/addressing/address-maps/ips.ts
+++ b/src/resources/addressing/address-maps/ips.ts
@@ -2,7 +2,7 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as IPsAPI from './ips';
+import * as Shared from '../../shared';
 
 export class IPs extends APIResource {
   /**
@@ -13,14 +13,12 @@ export class IPs extends APIResource {
     ipAddress: string,
     params: IPUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<IPUpdateResponse | null> {
+  ): Core.APIPromise<IPUpdateResponse> {
     const { account_id, body } = params;
-    return (
-      this._client.put(`/accounts/${account_id}/addressing/address_maps/${addressMapId}/ips/${ipAddress}`, {
-        body: body,
-        ...options,
-      }) as Core.APIPromise<{ result: IPUpdateResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.put(
+      `/accounts/${account_id}/addressing/address_maps/${addressMapId}/ips/${ipAddress}`,
+      { body: body, ...options },
+    );
   }
 
   /**
@@ -31,24 +29,92 @@ export class IPs extends APIResource {
     ipAddress: string,
     params: IPDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<IPDeleteResponse | null> {
+  ): Core.APIPromise<IPDeleteResponse> {
     const { account_id } = params;
-    return (
-      this._client.delete(
-        `/accounts/${account_id}/addressing/address_maps/${addressMapId}/ips/${ipAddress}`,
-        options,
-      ) as Core.APIPromise<{ result: IPDeleteResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.delete(
+      `/accounts/${account_id}/addressing/address_maps/${addressMapId}/ips/${ipAddress}`,
+      options,
+    );
   }
 }
 
-export type IPUpdateResponse = Array<unknown>;
+export interface IPUpdateResponse {
+  errors: Array<Shared.ResponseInfo>;
 
-export type IPDeleteResponse = Array<unknown>;
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+
+  result_info?: IPUpdateResponse.ResultInfo;
+}
+
+export namespace IPUpdateResponse {
+  export interface ResultInfo {
+    /**
+     * Total number of results for the requested service
+     */
+    count?: number;
+
+    /**
+     * Current page within paginated list of results
+     */
+    page?: number;
+
+    /**
+     * Number of results per page of results
+     */
+    per_page?: number;
+
+    /**
+     * Total results available without any search parameters
+     */
+    total_count?: number;
+  }
+}
+
+export interface IPDeleteResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+
+  result_info?: IPDeleteResponse.ResultInfo;
+}
+
+export namespace IPDeleteResponse {
+  export interface ResultInfo {
+    /**
+     * Total number of results for the requested service
+     */
+    count?: number;
+
+    /**
+     * Current page within paginated list of results
+     */
+    page?: number;
+
+    /**
+     * Number of results per page of results
+     */
+    per_page?: number;
+
+    /**
+     * Total results available without any search parameters
+     */
+    total_count?: number;
+  }
+}
 
 export interface IPUpdateParams {
   /**
-   * Path param: Identifier
+   * Path param: Identifier of a Cloudflare account.
    */
   account_id: string;
 
@@ -60,14 +126,16 @@ export interface IPUpdateParams {
 
 export interface IPDeleteParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export namespace IPs {
-  export import IPUpdateResponse = IPsAPI.IPUpdateResponse;
-  export import IPDeleteResponse = IPsAPI.IPDeleteResponse;
-  export import IPUpdateParams = IPsAPI.IPUpdateParams;
-  export import IPDeleteParams = IPsAPI.IPDeleteParams;
+export declare namespace IPs {
+  export {
+    type IPUpdateResponse as IPUpdateResponse,
+    type IPDeleteResponse as IPDeleteResponse,
+    type IPUpdateParams as IPUpdateParams,
+    type IPDeleteParams as IPDeleteParams,
+  };
 }
diff --git a/src/resources/addressing/address-maps/zones.ts b/src/resources/addressing/address-maps/zones.ts
index 92c518fc49..263fc1ee81 100644
--- a/src/resources/addressing/address-maps/zones.ts
+++ b/src/resources/addressing/address-maps/zones.ts
@@ -2,7 +2,7 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ZonesAPI from './zones';
+import * as Shared from '../../shared';
 
 export class Zones extends APIResource {
   /**
@@ -12,14 +12,12 @@ export class Zones extends APIResource {
     addressMapId: string,
     params: ZoneUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ZoneUpdateResponse | null> {
+  ): Core.APIPromise<ZoneUpdateResponse> {
     const { zone_id, account_id, body } = params;
-    return (
-      this._client.put(`/accounts/${account_id}/addressing/address_maps/${addressMapId}/zones/${zone_id}`, {
-        body: body,
-        ...options,
-      }) as Core.APIPromise<{ result: ZoneUpdateResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.put(
+      `/accounts/${account_id}/addressing/address_maps/${addressMapId}/zones/${zone_id}`,
+      { body: body, ...options },
+    );
   }
 
   /**
@@ -29,29 +27,97 @@ export class Zones extends APIResource {
     addressMapId: string,
     params: ZoneDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ZoneDeleteResponse | null> {
+  ): Core.APIPromise<ZoneDeleteResponse> {
     const { zone_id, account_id } = params;
-    return (
-      this._client.delete(
-        `/accounts/${account_id}/addressing/address_maps/${addressMapId}/zones/${zone_id}`,
-        options,
-      ) as Core.APIPromise<{ result: ZoneDeleteResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.delete(
+      `/accounts/${account_id}/addressing/address_maps/${addressMapId}/zones/${zone_id}`,
+      options,
+    );
   }
 }
 
-export type ZoneUpdateResponse = Array<unknown>;
+export interface ZoneUpdateResponse {
+  errors: Array<Shared.ResponseInfo>;
 
-export type ZoneDeleteResponse = Array<unknown>;
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+
+  result_info?: ZoneUpdateResponse.ResultInfo;
+}
+
+export namespace ZoneUpdateResponse {
+  export interface ResultInfo {
+    /**
+     * Total number of results for the requested service
+     */
+    count?: number;
+
+    /**
+     * Current page within paginated list of results
+     */
+    page?: number;
+
+    /**
+     * Number of results per page of results
+     */
+    per_page?: number;
+
+    /**
+     * Total results available without any search parameters
+     */
+    total_count?: number;
+  }
+}
+
+export interface ZoneDeleteResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+
+  result_info?: ZoneDeleteResponse.ResultInfo;
+}
+
+export namespace ZoneDeleteResponse {
+  export interface ResultInfo {
+    /**
+     * Total number of results for the requested service
+     */
+    count?: number;
+
+    /**
+     * Current page within paginated list of results
+     */
+    page?: number;
+
+    /**
+     * Number of results per page of results
+     */
+    per_page?: number;
+
+    /**
+     * Total results available without any search parameters
+     */
+    total_count?: number;
+  }
+}
 
 export interface ZoneUpdateParams {
   /**
-   * Path param: Identifier
+   * Path param: Identifier of a zone.
    */
   zone_id: string;
 
   /**
-   * Path param: Identifier
+   * Path param: Identifier of a Cloudflare account.
    */
   account_id: string;
 
@@ -63,19 +129,21 @@ export interface ZoneUpdateParams {
 
 export interface ZoneDeleteParams {
   /**
-   * Identifier
+   * Identifier of a zone.
    */
   zone_id: string;
 
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export namespace Zones {
-  export import ZoneUpdateResponse = ZonesAPI.ZoneUpdateResponse;
-  export import ZoneDeleteResponse = ZonesAPI.ZoneDeleteResponse;
-  export import ZoneUpdateParams = ZonesAPI.ZoneUpdateParams;
-  export import ZoneDeleteParams = ZonesAPI.ZoneDeleteParams;
+export declare namespace Zones {
+  export {
+    type ZoneUpdateResponse as ZoneUpdateResponse,
+    type ZoneDeleteResponse as ZoneDeleteResponse,
+    type ZoneUpdateParams as ZoneUpdateParams,
+    type ZoneDeleteParams as ZoneDeleteParams,
+  };
 }
diff --git a/src/resources/addressing/addressing.ts b/src/resources/addressing/addressing.ts
index 475a0d7a7d..06599a8421 100644
--- a/src/resources/addressing/addressing.ts
+++ b/src/resources/addressing/addressing.ts
@@ -1,11 +1,57 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
+import * as LOADocumentsAPI from './loa-documents';
+import {
+  LOADocumentCreateParams,
+  LOADocumentCreateResponse,
+  LOADocumentGetParams,
+  LOADocuments,
+} from './loa-documents';
 import * as ServicesAPI from './services';
+import { ServiceListParams, ServiceListResponse, ServiceListResponsesSinglePage, Services } from './services';
 import * as AddressMapsAPI from './address-maps/address-maps';
-import * as LOADocumentsAPI from './loa-documents/loa-documents';
+import {
+  AddressMap,
+  AddressMapCreateParams,
+  AddressMapCreateResponse,
+  AddressMapDeleteParams,
+  AddressMapDeleteResponse,
+  AddressMapEditParams,
+  AddressMapGetParams,
+  AddressMapGetResponse,
+  AddressMapListParams,
+  AddressMaps,
+  AddressMapsSinglePage,
+  Kind,
+} from './address-maps/address-maps';
 import * as PrefixesAPI from './prefixes/prefixes';
+import {
+  Prefix,
+  PrefixCreateParams,
+  PrefixDeleteParams,
+  PrefixDeleteResponse,
+  PrefixEditParams,
+  PrefixGetParams,
+  PrefixListParams,
+  Prefixes,
+  PrefixesSinglePage,
+} from './prefixes/prefixes';
 import * as RegionalHostnamesAPI from './regional-hostnames/regional-hostnames';
+import {
+  RegionalHostnameCreateParams,
+  RegionalHostnameCreateResponse,
+  RegionalHostnameDeleteParams,
+  RegionalHostnameDeleteResponse,
+  RegionalHostnameEditParams,
+  RegionalHostnameEditResponse,
+  RegionalHostnameGetParams,
+  RegionalHostnameGetResponse,
+  RegionalHostnameListParams,
+  RegionalHostnameListResponse,
+  RegionalHostnameListResponsesSinglePage,
+  RegionalHostnames,
+} from './regional-hostnames/regional-hostnames';
 
 export class Addressing extends APIResource {
   regionalHostnames: RegionalHostnamesAPI.RegionalHostnames = new RegionalHostnamesAPI.RegionalHostnames(
@@ -17,45 +63,70 @@ export class Addressing extends APIResource {
   prefixes: PrefixesAPI.Prefixes = new PrefixesAPI.Prefixes(this._client);
 }
 
-export namespace Addressing {
-  export import RegionalHostnames = RegionalHostnamesAPI.RegionalHostnames;
-  export import RegionalHostnameCreateResponse = RegionalHostnamesAPI.RegionalHostnameCreateResponse;
-  export import RegionalHostnameListResponse = RegionalHostnamesAPI.RegionalHostnameListResponse;
-  export import RegionalHostnameDeleteResponse = RegionalHostnamesAPI.RegionalHostnameDeleteResponse;
-  export import RegionalHostnameEditResponse = RegionalHostnamesAPI.RegionalHostnameEditResponse;
-  export import RegionalHostnameGetResponse = RegionalHostnamesAPI.RegionalHostnameGetResponse;
-  export import RegionalHostnameListResponsesSinglePage = RegionalHostnamesAPI.RegionalHostnameListResponsesSinglePage;
-  export import RegionalHostnameCreateParams = RegionalHostnamesAPI.RegionalHostnameCreateParams;
-  export import RegionalHostnameListParams = RegionalHostnamesAPI.RegionalHostnameListParams;
-  export import RegionalHostnameDeleteParams = RegionalHostnamesAPI.RegionalHostnameDeleteParams;
-  export import RegionalHostnameEditParams = RegionalHostnamesAPI.RegionalHostnameEditParams;
-  export import RegionalHostnameGetParams = RegionalHostnamesAPI.RegionalHostnameGetParams;
-  export import Services = ServicesAPI.Services;
-  export import ServiceListResponse = ServicesAPI.ServiceListResponse;
-  export import ServiceListResponsesSinglePage = ServicesAPI.ServiceListResponsesSinglePage;
-  export import ServiceListParams = ServicesAPI.ServiceListParams;
-  export import AddressMaps = AddressMapsAPI.AddressMaps;
-  export import AddressMap = AddressMapsAPI.AddressMap;
-  export import Kind = AddressMapsAPI.Kind;
-  export import AddressMapCreateResponse = AddressMapsAPI.AddressMapCreateResponse;
-  export import AddressMapDeleteResponse = AddressMapsAPI.AddressMapDeleteResponse;
-  export import AddressMapGetResponse = AddressMapsAPI.AddressMapGetResponse;
-  export import AddressMapsSinglePage = AddressMapsAPI.AddressMapsSinglePage;
-  export import AddressMapCreateParams = AddressMapsAPI.AddressMapCreateParams;
-  export import AddressMapListParams = AddressMapsAPI.AddressMapListParams;
-  export import AddressMapDeleteParams = AddressMapsAPI.AddressMapDeleteParams;
-  export import AddressMapEditParams = AddressMapsAPI.AddressMapEditParams;
-  export import AddressMapGetParams = AddressMapsAPI.AddressMapGetParams;
-  export import LOADocuments = LOADocumentsAPI.LOADocuments;
-  export import LOADocumentCreateResponse = LOADocumentsAPI.LOADocumentCreateResponse;
-  export import LOADocumentCreateParams = LOADocumentsAPI.LOADocumentCreateParams;
-  export import Prefixes = PrefixesAPI.Prefixes;
-  export import Prefix = PrefixesAPI.Prefix;
-  export import PrefixDeleteResponse = PrefixesAPI.PrefixDeleteResponse;
-  export import PrefixesSinglePage = PrefixesAPI.PrefixesSinglePage;
-  export import PrefixCreateParams = PrefixesAPI.PrefixCreateParams;
-  export import PrefixListParams = PrefixesAPI.PrefixListParams;
-  export import PrefixDeleteParams = PrefixesAPI.PrefixDeleteParams;
-  export import PrefixEditParams = PrefixesAPI.PrefixEditParams;
-  export import PrefixGetParams = PrefixesAPI.PrefixGetParams;
+Addressing.RegionalHostnames = RegionalHostnames;
+Addressing.RegionalHostnameListResponsesSinglePage = RegionalHostnameListResponsesSinglePage;
+Addressing.Services = Services;
+Addressing.ServiceListResponsesSinglePage = ServiceListResponsesSinglePage;
+Addressing.AddressMaps = AddressMaps;
+Addressing.AddressMapsSinglePage = AddressMapsSinglePage;
+Addressing.LOADocuments = LOADocuments;
+Addressing.Prefixes = Prefixes;
+Addressing.PrefixesSinglePage = PrefixesSinglePage;
+
+export declare namespace Addressing {
+  export {
+    RegionalHostnames as RegionalHostnames,
+    type RegionalHostnameCreateResponse as RegionalHostnameCreateResponse,
+    type RegionalHostnameListResponse as RegionalHostnameListResponse,
+    type RegionalHostnameDeleteResponse as RegionalHostnameDeleteResponse,
+    type RegionalHostnameEditResponse as RegionalHostnameEditResponse,
+    type RegionalHostnameGetResponse as RegionalHostnameGetResponse,
+    RegionalHostnameListResponsesSinglePage as RegionalHostnameListResponsesSinglePage,
+    type RegionalHostnameCreateParams as RegionalHostnameCreateParams,
+    type RegionalHostnameListParams as RegionalHostnameListParams,
+    type RegionalHostnameDeleteParams as RegionalHostnameDeleteParams,
+    type RegionalHostnameEditParams as RegionalHostnameEditParams,
+    type RegionalHostnameGetParams as RegionalHostnameGetParams,
+  };
+
+  export {
+    Services as Services,
+    type ServiceListResponse as ServiceListResponse,
+    ServiceListResponsesSinglePage as ServiceListResponsesSinglePage,
+    type ServiceListParams as ServiceListParams,
+  };
+
+  export {
+    AddressMaps as AddressMaps,
+    type AddressMap as AddressMap,
+    type Kind as Kind,
+    type AddressMapCreateResponse as AddressMapCreateResponse,
+    type AddressMapDeleteResponse as AddressMapDeleteResponse,
+    type AddressMapGetResponse as AddressMapGetResponse,
+    AddressMapsSinglePage as AddressMapsSinglePage,
+    type AddressMapCreateParams as AddressMapCreateParams,
+    type AddressMapListParams as AddressMapListParams,
+    type AddressMapDeleteParams as AddressMapDeleteParams,
+    type AddressMapEditParams as AddressMapEditParams,
+    type AddressMapGetParams as AddressMapGetParams,
+  };
+
+  export {
+    LOADocuments as LOADocuments,
+    type LOADocumentCreateResponse as LOADocumentCreateResponse,
+    type LOADocumentCreateParams as LOADocumentCreateParams,
+    type LOADocumentGetParams as LOADocumentGetParams,
+  };
+
+  export {
+    Prefixes as Prefixes,
+    type Prefix as Prefix,
+    type PrefixDeleteResponse as PrefixDeleteResponse,
+    PrefixesSinglePage as PrefixesSinglePage,
+    type PrefixCreateParams as PrefixCreateParams,
+    type PrefixListParams as PrefixListParams,
+    type PrefixDeleteParams as PrefixDeleteParams,
+    type PrefixEditParams as PrefixEditParams,
+    type PrefixGetParams as PrefixGetParams,
+  };
 }
diff --git a/src/resources/addressing/index.ts b/src/resources/addressing/index.ts
index ce13d9565a..6b64a96cdf 100644
--- a/src/resources/addressing/index.ts
+++ b/src/resources/addressing/index.ts
@@ -1,44 +1,54 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AddressMap,
-  Kind,
-  AddressMapCreateResponse,
-  AddressMapDeleteResponse,
-  AddressMapGetResponse,
-  AddressMapCreateParams,
-  AddressMapListParams,
-  AddressMapDeleteParams,
-  AddressMapEditParams,
-  AddressMapGetParams,
   AddressMapsSinglePage,
   AddressMaps,
+  type AddressMap,
+  type Kind,
+  type AddressMapCreateResponse,
+  type AddressMapDeleteResponse,
+  type AddressMapGetResponse,
+  type AddressMapCreateParams,
+  type AddressMapListParams,
+  type AddressMapDeleteParams,
+  type AddressMapEditParams,
+  type AddressMapGetParams,
 } from './address-maps/index';
 export { Addressing } from './addressing';
-export { LOADocumentCreateResponse, LOADocumentCreateParams, LOADocuments } from './loa-documents/index';
 export {
-  Prefix,
-  PrefixDeleteResponse,
-  PrefixCreateParams,
-  PrefixListParams,
-  PrefixDeleteParams,
-  PrefixEditParams,
-  PrefixGetParams,
+  LOADocuments,
+  type LOADocumentCreateResponse,
+  type LOADocumentCreateParams,
+  type LOADocumentGetParams,
+} from './loa-documents';
+export {
   PrefixesSinglePage,
   Prefixes,
+  type Prefix,
+  type PrefixDeleteResponse,
+  type PrefixCreateParams,
+  type PrefixListParams,
+  type PrefixDeleteParams,
+  type PrefixEditParams,
+  type PrefixGetParams,
 } from './prefixes/index';
 export {
-  RegionalHostnameCreateResponse,
-  RegionalHostnameListResponse,
-  RegionalHostnameDeleteResponse,
-  RegionalHostnameEditResponse,
-  RegionalHostnameGetResponse,
-  RegionalHostnameCreateParams,
-  RegionalHostnameListParams,
-  RegionalHostnameDeleteParams,
-  RegionalHostnameEditParams,
-  RegionalHostnameGetParams,
   RegionalHostnameListResponsesSinglePage,
   RegionalHostnames,
+  type RegionalHostnameCreateResponse,
+  type RegionalHostnameListResponse,
+  type RegionalHostnameDeleteResponse,
+  type RegionalHostnameEditResponse,
+  type RegionalHostnameGetResponse,
+  type RegionalHostnameCreateParams,
+  type RegionalHostnameListParams,
+  type RegionalHostnameDeleteParams,
+  type RegionalHostnameEditParams,
+  type RegionalHostnameGetParams,
 } from './regional-hostnames/index';
-export { ServiceListResponse, ServiceListParams, ServiceListResponsesSinglePage, Services } from './services';
+export {
+  ServiceListResponsesSinglePage,
+  Services,
+  type ServiceListResponse,
+  type ServiceListParams,
+} from './services';
diff --git a/src/resources/addressing/loa-documents.ts b/src/resources/addressing/loa-documents.ts
new file mode 100644
index 0000000000..ba1b9a39f8
--- /dev/null
+++ b/src/resources/addressing/loa-documents.ts
@@ -0,0 +1,100 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { type Response } from '../../_shims/index';
+
+export class LOADocuments extends APIResource {
+  /**
+   * Submit LOA document (pdf format) under the account.
+   */
+  create(
+    params: LOADocumentCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<LOADocumentCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(
+        `/accounts/${account_id}/addressing/loa_documents`,
+        Core.multipartFormRequestOptions({ body, ...options }),
+      ) as Core.APIPromise<{ result: LOADocumentCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Download specified LOA document under the account.
+   */
+  get(
+    loaDocumentId: string | null,
+    params: LOADocumentGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<Response> {
+    const { account_id } = params;
+    return this._client.get(`/accounts/${account_id}/addressing/loa_documents/${loaDocumentId}/download`, {
+      ...options,
+      headers: { Accept: 'application/pdf', ...options?.headers },
+      __binaryResponse: true,
+    });
+  }
+}
+
+export interface LOADocumentCreateResponse {
+  /**
+   * Identifier for the uploaded LOA document.
+   */
+  id?: string | null;
+
+  /**
+   * Identifier of a Cloudflare account.
+   */
+  account_id?: string;
+
+  created?: string;
+
+  /**
+   * Name of LOA document. Max file size 10MB, and supported filetype is pdf.
+   */
+  filename?: string;
+
+  /**
+   * File size of the uploaded LOA document.
+   */
+  size_bytes?: number;
+
+  /**
+   * Whether the LOA has been verified by Cloudflare staff.
+   */
+  verified?: boolean;
+
+  /**
+   * Timestamp of the moment the LOA was marked as validated.
+   */
+  verified_at?: string | null;
+}
+
+export interface LOADocumentCreateParams {
+  /**
+   * Path param: Identifier of a Cloudflare account.
+   */
+  account_id: string;
+
+  /**
+   * Body param: LOA document to upload.
+   */
+  loa_document: string;
+}
+
+export interface LOADocumentGetParams {
+  /**
+   * Identifier of a Cloudflare account.
+   */
+  account_id: string;
+}
+
+export declare namespace LOADocuments {
+  export {
+    type LOADocumentCreateResponse as LOADocumentCreateResponse,
+    type LOADocumentCreateParams as LOADocumentCreateParams,
+    type LOADocumentGetParams as LOADocumentGetParams,
+  };
+}
diff --git a/src/resources/addressing/loa-documents/downloads.ts b/src/resources/addressing/loa-documents/downloads.ts
deleted file mode 100644
index 3cb8be1d83..0000000000
--- a/src/resources/addressing/loa-documents/downloads.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../resource';
-import * as Core from '../../../core';
-import * as DownloadsAPI from './downloads';
-import { type Response } from '../../../_shims/index';
-
-export class Downloads extends APIResource {
-  /**
-   * Download specified LOA document under the account.
-   */
-  get(
-    loaDocumentId: string | null,
-    params: DownloadGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Response> {
-    const { account_id } = params;
-    return this._client.get(`/accounts/${account_id}/addressing/loa_documents/${loaDocumentId}/download`, {
-      ...options,
-      __binaryResponse: true,
-    });
-  }
-}
-
-export interface DownloadGetParams {
-  /**
-   * Identifier
-   */
-  account_id: string;
-}
-
-export namespace Downloads {
-  export import DownloadGetParams = DownloadsAPI.DownloadGetParams;
-}
diff --git a/src/resources/addressing/loa-documents/index.ts b/src/resources/addressing/loa-documents/index.ts
deleted file mode 100644
index 40c4791998..0000000000
--- a/src/resources/addressing/loa-documents/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { DownloadGetParams, Downloads } from './downloads';
-export { LOADocumentCreateResponse, LOADocumentCreateParams, LOADocuments } from './loa-documents';
diff --git a/src/resources/addressing/loa-documents/loa-documents.ts b/src/resources/addressing/loa-documents/loa-documents.ts
deleted file mode 100644
index d3275ba16c..0000000000
--- a/src/resources/addressing/loa-documents/loa-documents.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../resource';
-import * as Core from '../../../core';
-import * as LOADocumentsAPI from './loa-documents';
-import * as DownloadsAPI from './downloads';
-
-export class LOADocuments extends APIResource {
-  downloads: DownloadsAPI.Downloads = new DownloadsAPI.Downloads(this._client);
-
-  /**
-   * Submit LOA document (pdf format) under the account.
-   */
-  create(
-    params: LOADocumentCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<LOADocumentCreateResponse> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.post(
-        `/accounts/${account_id}/addressing/loa_documents`,
-        Core.multipartFormRequestOptions({ body, ...options }),
-      ) as Core.APIPromise<{ result: LOADocumentCreateResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export interface LOADocumentCreateResponse {
-  /**
-   * Name of LOA document.
-   */
-  filename?: string;
-}
-
-export interface LOADocumentCreateParams {
-  /**
-   * Path param: Identifier
-   */
-  account_id: string;
-
-  /**
-   * Body param: LOA document to upload.
-   */
-  loa_document: string;
-}
-
-export namespace LOADocuments {
-  export import LOADocumentCreateResponse = LOADocumentsAPI.LOADocumentCreateResponse;
-  export import LOADocumentCreateParams = LOADocumentsAPI.LOADocumentCreateParams;
-  export import Downloads = DownloadsAPI.Downloads;
-  export import DownloadGetParams = DownloadsAPI.DownloadGetParams;
-}
diff --git a/src/resources/addressing/prefixes/advertisement-status.ts b/src/resources/addressing/prefixes/advertisement-status.ts
new file mode 100644
index 0000000000..73a0c2a1e5
--- /dev/null
+++ b/src/resources/addressing/prefixes/advertisement-status.ts
@@ -0,0 +1,103 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class AdvertisementStatus extends APIResource {
+  /**
+   * Advertise or withdraw the BGP route for a prefix.
+   *
+   * **Deprecated:** Prefer the BGP Prefixes endpoints, which additionally allow for
+   * advertising and withdrawing subnets of an IP prefix.
+   */
+  edit(
+    prefixId: string,
+    params: AdvertisementStatusEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AdvertisementStatusEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/addressing/prefixes/${prefixId}/bgp/status`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: AdvertisementStatusEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * View the current advertisement state for a prefix.
+   *
+   * **Deprecated:** Prefer the BGP Prefixes endpoints, which additionally allow for
+   * advertising and withdrawing subnets of an IP prefix.
+   */
+  get(
+    prefixId: string,
+    params: AdvertisementStatusGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AdvertisementStatusGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/addressing/prefixes/${prefixId}/bgp/status`,
+        options,
+      ) as Core.APIPromise<{ result: AdvertisementStatusGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface AdvertisementStatusEditResponse {
+  /**
+   * Advertisement status of the prefix. If `true`, the BGP route for the prefix is
+   * advertised to the Internet. If `false`, the BGP route is withdrawn.
+   */
+  advertised?: boolean;
+
+  /**
+   * Last time the advertisement status was changed. This field is only not 'null' if
+   * on demand is enabled.
+   */
+  advertised_modified_at?: string | null;
+}
+
+export interface AdvertisementStatusGetResponse {
+  /**
+   * Advertisement status of the prefix. If `true`, the BGP route for the prefix is
+   * advertised to the Internet. If `false`, the BGP route is withdrawn.
+   */
+  advertised?: boolean;
+
+  /**
+   * Last time the advertisement status was changed. This field is only not 'null' if
+   * on demand is enabled.
+   */
+  advertised_modified_at?: string | null;
+}
+
+export interface AdvertisementStatusEditParams {
+  /**
+   * Path param: Identifier of a Cloudflare account.
+   */
+  account_id: string;
+
+  /**
+   * Body param: Advertisement status of the prefix. If `true`, the BGP route for the
+   * prefix is advertised to the Internet. If `false`, the BGP route is withdrawn.
+   */
+  advertised: boolean;
+}
+
+export interface AdvertisementStatusGetParams {
+  /**
+   * Identifier of a Cloudflare account.
+   */
+  account_id: string;
+}
+
+export declare namespace AdvertisementStatus {
+  export {
+    type AdvertisementStatusEditResponse as AdvertisementStatusEditResponse,
+    type AdvertisementStatusGetResponse as AdvertisementStatusGetResponse,
+    type AdvertisementStatusEditParams as AdvertisementStatusEditParams,
+    type AdvertisementStatusGetParams as AdvertisementStatusGetParams,
+  };
+}
diff --git a/src/resources/addressing/prefixes/bgp/prefixes.ts b/src/resources/addressing/prefixes/bgp-prefixes.ts
similarity index 64%
rename from src/resources/addressing/prefixes/bgp/prefixes.ts
rename to src/resources/addressing/prefixes/bgp-prefixes.ts
index e987f384ec..a49a099a4b 100644
--- a/src/resources/addressing/prefixes/bgp/prefixes.ts
+++ b/src/resources/addressing/prefixes/bgp-prefixes.ts
@@ -1,11 +1,29 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../../resource';
-import * as Core from '../../../../core';
-import * as PrefixesAPI from './prefixes';
-import { SinglePage } from '../../../../pagination';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { SinglePage } from '../../../pagination';
+
+export class BGPPrefixes extends APIResource {
+  /**
+   * Create a BGP prefix, controlling the BGP advertisement status of a specific
+   * subnet. When created, BGP prefixes are initially withdrawn, and can be
+   * advertised with the Update BGP Prefix API.
+   */
+  create(
+    prefixId: string,
+    params: BGPPrefixCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BGPPrefix> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/addressing/prefixes/${prefixId}/bgp/prefixes`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: BGPPrefix }>
+    )._thenUnwrap((obj) => obj.result);
+  }
 
-export class Prefixes extends APIResource {
   /**
    * List all BGP Prefixes within the specified IP Prefix. BGP Prefixes are used to
    * control which specific subnets are advertised to the Internet. It is possible to
@@ -14,7 +32,7 @@ export class Prefixes extends APIResource {
    */
   list(
     prefixId: string,
-    params: PrefixListParams,
+    params: BGPPrefixListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<BGPPrefixesSinglePage, BGPPrefix> {
     const { account_id } = params;
@@ -32,7 +50,7 @@ export class Prefixes extends APIResource {
   edit(
     prefixId: string,
     bgpPrefixId: string,
-    params: PrefixEditParams,
+    params: BGPPrefixEditParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<BGPPrefix> {
     const { account_id, ...body } = params;
@@ -50,7 +68,7 @@ export class Prefixes extends APIResource {
   get(
     prefixId: string,
     bgpPrefixId: string,
-    params: PrefixGetParams,
+    params: BGPPrefixGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<BGPPrefix> {
     const { account_id } = params;
@@ -67,7 +85,7 @@ export class BGPPrefixesSinglePage extends SinglePage<BGPPrefix> {}
 
 export interface BGPPrefix {
   /**
-   * Identifier
+   * Identifier of BGP Prefix.
    */
   id?: string;
 
@@ -132,42 +150,59 @@ export namespace BGPPrefix {
   }
 }
 
-export interface PrefixListParams {
+export interface BGPPrefixCreateParams {
+  /**
+   * Path param: Identifier of a Cloudflare account.
+   */
+  account_id: string;
+
+  /**
+   * Body param: IP Prefix in Classless Inter-Domain Routing format.
+   */
+  cidr?: string;
+}
+
+export interface BGPPrefixListParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export interface PrefixEditParams {
+export interface BGPPrefixEditParams {
   /**
-   * Path param: Identifier
+   * Path param: Identifier of a Cloudflare account.
    */
   account_id: string;
 
   /**
    * Body param:
    */
-  on_demand?: PrefixEditParams.OnDemand;
+  on_demand?: BGPPrefixEditParams.OnDemand;
 }
 
-export namespace PrefixEditParams {
+export namespace BGPPrefixEditParams {
   export interface OnDemand {
     advertised?: boolean;
   }
 }
 
-export interface PrefixGetParams {
+export interface BGPPrefixGetParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export namespace Prefixes {
-  export import BGPPrefix = PrefixesAPI.BGPPrefix;
-  export import BGPPrefixesSinglePage = PrefixesAPI.BGPPrefixesSinglePage;
-  export import PrefixListParams = PrefixesAPI.PrefixListParams;
-  export import PrefixEditParams = PrefixesAPI.PrefixEditParams;
-  export import PrefixGetParams = PrefixesAPI.PrefixGetParams;
+BGPPrefixes.BGPPrefixesSinglePage = BGPPrefixesSinglePage;
+
+export declare namespace BGPPrefixes {
+  export {
+    type BGPPrefix as BGPPrefix,
+    BGPPrefixesSinglePage as BGPPrefixesSinglePage,
+    type BGPPrefixCreateParams as BGPPrefixCreateParams,
+    type BGPPrefixListParams as BGPPrefixListParams,
+    type BGPPrefixEditParams as BGPPrefixEditParams,
+    type BGPPrefixGetParams as BGPPrefixGetParams,
+  };
 }
diff --git a/src/resources/addressing/prefixes/bgp/bgp.ts b/src/resources/addressing/prefixes/bgp/bgp.ts
deleted file mode 100644
index a6c0766ac7..0000000000
--- a/src/resources/addressing/prefixes/bgp/bgp.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../../resource';
-import * as BindingsAPI from './bindings';
-import * as PrefixesAPI from './prefixes';
-import * as StatusesAPI from './statuses';
-
-export class BGP extends APIResource {
-  bindings: BindingsAPI.Bindings = new BindingsAPI.Bindings(this._client);
-  prefixes: PrefixesAPI.Prefixes = new PrefixesAPI.Prefixes(this._client);
-  statuses: StatusesAPI.Statuses = new StatusesAPI.Statuses(this._client);
-}
-
-export namespace BGP {
-  export import Bindings = BindingsAPI.Bindings;
-  export import ServiceBinding = BindingsAPI.ServiceBinding;
-  export import BindingDeleteResponse = BindingsAPI.BindingDeleteResponse;
-  export import ServiceBindingsSinglePage = BindingsAPI.ServiceBindingsSinglePage;
-  export import BindingCreateParams = BindingsAPI.BindingCreateParams;
-  export import BindingListParams = BindingsAPI.BindingListParams;
-  export import BindingDeleteParams = BindingsAPI.BindingDeleteParams;
-  export import BindingGetParams = BindingsAPI.BindingGetParams;
-  export import Prefixes = PrefixesAPI.Prefixes;
-  export import BGPPrefix = PrefixesAPI.BGPPrefix;
-  export import BGPPrefixesSinglePage = PrefixesAPI.BGPPrefixesSinglePage;
-  export import PrefixListParams = PrefixesAPI.PrefixListParams;
-  export import PrefixEditParams = PrefixesAPI.PrefixEditParams;
-  export import PrefixGetParams = PrefixesAPI.PrefixGetParams;
-  export import Statuses = StatusesAPI.Statuses;
-  export import StatusEditResponse = StatusesAPI.StatusEditResponse;
-  export import StatusGetResponse = StatusesAPI.StatusGetResponse;
-  export import StatusEditParams = StatusesAPI.StatusEditParams;
-  export import StatusGetParams = StatusesAPI.StatusGetParams;
-}
diff --git a/src/resources/addressing/prefixes/bgp/index.ts b/src/resources/addressing/prefixes/bgp/index.ts
deleted file mode 100644
index 2ac5233947..0000000000
--- a/src/resources/addressing/prefixes/bgp/index.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { BGP } from './bgp';
-export {
-  BGPPrefix,
-  PrefixListParams,
-  PrefixEditParams,
-  PrefixGetParams,
-  BGPPrefixesSinglePage,
-  Prefixes,
-} from './prefixes';
-export {
-  ServiceBinding,
-  BindingDeleteResponse,
-  BindingCreateParams,
-  BindingListParams,
-  BindingDeleteParams,
-  BindingGetParams,
-  ServiceBindingsSinglePage,
-  Bindings,
-} from './bindings';
-export {
-  StatusEditResponse,
-  StatusGetResponse,
-  StatusEditParams,
-  StatusGetParams,
-  Statuses,
-} from './statuses';
diff --git a/src/resources/addressing/prefixes/bgp/statuses.ts b/src/resources/addressing/prefixes/bgp/statuses.ts
deleted file mode 100644
index 524257b5b5..0000000000
--- a/src/resources/addressing/prefixes/bgp/statuses.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../../resource';
-import * as Core from '../../../../core';
-import * as StatusesAPI from './statuses';
-
-export class Statuses extends APIResource {
-  /**
-   * Advertise or withdraw BGP route for a prefix.
-   */
-  edit(
-    prefixId: string,
-    params: StatusEditParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<StatusEditResponse> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.patch(`/accounts/${account_id}/addressing/prefixes/${prefixId}/bgp/status`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: StatusEditResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * List the current advertisement state for a prefix.
-   */
-  get(
-    prefixId: string,
-    params: StatusGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<StatusGetResponse> {
-    const { account_id } = params;
-    return (
-      this._client.get(
-        `/accounts/${account_id}/addressing/prefixes/${prefixId}/bgp/status`,
-        options,
-      ) as Core.APIPromise<{ result: StatusGetResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export interface StatusEditResponse {
-  /**
-   * Enablement of prefix advertisement to the Internet.
-   */
-  advertised?: boolean;
-
-  /**
-   * Last time the advertisement status was changed. This field is only not 'null' if
-   * on demand is enabled.
-   */
-  advertised_modified_at?: string | null;
-}
-
-export interface StatusGetResponse {
-  /**
-   * Enablement of prefix advertisement to the Internet.
-   */
-  advertised?: boolean;
-
-  /**
-   * Last time the advertisement status was changed. This field is only not 'null' if
-   * on demand is enabled.
-   */
-  advertised_modified_at?: string | null;
-}
-
-export interface StatusEditParams {
-  /**
-   * Path param: Identifier
-   */
-  account_id: string;
-
-  /**
-   * Body param: Enablement of prefix advertisement to the Internet.
-   */
-  advertised: boolean;
-}
-
-export interface StatusGetParams {
-  /**
-   * Identifier
-   */
-  account_id: string;
-}
-
-export namespace Statuses {
-  export import StatusEditResponse = StatusesAPI.StatusEditResponse;
-  export import StatusGetResponse = StatusesAPI.StatusGetResponse;
-  export import StatusEditParams = StatusesAPI.StatusEditParams;
-  export import StatusGetParams = StatusesAPI.StatusGetParams;
-}
diff --git a/src/resources/addressing/prefixes/delegations.ts b/src/resources/addressing/prefixes/delegations.ts
index 5eb3880d2e..7566c99df8 100644
--- a/src/resources/addressing/prefixes/delegations.ts
+++ b/src/resources/addressing/prefixes/delegations.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as DelegationsAPI from './delegations';
 import { SinglePage } from '../../../pagination';
 
 export class Delegations extends APIResource {
@@ -62,7 +61,7 @@ export class DelegationsSinglePage extends SinglePage<Delegations> {}
 
 export interface Delegations {
   /**
-   * Delegation identifier tag.
+   * Identifier of a Delegation.
    */
   id?: string;
 
@@ -81,21 +80,21 @@ export interface Delegations {
   modified_at?: string;
 
   /**
-   * Identifier
+   * Identifier of an IP Prefix.
    */
   parent_prefix_id?: string;
 }
 
 export interface DelegationDeleteResponse {
   /**
-   * Delegation identifier tag.
+   * Identifier of a Delegation.
    */
   id?: string;
 }
 
 export interface DelegationCreateParams {
   /**
-   * Path param: Identifier
+   * Path param: Identifier of a Cloudflare account.
    */
   account_id: string;
 
@@ -113,23 +112,27 @@ export interface DelegationCreateParams {
 
 export interface DelegationListParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
 export interface DelegationDeleteParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export namespace Delegations {
-  export import Delegations = DelegationsAPI.Delegations;
-  export import DelegationDeleteResponse = DelegationsAPI.DelegationDeleteResponse;
-  export import DelegationsSinglePage = DelegationsAPI.DelegationsSinglePage;
-  export import DelegationCreateParams = DelegationsAPI.DelegationCreateParams;
-  export import DelegationListParams = DelegationsAPI.DelegationListParams;
-  export import DelegationDeleteParams = DelegationsAPI.DelegationDeleteParams;
+Delegations.DelegationsSinglePage = DelegationsSinglePage;
+
+export declare namespace Delegations {
+  export {
+    type Delegations as Delegations,
+    type DelegationDeleteResponse as DelegationDeleteResponse,
+    DelegationsSinglePage as DelegationsSinglePage,
+    type DelegationCreateParams as DelegationCreateParams,
+    type DelegationListParams as DelegationListParams,
+    type DelegationDeleteParams as DelegationDeleteParams,
+  };
 }
diff --git a/src/resources/addressing/prefixes/index.ts b/src/resources/addressing/prefixes/index.ts
index f5c6f15ce2..1448718c77 100644
--- a/src/resources/addressing/prefixes/index.ts
+++ b/src/resources/addressing/prefixes/index.ts
@@ -1,22 +1,47 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { BGP } from './bgp/index';
 export {
-  Delegations,
-  DelegationDeleteResponse,
-  DelegationCreateParams,
-  DelegationListParams,
-  DelegationDeleteParams,
+  AdvertisementStatus,
+  type AdvertisementStatusEditResponse,
+  type AdvertisementStatusGetResponse,
+  type AdvertisementStatusEditParams,
+  type AdvertisementStatusGetParams,
+} from './advertisement-status';
+export {
+  BGPPrefixesSinglePage,
+  BGPPrefixes,
+  type BGPPrefix,
+  type BGPPrefixCreateParams,
+  type BGPPrefixListParams,
+  type BGPPrefixEditParams,
+  type BGPPrefixGetParams,
+} from './bgp-prefixes';
+export {
   DelegationsSinglePage,
+  Delegations,
+  type DelegationDeleteResponse,
+  type DelegationCreateParams,
+  type DelegationListParams,
+  type DelegationDeleteParams,
 } from './delegations';
 export {
-  Prefix,
-  PrefixDeleteResponse,
-  PrefixCreateParams,
-  PrefixListParams,
-  PrefixDeleteParams,
-  PrefixEditParams,
-  PrefixGetParams,
   PrefixesSinglePage,
   Prefixes,
+  type Prefix,
+  type PrefixDeleteResponse,
+  type PrefixCreateParams,
+  type PrefixListParams,
+  type PrefixDeleteParams,
+  type PrefixEditParams,
+  type PrefixGetParams,
 } from './prefixes';
+export {
+  ServiceBindingsSinglePage,
+  ServiceBindings,
+  type ServiceBinding,
+  type ServiceBindingDeleteResponse,
+  type ServiceBindingCreateParams,
+  type ServiceBindingListParams,
+  type ServiceBindingDeleteParams,
+  type ServiceBindingGetParams,
+} from './service-bindings';
diff --git a/src/resources/addressing/prefixes/prefixes.ts b/src/resources/addressing/prefixes/prefixes.ts
index ed4872a2bd..e3389f7360 100644
--- a/src/resources/addressing/prefixes/prefixes.ts
+++ b/src/resources/addressing/prefixes/prefixes.ts
@@ -2,13 +2,52 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as PrefixesAPI from './prefixes';
+import * as Shared from '../../shared';
+import * as AdvertisementStatusAPI from './advertisement-status';
+import {
+  AdvertisementStatus,
+  AdvertisementStatusEditParams,
+  AdvertisementStatusEditResponse,
+  AdvertisementStatusGetParams,
+  AdvertisementStatusGetResponse,
+} from './advertisement-status';
+import * as BGPPrefixesAPI from './bgp-prefixes';
+import {
+  BGPPrefix,
+  BGPPrefixCreateParams,
+  BGPPrefixEditParams,
+  BGPPrefixGetParams,
+  BGPPrefixListParams,
+  BGPPrefixes,
+  BGPPrefixesSinglePage,
+} from './bgp-prefixes';
 import * as DelegationsAPI from './delegations';
-import * as BGPAPI from './bgp/bgp';
+import {
+  DelegationCreateParams,
+  DelegationDeleteParams,
+  DelegationDeleteResponse,
+  DelegationListParams,
+  Delegations,
+  DelegationsSinglePage,
+} from './delegations';
+import * as ServiceBindingsAPI from './service-bindings';
+import {
+  ServiceBinding,
+  ServiceBindingCreateParams,
+  ServiceBindingDeleteParams,
+  ServiceBindingDeleteResponse,
+  ServiceBindingGetParams,
+  ServiceBindingListParams,
+  ServiceBindings,
+  ServiceBindingsSinglePage,
+} from './service-bindings';
 import { SinglePage } from '../../../pagination';
 
 export class Prefixes extends APIResource {
-  bgp: BGPAPI.BGP = new BGPAPI.BGP(this._client);
+  serviceBindings: ServiceBindingsAPI.ServiceBindings = new ServiceBindingsAPI.ServiceBindings(this._client);
+  bgpPrefixes: BGPPrefixesAPI.BGPPrefixes = new BGPPrefixesAPI.BGPPrefixes(this._client);
+  advertisementStatus: AdvertisementStatusAPI.AdvertisementStatus =
+    new AdvertisementStatusAPI.AdvertisementStatus(this._client);
   delegations: DelegationsAPI.Delegations = new DelegationsAPI.Delegations(this._client);
 
   /**
@@ -46,14 +85,9 @@ export class Prefixes extends APIResource {
     prefixId: string,
     params: PrefixDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<PrefixDeleteResponse | null> {
+  ): Core.APIPromise<PrefixDeleteResponse> {
     const { account_id } = params;
-    return (
-      this._client.delete(
-        `/accounts/${account_id}/addressing/prefixes/${prefixId}`,
-        options,
-      ) as Core.APIPromise<{ result: PrefixDeleteResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.delete(`/accounts/${account_id}/addressing/prefixes/${prefixId}`, options);
   }
 
   /**
@@ -87,12 +121,12 @@ export class PrefixesSinglePage extends SinglePage<Prefix> {}
 
 export interface Prefix {
   /**
-   * Identifier
+   * Identifier of an IP Prefix.
    */
   id?: string;
 
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id?: string;
 
@@ -150,11 +184,46 @@ export interface Prefix {
   on_demand_locked?: boolean;
 }
 
-export type PrefixDeleteResponse = Array<unknown>;
+export interface PrefixDeleteResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+
+  result_info?: PrefixDeleteResponse.ResultInfo;
+}
+
+export namespace PrefixDeleteResponse {
+  export interface ResultInfo {
+    /**
+     * Total number of results for the requested service
+     */
+    count?: number;
+
+    /**
+     * Current page within paginated list of results
+     */
+    page?: number;
+
+    /**
+     * Number of results per page of results
+     */
+    per_page?: number;
+
+    /**
+     * Total results available without any search parameters
+     */
+    total_count?: number;
+  }
+}
 
 export interface PrefixCreateParams {
   /**
-   * Path param: Identifier
+   * Path param: Identifier of a Cloudflare account.
    */
   account_id: string;
 
@@ -176,21 +245,21 @@ export interface PrefixCreateParams {
 
 export interface PrefixListParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
 export interface PrefixDeleteParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
 export interface PrefixEditParams {
   /**
-   * Path param: Identifier
+   * Path param: Identifier of a Cloudflare account.
    */
   account_id: string;
 
@@ -202,25 +271,66 @@ export interface PrefixEditParams {
 
 export interface PrefixGetParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export namespace Prefixes {
-  export import Prefix = PrefixesAPI.Prefix;
-  export import PrefixDeleteResponse = PrefixesAPI.PrefixDeleteResponse;
-  export import PrefixesSinglePage = PrefixesAPI.PrefixesSinglePage;
-  export import PrefixCreateParams = PrefixesAPI.PrefixCreateParams;
-  export import PrefixListParams = PrefixesAPI.PrefixListParams;
-  export import PrefixDeleteParams = PrefixesAPI.PrefixDeleteParams;
-  export import PrefixEditParams = PrefixesAPI.PrefixEditParams;
-  export import PrefixGetParams = PrefixesAPI.PrefixGetParams;
-  export import BGP = BGPAPI.BGP;
-  export import Delegations = DelegationsAPI.Delegations;
-  export import DelegationDeleteResponse = DelegationsAPI.DelegationDeleteResponse;
-  export import DelegationsSinglePage = DelegationsAPI.DelegationsSinglePage;
-  export import DelegationCreateParams = DelegationsAPI.DelegationCreateParams;
-  export import DelegationListParams = DelegationsAPI.DelegationListParams;
-  export import DelegationDeleteParams = DelegationsAPI.DelegationDeleteParams;
+Prefixes.PrefixesSinglePage = PrefixesSinglePage;
+Prefixes.ServiceBindings = ServiceBindings;
+Prefixes.ServiceBindingsSinglePage = ServiceBindingsSinglePage;
+Prefixes.BGPPrefixes = BGPPrefixes;
+Prefixes.BGPPrefixesSinglePage = BGPPrefixesSinglePage;
+Prefixes.AdvertisementStatus = AdvertisementStatus;
+Prefixes.DelegationsSinglePage = DelegationsSinglePage;
+
+export declare namespace Prefixes {
+  export {
+    type Prefix as Prefix,
+    type PrefixDeleteResponse as PrefixDeleteResponse,
+    PrefixesSinglePage as PrefixesSinglePage,
+    type PrefixCreateParams as PrefixCreateParams,
+    type PrefixListParams as PrefixListParams,
+    type PrefixDeleteParams as PrefixDeleteParams,
+    type PrefixEditParams as PrefixEditParams,
+    type PrefixGetParams as PrefixGetParams,
+  };
+
+  export {
+    ServiceBindings as ServiceBindings,
+    type ServiceBinding as ServiceBinding,
+    type ServiceBindingDeleteResponse as ServiceBindingDeleteResponse,
+    ServiceBindingsSinglePage as ServiceBindingsSinglePage,
+    type ServiceBindingCreateParams as ServiceBindingCreateParams,
+    type ServiceBindingListParams as ServiceBindingListParams,
+    type ServiceBindingDeleteParams as ServiceBindingDeleteParams,
+    type ServiceBindingGetParams as ServiceBindingGetParams,
+  };
+
+  export {
+    BGPPrefixes as BGPPrefixes,
+    type BGPPrefix as BGPPrefix,
+    BGPPrefixesSinglePage as BGPPrefixesSinglePage,
+    type BGPPrefixCreateParams as BGPPrefixCreateParams,
+    type BGPPrefixListParams as BGPPrefixListParams,
+    type BGPPrefixEditParams as BGPPrefixEditParams,
+    type BGPPrefixGetParams as BGPPrefixGetParams,
+  };
+
+  export {
+    AdvertisementStatus as AdvertisementStatus,
+    type AdvertisementStatusEditResponse as AdvertisementStatusEditResponse,
+    type AdvertisementStatusGetResponse as AdvertisementStatusGetResponse,
+    type AdvertisementStatusEditParams as AdvertisementStatusEditParams,
+    type AdvertisementStatusGetParams as AdvertisementStatusGetParams,
+  };
+
+  export {
+    type Delegations as Delegations,
+    type DelegationDeleteResponse as DelegationDeleteResponse,
+    DelegationsSinglePage as DelegationsSinglePage,
+    type DelegationCreateParams as DelegationCreateParams,
+    type DelegationListParams as DelegationListParams,
+    type DelegationDeleteParams as DelegationDeleteParams,
+  };
 }
diff --git a/src/resources/addressing/prefixes/bgp/bindings.ts b/src/resources/addressing/prefixes/service-bindings.ts
similarity index 68%
rename from src/resources/addressing/prefixes/bgp/bindings.ts
rename to src/resources/addressing/prefixes/service-bindings.ts
index d7b46f66ba..763fe5c7ff 100644
--- a/src/resources/addressing/prefixes/bgp/bindings.ts
+++ b/src/resources/addressing/prefixes/service-bindings.ts
@@ -1,12 +1,11 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../../resource';
-import * as Core from '../../../../core';
-import * as BindingsAPI from './bindings';
-import * as Shared from '../../../shared';
-import { SinglePage } from '../../../../pagination';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as Shared from '../../shared';
+import { SinglePage } from '../../../pagination';
 
-export class Bindings extends APIResource {
+export class ServiceBindings extends APIResource {
   /**
    * Creates a new Service Binding, routing traffic to IPs within the given CIDR to a
    * service running on Cloudflare's network. **Note:** This API may only be used on
@@ -15,7 +14,7 @@ export class Bindings extends APIResource {
    */
   create(
     prefixId: string,
-    params: BindingCreateParams,
+    params: ServiceBindingCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<ServiceBinding> {
     const { account_id, ...body } = params;
@@ -37,7 +36,7 @@ export class Bindings extends APIResource {
    */
   list(
     prefixId: string,
-    params: BindingListParams,
+    params: ServiceBindingListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<ServiceBindingsSinglePage, ServiceBinding> {
     const { account_id } = params;
@@ -54,9 +53,9 @@ export class Bindings extends APIResource {
   delete(
     prefixId: string,
     bindingId: string,
-    params: BindingDeleteParams,
+    params: ServiceBindingDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<BindingDeleteResponse> {
+  ): Core.APIPromise<ServiceBindingDeleteResponse> {
     const { account_id } = params;
     return this._client.delete(
       `/accounts/${account_id}/addressing/prefixes/${prefixId}/bindings/${bindingId}`,
@@ -70,7 +69,7 @@ export class Bindings extends APIResource {
   get(
     prefixId: string,
     bindingId: string,
-    params: BindingGetParams,
+    params: ServiceBindingGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<ServiceBinding> {
     const { account_id } = params;
@@ -87,7 +86,7 @@ export class ServiceBindingsSinglePage extends SinglePage<ServiceBinding> {}
 
 export interface ServiceBinding {
   /**
-   * Identifier
+   * Identifier of a Service Binding.
    */
   id?: string;
 
@@ -102,7 +101,8 @@ export interface ServiceBinding {
   provisioning?: ServiceBinding.Provisioning;
 
   /**
-   * Identifier
+   * Identifier of a Service on the Cloudflare network. Available services and their
+   * IDs may be found in the **List Services** endpoint.
    */
   service_id?: string;
 
@@ -125,7 +125,7 @@ export namespace ServiceBinding {
   }
 }
 
-export interface BindingDeleteResponse {
+export interface ServiceBindingDeleteResponse {
   errors: Array<Shared.ResponseInfo>;
 
   messages: Array<Shared.ResponseInfo>;
@@ -136,9 +136,9 @@ export interface BindingDeleteResponse {
   success: true;
 }
 
-export interface BindingCreateParams {
+export interface ServiceBindingCreateParams {
   /**
-   * Path param: Identifier
+   * Path param: Identifier of a Cloudflare account.
    */
   account_id: string;
 
@@ -148,38 +148,43 @@ export interface BindingCreateParams {
   cidr?: string;
 
   /**
-   * Body param: Identifier
+   * Body param: Identifier of a Service on the Cloudflare network. Available
+   * services and their IDs may be found in the **List Services** endpoint.
    */
   service_id?: string;
 }
 
-export interface BindingListParams {
+export interface ServiceBindingListParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export interface BindingDeleteParams {
+export interface ServiceBindingDeleteParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export interface BindingGetParams {
+export interface ServiceBindingGetParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export namespace Bindings {
-  export import ServiceBinding = BindingsAPI.ServiceBinding;
-  export import BindingDeleteResponse = BindingsAPI.BindingDeleteResponse;
-  export import ServiceBindingsSinglePage = BindingsAPI.ServiceBindingsSinglePage;
-  export import BindingCreateParams = BindingsAPI.BindingCreateParams;
-  export import BindingListParams = BindingsAPI.BindingListParams;
-  export import BindingDeleteParams = BindingsAPI.BindingDeleteParams;
-  export import BindingGetParams = BindingsAPI.BindingGetParams;
+ServiceBindings.ServiceBindingsSinglePage = ServiceBindingsSinglePage;
+
+export declare namespace ServiceBindings {
+  export {
+    type ServiceBinding as ServiceBinding,
+    type ServiceBindingDeleteResponse as ServiceBindingDeleteResponse,
+    ServiceBindingsSinglePage as ServiceBindingsSinglePage,
+    type ServiceBindingCreateParams as ServiceBindingCreateParams,
+    type ServiceBindingListParams as ServiceBindingListParams,
+    type ServiceBindingDeleteParams as ServiceBindingDeleteParams,
+    type ServiceBindingGetParams as ServiceBindingGetParams,
+  };
 }
diff --git a/src/resources/addressing/regional-hostnames/index.ts b/src/resources/addressing/regional-hostnames/index.ts
index b283fd5c16..527ec41ccf 100644
--- a/src/resources/addressing/regional-hostnames/index.ts
+++ b/src/resources/addressing/regional-hostnames/index.ts
@@ -1,17 +1,22 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { RegionListResponse, RegionListParams, RegionListResponsesSinglePage, Regions } from './regions';
 export {
-  RegionalHostnameCreateResponse,
-  RegionalHostnameListResponse,
-  RegionalHostnameDeleteResponse,
-  RegionalHostnameEditResponse,
-  RegionalHostnameGetResponse,
-  RegionalHostnameCreateParams,
-  RegionalHostnameListParams,
-  RegionalHostnameDeleteParams,
-  RegionalHostnameEditParams,
-  RegionalHostnameGetParams,
+  RegionListResponsesSinglePage,
+  Regions,
+  type RegionListResponse,
+  type RegionListParams,
+} from './regions';
+export {
   RegionalHostnameListResponsesSinglePage,
   RegionalHostnames,
+  type RegionalHostnameCreateResponse,
+  type RegionalHostnameListResponse,
+  type RegionalHostnameDeleteResponse,
+  type RegionalHostnameEditResponse,
+  type RegionalHostnameGetResponse,
+  type RegionalHostnameCreateParams,
+  type RegionalHostnameListParams,
+  type RegionalHostnameDeleteParams,
+  type RegionalHostnameEditParams,
+  type RegionalHostnameGetParams,
 } from './regional-hostnames';
diff --git a/src/resources/addressing/regional-hostnames/regional-hostnames.ts b/src/resources/addressing/regional-hostnames/regional-hostnames.ts
index 5845077ed0..3c3b0c2162 100644
--- a/src/resources/addressing/regional-hostnames/regional-hostnames.ts
+++ b/src/resources/addressing/regional-hostnames/regional-hostnames.ts
@@ -2,9 +2,9 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as RegionalHostnamesAPI from './regional-hostnames';
 import * as Shared from '../../shared';
 import * as RegionsAPI from './regions';
+import { RegionListParams, RegionListResponse, RegionListResponsesSinglePage, Regions } from './regions';
 import { SinglePage } from '../../../pagination';
 
 export class RegionalHostnames extends APIResource {
@@ -228,20 +228,29 @@ export interface RegionalHostnameGetParams {
   zone_id: string;
 }
 
-export namespace RegionalHostnames {
-  export import RegionalHostnameCreateResponse = RegionalHostnamesAPI.RegionalHostnameCreateResponse;
-  export import RegionalHostnameListResponse = RegionalHostnamesAPI.RegionalHostnameListResponse;
-  export import RegionalHostnameDeleteResponse = RegionalHostnamesAPI.RegionalHostnameDeleteResponse;
-  export import RegionalHostnameEditResponse = RegionalHostnamesAPI.RegionalHostnameEditResponse;
-  export import RegionalHostnameGetResponse = RegionalHostnamesAPI.RegionalHostnameGetResponse;
-  export import RegionalHostnameListResponsesSinglePage = RegionalHostnamesAPI.RegionalHostnameListResponsesSinglePage;
-  export import RegionalHostnameCreateParams = RegionalHostnamesAPI.RegionalHostnameCreateParams;
-  export import RegionalHostnameListParams = RegionalHostnamesAPI.RegionalHostnameListParams;
-  export import RegionalHostnameDeleteParams = RegionalHostnamesAPI.RegionalHostnameDeleteParams;
-  export import RegionalHostnameEditParams = RegionalHostnamesAPI.RegionalHostnameEditParams;
-  export import RegionalHostnameGetParams = RegionalHostnamesAPI.RegionalHostnameGetParams;
-  export import Regions = RegionsAPI.Regions;
-  export import RegionListResponse = RegionsAPI.RegionListResponse;
-  export import RegionListResponsesSinglePage = RegionsAPI.RegionListResponsesSinglePage;
-  export import RegionListParams = RegionsAPI.RegionListParams;
+RegionalHostnames.RegionalHostnameListResponsesSinglePage = RegionalHostnameListResponsesSinglePage;
+RegionalHostnames.Regions = Regions;
+RegionalHostnames.RegionListResponsesSinglePage = RegionListResponsesSinglePage;
+
+export declare namespace RegionalHostnames {
+  export {
+    type RegionalHostnameCreateResponse as RegionalHostnameCreateResponse,
+    type RegionalHostnameListResponse as RegionalHostnameListResponse,
+    type RegionalHostnameDeleteResponse as RegionalHostnameDeleteResponse,
+    type RegionalHostnameEditResponse as RegionalHostnameEditResponse,
+    type RegionalHostnameGetResponse as RegionalHostnameGetResponse,
+    RegionalHostnameListResponsesSinglePage as RegionalHostnameListResponsesSinglePage,
+    type RegionalHostnameCreateParams as RegionalHostnameCreateParams,
+    type RegionalHostnameListParams as RegionalHostnameListParams,
+    type RegionalHostnameDeleteParams as RegionalHostnameDeleteParams,
+    type RegionalHostnameEditParams as RegionalHostnameEditParams,
+    type RegionalHostnameGetParams as RegionalHostnameGetParams,
+  };
+
+  export {
+    Regions as Regions,
+    type RegionListResponse as RegionListResponse,
+    RegionListResponsesSinglePage as RegionListResponsesSinglePage,
+    type RegionListParams as RegionListParams,
+  };
 }
diff --git a/src/resources/addressing/regional-hostnames/regions.ts b/src/resources/addressing/regional-hostnames/regions.ts
index db24824dc1..db005d7338 100644
--- a/src/resources/addressing/regional-hostnames/regions.ts
+++ b/src/resources/addressing/regional-hostnames/regions.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as RegionsAPI from './regions';
 import { SinglePage } from '../../../pagination';
 
 export class Regions extends APIResource {
@@ -43,8 +42,12 @@ export interface RegionListParams {
   account_id: string;
 }
 
-export namespace Regions {
-  export import RegionListResponse = RegionsAPI.RegionListResponse;
-  export import RegionListResponsesSinglePage = RegionsAPI.RegionListResponsesSinglePage;
-  export import RegionListParams = RegionsAPI.RegionListParams;
+Regions.RegionListResponsesSinglePage = RegionListResponsesSinglePage;
+
+export declare namespace Regions {
+  export {
+    type RegionListResponse as RegionListResponse,
+    RegionListResponsesSinglePage as RegionListResponsesSinglePage,
+    type RegionListParams as RegionListParams,
+  };
 }
diff --git a/src/resources/addressing/services.ts b/src/resources/addressing/services.ts
index 13cd36b87f..17341ca348 100644
--- a/src/resources/addressing/services.ts
+++ b/src/resources/addressing/services.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ServicesAPI from './services';
 import { SinglePage } from '../../pagination';
 
 export class Services extends APIResource {
@@ -29,7 +28,8 @@ export class ServiceListResponsesSinglePage extends SinglePage<ServiceListRespon
 
 export interface ServiceListResponse {
   /**
-   * Identifier
+   * Identifier of a Service on the Cloudflare network. Available services and their
+   * IDs may be found in the **List Services** endpoint.
    */
   id?: string;
 
@@ -41,13 +41,17 @@ export interface ServiceListResponse {
 
 export interface ServiceListParams {
   /**
-   * Identifier
+   * Identifier of a Cloudflare account.
    */
   account_id: string;
 }
 
-export namespace Services {
-  export import ServiceListResponse = ServicesAPI.ServiceListResponse;
-  export import ServiceListResponsesSinglePage = ServicesAPI.ServiceListResponsesSinglePage;
-  export import ServiceListParams = ServicesAPI.ServiceListParams;
+Services.ServiceListResponsesSinglePage = ServiceListResponsesSinglePage;
+
+export declare namespace Services {
+  export {
+    type ServiceListResponse as ServiceListResponse,
+    ServiceListResponsesSinglePage as ServiceListResponsesSinglePage,
+    type ServiceListParams as ServiceListParams,
+  };
 }
diff --git a/src/resources/ai-gateway/ai-gateway.ts b/src/resources/ai-gateway/ai-gateway.ts
index ab5ca2849c..5bb82595b3 100644
--- a/src/resources/ai-gateway/ai-gateway.ts
+++ b/src/resources/ai-gateway/ai-gateway.ts
@@ -2,11 +2,60 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
+import * as DatasetsAPI from './datasets';
+import {
+  DatasetCreateParams,
+  DatasetCreateResponse,
+  DatasetDeleteParams,
+  DatasetDeleteResponse,
+  DatasetGetParams,
+  DatasetGetResponse,
+  DatasetListParams,
+  DatasetListResponse,
+  DatasetListResponsesV4PagePaginationArray,
+  DatasetUpdateParams,
+  DatasetUpdateResponse,
+  Datasets,
+} from './datasets';
+import * as EvaluationTypesAPI from './evaluation-types';
+import { EvaluationTypeGetParams, EvaluationTypeGetResponse, EvaluationTypes } from './evaluation-types';
+import * as EvaluationsAPI from './evaluations';
+import {
+  EvaluationCreateParams,
+  EvaluationCreateResponse,
+  EvaluationDeleteParams,
+  EvaluationDeleteResponse,
+  EvaluationGetParams,
+  EvaluationGetResponse,
+  EvaluationListParams,
+  EvaluationListResponse,
+  EvaluationListResponsesV4PagePaginationArray,
+  Evaluations,
+} from './evaluations';
 import * as LogsAPI from './logs';
+import {
+  LogDeleteParams,
+  LogDeleteResponse,
+  LogEditParams,
+  LogEditResponse,
+  LogGetParams,
+  LogGetResponse,
+  LogListParams,
+  LogListResponse,
+  LogListResponsesV4PagePaginationArray,
+  LogRequestParams,
+  LogRequestResponse,
+  LogResponseParams,
+  LogResponseResponse,
+  Logs,
+} from './logs';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class AIGateway extends APIResource {
+  evaluationTypes: EvaluationTypesAPI.EvaluationTypes = new EvaluationTypesAPI.EvaluationTypes(this._client);
   logs: LogsAPI.Logs = new LogsAPI.Logs(this._client);
+  datasets: DatasetsAPI.Datasets = new DatasetsAPI.Datasets(this._client);
+  evaluations: EvaluationsAPI.Evaluations = new EvaluationsAPI.Evaluations(this._client);
 
   /**
    * Create a new Gateway
@@ -92,32 +141,36 @@ export class AIGateway extends APIResource {
 export class AIGatewayListResponsesV4PagePaginationArray extends V4PagePaginationArray<AIGatewayListResponse> {}
 
 export interface AIGatewayCreateResponse {
-  task: AIGatewayCreateResponse.Task;
-}
+  /**
+   * gateway id
+   */
+  id: string;
+
+  account_id: string;
+
+  account_tag: string;
 
-export namespace AIGatewayCreateResponse {
-  export interface Task {
-    /**
-     * gateway id
-     */
-    id: string;
+  cache_invalidate_on_update: boolean;
 
-    cache_invalidate_on_update: boolean;
+  cache_ttl: number | null;
 
-    cache_ttl: number | null;
+  collect_logs: boolean;
 
-    collect_logs: boolean;
+  created_at: string;
 
-    created_at: string;
+  internal_id: string;
 
-    modified_at: string;
+  modified_at: string;
 
-    rate_limiting_interval: number | null;
+  rate_limiting_interval: number | null;
 
-    rate_limiting_limit: number | null;
+  rate_limiting_limit: number | null;
 
-    rate_limiting_technique: 'fixed' | 'sliding';
-  }
+  rate_limiting_technique: 'fixed' | 'sliding';
+
+  logpush?: boolean;
+
+  logpush_public_key?: string | null;
 }
 
 export interface AIGatewayUpdateResponse {
@@ -126,6 +179,10 @@ export interface AIGatewayUpdateResponse {
    */
   id: string;
 
+  account_id: string;
+
+  account_tag: string;
+
   cache_invalidate_on_update: boolean;
 
   cache_ttl: number | null;
@@ -134,6 +191,8 @@ export interface AIGatewayUpdateResponse {
 
   created_at: string;
 
+  internal_id: string;
+
   modified_at: string;
 
   rate_limiting_interval: number | null;
@@ -141,6 +200,10 @@ export interface AIGatewayUpdateResponse {
   rate_limiting_limit: number | null;
 
   rate_limiting_technique: 'fixed' | 'sliding';
+
+  logpush?: boolean;
+
+  logpush_public_key?: string | null;
 }
 
 export interface AIGatewayListResponse {
@@ -149,6 +212,10 @@ export interface AIGatewayListResponse {
    */
   id: string;
 
+  account_id: string;
+
+  account_tag: string;
+
   cache_invalidate_on_update: boolean;
 
   cache_ttl: number | null;
@@ -157,6 +224,8 @@ export interface AIGatewayListResponse {
 
   created_at: string;
 
+  internal_id: string;
+
   modified_at: string;
 
   rate_limiting_interval: number | null;
@@ -164,6 +233,10 @@ export interface AIGatewayListResponse {
   rate_limiting_limit: number | null;
 
   rate_limiting_technique: 'fixed' | 'sliding';
+
+  logpush?: boolean;
+
+  logpush_public_key?: string | null;
 }
 
 export interface AIGatewayDeleteResponse {
@@ -172,6 +245,10 @@ export interface AIGatewayDeleteResponse {
    */
   id: string;
 
+  account_id: string;
+
+  account_tag: string;
+
   cache_invalidate_on_update: boolean;
 
   cache_ttl: number | null;
@@ -180,6 +257,8 @@ export interface AIGatewayDeleteResponse {
 
   created_at: string;
 
+  internal_id: string;
+
   modified_at: string;
 
   rate_limiting_interval: number | null;
@@ -187,6 +266,10 @@ export interface AIGatewayDeleteResponse {
   rate_limiting_limit: number | null;
 
   rate_limiting_technique: 'fixed' | 'sliding';
+
+  logpush?: boolean;
+
+  logpush_public_key?: string | null;
 }
 
 export interface AIGatewayGetResponse {
@@ -195,6 +278,10 @@ export interface AIGatewayGetResponse {
    */
   id: string;
 
+  account_id: string;
+
+  account_tag: string;
+
   cache_invalidate_on_update: boolean;
 
   cache_ttl: number | null;
@@ -203,6 +290,8 @@ export interface AIGatewayGetResponse {
 
   created_at: string;
 
+  internal_id: string;
+
   modified_at: string;
 
   rate_limiting_interval: number | null;
@@ -210,6 +299,10 @@ export interface AIGatewayGetResponse {
   rate_limiting_limit: number | null;
 
   rate_limiting_technique: 'fixed' | 'sliding';
+
+  logpush?: boolean;
+
+  logpush_public_key?: string | null;
 }
 
 export interface AIGatewayCreateParams {
@@ -252,6 +345,16 @@ export interface AIGatewayCreateParams {
    * Body param:
    */
   rate_limiting_technique: 'fixed' | 'sliding';
+
+  /**
+   * Body param:
+   */
+  logpush?: boolean;
+
+  /**
+   * Body param:
+   */
+  logpush_public_key?: string | null;
 }
 
 export interface AIGatewayUpdateParams {
@@ -289,6 +392,16 @@ export interface AIGatewayUpdateParams {
    * Body param:
    */
   rate_limiting_technique: 'fixed' | 'sliding';
+
+  /**
+   * Body param:
+   */
+  logpush?: boolean;
+
+  /**
+   * Body param:
+   */
+  logpush_public_key?: string | null;
 }
 
 export interface AIGatewayListParams extends V4PagePaginationArrayParams {
@@ -298,14 +411,9 @@ export interface AIGatewayListParams extends V4PagePaginationArrayParams {
   account_id: string;
 
   /**
-   * Query param: gateway id
-   */
-  id?: string;
-
-  /**
-   * Query param: Order By Column Name
+   * Query param: Search by id
    */
-  order_by?: string;
+  search?: string;
 }
 
 export interface AIGatewayDeleteParams {
@@ -316,9 +424,63 @@ export interface AIGatewayGetParams {
   account_id: string;
 }
 
-export namespace AIGateway {
-  export import Logs = LogsAPI.Logs;
-  export import LogListResponse = LogsAPI.LogListResponse;
-  export import LogListResponsesV4PagePaginationArray = LogsAPI.LogListResponsesV4PagePaginationArray;
-  export import LogListParams = LogsAPI.LogListParams;
+AIGateway.EvaluationTypes = EvaluationTypes;
+AIGateway.Logs = Logs;
+AIGateway.LogListResponsesV4PagePaginationArray = LogListResponsesV4PagePaginationArray;
+AIGateway.Datasets = Datasets;
+AIGateway.DatasetListResponsesV4PagePaginationArray = DatasetListResponsesV4PagePaginationArray;
+AIGateway.Evaluations = Evaluations;
+AIGateway.EvaluationListResponsesV4PagePaginationArray = EvaluationListResponsesV4PagePaginationArray;
+
+export declare namespace AIGateway {
+  export {
+    EvaluationTypes as EvaluationTypes,
+    type EvaluationTypeGetResponse as EvaluationTypeGetResponse,
+    type EvaluationTypeGetParams as EvaluationTypeGetParams,
+  };
+
+  export {
+    Logs as Logs,
+    type LogListResponse as LogListResponse,
+    type LogDeleteResponse as LogDeleteResponse,
+    type LogEditResponse as LogEditResponse,
+    type LogGetResponse as LogGetResponse,
+    type LogRequestResponse as LogRequestResponse,
+    type LogResponseResponse as LogResponseResponse,
+    LogListResponsesV4PagePaginationArray as LogListResponsesV4PagePaginationArray,
+    type LogListParams as LogListParams,
+    type LogDeleteParams as LogDeleteParams,
+    type LogEditParams as LogEditParams,
+    type LogGetParams as LogGetParams,
+    type LogRequestParams as LogRequestParams,
+    type LogResponseParams as LogResponseParams,
+  };
+
+  export {
+    Datasets as Datasets,
+    type DatasetCreateResponse as DatasetCreateResponse,
+    type DatasetUpdateResponse as DatasetUpdateResponse,
+    type DatasetListResponse as DatasetListResponse,
+    type DatasetDeleteResponse as DatasetDeleteResponse,
+    type DatasetGetResponse as DatasetGetResponse,
+    DatasetListResponsesV4PagePaginationArray as DatasetListResponsesV4PagePaginationArray,
+    type DatasetCreateParams as DatasetCreateParams,
+    type DatasetUpdateParams as DatasetUpdateParams,
+    type DatasetListParams as DatasetListParams,
+    type DatasetDeleteParams as DatasetDeleteParams,
+    type DatasetGetParams as DatasetGetParams,
+  };
+
+  export {
+    Evaluations as Evaluations,
+    type EvaluationCreateResponse as EvaluationCreateResponse,
+    type EvaluationListResponse as EvaluationListResponse,
+    type EvaluationDeleteResponse as EvaluationDeleteResponse,
+    type EvaluationGetResponse as EvaluationGetResponse,
+    EvaluationListResponsesV4PagePaginationArray as EvaluationListResponsesV4PagePaginationArray,
+    type EvaluationCreateParams as EvaluationCreateParams,
+    type EvaluationListParams as EvaluationListParams,
+    type EvaluationDeleteParams as EvaluationDeleteParams,
+    type EvaluationGetParams as EvaluationGetParams,
+  };
 }
diff --git a/src/resources/ai-gateway/datasets.ts b/src/resources/ai-gateway/datasets.ts
new file mode 100644
index 0000000000..6582ad5afa
--- /dev/null
+++ b/src/resources/ai-gateway/datasets.ts
@@ -0,0 +1,464 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
+
+export class Datasets extends APIResource {
+  /**
+   * Create a new Dataset
+   */
+  create(
+    gatewayId: string,
+    params: DatasetCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DatasetCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/datasets`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: DatasetCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update a Dataset
+   */
+  update(
+    gatewayId: string,
+    id: string,
+    params: DatasetUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DatasetUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/datasets/${id}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: DatasetUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List Datasets
+   */
+  list(
+    gatewayId: string,
+    params: DatasetListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<DatasetListResponsesV4PagePaginationArray, DatasetListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/datasets`,
+      DatasetListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Delete a Dataset
+   */
+  delete(
+    gatewayId: string,
+    id: string,
+    params: DatasetDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DatasetDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/datasets/${id}`,
+        options,
+      ) as Core.APIPromise<{ result: DatasetDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetch a Dataset
+   */
+  get(
+    gatewayId: string,
+    id: string,
+    params: DatasetGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DatasetGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/datasets/${id}`,
+        options,
+      ) as Core.APIPromise<{ result: DatasetGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class DatasetListResponsesV4PagePaginationArray extends V4PagePaginationArray<DatasetListResponse> {}
+
+export interface DatasetCreateResponse {
+  id: string;
+
+  account_id: string;
+
+  account_tag: string;
+
+  created_at: string;
+
+  enable: boolean;
+
+  filters: Array<DatasetCreateResponse.Filter>;
+
+  /**
+   * gateway id
+   */
+  gateway_id: string;
+
+  modified_at: string;
+
+  name: string;
+}
+
+export namespace DatasetCreateResponse {
+  export interface Filter {
+    key:
+      | 'created_at'
+      | 'request_content_type'
+      | 'response_content_type'
+      | 'success'
+      | 'cached'
+      | 'provider'
+      | 'model'
+      | 'cost'
+      | 'tokens'
+      | 'tokens_in'
+      | 'tokens_out'
+      | 'duration'
+      | 'feedback';
+
+    operator: 'eq' | 'contains' | 'lt' | 'gt';
+
+    value: Array<string | number | boolean>;
+  }
+}
+
+export interface DatasetUpdateResponse {
+  id: string;
+
+  account_id: string;
+
+  account_tag: string;
+
+  created_at: string;
+
+  enable: boolean;
+
+  filters: Array<DatasetUpdateResponse.Filter>;
+
+  /**
+   * gateway id
+   */
+  gateway_id: string;
+
+  modified_at: string;
+
+  name: string;
+}
+
+export namespace DatasetUpdateResponse {
+  export interface Filter {
+    key:
+      | 'created_at'
+      | 'request_content_type'
+      | 'response_content_type'
+      | 'success'
+      | 'cached'
+      | 'provider'
+      | 'model'
+      | 'cost'
+      | 'tokens'
+      | 'tokens_in'
+      | 'tokens_out'
+      | 'duration'
+      | 'feedback';
+
+    operator: 'eq' | 'contains' | 'lt' | 'gt';
+
+    value: Array<string | number | boolean>;
+  }
+}
+
+export interface DatasetListResponse {
+  id: string;
+
+  account_id: string;
+
+  account_tag: string;
+
+  created_at: string;
+
+  enable: boolean;
+
+  filters: Array<DatasetListResponse.Filter>;
+
+  /**
+   * gateway id
+   */
+  gateway_id: string;
+
+  modified_at: string;
+
+  name: string;
+}
+
+export namespace DatasetListResponse {
+  export interface Filter {
+    key:
+      | 'created_at'
+      | 'request_content_type'
+      | 'response_content_type'
+      | 'success'
+      | 'cached'
+      | 'provider'
+      | 'model'
+      | 'cost'
+      | 'tokens'
+      | 'tokens_in'
+      | 'tokens_out'
+      | 'duration'
+      | 'feedback';
+
+    operator: 'eq' | 'contains' | 'lt' | 'gt';
+
+    value: Array<string | number | boolean>;
+  }
+}
+
+export interface DatasetDeleteResponse {
+  id: string;
+
+  account_id: string;
+
+  account_tag: string;
+
+  created_at: string;
+
+  enable: boolean;
+
+  filters: Array<DatasetDeleteResponse.Filter>;
+
+  /**
+   * gateway id
+   */
+  gateway_id: string;
+
+  modified_at: string;
+
+  name: string;
+}
+
+export namespace DatasetDeleteResponse {
+  export interface Filter {
+    key:
+      | 'created_at'
+      | 'request_content_type'
+      | 'response_content_type'
+      | 'success'
+      | 'cached'
+      | 'provider'
+      | 'model'
+      | 'cost'
+      | 'tokens'
+      | 'tokens_in'
+      | 'tokens_out'
+      | 'duration'
+      | 'feedback';
+
+    operator: 'eq' | 'contains' | 'lt' | 'gt';
+
+    value: Array<string | number | boolean>;
+  }
+}
+
+export interface DatasetGetResponse {
+  id: string;
+
+  account_id: string;
+
+  account_tag: string;
+
+  created_at: string;
+
+  enable: boolean;
+
+  filters: Array<DatasetGetResponse.Filter>;
+
+  /**
+   * gateway id
+   */
+  gateway_id: string;
+
+  modified_at: string;
+
+  name: string;
+}
+
+export namespace DatasetGetResponse {
+  export interface Filter {
+    key:
+      | 'created_at'
+      | 'request_content_type'
+      | 'response_content_type'
+      | 'success'
+      | 'cached'
+      | 'provider'
+      | 'model'
+      | 'cost'
+      | 'tokens'
+      | 'tokens_in'
+      | 'tokens_out'
+      | 'duration'
+      | 'feedback';
+
+    operator: 'eq' | 'contains' | 'lt' | 'gt';
+
+    value: Array<string | number | boolean>;
+  }
+}
+
+export interface DatasetCreateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  enable: boolean;
+
+  /**
+   * Body param:
+   */
+  filters: Array<DatasetCreateParams.Filter>;
+
+  /**
+   * Body param:
+   */
+  name: string;
+}
+
+export namespace DatasetCreateParams {
+  export interface Filter {
+    key:
+      | 'created_at'
+      | 'request_content_type'
+      | 'response_content_type'
+      | 'success'
+      | 'cached'
+      | 'provider'
+      | 'model'
+      | 'cost'
+      | 'tokens'
+      | 'tokens_in'
+      | 'tokens_out'
+      | 'duration'
+      | 'feedback';
+
+    operator: 'eq' | 'contains' | 'lt' | 'gt';
+
+    value: Array<string | number | boolean>;
+  }
+}
+
+export interface DatasetUpdateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  enable: boolean;
+
+  /**
+   * Body param:
+   */
+  filters: Array<DatasetUpdateParams.Filter>;
+
+  /**
+   * Body param:
+   */
+  name: string;
+}
+
+export namespace DatasetUpdateParams {
+  export interface Filter {
+    key:
+      | 'created_at'
+      | 'request_content_type'
+      | 'response_content_type'
+      | 'success'
+      | 'cached'
+      | 'provider'
+      | 'model'
+      | 'cost'
+      | 'tokens'
+      | 'tokens_in'
+      | 'tokens_out'
+      | 'duration'
+      | 'feedback';
+
+    operator: 'eq' | 'contains' | 'lt' | 'gt';
+
+    value: Array<string | number | boolean>;
+  }
+}
+
+export interface DatasetListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Query param:
+   */
+  enable?: boolean;
+
+  /**
+   * Query param:
+   */
+  name?: string;
+
+  /**
+   * Query param: Search by id, name, filters
+   */
+  search?: string;
+}
+
+export interface DatasetDeleteParams {
+  account_id: string;
+}
+
+export interface DatasetGetParams {
+  account_id: string;
+}
+
+Datasets.DatasetListResponsesV4PagePaginationArray = DatasetListResponsesV4PagePaginationArray;
+
+export declare namespace Datasets {
+  export {
+    type DatasetCreateResponse as DatasetCreateResponse,
+    type DatasetUpdateResponse as DatasetUpdateResponse,
+    type DatasetListResponse as DatasetListResponse,
+    type DatasetDeleteResponse as DatasetDeleteResponse,
+    type DatasetGetResponse as DatasetGetResponse,
+    DatasetListResponsesV4PagePaginationArray as DatasetListResponsesV4PagePaginationArray,
+    type DatasetCreateParams as DatasetCreateParams,
+    type DatasetUpdateParams as DatasetUpdateParams,
+    type DatasetListParams as DatasetListParams,
+    type DatasetDeleteParams as DatasetDeleteParams,
+    type DatasetGetParams as DatasetGetParams,
+  };
+}
diff --git a/src/resources/ai-gateway/evaluation-types.ts b/src/resources/ai-gateway/evaluation-types.ts
new file mode 100644
index 0000000000..47d847d1e0
--- /dev/null
+++ b/src/resources/ai-gateway/evaluation-types.ts
@@ -0,0 +1,78 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+
+export class EvaluationTypes extends APIResource {
+  /**
+   * List Evaluators
+   */
+  get(
+    params: EvaluationTypeGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<EvaluationTypeGetResponse> {
+    const { account_id, ...query } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/ai-gateway/evaluation-types`, {
+        query,
+        ...options,
+      }) as Core.APIPromise<{ result: EvaluationTypeGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type EvaluationTypeGetResponse = Array<EvaluationTypeGetResponse.EvaluationTypeGetResponseItem>;
+
+export namespace EvaluationTypeGetResponse {
+  export interface EvaluationTypeGetResponseItem {
+    id: string;
+
+    created_at: string;
+
+    description: string;
+
+    enable: boolean;
+
+    mandatory: boolean;
+
+    modified_at: string;
+
+    name: string;
+
+    type: string;
+  }
+}
+
+export interface EvaluationTypeGetParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Query param:
+   */
+  order_by?: string;
+
+  /**
+   * Query param:
+   */
+  order_by_direction?: 'asc' | 'desc';
+
+  /**
+   * Query param:
+   */
+  page?: number;
+
+  /**
+   * Query param:
+   */
+  per_page?: number;
+}
+
+export declare namespace EvaluationTypes {
+  export {
+    type EvaluationTypeGetResponse as EvaluationTypeGetResponse,
+    type EvaluationTypeGetParams as EvaluationTypeGetParams,
+  };
+}
diff --git a/src/resources/ai-gateway/evaluations.ts b/src/resources/ai-gateway/evaluations.ts
new file mode 100644
index 0000000000..b572e53b69
--- /dev/null
+++ b/src/resources/ai-gateway/evaluations.ts
@@ -0,0 +1,526 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
+
+export class Evaluations extends APIResource {
+  /**
+   * Create a new Evaluation
+   */
+  create(
+    gatewayId: string,
+    params: EvaluationCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<EvaluationCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/evaluations`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: EvaluationCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List Evaluations
+   */
+  list(
+    gatewayId: string,
+    params: EvaluationListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<EvaluationListResponsesV4PagePaginationArray, EvaluationListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/evaluations`,
+      EvaluationListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Delete a Evaluation
+   */
+  delete(
+    gatewayId: string,
+    id: string,
+    params: EvaluationDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<EvaluationDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/evaluations/${id}`,
+        options,
+      ) as Core.APIPromise<{ result: EvaluationDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetch a Evaluation
+   */
+  get(
+    gatewayId: string,
+    id: string,
+    params: EvaluationGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<EvaluationGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/evaluations/${id}`,
+        options,
+      ) as Core.APIPromise<{ result: EvaluationGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class EvaluationListResponsesV4PagePaginationArray extends V4PagePaginationArray<EvaluationListResponse> {}
+
+export interface EvaluationCreateResponse {
+  id: string;
+
+  account_id: string;
+
+  account_tag: string;
+
+  created_at: string;
+
+  datasets: Array<EvaluationCreateResponse.Dataset>;
+
+  /**
+   * gateway id
+   */
+  gateway_id: string;
+
+  modified_at: string;
+
+  name: string;
+
+  processed: boolean;
+
+  results: Array<EvaluationCreateResponse.Result>;
+
+  total_logs: number;
+}
+
+export namespace EvaluationCreateResponse {
+  export interface Dataset {
+    id: string;
+
+    account_id: string;
+
+    account_tag: string;
+
+    created_at: string;
+
+    enable: boolean;
+
+    filters: Array<Dataset.Filter>;
+
+    /**
+     * gateway id
+     */
+    gateway_id: string;
+
+    modified_at: string;
+
+    name: string;
+  }
+
+  export namespace Dataset {
+    export interface Filter {
+      key:
+        | 'created_at'
+        | 'request_content_type'
+        | 'response_content_type'
+        | 'success'
+        | 'cached'
+        | 'provider'
+        | 'model'
+        | 'cost'
+        | 'tokens'
+        | 'tokens_in'
+        | 'tokens_out'
+        | 'duration'
+        | 'feedback';
+
+      operator: 'eq' | 'contains' | 'lt' | 'gt';
+
+      value: Array<string | number | boolean>;
+    }
+  }
+
+  export interface Result {
+    id: string;
+
+    created_at: string;
+
+    evaluation_id: string;
+
+    evaluation_type_id: string;
+
+    modified_at: string;
+
+    result: string;
+
+    status: number;
+
+    status_description: string;
+
+    total_logs: number;
+  }
+}
+
+export interface EvaluationListResponse {
+  id: string;
+
+  account_id: string;
+
+  account_tag: string;
+
+  created_at: string;
+
+  datasets: Array<EvaluationListResponse.Dataset>;
+
+  /**
+   * gateway id
+   */
+  gateway_id: string;
+
+  modified_at: string;
+
+  name: string;
+
+  processed: boolean;
+
+  results: Array<EvaluationListResponse.Result>;
+
+  total_logs: number;
+}
+
+export namespace EvaluationListResponse {
+  export interface Dataset {
+    id: string;
+
+    account_id: string;
+
+    account_tag: string;
+
+    created_at: string;
+
+    enable: boolean;
+
+    filters: Array<Dataset.Filter>;
+
+    /**
+     * gateway id
+     */
+    gateway_id: string;
+
+    modified_at: string;
+
+    name: string;
+  }
+
+  export namespace Dataset {
+    export interface Filter {
+      key:
+        | 'created_at'
+        | 'request_content_type'
+        | 'response_content_type'
+        | 'success'
+        | 'cached'
+        | 'provider'
+        | 'model'
+        | 'cost'
+        | 'tokens'
+        | 'tokens_in'
+        | 'tokens_out'
+        | 'duration'
+        | 'feedback';
+
+      operator: 'eq' | 'contains' | 'lt' | 'gt';
+
+      value: Array<string | number | boolean>;
+    }
+  }
+
+  export interface Result {
+    id: string;
+
+    created_at: string;
+
+    evaluation_id: string;
+
+    evaluation_type_id: string;
+
+    modified_at: string;
+
+    result: string;
+
+    status: number;
+
+    status_description: string;
+
+    total_logs: number;
+  }
+}
+
+export interface EvaluationDeleteResponse {
+  id: string;
+
+  account_id: string;
+
+  account_tag: string;
+
+  created_at: string;
+
+  datasets: Array<EvaluationDeleteResponse.Dataset>;
+
+  /**
+   * gateway id
+   */
+  gateway_id: string;
+
+  modified_at: string;
+
+  name: string;
+
+  processed: boolean;
+
+  results: Array<EvaluationDeleteResponse.Result>;
+
+  total_logs: number;
+}
+
+export namespace EvaluationDeleteResponse {
+  export interface Dataset {
+    id: string;
+
+    account_id: string;
+
+    account_tag: string;
+
+    created_at: string;
+
+    enable: boolean;
+
+    filters: Array<Dataset.Filter>;
+
+    /**
+     * gateway id
+     */
+    gateway_id: string;
+
+    modified_at: string;
+
+    name: string;
+  }
+
+  export namespace Dataset {
+    export interface Filter {
+      key:
+        | 'created_at'
+        | 'request_content_type'
+        | 'response_content_type'
+        | 'success'
+        | 'cached'
+        | 'provider'
+        | 'model'
+        | 'cost'
+        | 'tokens'
+        | 'tokens_in'
+        | 'tokens_out'
+        | 'duration'
+        | 'feedback';
+
+      operator: 'eq' | 'contains' | 'lt' | 'gt';
+
+      value: Array<string | number | boolean>;
+    }
+  }
+
+  export interface Result {
+    id: string;
+
+    created_at: string;
+
+    evaluation_id: string;
+
+    evaluation_type_id: string;
+
+    modified_at: string;
+
+    result: string;
+
+    status: number;
+
+    status_description: string;
+
+    total_logs: number;
+  }
+}
+
+export interface EvaluationGetResponse {
+  id: string;
+
+  account_id: string;
+
+  account_tag: string;
+
+  created_at: string;
+
+  datasets: Array<EvaluationGetResponse.Dataset>;
+
+  /**
+   * gateway id
+   */
+  gateway_id: string;
+
+  modified_at: string;
+
+  name: string;
+
+  processed: boolean;
+
+  results: Array<EvaluationGetResponse.Result>;
+
+  total_logs: number;
+}
+
+export namespace EvaluationGetResponse {
+  export interface Dataset {
+    id: string;
+
+    account_id: string;
+
+    account_tag: string;
+
+    created_at: string;
+
+    enable: boolean;
+
+    filters: Array<Dataset.Filter>;
+
+    /**
+     * gateway id
+     */
+    gateway_id: string;
+
+    modified_at: string;
+
+    name: string;
+  }
+
+  export namespace Dataset {
+    export interface Filter {
+      key:
+        | 'created_at'
+        | 'request_content_type'
+        | 'response_content_type'
+        | 'success'
+        | 'cached'
+        | 'provider'
+        | 'model'
+        | 'cost'
+        | 'tokens'
+        | 'tokens_in'
+        | 'tokens_out'
+        | 'duration'
+        | 'feedback';
+
+      operator: 'eq' | 'contains' | 'lt' | 'gt';
+
+      value: Array<string | number | boolean>;
+    }
+  }
+
+  export interface Result {
+    id: string;
+
+    created_at: string;
+
+    evaluation_id: string;
+
+    evaluation_type_id: string;
+
+    modified_at: string;
+
+    result: string;
+
+    status: number;
+
+    status_description: string;
+
+    total_logs: number;
+  }
+}
+
+export interface EvaluationCreateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  dataset_ids: Array<string>;
+
+  /**
+   * Body param:
+   */
+  evaluation_type_ids: Array<string>;
+
+  /**
+   * Body param:
+   */
+  name: string;
+}
+
+export interface EvaluationListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Query param:
+   */
+  name?: string;
+
+  /**
+   * Query param:
+   */
+  processed?: boolean;
+
+  /**
+   * Query param: Search by id, name
+   */
+  search?: string;
+}
+
+export interface EvaluationDeleteParams {
+  account_id: string;
+}
+
+export interface EvaluationGetParams {
+  account_id: string;
+}
+
+Evaluations.EvaluationListResponsesV4PagePaginationArray = EvaluationListResponsesV4PagePaginationArray;
+
+export declare namespace Evaluations {
+  export {
+    type EvaluationCreateResponse as EvaluationCreateResponse,
+    type EvaluationListResponse as EvaluationListResponse,
+    type EvaluationDeleteResponse as EvaluationDeleteResponse,
+    type EvaluationGetResponse as EvaluationGetResponse,
+    EvaluationListResponsesV4PagePaginationArray as EvaluationListResponsesV4PagePaginationArray,
+    type EvaluationCreateParams as EvaluationCreateParams,
+    type EvaluationListParams as EvaluationListParams,
+    type EvaluationDeleteParams as EvaluationDeleteParams,
+    type EvaluationGetParams as EvaluationGetParams,
+  };
+}
diff --git a/src/resources/ai-gateway/index.ts b/src/resources/ai-gateway/index.ts
index 8a6c4921d2..9168fda6da 100644
--- a/src/resources/ai-gateway/index.ts
+++ b/src/resources/ai-gateway/index.ts
@@ -1,4 +1,50 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { AIGateway } from './ai-gateway';
-export { LogListResponse, LogListParams, LogListResponsesV4PagePaginationArray, Logs } from './logs';
+export {
+  DatasetListResponsesV4PagePaginationArray,
+  Datasets,
+  type DatasetCreateResponse,
+  type DatasetUpdateResponse,
+  type DatasetListResponse,
+  type DatasetDeleteResponse,
+  type DatasetGetResponse,
+  type DatasetCreateParams,
+  type DatasetUpdateParams,
+  type DatasetListParams,
+  type DatasetDeleteParams,
+  type DatasetGetParams,
+} from './datasets';
+export {
+  EvaluationListResponsesV4PagePaginationArray,
+  Evaluations,
+  type EvaluationCreateResponse,
+  type EvaluationListResponse,
+  type EvaluationDeleteResponse,
+  type EvaluationGetResponse,
+  type EvaluationCreateParams,
+  type EvaluationListParams,
+  type EvaluationDeleteParams,
+  type EvaluationGetParams,
+} from './evaluations';
+export {
+  EvaluationTypes,
+  type EvaluationTypeGetResponse,
+  type EvaluationTypeGetParams,
+} from './evaluation-types';
+export {
+  LogListResponsesV4PagePaginationArray,
+  Logs,
+  type LogListResponse,
+  type LogDeleteResponse,
+  type LogEditResponse,
+  type LogGetResponse,
+  type LogRequestResponse,
+  type LogResponseResponse,
+  type LogListParams,
+  type LogDeleteParams,
+  type LogEditParams,
+  type LogGetParams,
+  type LogRequestParams,
+  type LogResponseParams,
+} from './logs';
diff --git a/src/resources/ai-gateway/logs.ts b/src/resources/ai-gateway/logs.ts
index 68209695b9..a5631d091a 100644
--- a/src/resources/ai-gateway/logs.ts
+++ b/src/resources/ai-gateway/logs.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as LogsAPI from './logs';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class Logs extends APIResource {
@@ -10,17 +9,100 @@ export class Logs extends APIResource {
    * List Gateway Logs
    */
   list(
-    id: string,
+    gatewayId: string,
     params: LogListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<LogListResponsesV4PagePaginationArray, LogListResponse> {
     const { account_id, ...query } = params;
     return this._client.getAPIList(
-      `/accounts/${account_id}/ai-gateway/gateways/${id}/logs`,
+      `/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/logs`,
       LogListResponsesV4PagePaginationArray,
       { query, ...options },
     );
   }
+
+  /**
+   * Delete Gateway Logs
+   */
+  delete(
+    gatewayId: string,
+    params: LogDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<LogDeleteResponse> {
+    const { account_id, filters, limit, order_by, order_by_direction } = params;
+    return this._client.delete(`/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/logs`, {
+      query: { filters, limit, order_by, order_by_direction },
+      ...options,
+    });
+  }
+
+  /**
+   * Patch Gateway Log
+   */
+  edit(
+    gatewayId: string,
+    id: string,
+    params: LogEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<LogEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/logs/${id}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: LogEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get Gateway Log Detail
+   */
+  get(
+    gatewayId: string,
+    id: string,
+    params: LogGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<LogGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/logs/${id}`,
+        options,
+      ) as Core.APIPromise<{ result: LogGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get Gateway Log Request
+   */
+  request(
+    gatewayId: string,
+    id: string,
+    params: LogRequestParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<unknown> {
+    const { account_id } = params;
+    return this._client.get(
+      `/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/logs/${id}/request`,
+      options,
+    );
+  }
+
+  /**
+   * Get Gateway Log Response
+   */
+  response(
+    gatewayId: string,
+    id: string,
+    params: LogResponseParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<unknown> {
+    const { account_id } = params;
+    return this._client.get(
+      `/accounts/${account_id}/ai-gateway/gateways/${gatewayId}/logs/${id}/response`,
+      options,
+    );
+  }
 }
 
 export class LogListResponsesV4PagePaginationArray extends V4PagePaginationArray<LogListResponse> {}
@@ -40,29 +122,93 @@ export interface LogListResponse {
 
   provider: string;
 
-  request: string;
+  success: boolean;
+
+  tokens_in: number | null;
 
-  response: string;
+  tokens_out: number | null;
+
+  cost?: number;
+
+  custom_cost?: boolean;
+
+  metadata?: string;
+
+  model_type?: string;
+
+  request_content_type?: string;
 
+  request_type?: string;
+
+  response_content_type?: string;
+
+  status_code?: number;
+
+  step?: number;
+}
+
+export interface LogDeleteResponse {
   success: boolean;
+}
 
-  tokens_in: number;
+export type LogEditResponse = unknown;
 
-  tokens_out: number;
+export interface LogGetResponse {
+  id: string;
+
+  cached: boolean;
+
+  created_at: string;
+
+  duration: number;
+
+  model: string;
+
+  path: string;
+
+  provider: string;
+
+  success: boolean;
+
+  tokens_in: number | null;
+
+  tokens_out: number | null;
+
+  cost?: number;
+
+  custom_cost?: boolean;
 
   metadata?: string;
 
+  model_type?: string;
+
   request_content_type?: string;
 
+  request_head?: string;
+
+  request_head_complete?: boolean;
+
+  request_size?: number;
+
   request_type?: string;
 
   response_content_type?: string;
 
+  response_head?: string;
+
+  response_head_complete?: boolean;
+
+  response_size?: number;
+
   status_code?: number;
 
   step?: number;
 }
 
+export type LogRequestResponse = unknown;
+
+export type LogResponseResponse = unknown;
+
 export interface LogListParams extends V4PagePaginationArrayParams {
   /**
    * Path param:
@@ -87,7 +233,102 @@ export interface LogListParams extends V4PagePaginationArrayParams {
   /**
    * Query param:
    */
-  order_by?: 'created_at' | 'provider';
+  feedback?: 0 | 1;
+
+  /**
+   * Query param:
+   */
+  filters?: Array<LogListParams.Filter>;
+
+  /**
+   * Query param:
+   */
+  max_cost?: number;
+
+  /**
+   * Query param:
+   */
+  max_duration?: number;
+
+  /**
+   * Query param:
+   */
+  max_tokens_in?: number;
+
+  /**
+   * Query param:
+   */
+  max_tokens_out?: number;
+
+  /**
+   * Query param:
+   */
+  max_total_tokens?: number;
+
+  /**
+   * Query param:
+   */
+  meta_info?: boolean;
+
+  /**
+   * Query param:
+   */
+  min_cost?: number;
+
+  /**
+   * Query param:
+   */
+  min_duration?: number;
+
+  /**
+   * Query param:
+   */
+  min_tokens_in?: number;
+
+  /**
+   * Query param:
+   */
+  min_tokens_out?: number;
+
+  /**
+   * Query param:
+   */
+  min_total_tokens?: number;
+
+  /**
+   * Query param:
+   */
+  model?: string;
+
+  /**
+   * Query param:
+   */
+  model_type?: string;
+
+  /**
+   * Query param:
+   */
+  order_by?: 'created_at' | 'provider' | 'model' | 'model_type' | 'success' | 'cached';
+
+  /**
+   * Query param:
+   */
+  order_by_direction?: 'asc' | 'desc';
+
+  /**
+   * Query param:
+   */
+  provider?: string;
+
+  /**
+   * Query param:
+   */
+  request_content_type?: string;
+
+  /**
+   * Query param:
+   */
+  response_content_type?: string;
 
   /**
    * Query param:
@@ -105,8 +346,156 @@ export interface LogListParams extends V4PagePaginationArrayParams {
   success?: boolean;
 }
 
-export namespace Logs {
-  export import LogListResponse = LogsAPI.LogListResponse;
-  export import LogListResponsesV4PagePaginationArray = LogsAPI.LogListResponsesV4PagePaginationArray;
-  export import LogListParams = LogsAPI.LogListParams;
+export namespace LogListParams {
+  export interface Filter {
+    key:
+      | 'id'
+      | 'created_at'
+      | 'request_content_type'
+      | 'response_content_type'
+      | 'success'
+      | 'cached'
+      | 'provider'
+      | 'model'
+      | 'model_type'
+      | 'cost'
+      | 'tokens'
+      | 'tokens_in'
+      | 'tokens_out'
+      | 'duration'
+      | 'feedback'
+      | 'event_id'
+      | 'request_type'
+      | 'metadata.key'
+      | 'metadata.value'
+      | 'prompts.prompt_id'
+      | 'prompts.version_id';
+
+    operator: 'eq' | 'neq' | 'contains' | 'lt' | 'gt';
+
+    value: Array<string | null | number | boolean>;
+  }
+}
+
+export interface LogDeleteParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Query param:
+   */
+  filters?: Array<LogDeleteParams.Filter>;
+
+  /**
+   * Query param:
+   */
+  limit?: number;
+
+  /**
+   * Query param:
+   */
+  order_by?:
+    | 'created_at'
+    | 'provider'
+    | 'model'
+    | 'model_type'
+    | 'success'
+    | 'cached'
+    | 'cost'
+    | 'tokens_in'
+    | 'tokens_out'
+    | 'duration'
+    | 'feedback';
+
+  /**
+   * Query param:
+   */
+  order_by_direction?: 'asc' | 'desc';
+}
+
+export namespace LogDeleteParams {
+  export interface Filter {
+    key:
+      | 'id'
+      | 'created_at'
+      | 'request_content_type'
+      | 'response_content_type'
+      | 'success'
+      | 'cached'
+      | 'provider'
+      | 'model'
+      | 'model_type'
+      | 'cost'
+      | 'tokens'
+      | 'tokens_in'
+      | 'tokens_out'
+      | 'duration'
+      | 'feedback'
+      | 'event_id'
+      | 'request_type'
+      | 'metadata.key'
+      | 'metadata.value'
+      | 'prompts.prompt_id'
+      | 'prompts.version_id';
+
+    operator: 'eq' | 'neq' | 'contains' | 'lt' | 'gt';
+
+    value: Array<string | null | number | boolean>;
+  }
+}
+
+export interface LogEditParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  feedback?: number | null;
+
+  /**
+   * Body param:
+   */
+  metadata?: Record<string, string | number | boolean> | null;
+
+  /**
+   * Body param:
+   */
+  score?: number | null;
+}
+
+export interface LogGetParams {
+  account_id: string;
+}
+
+export interface LogRequestParams {
+  account_id: string;
+}
+
+export interface LogResponseParams {
+  account_id: string;
+}
+
+Logs.LogListResponsesV4PagePaginationArray = LogListResponsesV4PagePaginationArray;
+
+export declare namespace Logs {
+  export {
+    type LogListResponse as LogListResponse,
+    type LogDeleteResponse as LogDeleteResponse,
+    type LogEditResponse as LogEditResponse,
+    type LogGetResponse as LogGetResponse,
+    type LogRequestResponse as LogRequestResponse,
+    type LogResponseResponse as LogResponseResponse,
+    LogListResponsesV4PagePaginationArray as LogListResponsesV4PagePaginationArray,
+    type LogListParams as LogListParams,
+    type LogDeleteParams as LogDeleteParams,
+    type LogEditParams as LogEditParams,
+    type LogGetParams as LogGetParams,
+    type LogRequestParams as LogRequestParams,
+    type LogResponseParams as LogResponseParams,
+  };
 }
diff --git a/src/resources/ai/ai.ts b/src/resources/ai/ai.ts
new file mode 100644
index 0000000000..5688651c05
--- /dev/null
+++ b/src/resources/ai/ai.ts
@@ -0,0 +1,812 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import * as AuthorsAPI from './authors';
+import { AuthorListParams, AuthorListResponse, AuthorListResponsesSinglePage, Authors } from './authors';
+import * as TasksAPI from './tasks';
+import { TaskListParams, TaskListResponse, TaskListResponsesSinglePage, Tasks } from './tasks';
+import * as FinetunesAPI from './finetunes/finetunes';
+import {
+  FinetuneCreateParams,
+  FinetuneCreateResponse,
+  FinetuneListParams,
+  FinetuneListResponse,
+  Finetunes,
+} from './finetunes/finetunes';
+import * as ModelsAPI from './models/models';
+import {
+  ModelListParams,
+  ModelListResponse,
+  ModelListResponsesV4PagePaginationArray,
+  Models,
+} from './models/models';
+
+export class AI extends APIResource {
+  finetunes: FinetunesAPI.Finetunes = new FinetunesAPI.Finetunes(this._client);
+  authors: AuthorsAPI.Authors = new AuthorsAPI.Authors(this._client);
+  tasks: TasksAPI.Tasks = new TasksAPI.Tasks(this._client);
+  models: ModelsAPI.Models = new ModelsAPI.Models(this._client);
+
+  /**
+   * This endpoint provides users with the capability to run specific AI models
+   * on-demand.
+   *
+   * By submitting the required input data, users can receive real-time predictions
+   * or results generated by the chosen AI model. The endpoint supports various AI
+   * model types, ensuring flexibility and adaptability for diverse use cases.
+   *
+   * Model specific inputs available in
+   * [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
+   */
+  run(modelName: string, params: AIRunParams, options?: Core.RequestOptions): Core.APIPromise<AIRunResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/ai/run/${modelName}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: AIRunResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+/**
+ * An array of classification results for the input text
+ */
+export type AIRunResponse =
+  | Array<AIRunResponse.TextClassification>
+  | Core.Uploadable
+  | AIRunResponse.Audio
+  | AIRunResponse.TextEmbeddings
+  | AIRunResponse.AutomaticSpeechRecognition
+  | Array<AIRunResponse.ImageClassification>
+  | Array<AIRunResponse.ObjectDetection>
+  | AIRunResponse.UnionMember7
+  | AIRunResponse.Translation
+  | AIRunResponse.Summarization
+  | AIRunResponse.ImageToText;
+
+export namespace AIRunResponse {
+  export interface TextClassification {
+    /**
+     * The classification label assigned to the text (e.g., 'POSITIVE' or 'NEGATIVE')
+     */
+    label?: string;
+
+    /**
+     * Confidence score indicating the likelihood that the text belongs to the
+     * specified label
+     */
+    score?: number;
+  }
+
+  export interface Audio {
+    /**
+     * The generated audio in MP3 format, base64-encoded
+     */
+    audio?: string;
+  }
+
+  export interface TextEmbeddings {
+    /**
+     * Embeddings of the requested text values
+     */
+    data?: Array<Array<number>>;
+
+    shape?: Array<number>;
+  }
+
+  export interface AutomaticSpeechRecognition {
+    /**
+     * The transcription
+     */
+    text: string;
+
+    vtt?: string;
+
+    word_count?: number;
+
+    words?: Array<AutomaticSpeechRecognition.Word>;
+  }
+
+  export namespace AutomaticSpeechRecognition {
+    export interface Word {
+      /**
+       * The ending second when the word completes
+       */
+      end?: number;
+
+      /**
+       * The second this word begins in the recording
+       */
+      start?: number;
+
+      word?: string;
+    }
+  }
+
+  export interface ImageClassification {
+    /**
+     * The predicted category or class for the input image based on analysis
+     */
+    label?: string;
+
+    /**
+     * A confidence value, between 0 and 1, indicating how certain the model is about
+     * the predicted label
+     */
+    score?: number;
+  }
+
+  export interface ObjectDetection {
+    /**
+     * Coordinates defining the bounding box around the detected object
+     */
+    box?: ObjectDetection.Box;
+
+    /**
+     * The class label or name of the detected object
+     */
+    label?: string;
+
+    /**
+     * Confidence score indicating the likelihood that the detection is correct
+     */
+    score?: number;
+  }
+
+  export namespace ObjectDetection {
+    /**
+     * Coordinates defining the bounding box around the detected object
+     */
+    export interface Box {
+      /**
+       * The x-coordinate of the bottom-right corner of the bounding box
+       */
+      xmax?: number;
+
+      /**
+       * The x-coordinate of the top-left corner of the bounding box
+       */
+      xmin?: number;
+
+      /**
+       * The y-coordinate of the bottom-right corner of the bounding box
+       */
+      ymax?: number;
+
+      /**
+       * The y-coordinate of the top-left corner of the bounding box
+       */
+      ymin?: number;
+    }
+  }
+
+  export interface UnionMember7 {
+    /**
+     * The generated text response from the model
+     */
+    response?: string;
+
+    /**
+     * An array of tool calls requests made during the response generation
+     */
+    tool_calls?: Array<UnionMember7.ToolCall>;
+  }
+
+  export namespace UnionMember7 {
+    export interface ToolCall {
+      /**
+       * The arguments passed to be passed to the tool call request
+       */
+      arguments?: unknown;
+
+      /**
+       * The name of the tool to be called
+       */
+      name?: string;
+    }
+  }
+
+  export interface Translation {
+    /**
+     * The translated text in the target language
+     */
+    translated_text?: string;
+  }
+
+  export interface Summarization {
+    /**
+     * The summarized version of the input text
+     */
+    summary?: string;
+  }
+
+  export interface ImageToText {
+    description?: string;
+  }
+}
+
+export type AIRunParams =
+  | AIRunParams.TextClassification
+  | AIRunParams.TextToImage
+  | AIRunParams.TextToSpeech
+  | AIRunParams.TextEmbeddings
+  | AIRunParams.AutomaticSpeechRecognition
+  | AIRunParams.ImageClassification
+  | AIRunParams.ObjectDetection
+  | AIRunParams.Prompt
+  | AIRunParams.Messages
+  | AIRunParams.Translation
+  | AIRunParams.Summarization
+  | AIRunParams.ImageToText;
+
+export declare namespace AIRunParams {
+  export interface TextClassification {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: The text that you want to classify
+     */
+    text: string;
+  }
+
+  export interface TextToImage {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: A text description of the image you want to generate
+     */
+    prompt: string;
+
+    /**
+     * Body param: Controls how closely the generated image should adhere to the
+     * prompt; higher values make the image more aligned with the prompt
+     */
+    guidance?: number;
+
+    /**
+     * Body param: The height of the generated image in pixels
+     */
+    height?: number;
+
+    /**
+     * Body param: For use with img2img tasks. An array of integers that represent the
+     * image data constrained to 8-bit unsigned integer values
+     */
+    image?: Array<number>;
+
+    /**
+     * Body param: For use with img2img tasks. A base64-encoded string of the input
+     * image
+     */
+    image_b64?: string;
+
+    /**
+     * Body param: An array representing An array of integers that represent mask image
+     * data for inpainting constrained to 8-bit unsigned integer values
+     */
+    mask?: Array<number>;
+
+    /**
+     * Body param: Text describing elements to avoid in the generated image
+     */
+    negative_prompt?: string;
+
+    /**
+     * Body param: The number of diffusion steps; higher values can improve quality but
+     * take longer
+     */
+    num_steps?: number;
+
+    /**
+     * Body param: Random seed for reproducibility of the image generation
+     */
+    seed?: number;
+
+    /**
+     * Body param: A value between 0 and 1 indicating how strongly to apply the
+     * transformation during img2img tasks; lower values make the output closer to the
+     * input image
+     */
+    strength?: number;
+
+    /**
+     * Body param: The width of the generated image in pixels
+     */
+    width?: number;
+  }
+
+  export interface TextToSpeech {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: A text description of the image you want to generate
+     */
+    prompt: string;
+
+    /**
+     * Body param: The speech language (e.g., 'en' for English, 'fr' for French).
+     * Defaults to 'en' if not specified
+     */
+    lang?: string;
+  }
+
+  export interface TextEmbeddings {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: The text to embed
+     */
+    text: string | Array<string>;
+  }
+
+  export interface AutomaticSpeechRecognition {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: An array of integers that represent the audio data constrained to
+     * 8-bit unsigned integer values
+     */
+    audio: Array<number>;
+
+    /**
+     * Body param: The language of the recorded audio
+     */
+    source_lang?: string;
+
+    /**
+     * Body param: The language to translate the transcription into. Currently only
+     * English is supported.
+     */
+    target_lang?: string;
+  }
+
+  export interface ImageClassification {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: An array of integers that represent the image data constrained to
+     * 8-bit unsigned integer values
+     */
+    image: Array<number>;
+  }
+
+  export interface ObjectDetection {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: An array of integers that represent the image data constrained to
+     * 8-bit unsigned integer values
+     */
+    image?: Array<number>;
+  }
+
+  export interface Prompt {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: The input text prompt for the model to generate a response.
+     */
+    prompt: string;
+
+    /**
+     * Body param: Decreases the likelihood of the model repeating the same lines
+     * verbatim.
+     */
+    frequency_penalty?: number;
+
+    /**
+     * Body param: Name of the LoRA (Low-Rank Adaptation) model to fine-tune the base
+     * model.
+     */
+    lora?: string;
+
+    /**
+     * Body param: The maximum number of tokens to generate in the response.
+     */
+    max_tokens?: number;
+
+    /**
+     * Body param: Increases the likelihood of the model introducing new topics.
+     */
+    presence_penalty?: number;
+
+    /**
+     * Body param: If true, a chat template is not applied and you must adhere to the
+     * specific model's expected formatting.
+     */
+    raw?: boolean;
+
+    /**
+     * Body param: Penalty for repeated tokens; higher values discourage repetition.
+     */
+    repetition_penalty?: number;
+
+    /**
+     * Body param: Random seed for reproducibility of the generation.
+     */
+    seed?: number;
+
+    /**
+     * Body param: If true, the response will be streamed back incrementally using SSE,
+     * Server Sent Events.
+     */
+    stream?: boolean;
+
+    /**
+     * Body param: Controls the randomness of the output; higher values produce more
+     * random results.
+     */
+    temperature?: number;
+
+    /**
+     * Body param: Limits the AI to choose from the top 'k' most probable words. Lower
+     * values make responses more focused; higher values introduce more variety and
+     * potential surprises.
+     */
+    top_k?: number;
+
+    /**
+     * Body param: Adjusts the creativity of the AI's responses by controlling how many
+     * possible words it considers. Lower values make outputs more predictable; higher
+     * values allow for more varied and creative responses.
+     */
+    top_p?: number;
+  }
+
+  export interface Messages {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: An array of message objects representing the conversation history.
+     */
+    messages: Array<AIRunParams.Messages.Message>;
+
+    /**
+     * Body param: Decreases the likelihood of the model repeating the same lines
+     * verbatim.
+     */
+    frequency_penalty?: number;
+
+    /**
+     * Body param:
+     */
+    functions?: Array<AIRunParams.Messages.Function>;
+
+    /**
+     * Body param: The maximum number of tokens to generate in the response.
+     */
+    max_tokens?: number;
+
+    /**
+     * Body param: Increases the likelihood of the model introducing new topics.
+     */
+    presence_penalty?: number;
+
+    /**
+     * Body param: Penalty for repeated tokens; higher values discourage repetition.
+     */
+    repetition_penalty?: number;
+
+    /**
+     * Body param: Random seed for reproducibility of the generation.
+     */
+    seed?: number;
+
+    /**
+     * Body param: If true, the response will be streamed back incrementally.
+     */
+    stream?: boolean;
+
+    /**
+     * Body param: Controls the randomness of the output; higher values produce more
+     * random results.
+     */
+    temperature?: number;
+
+    /**
+     * Body param: A list of tools available for the assistant to use.
+     */
+    tools?: Array<AIRunParams.Messages.UnionMember0 | AIRunParams.Messages.UnionMember1>;
+
+    /**
+     * Body param: Limits the AI to choose from the top 'k' most probable words. Lower
+     * values make responses more focused; higher values introduce more variety and
+     * potential surprises.
+     */
+    top_k?: number;
+
+    /**
+     * Body param: Controls the creativity of the AI's responses by adjusting how many
+     * possible words it considers. Lower values make outputs more predictable; higher
+     * values allow for more varied and creative responses.
+     */
+    top_p?: number;
+  }
+
+  export namespace Messages {
+    export interface Message {
+      /**
+       * The content of the message as a string.
+       */
+      content: string;
+
+      /**
+       * The role of the message sender (e.g., 'user', 'assistant', 'system', 'tool').
+       */
+      role: string;
+    }
+
+    export interface Function {
+      code: string;
+
+      name: string;
+    }
+
+    export interface UnionMember0 {
+      /**
+       * A brief description of what the tool does.
+       */
+      description: string;
+
+      /**
+       * The name of the tool. More descriptive the better.
+       */
+      name: string;
+
+      /**
+       * Schema defining the parameters accepted by the tool.
+       */
+      parameters: UnionMember0.Parameters;
+    }
+
+    export namespace UnionMember0 {
+      /**
+       * Schema defining the parameters accepted by the tool.
+       */
+      export interface Parameters {
+        /**
+         * Definitions of each parameter.
+         */
+        properties: Record<string, Parameters.Properties>;
+
+        /**
+         * The type of the parameters object (usually 'object').
+         */
+        type: string;
+
+        /**
+         * List of required parameter names.
+         */
+        required?: Array<string>;
+      }
+
+      export namespace Parameters {
+        export interface Properties {
+          /**
+           * A description of the expected parameter.
+           */
+          description: string;
+
+          /**
+           * The data type of the parameter.
+           */
+          type: string;
+        }
+      }
+    }
+
+    export interface UnionMember1 {
+      /**
+       * Details of the function tool.
+       */
+      function: UnionMember1.Function;
+
+      /**
+       * Specifies the type of tool (e.g., 'function').
+       */
+      type: string;
+    }
+
+    export namespace UnionMember1 {
+      /**
+       * Details of the function tool.
+       */
+      export interface Function {
+        /**
+         * A brief description of what the function does.
+         */
+        description: string;
+
+        /**
+         * The name of the function.
+         */
+        name: string;
+
+        /**
+         * Schema defining the parameters accepted by the function.
+         */
+        parameters: Function.Parameters;
+      }
+
+      export namespace Function {
+        /**
+         * Schema defining the parameters accepted by the function.
+         */
+        export interface Parameters {
+          /**
+           * Definitions of each parameter.
+           */
+          properties: Record<string, Parameters.Properties>;
+
+          /**
+           * The type of the parameters object (usually 'object').
+           */
+          type: string;
+
+          /**
+           * List of required parameter names.
+           */
+          required?: Array<string>;
+        }
+
+        export namespace Parameters {
+          export interface Properties {
+            /**
+             * A description of the expected parameter.
+             */
+            description: string;
+
+            /**
+             * The data type of the parameter.
+             */
+            type: string;
+          }
+        }
+      }
+    }
+  }
+
+  export interface Translation {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: The language code to translate the text into (e.g., 'es' for
+     * Spanish)
+     */
+    target_lang: string;
+
+    /**
+     * Body param: The text to be translated
+     */
+    text: string;
+
+    /**
+     * Body param: The language code of the source text (e.g., 'en' for English).
+     * Defaults to 'en' if not specified
+     */
+    source_lang?: string;
+  }
+
+  export interface Summarization {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: The text that you want the model to summarize
+     */
+    input_text: string;
+
+    /**
+     * Body param: The maximum length of the generated summary in tokens
+     */
+    max_length?: number;
+  }
+
+  export interface ImageToText {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param: An array of integers that represent the image data constrained to
+     * 8-bit unsigned integer values
+     */
+    image: Array<number>;
+
+    /**
+     * Body param: The maximum number of tokens to generate in the response.
+     */
+    max_tokens?: number;
+
+    /**
+     * Body param: The input text prompt for the model to generate a response.
+     */
+    prompt?: string;
+
+    /**
+     * Body param: If true, a chat template is not applied and you must adhere to the
+     * specific model's expected formatting.
+     */
+    raw?: boolean;
+
+    /**
+     * Body param: Controls the randomness of the output; higher values produce more
+     * random results.
+     */
+    temperature?: number;
+  }
+}
+
+AI.Finetunes = Finetunes;
+AI.Authors = Authors;
+AI.AuthorListResponsesSinglePage = AuthorListResponsesSinglePage;
+AI.Tasks = Tasks;
+AI.TaskListResponsesSinglePage = TaskListResponsesSinglePage;
+AI.Models = Models;
+AI.ModelListResponsesV4PagePaginationArray = ModelListResponsesV4PagePaginationArray;
+
+export declare namespace AI {
+  export {
+    Finetunes as Finetunes,
+    type FinetuneCreateResponse as FinetuneCreateResponse,
+    type FinetuneListResponse as FinetuneListResponse,
+    type FinetuneCreateParams as FinetuneCreateParams,
+    type FinetuneListParams as FinetuneListParams,
+  };
+
+  export {
+    Authors as Authors,
+    type AuthorListResponse as AuthorListResponse,
+    AuthorListResponsesSinglePage as AuthorListResponsesSinglePage,
+    type AuthorListParams as AuthorListParams,
+  };
+
+  export {
+    Tasks as Tasks,
+    type TaskListResponse as TaskListResponse,
+    TaskListResponsesSinglePage as TaskListResponsesSinglePage,
+    type TaskListParams as TaskListParams,
+  };
+
+  export {
+    Models as Models,
+    type ModelListResponse as ModelListResponse,
+    ModelListResponsesV4PagePaginationArray as ModelListResponsesV4PagePaginationArray,
+    type ModelListParams as ModelListParams,
+  };
+}
diff --git a/src/resources/ai/authors.ts b/src/resources/ai/authors.ts
new file mode 100644
index 0000000000..4b672ce143
--- /dev/null
+++ b/src/resources/ai/authors.ts
@@ -0,0 +1,40 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { SinglePage } from '../../pagination';
+
+export class Authors extends APIResource {
+  /**
+   * Author Search
+   */
+  list(
+    params: AuthorListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<AuthorListResponsesSinglePage, AuthorListResponse> {
+    const { account_id } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/ai/authors/search`,
+      AuthorListResponsesSinglePage,
+      options,
+    );
+  }
+}
+
+export class AuthorListResponsesSinglePage extends SinglePage<AuthorListResponse> {}
+
+export type AuthorListResponse = unknown;
+
+export interface AuthorListParams {
+  account_id: string;
+}
+
+Authors.AuthorListResponsesSinglePage = AuthorListResponsesSinglePage;
+
+export declare namespace Authors {
+  export {
+    type AuthorListResponse as AuthorListResponse,
+    AuthorListResponsesSinglePage as AuthorListResponsesSinglePage,
+    type AuthorListParams as AuthorListParams,
+  };
+}
diff --git a/src/resources/ai/finetunes/assets.ts b/src/resources/ai/finetunes/assets.ts
new file mode 100644
index 0000000000..ec1feaaefd
--- /dev/null
+++ b/src/resources/ai/finetunes/assets.ts
@@ -0,0 +1,58 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Assets extends APIResource {
+  /**
+   * Upload a Finetune Asset
+   */
+  create(
+    finetuneId: string,
+    params: AssetCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AssetCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(
+        `/accounts/${account_id}/ai/finetunes/${finetuneId}/finetune-assets`,
+        Core.multipartFormRequestOptions({ body, ...options }),
+      ) as Core.APIPromise<{ result: AssetCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface AssetCreateResponse {
+  id: string;
+
+  bucket_name: string;
+
+  created_at: string;
+
+  file_name: string;
+
+  finetune_id: string;
+
+  modified_at: string;
+}
+
+export interface AssetCreateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  file?: Core.Uploadable;
+
+  /**
+   * Body param:
+   */
+  file_name?: string;
+}
+
+export declare namespace Assets {
+  export { type AssetCreateResponse as AssetCreateResponse, type AssetCreateParams as AssetCreateParams };
+}
diff --git a/src/resources/ai/finetunes/finetunes.ts b/src/resources/ai/finetunes/finetunes.ts
new file mode 100644
index 0000000000..a32d999063
--- /dev/null
+++ b/src/resources/ai/finetunes/finetunes.ts
@@ -0,0 +1,127 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as AssetsAPI from './assets';
+import { AssetCreateParams, AssetCreateResponse, Assets } from './assets';
+import * as PublicAPI from './public';
+import { Public, PublicListParams, PublicListResponse, PublicListResponsesSinglePage } from './public';
+
+export class Finetunes extends APIResource {
+  assets: AssetsAPI.Assets = new AssetsAPI.Assets(this._client);
+  public: PublicAPI.Public = new PublicAPI.Public(this._client);
+
+  /**
+   * Create a new Finetune
+   */
+  create(
+    params: FinetuneCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FinetuneCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/ai/finetunes`, { body, ...options }) as Core.APIPromise<{
+        result: FinetuneCreateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List Finetunes
+   */
+  list(params: FinetuneListParams, options?: Core.RequestOptions): Core.APIPromise<FinetuneListResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/ai/finetunes`, options) as Core.APIPromise<{
+        result: FinetuneListResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface FinetuneCreateResponse {
+  id: string;
+
+  created_at: string;
+
+  model: string;
+
+  modified_at: string;
+
+  name: string;
+
+  public: boolean;
+
+  description?: string;
+}
+
+export interface FinetuneListResponse {
+  id: string;
+
+  created_at: string;
+
+  model: string;
+
+  modified_at: string;
+
+  name: string;
+
+  description?: string;
+}
+
+export interface FinetuneCreateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  model: string;
+
+  /**
+   * Body param:
+   */
+  name: string;
+
+  /**
+   * Body param:
+   */
+  description?: string;
+
+  /**
+   * Body param:
+   */
+  public?: boolean;
+}
+
+export interface FinetuneListParams {
+  account_id: string;
+}
+
+Finetunes.Assets = Assets;
+Finetunes.Public = Public;
+Finetunes.PublicListResponsesSinglePage = PublicListResponsesSinglePage;
+
+export declare namespace Finetunes {
+  export {
+    type FinetuneCreateResponse as FinetuneCreateResponse,
+    type FinetuneListResponse as FinetuneListResponse,
+    type FinetuneCreateParams as FinetuneCreateParams,
+    type FinetuneListParams as FinetuneListParams,
+  };
+
+  export {
+    Assets as Assets,
+    type AssetCreateResponse as AssetCreateResponse,
+    type AssetCreateParams as AssetCreateParams,
+  };
+
+  export {
+    Public as Public,
+    type PublicListResponse as PublicListResponse,
+    PublicListResponsesSinglePage as PublicListResponsesSinglePage,
+    type PublicListParams as PublicListParams,
+  };
+}
diff --git a/src/resources/ai/finetunes/index.ts b/src/resources/ai/finetunes/index.ts
new file mode 100644
index 0000000000..b1afe5dee7
--- /dev/null
+++ b/src/resources/ai/finetunes/index.ts
@@ -0,0 +1,16 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Assets, type AssetCreateResponse, type AssetCreateParams } from './assets';
+export {
+  Finetunes,
+  type FinetuneCreateResponse,
+  type FinetuneListResponse,
+  type FinetuneCreateParams,
+  type FinetuneListParams,
+} from './finetunes';
+export {
+  PublicListResponsesSinglePage,
+  Public,
+  type PublicListResponse,
+  type PublicListParams,
+} from './public';
diff --git a/src/resources/ai/finetunes/public.ts b/src/resources/ai/finetunes/public.ts
new file mode 100644
index 0000000000..8494bc7eb4
--- /dev/null
+++ b/src/resources/ai/finetunes/public.ts
@@ -0,0 +1,72 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { SinglePage } from '../../../pagination';
+
+export class Public extends APIResource {
+  /**
+   * List Public Finetunes
+   */
+  list(
+    params: PublicListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<PublicListResponsesSinglePage, PublicListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/ai/finetunes/public`,
+      PublicListResponsesSinglePage,
+      { query, ...options },
+    );
+  }
+}
+
+export class PublicListResponsesSinglePage extends SinglePage<PublicListResponse> {}
+
+export interface PublicListResponse {
+  id: string;
+
+  created_at: string;
+
+  model: string;
+
+  modified_at: string;
+
+  name: string;
+
+  public: boolean;
+
+  description?: string;
+}
+
+export interface PublicListParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Query param: Pagination Limit
+   */
+  limit?: number;
+
+  /**
+   * Query param: Pagination Offset
+   */
+  offset?: number;
+
+  /**
+   * Query param: Order By Column Name
+   */
+  orderBy?: string;
+}
+
+Public.PublicListResponsesSinglePage = PublicListResponsesSinglePage;
+
+export declare namespace Public {
+  export {
+    type PublicListResponse as PublicListResponse,
+    PublicListResponsesSinglePage as PublicListResponsesSinglePage,
+    type PublicListParams as PublicListParams,
+  };
+}
diff --git a/src/resources/ai/index.ts b/src/resources/ai/index.ts
new file mode 100644
index 0000000000..d75349a3a3
--- /dev/null
+++ b/src/resources/ai/index.ts
@@ -0,0 +1,23 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { AI } from './ai';
+export {
+  AuthorListResponsesSinglePage,
+  Authors,
+  type AuthorListResponse,
+  type AuthorListParams,
+} from './authors';
+export {
+  Finetunes,
+  type FinetuneCreateResponse,
+  type FinetuneListResponse,
+  type FinetuneCreateParams,
+  type FinetuneListParams,
+} from './finetunes/index';
+export {
+  ModelListResponsesV4PagePaginationArray,
+  Models,
+  type ModelListResponse,
+  type ModelListParams,
+} from './models/index';
+export { TaskListResponsesSinglePage, Tasks, type TaskListResponse, type TaskListParams } from './tasks';
diff --git a/src/resources/ai/models/index.ts b/src/resources/ai/models/index.ts
new file mode 100644
index 0000000000..4d7a7597b2
--- /dev/null
+++ b/src/resources/ai/models/index.ts
@@ -0,0 +1,9 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  ModelListResponsesV4PagePaginationArray,
+  Models,
+  type ModelListResponse,
+  type ModelListParams,
+} from './models';
+export { Schema, type SchemaGetResponse, type SchemaGetParams } from './schema';
diff --git a/src/resources/ai/models/models.ts b/src/resources/ai/models/models.ts
new file mode 100644
index 0000000000..3a80c39394
--- /dev/null
+++ b/src/resources/ai/models/models.ts
@@ -0,0 +1,79 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as SchemaAPI from './schema';
+import { Schema, SchemaGetParams, SchemaGetResponse } from './schema';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
+
+export class Models extends APIResource {
+  schema: SchemaAPI.Schema = new SchemaAPI.Schema(this._client);
+
+  /**
+   * Model Search
+   */
+  list(
+    params: ModelListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<ModelListResponsesV4PagePaginationArray, ModelListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/ai/models/search`,
+      ModelListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+}
+
+export class ModelListResponsesV4PagePaginationArray extends V4PagePaginationArray<ModelListResponse> {}
+
+export type ModelListResponse = unknown;
+
+export interface ModelListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Query param: Filter by Author
+   */
+  author?: string;
+
+  /**
+   * Query param: Filter to hide experimental models
+   */
+  hide_experimental?: boolean;
+
+  /**
+   * Query param: Search
+   */
+  search?: string;
+
+  /**
+   * Query param: Filter by Source Id
+   */
+  source?: number;
+
+  /**
+   * Query param: Filter by Task Name
+   */
+  task?: string;
+}
+
+Models.ModelListResponsesV4PagePaginationArray = ModelListResponsesV4PagePaginationArray;
+Models.Schema = Schema;
+
+export declare namespace Models {
+  export {
+    type ModelListResponse as ModelListResponse,
+    ModelListResponsesV4PagePaginationArray as ModelListResponsesV4PagePaginationArray,
+    type ModelListParams as ModelListParams,
+  };
+
+  export {
+    Schema as Schema,
+    type SchemaGetResponse as SchemaGetResponse,
+    type SchemaGetParams as SchemaGetParams,
+  };
+}
diff --git a/src/resources/workers/ai/models/schema.ts b/src/resources/ai/models/schema.ts
similarity index 71%
rename from src/resources/workers/ai/models/schema.ts
rename to src/resources/ai/models/schema.ts
index b306a1e188..1864a8ba7d 100644
--- a/src/resources/workers/ai/models/schema.ts
+++ b/src/resources/ai/models/schema.ts
@@ -1,8 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../../resource';
-import * as Core from '../../../../core';
-import * as SchemaAPI from './schema';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
 
 export class Schema extends APIResource {
   /**
@@ -32,7 +31,6 @@ export interface SchemaGetParams {
   model: string;
 }
 
-export namespace Schema {
-  export import SchemaGetResponse = SchemaAPI.SchemaGetResponse;
-  export import SchemaGetParams = SchemaAPI.SchemaGetParams;
+export declare namespace Schema {
+  export { type SchemaGetResponse as SchemaGetResponse, type SchemaGetParams as SchemaGetParams };
 }
diff --git a/src/resources/ai/tasks.ts b/src/resources/ai/tasks.ts
new file mode 100644
index 0000000000..5e830da4d9
--- /dev/null
+++ b/src/resources/ai/tasks.ts
@@ -0,0 +1,40 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { SinglePage } from '../../pagination';
+
+export class Tasks extends APIResource {
+  /**
+   * Task Search
+   */
+  list(
+    params: TaskListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<TaskListResponsesSinglePage, TaskListResponse> {
+    const { account_id } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/ai/tasks/search`,
+      TaskListResponsesSinglePage,
+      options,
+    );
+  }
+}
+
+export class TaskListResponsesSinglePage extends SinglePage<TaskListResponse> {}
+
+export type TaskListResponse = unknown;
+
+export interface TaskListParams {
+  account_id: string;
+}
+
+Tasks.TaskListResponsesSinglePage = TaskListResponsesSinglePage;
+
+export declare namespace Tasks {
+  export {
+    type TaskListResponse as TaskListResponse,
+    TaskListResponsesSinglePage as TaskListResponsesSinglePage,
+    type TaskListParams as TaskListParams,
+  };
+}
diff --git a/src/resources/alerting/alerting.ts b/src/resources/alerting/alerting.ts
index 031e5284d9..6f955cbcb8 100644
--- a/src/resources/alerting/alerting.ts
+++ b/src/resources/alerting/alerting.ts
@@ -2,9 +2,27 @@
 
 import { APIResource } from '../../resource';
 import * as AvailableAlertsAPI from './available-alerts';
+import { AvailableAlertListParams, AvailableAlertListResponse, AvailableAlerts } from './available-alerts';
 import * as HistoryAPI from './history';
+import { HistoriesV4PagePaginationArray, History, HistoryListParams, HistoryResource } from './history';
 import * as PoliciesAPI from './policies';
+import {
+  Mechanism,
+  Policies,
+  PoliciesSinglePage,
+  Policy,
+  PolicyCreateParams,
+  PolicyCreateResponse,
+  PolicyDeleteParams,
+  PolicyDeleteResponse,
+  PolicyFilter,
+  PolicyGetParams,
+  PolicyListParams,
+  PolicyUpdateParams,
+  PolicyUpdateResponse,
+} from './policies';
 import * as DestinationsAPI from './destinations/destinations';
+import { Destinations } from './destinations/destinations';
 
 export class Alerting extends APIResource {
   availableAlerts: AvailableAlertsAPI.AvailableAlerts = new AvailableAlertsAPI.AvailableAlerts(this._client);
@@ -13,26 +31,42 @@ export class Alerting extends APIResource {
   policies: PoliciesAPI.Policies = new PoliciesAPI.Policies(this._client);
 }
 
-export namespace Alerting {
-  export import AvailableAlerts = AvailableAlertsAPI.AvailableAlerts;
-  export import AvailableAlertListResponse = AvailableAlertsAPI.AvailableAlertListResponse;
-  export import AvailableAlertListParams = AvailableAlertsAPI.AvailableAlertListParams;
-  export import Destinations = DestinationsAPI.Destinations;
-  export import HistoryResource = HistoryAPI.HistoryResource;
-  export import History = HistoryAPI.History;
-  export import HistoriesV4PagePaginationArray = HistoryAPI.HistoriesV4PagePaginationArray;
-  export import HistoryListParams = HistoryAPI.HistoryListParams;
-  export import Policies = PoliciesAPI.Policies;
-  export import Mechanism = PoliciesAPI.Mechanism;
-  export import Policy = PoliciesAPI.Policy;
-  export import PolicyFilter = PoliciesAPI.PolicyFilter;
-  export import PolicyCreateResponse = PoliciesAPI.PolicyCreateResponse;
-  export import PolicyUpdateResponse = PoliciesAPI.PolicyUpdateResponse;
-  export import PolicyDeleteResponse = PoliciesAPI.PolicyDeleteResponse;
-  export import PoliciesSinglePage = PoliciesAPI.PoliciesSinglePage;
-  export import PolicyCreateParams = PoliciesAPI.PolicyCreateParams;
-  export import PolicyUpdateParams = PoliciesAPI.PolicyUpdateParams;
-  export import PolicyListParams = PoliciesAPI.PolicyListParams;
-  export import PolicyDeleteParams = PoliciesAPI.PolicyDeleteParams;
-  export import PolicyGetParams = PoliciesAPI.PolicyGetParams;
+Alerting.AvailableAlerts = AvailableAlerts;
+Alerting.Destinations = Destinations;
+Alerting.HistoryResource = HistoryResource;
+Alerting.HistoriesV4PagePaginationArray = HistoriesV4PagePaginationArray;
+Alerting.Policies = Policies;
+Alerting.PoliciesSinglePage = PoliciesSinglePage;
+
+export declare namespace Alerting {
+  export {
+    AvailableAlerts as AvailableAlerts,
+    type AvailableAlertListResponse as AvailableAlertListResponse,
+    type AvailableAlertListParams as AvailableAlertListParams,
+  };
+
+  export { Destinations as Destinations };
+
+  export {
+    HistoryResource as HistoryResource,
+    type History as History,
+    HistoriesV4PagePaginationArray as HistoriesV4PagePaginationArray,
+    type HistoryListParams as HistoryListParams,
+  };
+
+  export {
+    Policies as Policies,
+    type Mechanism as Mechanism,
+    type Policy as Policy,
+    type PolicyFilter as PolicyFilter,
+    type PolicyCreateResponse as PolicyCreateResponse,
+    type PolicyUpdateResponse as PolicyUpdateResponse,
+    type PolicyDeleteResponse as PolicyDeleteResponse,
+    PoliciesSinglePage as PoliciesSinglePage,
+    type PolicyCreateParams as PolicyCreateParams,
+    type PolicyUpdateParams as PolicyUpdateParams,
+    type PolicyListParams as PolicyListParams,
+    type PolicyDeleteParams as PolicyDeleteParams,
+    type PolicyGetParams as PolicyGetParams,
+  };
 }
diff --git a/src/resources/alerting/available-alerts.ts b/src/resources/alerting/available-alerts.ts
index ca58406b88..acd3a3261e 100644
--- a/src/resources/alerting/available-alerts.ts
+++ b/src/resources/alerting/available-alerts.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as AvailableAlertsAPI from './available-alerts';
 
 export class AvailableAlerts extends APIResource {
   /**
@@ -21,13 +20,10 @@ export class AvailableAlerts extends APIResource {
   }
 }
 
-export type AvailableAlertListResponse = Record<
-  string,
-  Array<AvailableAlertListResponse.UnnamedSchemaWithMapParent1>
->;
+export type AvailableAlertListResponse = Record<string, Array<AvailableAlertListResponse.Item>>;
 
 export namespace AvailableAlertListResponse {
-  export interface UnnamedSchemaWithMapParent1 {
+  export interface Item {
     /**
      * Describes the alert type.
      */
@@ -58,7 +54,9 @@ export interface AvailableAlertListParams {
   account_id: string;
 }
 
-export namespace AvailableAlerts {
-  export import AvailableAlertListResponse = AvailableAlertsAPI.AvailableAlertListResponse;
-  export import AvailableAlertListParams = AvailableAlertsAPI.AvailableAlertListParams;
+export declare namespace AvailableAlerts {
+  export {
+    type AvailableAlertListResponse as AvailableAlertListResponse,
+    type AvailableAlertListParams as AvailableAlertListParams,
+  };
 }
diff --git a/src/resources/alerting/destinations/destinations.ts b/src/resources/alerting/destinations/destinations.ts
index ed7e2c8144..cc1fd9b34c 100644
--- a/src/resources/alerting/destinations/destinations.ts
+++ b/src/resources/alerting/destinations/destinations.ts
@@ -2,8 +2,33 @@
 
 import { APIResource } from '../../../resource';
 import * as EligibleAPI from './eligible';
+import { Eligible, EligibleGetParams, EligibleGetResponse } from './eligible';
 import * as PagerdutyAPI from './pagerduty';
+import {
+  Pagerduty,
+  PagerdutyCreateParams,
+  PagerdutyCreateResponse,
+  PagerdutyDeleteParams,
+  PagerdutyDeleteResponse,
+  PagerdutyGetParams,
+  PagerdutyGetResponse,
+  PagerdutyLinkParams,
+  PagerdutyLinkResponse,
+  PagerdutyResource,
+} from './pagerduty';
 import * as WebhooksAPI from './webhooks';
+import {
+  WebhookCreateParams,
+  WebhookCreateResponse,
+  WebhookDeleteParams,
+  WebhookDeleteResponse,
+  WebhookGetParams,
+  WebhookListParams,
+  WebhookUpdateParams,
+  WebhookUpdateResponse,
+  Webhooks,
+  WebhooksSinglePage,
+} from './webhooks';
 
 export class Destinations extends APIResource {
   eligible: EligibleAPI.Eligible = new EligibleAPI.Eligible(this._client);
@@ -11,28 +36,40 @@ export class Destinations extends APIResource {
   webhooks: WebhooksAPI.Webhooks = new WebhooksAPI.Webhooks(this._client);
 }
 
-export namespace Destinations {
-  export import Eligible = EligibleAPI.Eligible;
-  export import EligibleGetResponse = EligibleAPI.EligibleGetResponse;
-  export import EligibleGetParams = EligibleAPI.EligibleGetParams;
-  export import PagerdutyResource = PagerdutyAPI.PagerdutyResource;
-  export import Pagerduty = PagerdutyAPI.Pagerduty;
-  export import PagerdutyCreateResponse = PagerdutyAPI.PagerdutyCreateResponse;
-  export import PagerdutyDeleteResponse = PagerdutyAPI.PagerdutyDeleteResponse;
-  export import PagerdutyGetResponse = PagerdutyAPI.PagerdutyGetResponse;
-  export import PagerdutyLinkResponse = PagerdutyAPI.PagerdutyLinkResponse;
-  export import PagerdutyCreateParams = PagerdutyAPI.PagerdutyCreateParams;
-  export import PagerdutyDeleteParams = PagerdutyAPI.PagerdutyDeleteParams;
-  export import PagerdutyGetParams = PagerdutyAPI.PagerdutyGetParams;
-  export import PagerdutyLinkParams = PagerdutyAPI.PagerdutyLinkParams;
-  export import Webhooks = WebhooksAPI.Webhooks;
-  export import WebhookCreateResponse = WebhooksAPI.WebhookCreateResponse;
-  export import WebhookUpdateResponse = WebhooksAPI.WebhookUpdateResponse;
-  export import WebhookDeleteResponse = WebhooksAPI.WebhookDeleteResponse;
-  export import WebhooksSinglePage = WebhooksAPI.WebhooksSinglePage;
-  export import WebhookCreateParams = WebhooksAPI.WebhookCreateParams;
-  export import WebhookUpdateParams = WebhooksAPI.WebhookUpdateParams;
-  export import WebhookListParams = WebhooksAPI.WebhookListParams;
-  export import WebhookDeleteParams = WebhooksAPI.WebhookDeleteParams;
-  export import WebhookGetParams = WebhooksAPI.WebhookGetParams;
+Destinations.Eligible = Eligible;
+Destinations.PagerdutyResource = PagerdutyResource;
+Destinations.WebhooksSinglePage = WebhooksSinglePage;
+
+export declare namespace Destinations {
+  export {
+    Eligible as Eligible,
+    type EligibleGetResponse as EligibleGetResponse,
+    type EligibleGetParams as EligibleGetParams,
+  };
+
+  export {
+    PagerdutyResource as PagerdutyResource,
+    type Pagerduty as Pagerduty,
+    type PagerdutyCreateResponse as PagerdutyCreateResponse,
+    type PagerdutyDeleteResponse as PagerdutyDeleteResponse,
+    type PagerdutyGetResponse as PagerdutyGetResponse,
+    type PagerdutyLinkResponse as PagerdutyLinkResponse,
+    type PagerdutyCreateParams as PagerdutyCreateParams,
+    type PagerdutyDeleteParams as PagerdutyDeleteParams,
+    type PagerdutyGetParams as PagerdutyGetParams,
+    type PagerdutyLinkParams as PagerdutyLinkParams,
+  };
+
+  export {
+    type Webhooks as Webhooks,
+    type WebhookCreateResponse as WebhookCreateResponse,
+    type WebhookUpdateResponse as WebhookUpdateResponse,
+    type WebhookDeleteResponse as WebhookDeleteResponse,
+    WebhooksSinglePage as WebhooksSinglePage,
+    type WebhookCreateParams as WebhookCreateParams,
+    type WebhookUpdateParams as WebhookUpdateParams,
+    type WebhookListParams as WebhookListParams,
+    type WebhookDeleteParams as WebhookDeleteParams,
+    type WebhookGetParams as WebhookGetParams,
+  };
 }
diff --git a/src/resources/alerting/destinations/eligible.ts b/src/resources/alerting/destinations/eligible.ts
index be6d7a2f28..93e480679c 100644
--- a/src/resources/alerting/destinations/eligible.ts
+++ b/src/resources/alerting/destinations/eligible.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as EligibleAPI from './eligible';
 
 export class Eligible extends APIResource {
   /**
@@ -19,10 +18,10 @@ export class Eligible extends APIResource {
   }
 }
 
-export type EligibleGetResponse = Record<string, Array<EligibleGetResponse.UnnamedSchemaWithMapParent2>>;
+export type EligibleGetResponse = Record<string, Array<EligibleGetResponse.Item>>;
 
 export namespace EligibleGetResponse {
-  export interface UnnamedSchemaWithMapParent2 {
+  export interface Item {
     /**
      * Determines whether or not the account is eligible for the delivery mechanism.
      */
@@ -48,7 +47,6 @@ export interface EligibleGetParams {
   account_id: string;
 }
 
-export namespace Eligible {
-  export import EligibleGetResponse = EligibleAPI.EligibleGetResponse;
-  export import EligibleGetParams = EligibleAPI.EligibleGetParams;
+export declare namespace Eligible {
+  export { type EligibleGetResponse as EligibleGetResponse, type EligibleGetParams as EligibleGetParams };
 }
diff --git a/src/resources/alerting/destinations/index.ts b/src/resources/alerting/destinations/index.ts
index 2900a2183c..fae3c4db34 100644
--- a/src/resources/alerting/destinations/index.ts
+++ b/src/resources/alerting/destinations/index.ts
@@ -1,28 +1,28 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Destinations } from './destinations';
-export { EligibleGetResponse, EligibleGetParams, Eligible } from './eligible';
+export { Eligible, type EligibleGetResponse, type EligibleGetParams } from './eligible';
 export {
-  Pagerduty,
-  PagerdutyCreateResponse,
-  PagerdutyDeleteResponse,
-  PagerdutyGetResponse,
-  PagerdutyLinkResponse,
-  PagerdutyCreateParams,
-  PagerdutyDeleteParams,
-  PagerdutyGetParams,
-  PagerdutyLinkParams,
   PagerdutyResource,
+  type Pagerduty,
+  type PagerdutyCreateResponse,
+  type PagerdutyDeleteResponse,
+  type PagerdutyGetResponse,
+  type PagerdutyLinkResponse,
+  type PagerdutyCreateParams,
+  type PagerdutyDeleteParams,
+  type PagerdutyGetParams,
+  type PagerdutyLinkParams,
 } from './pagerduty';
 export {
-  Webhooks,
-  WebhookCreateResponse,
-  WebhookUpdateResponse,
-  WebhookDeleteResponse,
-  WebhookCreateParams,
-  WebhookUpdateParams,
-  WebhookListParams,
-  WebhookDeleteParams,
-  WebhookGetParams,
   WebhooksSinglePage,
+  Webhooks,
+  type WebhookCreateResponse,
+  type WebhookUpdateResponse,
+  type WebhookDeleteResponse,
+  type WebhookCreateParams,
+  type WebhookUpdateParams,
+  type WebhookListParams,
+  type WebhookDeleteParams,
+  type WebhookGetParams,
 } from './webhooks';
diff --git a/src/resources/alerting/destinations/pagerduty.ts b/src/resources/alerting/destinations/pagerduty.ts
index 64aca5fb66..6d35088fc5 100644
--- a/src/resources/alerting/destinations/pagerduty.ts
+++ b/src/resources/alerting/destinations/pagerduty.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as PagerdutyAPI from './pagerduty';
 import * as Shared from '../../shared';
 
 export class PagerdutyResource extends APIResource {
@@ -157,14 +156,16 @@ export interface PagerdutyLinkParams {
   account_id: string;
 }
 
-export namespace PagerdutyResource {
-  export import Pagerduty = PagerdutyAPI.Pagerduty;
-  export import PagerdutyCreateResponse = PagerdutyAPI.PagerdutyCreateResponse;
-  export import PagerdutyDeleteResponse = PagerdutyAPI.PagerdutyDeleteResponse;
-  export import PagerdutyGetResponse = PagerdutyAPI.PagerdutyGetResponse;
-  export import PagerdutyLinkResponse = PagerdutyAPI.PagerdutyLinkResponse;
-  export import PagerdutyCreateParams = PagerdutyAPI.PagerdutyCreateParams;
-  export import PagerdutyDeleteParams = PagerdutyAPI.PagerdutyDeleteParams;
-  export import PagerdutyGetParams = PagerdutyAPI.PagerdutyGetParams;
-  export import PagerdutyLinkParams = PagerdutyAPI.PagerdutyLinkParams;
+export declare namespace PagerdutyResource {
+  export {
+    type Pagerduty as Pagerduty,
+    type PagerdutyCreateResponse as PagerdutyCreateResponse,
+    type PagerdutyDeleteResponse as PagerdutyDeleteResponse,
+    type PagerdutyGetResponse as PagerdutyGetResponse,
+    type PagerdutyLinkResponse as PagerdutyLinkResponse,
+    type PagerdutyCreateParams as PagerdutyCreateParams,
+    type PagerdutyDeleteParams as PagerdutyDeleteParams,
+    type PagerdutyGetParams as PagerdutyGetParams,
+    type PagerdutyLinkParams as PagerdutyLinkParams,
+  };
 }
diff --git a/src/resources/alerting/destinations/webhooks.ts b/src/resources/alerting/destinations/webhooks.ts
index 6efe9b21c5..266fb0ef19 100644
--- a/src/resources/alerting/destinations/webhooks.ts
+++ b/src/resources/alerting/destinations/webhooks.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as WebhooksAPI from './webhooks';
 import * as Shared from '../../shared';
 import { SinglePage } from '../../../pagination';
 
@@ -252,15 +251,19 @@ export interface WebhookGetParams {
   account_id: string;
 }
 
-export namespace Webhooks {
-  export import Webhooks = WebhooksAPI.Webhooks;
-  export import WebhookCreateResponse = WebhooksAPI.WebhookCreateResponse;
-  export import WebhookUpdateResponse = WebhooksAPI.WebhookUpdateResponse;
-  export import WebhookDeleteResponse = WebhooksAPI.WebhookDeleteResponse;
-  export import WebhooksSinglePage = WebhooksAPI.WebhooksSinglePage;
-  export import WebhookCreateParams = WebhooksAPI.WebhookCreateParams;
-  export import WebhookUpdateParams = WebhooksAPI.WebhookUpdateParams;
-  export import WebhookListParams = WebhooksAPI.WebhookListParams;
-  export import WebhookDeleteParams = WebhooksAPI.WebhookDeleteParams;
-  export import WebhookGetParams = WebhooksAPI.WebhookGetParams;
+Webhooks.WebhooksSinglePage = WebhooksSinglePage;
+
+export declare namespace Webhooks {
+  export {
+    type Webhooks as Webhooks,
+    type WebhookCreateResponse as WebhookCreateResponse,
+    type WebhookUpdateResponse as WebhookUpdateResponse,
+    type WebhookDeleteResponse as WebhookDeleteResponse,
+    WebhooksSinglePage as WebhooksSinglePage,
+    type WebhookCreateParams as WebhookCreateParams,
+    type WebhookUpdateParams as WebhookUpdateParams,
+    type WebhookListParams as WebhookListParams,
+    type WebhookDeleteParams as WebhookDeleteParams,
+    type WebhookGetParams as WebhookGetParams,
+  };
 }
diff --git a/src/resources/alerting/history.ts b/src/resources/alerting/history.ts
index 0f0833e193..b6ae964dcc 100644
--- a/src/resources/alerting/history.ts
+++ b/src/resources/alerting/history.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as HistoryAPI from './history';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class HistoryResource extends APIResource {
@@ -93,8 +92,12 @@ export interface HistoryListParams extends V4PagePaginationArrayParams {
   since?: string;
 }
 
-export namespace HistoryResource {
-  export import History = HistoryAPI.History;
-  export import HistoriesV4PagePaginationArray = HistoryAPI.HistoriesV4PagePaginationArray;
-  export import HistoryListParams = HistoryAPI.HistoryListParams;
+HistoryResource.HistoriesV4PagePaginationArray = HistoriesV4PagePaginationArray;
+
+export declare namespace HistoryResource {
+  export {
+    type History as History,
+    HistoriesV4PagePaginationArray as HistoriesV4PagePaginationArray,
+    type HistoryListParams as HistoryListParams,
+  };
 }
diff --git a/src/resources/alerting/index.ts b/src/resources/alerting/index.ts
index 4e3c7f7a3b..d249a16557 100644
--- a/src/resources/alerting/index.ts
+++ b/src/resources/alerting/index.ts
@@ -1,21 +1,30 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Alerting } from './alerting';
-export { AvailableAlertListResponse, AvailableAlertListParams, AvailableAlerts } from './available-alerts';
+export {
+  AvailableAlerts,
+  type AvailableAlertListResponse,
+  type AvailableAlertListParams,
+} from './available-alerts';
 export { Destinations } from './destinations/index';
-export { History, HistoryListParams, HistoriesV4PagePaginationArray, HistoryResource } from './history';
 export {
-  Mechanism,
-  Policy,
-  PolicyFilter,
-  PolicyCreateResponse,
-  PolicyUpdateResponse,
-  PolicyDeleteResponse,
-  PolicyCreateParams,
-  PolicyUpdateParams,
-  PolicyListParams,
-  PolicyDeleteParams,
-  PolicyGetParams,
+  HistoriesV4PagePaginationArray,
+  HistoryResource,
+  type History,
+  type HistoryListParams,
+} from './history';
+export {
   PoliciesSinglePage,
   Policies,
+  type Mechanism,
+  type Policy,
+  type PolicyFilter,
+  type PolicyCreateResponse,
+  type PolicyUpdateResponse,
+  type PolicyDeleteResponse,
+  type PolicyCreateParams,
+  type PolicyUpdateParams,
+  type PolicyListParams,
+  type PolicyDeleteParams,
+  type PolicyGetParams,
 } from './policies';
diff --git a/src/resources/alerting/policies.ts b/src/resources/alerting/policies.ts
index 2e2acdece5..44e7c522cc 100644
--- a/src/resources/alerting/policies.ts
+++ b/src/resources/alerting/policies.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as PoliciesAPI from './policies';
 import * as Shared from '../shared';
 import { SinglePage } from '../../pagination';
 
@@ -84,14 +83,14 @@ export class PoliciesSinglePage extends SinglePage<Policy> {}
  * List of IDs that will be used when dispatching a notification. IDs for email
  * type will be the email address.
  */
-export type Mechanism = Record<string, Array<Mechanism.UnnamedSchemaWithMapParent3>>;
+export type Mechanism = Record<string, Array<Mechanism.Item>>;
 
 export namespace Mechanism {
-  export interface UnnamedSchemaWithMapParent3 {
+  export interface Item {
     /**
      * UUID
      */
-    id?: string | string;
+    id?: string;
   }
 }
 
@@ -99,14 +98,14 @@ export namespace Mechanism {
  * List of IDs that will be used when dispatching a notification. IDs for email
  * type will be the email address.
  */
-export type MechanismParam = Record<string, Array<MechanismParam.UnnamedSchemaWithMapParent3>>;
+export type MechanismParam = Record<string, Array<MechanismParam.Item>>;
 
 export namespace MechanismParam {
-  export interface UnnamedSchemaWithMapParent3 {
+  export interface Item {
     /**
      * UUID
      */
-    id?: string | string;
+    id?: string;
   }
 }
 
@@ -116,6 +115,12 @@ export interface Policy {
    */
   id?: string;
 
+  /**
+   * Optional specification of how often to re-alert from the same incident, not
+   * support on all alert types.
+   */
+  alert_interval?: string;
+
   /**
    * Refers to which event will trigger a Notification dispatch. You can use the
    * endpoint to get available alert types which then will give you a list of
@@ -135,8 +140,11 @@ export interface Policy {
     | 'brand_protection_digest'
     | 'clickhouse_alert_fw_anomaly'
     | 'clickhouse_alert_fw_ent_anomaly'
+    | 'cloudforce_one_request_notification'
+    | 'custom_analytics'
     | 'custom_ssl_certificate_event_type'
     | 'dedicated_ssl_certificate_event_type'
+    | 'device_connectivity_anomaly_alert'
     | 'dos_attack_l4'
     | 'dos_attack_l7'
     | 'expiring_service_token_alert'
@@ -149,10 +157,13 @@ export interface Policy {
     | 'http_alert_edge_error'
     | 'http_alert_origin_error'
     | 'incident_alert'
+    | 'image_notification'
+    | 'image_resizing_notification'
     | 'load_balancing_health_alert'
     | 'load_balancing_pool_enablement_alert'
     | 'logo_match_alert'
     | 'magic_tunnel_health_check_event'
+    | 'magic_wan_tunnel_health'
     | 'maintenance_event_notification'
     | 'mtls_certificate_store_certificate_expiration_type'
     | 'pages_event_alert'
@@ -167,10 +178,13 @@ export interface Policy {
     | 'scriptmonitor_alert_new_resources'
     | 'secondary_dns_all_primaries_failing'
     | 'secondary_dns_primaries_failing'
+    | 'secondary_dns_warning'
     | 'secondary_dns_zone_successfully_updated'
     | 'secondary_dns_zone_validation_warning'
     | 'sentinel_alert'
     | 'stream_live_notifications'
+    | 'synthetic_test_latency_alert'
+    | 'synthetic_test_low_availability_alert'
     | 'traffic_anomalies_alert'
     | 'tunnel_health_event'
     | 'tunnel_update_event'
@@ -228,8 +242,7 @@ export interface PolicyFilter {
   affected_asns?: Array<string>;
 
   /**
-   * Used for configuring incident_alert. A list of identifiers for each component to
-   * monitor.
+   * Used for configuring incident_alert
    */
   affected_components?: Array<string>;
 
@@ -249,9 +262,9 @@ export interface PolicyFilter {
   alert_trigger_preferences?: Array<string>;
 
   /**
-   * Used for configuring magic_tunnel_health_check_event
+   * Usage depends on specific alert type
    */
-  alert_trigger_preferences_value?: Array<'99.0' | '98.0' | '97.0'>;
+  alert_trigger_preferences_value?: Array<string>;
 
   /**
    * Used for configuring load_balancing_pool_enablement_alert
@@ -335,6 +348,11 @@ export interface PolicyFilter {
    */
   pool_id?: Array<string>;
 
+  /**
+   * Usage depends on specific alert type
+   */
+  pop_name?: Array<string>;
+
   /**
    * Used for configuring billing_usage_alert
    */
@@ -406,7 +424,7 @@ export interface PolicyFilter {
   tunnel_id?: Array<string>;
 
   /**
-   * Used for configuring magic_tunnel_health_check_event
+   * Usage depends on specific alert type
    */
   tunnel_name?: Array<string>;
 
@@ -438,8 +456,7 @@ export interface PolicyFilterParam {
   affected_asns?: Array<string>;
 
   /**
-   * Used for configuring incident_alert. A list of identifiers for each component to
-   * monitor.
+   * Used for configuring incident_alert
    */
   affected_components?: Array<string>;
 
@@ -459,9 +476,9 @@ export interface PolicyFilterParam {
   alert_trigger_preferences?: Array<string>;
 
   /**
-   * Used for configuring magic_tunnel_health_check_event
+   * Usage depends on specific alert type
    */
-  alert_trigger_preferences_value?: Array<'99.0' | '98.0' | '97.0'>;
+  alert_trigger_preferences_value?: Array<string>;
 
   /**
    * Used for configuring load_balancing_pool_enablement_alert
@@ -545,6 +562,11 @@ export interface PolicyFilterParam {
    */
   pool_id?: Array<string>;
 
+  /**
+   * Usage depends on specific alert type
+   */
+  pop_name?: Array<string>;
+
   /**
    * Used for configuring billing_usage_alert
    */
@@ -616,7 +638,7 @@ export interface PolicyFilterParam {
   tunnel_id?: Array<string>;
 
   /**
-   * Used for configuring magic_tunnel_health_check_event
+   * Usage depends on specific alert type
    */
   tunnel_name?: Array<string>;
 
@@ -707,8 +729,11 @@ export interface PolicyCreateParams {
     | 'brand_protection_digest'
     | 'clickhouse_alert_fw_anomaly'
     | 'clickhouse_alert_fw_ent_anomaly'
+    | 'cloudforce_one_request_notification'
+    | 'custom_analytics'
     | 'custom_ssl_certificate_event_type'
     | 'dedicated_ssl_certificate_event_type'
+    | 'device_connectivity_anomaly_alert'
     | 'dos_attack_l4'
     | 'dos_attack_l7'
     | 'expiring_service_token_alert'
@@ -721,10 +746,13 @@ export interface PolicyCreateParams {
     | 'http_alert_edge_error'
     | 'http_alert_origin_error'
     | 'incident_alert'
+    | 'image_notification'
+    | 'image_resizing_notification'
     | 'load_balancing_health_alert'
     | 'load_balancing_pool_enablement_alert'
     | 'logo_match_alert'
     | 'magic_tunnel_health_check_event'
+    | 'magic_wan_tunnel_health'
     | 'maintenance_event_notification'
     | 'mtls_certificate_store_certificate_expiration_type'
     | 'pages_event_alert'
@@ -739,10 +767,13 @@ export interface PolicyCreateParams {
     | 'scriptmonitor_alert_new_resources'
     | 'secondary_dns_all_primaries_failing'
     | 'secondary_dns_primaries_failing'
+    | 'secondary_dns_warning'
     | 'secondary_dns_zone_successfully_updated'
     | 'secondary_dns_zone_validation_warning'
     | 'sentinel_alert'
     | 'stream_live_notifications'
+    | 'synthetic_test_latency_alert'
+    | 'synthetic_test_low_availability_alert'
     | 'traffic_anomalies_alert'
     | 'tunnel_health_event'
     | 'tunnel_update_event'
@@ -766,6 +797,12 @@ export interface PolicyCreateParams {
    */
   name: string;
 
+  /**
+   * Body param: Optional specification of how often to re-alert from the same
+   * incident, not support on all alert types.
+   */
+  alert_interval?: string;
+
   /**
    * Body param: Optional description for the Notification policy.
    */
@@ -785,6 +822,12 @@ export interface PolicyUpdateParams {
    */
   account_id: string;
 
+  /**
+   * Body param: Optional specification of how often to re-alert from the same
+   * incident, not support on all alert types.
+   */
+  alert_interval?: string;
+
   /**
    * Body param: Refers to which event will trigger a Notification dispatch. You can
    * use the endpoint to get available alert types which then will give you a list of
@@ -804,8 +847,11 @@ export interface PolicyUpdateParams {
     | 'brand_protection_digest'
     | 'clickhouse_alert_fw_anomaly'
     | 'clickhouse_alert_fw_ent_anomaly'
+    | 'cloudforce_one_request_notification'
+    | 'custom_analytics'
     | 'custom_ssl_certificate_event_type'
     | 'dedicated_ssl_certificate_event_type'
+    | 'device_connectivity_anomaly_alert'
     | 'dos_attack_l4'
     | 'dos_attack_l7'
     | 'expiring_service_token_alert'
@@ -818,10 +864,13 @@ export interface PolicyUpdateParams {
     | 'http_alert_edge_error'
     | 'http_alert_origin_error'
     | 'incident_alert'
+    | 'image_notification'
+    | 'image_resizing_notification'
     | 'load_balancing_health_alert'
     | 'load_balancing_pool_enablement_alert'
     | 'logo_match_alert'
     | 'magic_tunnel_health_check_event'
+    | 'magic_wan_tunnel_health'
     | 'maintenance_event_notification'
     | 'mtls_certificate_store_certificate_expiration_type'
     | 'pages_event_alert'
@@ -836,10 +885,13 @@ export interface PolicyUpdateParams {
     | 'scriptmonitor_alert_new_resources'
     | 'secondary_dns_all_primaries_failing'
     | 'secondary_dns_primaries_failing'
+    | 'secondary_dns_warning'
     | 'secondary_dns_zone_successfully_updated'
     | 'secondary_dns_zone_validation_warning'
     | 'sentinel_alert'
     | 'stream_live_notifications'
+    | 'synthetic_test_latency_alert'
+    | 'synthetic_test_low_availability_alert'
     | 'traffic_anomalies_alert'
     | 'tunnel_health_event'
     | 'tunnel_update_event'
@@ -897,17 +949,21 @@ export interface PolicyGetParams {
   account_id: string;
 }
 
-export namespace Policies {
-  export import Mechanism = PoliciesAPI.Mechanism;
-  export import Policy = PoliciesAPI.Policy;
-  export import PolicyFilter = PoliciesAPI.PolicyFilter;
-  export import PolicyCreateResponse = PoliciesAPI.PolicyCreateResponse;
-  export import PolicyUpdateResponse = PoliciesAPI.PolicyUpdateResponse;
-  export import PolicyDeleteResponse = PoliciesAPI.PolicyDeleteResponse;
-  export import PoliciesSinglePage = PoliciesAPI.PoliciesSinglePage;
-  export import PolicyCreateParams = PoliciesAPI.PolicyCreateParams;
-  export import PolicyUpdateParams = PoliciesAPI.PolicyUpdateParams;
-  export import PolicyListParams = PoliciesAPI.PolicyListParams;
-  export import PolicyDeleteParams = PoliciesAPI.PolicyDeleteParams;
-  export import PolicyGetParams = PoliciesAPI.PolicyGetParams;
+Policies.PoliciesSinglePage = PoliciesSinglePage;
+
+export declare namespace Policies {
+  export {
+    type Mechanism as Mechanism,
+    type Policy as Policy,
+    type PolicyFilter as PolicyFilter,
+    type PolicyCreateResponse as PolicyCreateResponse,
+    type PolicyUpdateResponse as PolicyUpdateResponse,
+    type PolicyDeleteResponse as PolicyDeleteResponse,
+    PoliciesSinglePage as PoliciesSinglePage,
+    type PolicyCreateParams as PolicyCreateParams,
+    type PolicyUpdateParams as PolicyUpdateParams,
+    type PolicyListParams as PolicyListParams,
+    type PolicyDeleteParams as PolicyDeleteParams,
+    type PolicyGetParams as PolicyGetParams,
+  };
 }
diff --git a/src/resources/api-gateway/api-gateway.ts b/src/resources/api-gateway/api-gateway.ts
index 4f13f5a1a1..6bc719c0a8 100644
--- a/src/resources/api-gateway/api-gateway.ts
+++ b/src/resources/api-gateway/api-gateway.ts
@@ -2,11 +2,58 @@
 
 import { APIResource } from '../../resource';
 import * as ConfigurationsAPI from './configurations';
+import {
+  Configuration,
+  ConfigurationGetParams,
+  ConfigurationUpdateParams,
+  ConfigurationUpdateResponse,
+  Configurations,
+} from './configurations';
 import * as SchemasAPI from './schemas';
+import { SchemaListParams, SchemaListResponse, Schemas } from './schemas';
 import * as DiscoveryAPI from './discovery/discovery';
+import {
+  Discovery,
+  DiscoveryGetParams,
+  DiscoveryGetResponse,
+  DiscoveryOperation,
+} from './discovery/discovery';
+import * as ExpressionTemplateAPI from './expression-template/expression-template';
+import { ExpressionTemplate } from './expression-template/expression-template';
 import * as OperationsAPI from './operations/operations';
+import {
+  APIShield,
+  OperationBulkCreateParams,
+  OperationBulkCreateResponse,
+  OperationBulkDeleteParams,
+  OperationBulkDeleteResponse,
+  OperationCreateParams,
+  OperationCreateResponse,
+  OperationDeleteParams,
+  OperationDeleteResponse,
+  OperationGetParams,
+  OperationGetResponse,
+  OperationListParams,
+  OperationListResponse,
+  OperationListResponsesV4PagePaginationArray,
+  Operations,
+} from './operations/operations';
 import * as SettingsAPI from './settings/settings';
+import { Settings } from './settings/settings';
 import * as UserSchemasAPI from './user-schemas/user-schemas';
+import {
+  Message,
+  PublicSchema,
+  PublicSchemasV4PagePaginationArray,
+  SchemaUpload,
+  UserSchemaCreateParams,
+  UserSchemaDeleteParams,
+  UserSchemaDeleteResponse,
+  UserSchemaEditParams,
+  UserSchemaGetParams,
+  UserSchemaListParams,
+  UserSchemas,
+} from './user-schemas/user-schemas';
 
 export class APIGateway extends APIResource {
   configurations: ConfigurationsAPI.Configurations = new ConfigurationsAPI.Configurations(this._client);
@@ -15,42 +62,75 @@ export class APIGateway extends APIResource {
   schemas: SchemasAPI.Schemas = new SchemasAPI.Schemas(this._client);
   settings: SettingsAPI.Settings = new SettingsAPI.Settings(this._client);
   userSchemas: UserSchemasAPI.UserSchemas = new UserSchemasAPI.UserSchemas(this._client);
+  expressionTemplate: ExpressionTemplateAPI.ExpressionTemplate = new ExpressionTemplateAPI.ExpressionTemplate(
+    this._client,
+  );
 }
 
-export namespace APIGateway {
-  export import Configurations = ConfigurationsAPI.Configurations;
-  export import Configuration = ConfigurationsAPI.Configuration;
-  export import ConfigurationUpdateResponse = ConfigurationsAPI.ConfigurationUpdateResponse;
-  export import ConfigurationUpdateParams = ConfigurationsAPI.ConfigurationUpdateParams;
-  export import ConfigurationGetParams = ConfigurationsAPI.ConfigurationGetParams;
-  export import Discovery = DiscoveryAPI.Discovery;
-  export import DiscoveryOperation = DiscoveryAPI.DiscoveryOperation;
-  export import DiscoveryGetResponse = DiscoveryAPI.DiscoveryGetResponse;
-  export import DiscoveryGetParams = DiscoveryAPI.DiscoveryGetParams;
-  export import Operations = OperationsAPI.Operations;
-  export import APIShield = OperationsAPI.APIShield;
-  export import OperationCreateResponse = OperationsAPI.OperationCreateResponse;
-  export import OperationListResponse = OperationsAPI.OperationListResponse;
-  export import OperationDeleteResponse = OperationsAPI.OperationDeleteResponse;
-  export import OperationGetResponse = OperationsAPI.OperationGetResponse;
-  export import OperationListResponsesV4PagePaginationArray = OperationsAPI.OperationListResponsesV4PagePaginationArray;
-  export import OperationCreateParams = OperationsAPI.OperationCreateParams;
-  export import OperationListParams = OperationsAPI.OperationListParams;
-  export import OperationDeleteParams = OperationsAPI.OperationDeleteParams;
-  export import OperationGetParams = OperationsAPI.OperationGetParams;
-  export import Schemas = SchemasAPI.Schemas;
-  export import SchemaListResponse = SchemasAPI.SchemaListResponse;
-  export import SchemaListParams = SchemasAPI.SchemaListParams;
-  export import Settings = SettingsAPI.Settings;
-  export import UserSchemas = UserSchemasAPI.UserSchemas;
-  export import Message = UserSchemasAPI.Message;
-  export import PublicSchema = UserSchemasAPI.PublicSchema;
-  export import SchemaUpload = UserSchemasAPI.SchemaUpload;
-  export import UserSchemaDeleteResponse = UserSchemasAPI.UserSchemaDeleteResponse;
-  export import PublicSchemasV4PagePaginationArray = UserSchemasAPI.PublicSchemasV4PagePaginationArray;
-  export import UserSchemaCreateParams = UserSchemasAPI.UserSchemaCreateParams;
-  export import UserSchemaListParams = UserSchemasAPI.UserSchemaListParams;
-  export import UserSchemaDeleteParams = UserSchemasAPI.UserSchemaDeleteParams;
-  export import UserSchemaEditParams = UserSchemasAPI.UserSchemaEditParams;
-  export import UserSchemaGetParams = UserSchemasAPI.UserSchemaGetParams;
+APIGateway.Configurations = Configurations;
+APIGateway.Discovery = Discovery;
+APIGateway.Operations = Operations;
+APIGateway.OperationListResponsesV4PagePaginationArray = OperationListResponsesV4PagePaginationArray;
+APIGateway.Schemas = Schemas;
+APIGateway.UserSchemas = UserSchemas;
+APIGateway.PublicSchemasV4PagePaginationArray = PublicSchemasV4PagePaginationArray;
+APIGateway.ExpressionTemplate = ExpressionTemplate;
+
+export declare namespace APIGateway {
+  export {
+    Configurations as Configurations,
+    type Configuration as Configuration,
+    type ConfigurationUpdateResponse as ConfigurationUpdateResponse,
+    type ConfigurationUpdateParams as ConfigurationUpdateParams,
+    type ConfigurationGetParams as ConfigurationGetParams,
+  };
+
+  export {
+    Discovery as Discovery,
+    type DiscoveryOperation as DiscoveryOperation,
+    type DiscoveryGetResponse as DiscoveryGetResponse,
+    type DiscoveryGetParams as DiscoveryGetParams,
+  };
+
+  export {
+    Operations as Operations,
+    type APIShield as APIShield,
+    type OperationCreateResponse as OperationCreateResponse,
+    type OperationListResponse as OperationListResponse,
+    type OperationDeleteResponse as OperationDeleteResponse,
+    type OperationBulkCreateResponse as OperationBulkCreateResponse,
+    type OperationBulkDeleteResponse as OperationBulkDeleteResponse,
+    type OperationGetResponse as OperationGetResponse,
+    OperationListResponsesV4PagePaginationArray as OperationListResponsesV4PagePaginationArray,
+    type OperationCreateParams as OperationCreateParams,
+    type OperationListParams as OperationListParams,
+    type OperationDeleteParams as OperationDeleteParams,
+    type OperationBulkCreateParams as OperationBulkCreateParams,
+    type OperationBulkDeleteParams as OperationBulkDeleteParams,
+    type OperationGetParams as OperationGetParams,
+  };
+
+  export {
+    Schemas as Schemas,
+    type SchemaListResponse as SchemaListResponse,
+    type SchemaListParams as SchemaListParams,
+  };
+
+  export { type Settings as Settings };
+
+  export {
+    UserSchemas as UserSchemas,
+    type Message as Message,
+    type PublicSchema as PublicSchema,
+    type SchemaUpload as SchemaUpload,
+    type UserSchemaDeleteResponse as UserSchemaDeleteResponse,
+    PublicSchemasV4PagePaginationArray as PublicSchemasV4PagePaginationArray,
+    type UserSchemaCreateParams as UserSchemaCreateParams,
+    type UserSchemaListParams as UserSchemaListParams,
+    type UserSchemaDeleteParams as UserSchemaDeleteParams,
+    type UserSchemaEditParams as UserSchemaEditParams,
+    type UserSchemaGetParams as UserSchemaGetParams,
+  };
+
+  export { ExpressionTemplate as ExpressionTemplate };
 }
diff --git a/src/resources/api-gateway/configurations.ts b/src/resources/api-gateway/configurations.ts
index 4fc5d930f6..5d7bffa1d2 100644
--- a/src/resources/api-gateway/configurations.ts
+++ b/src/resources/api-gateway/configurations.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ConfigurationsAPI from './configurations';
 import * as UserSchemasAPI from './user-schemas/user-schemas';
 
 export class Configurations extends APIResource {
@@ -33,7 +32,7 @@ export class Configurations extends APIResource {
 
 export interface Configuration {
   auth_id_characteristics: Array<
-    Configuration.APIShieldAuthIDCharacteristic | Configuration.APIShieldAuthIDCharacteristicJwtClaim
+    Configuration.APIShieldAuthIDCharacteristic | Configuration.APIShieldAuthIDCharacteristicJWTClaim
   >;
 }
 
@@ -56,7 +55,7 @@ export namespace Configuration {
   /**
    * Auth ID Characteristic extracted from JWT Token Claims
    */
-  export interface APIShieldAuthIDCharacteristicJwtClaim {
+  export interface APIShieldAuthIDCharacteristicJWTClaim {
     /**
      * Claim location expressed as `$(token_config_id):$(json_path)`, where
      * `token_config_id` is the ID of the token configuration used in validating the
@@ -97,7 +96,7 @@ export interface ConfigurationUpdateParams {
    */
   auth_id_characteristics: Array<
     | ConfigurationUpdateParams.APIShieldAuthIDCharacteristic
-    | ConfigurationUpdateParams.APIShieldAuthIDCharacteristicJwtClaim
+    | ConfigurationUpdateParams.APIShieldAuthIDCharacteristicJWTClaim
   >;
 }
 
@@ -120,7 +119,7 @@ export namespace ConfigurationUpdateParams {
   /**
    * Auth ID Characteristic extracted from JWT Token Claims
    */
-  export interface APIShieldAuthIDCharacteristicJwtClaim {
+  export interface APIShieldAuthIDCharacteristicJWTClaim {
     /**
      * Claim location expressed as `$(token_config_id):$(json_path)`, where
      * `token_config_id` is the ID of the token configuration used in validating the
@@ -151,9 +150,11 @@ export interface ConfigurationGetParams {
   properties?: Array<'auth_id_characteristics'>;
 }
 
-export namespace Configurations {
-  export import Configuration = ConfigurationsAPI.Configuration;
-  export import ConfigurationUpdateResponse = ConfigurationsAPI.ConfigurationUpdateResponse;
-  export import ConfigurationUpdateParams = ConfigurationsAPI.ConfigurationUpdateParams;
-  export import ConfigurationGetParams = ConfigurationsAPI.ConfigurationGetParams;
+export declare namespace Configurations {
+  export {
+    type Configuration as Configuration,
+    type ConfigurationUpdateResponse as ConfigurationUpdateResponse,
+    type ConfigurationUpdateParams as ConfigurationUpdateParams,
+    type ConfigurationGetParams as ConfigurationGetParams,
+  };
 }
diff --git a/src/resources/api-gateway/discovery/discovery.ts b/src/resources/api-gateway/discovery/discovery.ts
index 192f1b7682..e0ec7b04b4 100644
--- a/src/resources/api-gateway/discovery/discovery.ts
+++ b/src/resources/api-gateway/discovery/discovery.ts
@@ -2,8 +2,15 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as DiscoveryAPI from './discovery';
 import * as OperationsAPI from './operations';
+import {
+  OperationBulkEditParams,
+  OperationBulkEditResponse,
+  OperationEditParams,
+  OperationEditResponse,
+  OperationListParams,
+  Operations,
+} from './operations';
 import { V4PagePaginationArray } from '../../../pagination';
 
 export class Discovery extends APIResource {
@@ -103,12 +110,21 @@ export interface DiscoveryGetParams {
   zone_id: string;
 }
 
-export namespace Discovery {
-  export import DiscoveryOperation = DiscoveryAPI.DiscoveryOperation;
-  export import DiscoveryGetResponse = DiscoveryAPI.DiscoveryGetResponse;
-  export import DiscoveryGetParams = DiscoveryAPI.DiscoveryGetParams;
-  export import Operations = OperationsAPI.Operations;
-  export import OperationEditResponse = OperationsAPI.OperationEditResponse;
-  export import OperationListParams = OperationsAPI.OperationListParams;
-  export import OperationEditParams = OperationsAPI.OperationEditParams;
+Discovery.Operations = Operations;
+
+export declare namespace Discovery {
+  export {
+    type DiscoveryOperation as DiscoveryOperation,
+    type DiscoveryGetResponse as DiscoveryGetResponse,
+    type DiscoveryGetParams as DiscoveryGetParams,
+  };
+
+  export {
+    Operations as Operations,
+    type OperationBulkEditResponse as OperationBulkEditResponse,
+    type OperationEditResponse as OperationEditResponse,
+    type OperationListParams as OperationListParams,
+    type OperationBulkEditParams as OperationBulkEditParams,
+    type OperationEditParams as OperationEditParams,
+  };
 }
diff --git a/src/resources/api-gateway/discovery/index.ts b/src/resources/api-gateway/discovery/index.ts
index 613cea3e21..a2a9fd29a6 100644
--- a/src/resources/api-gateway/discovery/index.ts
+++ b/src/resources/api-gateway/discovery/index.ts
@@ -1,10 +1,17 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  DiscoveryOperation,
-  DiscoveryGetResponse,
-  DiscoveryGetParams,
   DiscoveryOperationsV4PagePaginationArray,
   Discovery,
+  type DiscoveryOperation,
+  type DiscoveryGetResponse,
+  type DiscoveryGetParams,
 } from './discovery';
-export { OperationEditResponse, OperationListParams, OperationEditParams, Operations } from './operations';
+export {
+  Operations,
+  type OperationBulkEditResponse,
+  type OperationEditResponse,
+  type OperationListParams,
+  type OperationBulkEditParams,
+  type OperationEditParams,
+} from './operations';
diff --git a/src/resources/api-gateway/discovery/operations.ts b/src/resources/api-gateway/discovery/operations.ts
index eceff512c3..bc92f8b5fe 100644
--- a/src/resources/api-gateway/discovery/operations.ts
+++ b/src/resources/api-gateway/discovery/operations.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as OperationsAPI from './operations';
 import * as DiscoveryAPI from './discovery';
 import { DiscoveryOperationsV4PagePaginationArray } from './discovery';
 import { type V4PagePaginationArrayParams } from '../../../pagination';
@@ -23,6 +22,22 @@ export class Operations extends APIResource {
     );
   }
 
+  /**
+   * Update the `state` on one or more discovered operations
+   */
+  bulkEdit(
+    params: OperationBulkEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<OperationBulkEditResponse> {
+    const { zone_id, body } = params;
+    return (
+      this._client.patch(`/zones/${zone_id}/api_gateway/discovery/operations`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: OperationBulkEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Update the `state` on a discovered operation
    */
@@ -41,6 +56,23 @@ export class Operations extends APIResource {
   }
 }
 
+export type OperationBulkEditResponse = Record<string, OperationBulkEditResponse.item>;
+
+export namespace OperationBulkEditResponse {
+  /**
+   * Mappings of discovered operations (keys) to objects describing their state
+   */
+  export interface item {
+    /**
+     * Mark state of operation in API Discovery
+     *
+     * - `review` - Mark operation as for review
+     * - `ignored` - Mark operation as ignored
+     */
+    state?: 'review' | 'ignored';
+  }
+}
+
 export interface OperationEditResponse {
   /**
    * State of operation in API Discovery
@@ -112,6 +144,33 @@ export interface OperationListParams extends V4PagePaginationArrayParams {
   state?: 'review' | 'saved' | 'ignored';
 }
 
+export interface OperationBulkEditParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  body: Record<string, OperationBulkEditParams.Body>;
+}
+
+export namespace OperationBulkEditParams {
+  /**
+   * Mappings of discovered operations (keys) to objects describing their state
+   */
+  export interface Body {
+    /**
+     * Mark state of operation in API Discovery
+     *
+     * - `review` - Mark operation as for review
+     * - `ignored` - Mark operation as ignored
+     */
+    state?: 'review' | 'ignored';
+  }
+}
+
 export interface OperationEditParams {
   /**
    * Path param: Identifier
@@ -127,10 +186,14 @@ export interface OperationEditParams {
   state?: 'review' | 'ignored';
 }
 
-export namespace Operations {
-  export import OperationEditResponse = OperationsAPI.OperationEditResponse;
-  export import OperationListParams = OperationsAPI.OperationListParams;
-  export import OperationEditParams = OperationsAPI.OperationEditParams;
+export declare namespace Operations {
+  export {
+    type OperationBulkEditResponse as OperationBulkEditResponse,
+    type OperationEditResponse as OperationEditResponse,
+    type OperationListParams as OperationListParams,
+    type OperationBulkEditParams as OperationBulkEditParams,
+    type OperationEditParams as OperationEditParams,
+  };
 }
 
 export { DiscoveryOperationsV4PagePaginationArray };
diff --git a/src/resources/api-gateway/expression-template/expression-template.ts b/src/resources/api-gateway/expression-template/expression-template.ts
new file mode 100644
index 0000000000..a6ae3b53fb
--- /dev/null
+++ b/src/resources/api-gateway/expression-template/expression-template.ts
@@ -0,0 +1,19 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as FallthroughAPI from './fallthrough';
+import { Fallthrough, FallthroughCreateParams, FallthroughCreateResponse } from './fallthrough';
+
+export class ExpressionTemplate extends APIResource {
+  fallthrough: FallthroughAPI.Fallthrough = new FallthroughAPI.Fallthrough(this._client);
+}
+
+ExpressionTemplate.Fallthrough = Fallthrough;
+
+export declare namespace ExpressionTemplate {
+  export {
+    Fallthrough as Fallthrough,
+    type FallthroughCreateResponse as FallthroughCreateResponse,
+    type FallthroughCreateParams as FallthroughCreateParams,
+  };
+}
diff --git a/src/resources/api-gateway/expression-template/fallthrough.ts b/src/resources/api-gateway/expression-template/fallthrough.ts
new file mode 100644
index 0000000000..fde934fa74
--- /dev/null
+++ b/src/resources/api-gateway/expression-template/fallthrough.ts
@@ -0,0 +1,53 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Fallthrough extends APIResource {
+  /**
+   * Generate fallthrough WAF expression template from a set of API hosts
+   */
+  create(
+    params: FallthroughCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FallthroughCreateResponse> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.post(`/zones/${zone_id}/api_gateway/expression-template/fallthrough`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: FallthroughCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface FallthroughCreateResponse {
+  /**
+   * WAF Expression for fallthrough
+   */
+  expression: string;
+
+  /**
+   * Title for the expression
+   */
+  title: string;
+}
+
+export interface FallthroughCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: List of hosts to be targeted in the expression
+   */
+  hosts: Array<string>;
+}
+
+export declare namespace Fallthrough {
+  export {
+    type FallthroughCreateResponse as FallthroughCreateResponse,
+    type FallthroughCreateParams as FallthroughCreateParams,
+  };
+}
diff --git a/src/resources/api-gateway/expression-template/index.ts b/src/resources/api-gateway/expression-template/index.ts
new file mode 100644
index 0000000000..cc73a35d00
--- /dev/null
+++ b/src/resources/api-gateway/expression-template/index.ts
@@ -0,0 +1,4 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { ExpressionTemplate } from './expression-template';
+export { Fallthrough, type FallthroughCreateResponse, type FallthroughCreateParams } from './fallthrough';
diff --git a/src/resources/api-gateway/index.ts b/src/resources/api-gateway/index.ts
index 1d7cb1a5d1..d33e337bec 100644
--- a/src/resources/api-gateway/index.ts
+++ b/src/resources/api-gateway/index.ts
@@ -2,44 +2,49 @@
 
 export { APIGateway } from './api-gateway';
 export {
-  APIShield,
-  OperationCreateResponse,
-  OperationListResponse,
-  OperationDeleteResponse,
-  OperationGetResponse,
-  OperationCreateParams,
-  OperationListParams,
-  OperationDeleteParams,
-  OperationGetParams,
-  OperationListResponsesV4PagePaginationArray,
-  Operations,
-} from './operations/index';
-export {
-  Configuration,
-  ConfigurationUpdateResponse,
-  ConfigurationUpdateParams,
-  ConfigurationGetParams,
   Configurations,
+  type Configuration,
+  type ConfigurationUpdateResponse,
+  type ConfigurationUpdateParams,
+  type ConfigurationGetParams,
 } from './configurations';
 export {
-  DiscoveryOperation,
-  DiscoveryGetResponse,
-  DiscoveryGetParams,
   DiscoveryOperationsV4PagePaginationArray,
   Discovery,
+  type DiscoveryOperation,
+  type DiscoveryGetResponse,
+  type DiscoveryGetParams,
 } from './discovery/index';
+export { ExpressionTemplate } from './expression-template/index';
+export {
+  OperationListResponsesV4PagePaginationArray,
+  Operations,
+  type APIShield,
+  type OperationCreateResponse,
+  type OperationListResponse,
+  type OperationDeleteResponse,
+  type OperationBulkCreateResponse,
+  type OperationBulkDeleteResponse,
+  type OperationGetResponse,
+  type OperationCreateParams,
+  type OperationListParams,
+  type OperationDeleteParams,
+  type OperationBulkCreateParams,
+  type OperationBulkDeleteParams,
+  type OperationGetParams,
+} from './operations/index';
 export {
-  Message,
-  PublicSchema,
-  SchemaUpload,
-  UserSchemaDeleteResponse,
-  UserSchemaCreateParams,
-  UserSchemaListParams,
-  UserSchemaDeleteParams,
-  UserSchemaEditParams,
-  UserSchemaGetParams,
   PublicSchemasV4PagePaginationArray,
   UserSchemas,
+  type Message,
+  type PublicSchema,
+  type SchemaUpload,
+  type UserSchemaDeleteResponse,
+  type UserSchemaCreateParams,
+  type UserSchemaListParams,
+  type UserSchemaDeleteParams,
+  type UserSchemaEditParams,
+  type UserSchemaGetParams,
 } from './user-schemas/index';
-export { SchemaListResponse, SchemaListParams, Schemas } from './schemas';
+export { Schemas, type SchemaListResponse, type SchemaListParams } from './schemas';
 export { Settings } from './settings/index';
diff --git a/src/resources/api-gateway/operations/index.ts b/src/resources/api-gateway/operations/index.ts
index 97da31c431..d20282f578 100644
--- a/src/resources/api-gateway/operations/index.ts
+++ b/src/resources/api-gateway/operations/index.ts
@@ -1,24 +1,28 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  APIShield,
-  OperationCreateResponse,
-  OperationListResponse,
-  OperationDeleteResponse,
-  OperationGetResponse,
-  OperationCreateParams,
-  OperationListParams,
-  OperationDeleteParams,
-  OperationGetParams,
   OperationListResponsesV4PagePaginationArray,
   Operations,
+  type APIShield,
+  type OperationCreateResponse,
+  type OperationListResponse,
+  type OperationDeleteResponse,
+  type OperationBulkCreateResponse,
+  type OperationBulkDeleteResponse,
+  type OperationGetResponse,
+  type OperationCreateParams,
+  type OperationListParams,
+  type OperationDeleteParams,
+  type OperationBulkCreateParams,
+  type OperationBulkDeleteParams,
+  type OperationGetParams,
 } from './operations';
 export {
-  SettingsMultipleRequest,
-  SchemaValidationUpdateResponse,
-  SchemaValidationGetResponse,
-  SchemaValidationUpdateParams,
-  SchemaValidationEditParams,
-  SchemaValidationGetParams,
   SchemaValidation,
+  type SettingsMultipleRequest,
+  type SchemaValidationUpdateResponse,
+  type SchemaValidationGetResponse,
+  type SchemaValidationUpdateParams,
+  type SchemaValidationEditParams,
+  type SchemaValidationGetParams,
 } from './schema-validation';
diff --git a/src/resources/api-gateway/operations/operations.ts b/src/resources/api-gateway/operations/operations.ts
index 393fb265a8..de5fcb51fd 100644
--- a/src/resources/api-gateway/operations/operations.ts
+++ b/src/resources/api-gateway/operations/operations.ts
@@ -2,8 +2,16 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as OperationsAPI from './operations';
 import * as SchemaValidationAPI from './schema-validation';
+import {
+  SchemaValidation,
+  SchemaValidationEditParams,
+  SchemaValidationGetParams,
+  SchemaValidationGetResponse,
+  SchemaValidationUpdateParams,
+  SchemaValidationUpdateResponse,
+  SettingsMultipleRequest,
+} from './schema-validation';
 import * as UserSchemasAPI from '../user-schemas/user-schemas';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
@@ -13,20 +21,20 @@ export class Operations extends APIResource {
   );
 
   /**
-   * Add one or more operations to a zone. Endpoints can contain path variables.
-   * Host, method, endpoint will be normalized to a canoncial form when creating an
-   * operation and must be unique on the zone. Inserting an operation that matches an
-   * existing one will return the record of the already existing operation and update
-   * its last_updated date.
+   * Add one operation to a zone. Endpoints can contain path variables. Host, method,
+   * endpoint will be normalized to a canoncial form when creating an operation and
+   * must be unique on the zone. Inserting an operation that matches an existing one
+   * will return the record of the already existing operation and update its
+   * last_updated date.
    */
   create(
     params: OperationCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<OperationCreateResponse> {
-    const { zone_id, body } = params;
+    const { zone_id, ...body } = params;
     return (
-      this._client.post(`/zones/${zone_id}/api_gateway/operations`, {
-        body: body,
+      this._client.post(`/zones/${zone_id}/api_gateway/operations/item`, {
+        body,
         ...options,
       }) as Core.APIPromise<{ result: OperationCreateResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -59,6 +67,37 @@ export class Operations extends APIResource {
     return this._client.delete(`/zones/${zone_id}/api_gateway/operations/${operationId}`, options);
   }
 
+  /**
+   * Add one or more operations to a zone. Endpoints can contain path variables.
+   * Host, method, endpoint will be normalized to a canoncial form when creating an
+   * operation and must be unique on the zone. Inserting an operation that matches an
+   * existing one will return the record of the already existing operation and update
+   * its last_updated date.
+   */
+  bulkCreate(
+    params: OperationBulkCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<OperationBulkCreateResponse> {
+    const { zone_id, body } = params;
+    return (
+      this._client.post(`/zones/${zone_id}/api_gateway/operations`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: OperationBulkCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Delete multiple operations
+   */
+  bulkDelete(
+    params: OperationBulkDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<OperationBulkDeleteResponse> {
+    const { zone_id } = params;
+    return this._client.delete(`/zones/${zone_id}/api_gateway/operations`, options);
+  }
+
   /**
    * Retrieve information about an operation
    */
@@ -104,16 +143,43 @@ export interface APIShield {
    * UUID
    */
   operation_id: string;
+}
+
+export interface OperationCreateResponse {
+  /**
+   * The endpoint which can contain path parameter templates in curly braces, each
+   * will be replaced from left to right with {varN}, starting with {var1}, during
+   * insertion. This will further be Cloudflare-normalized upon insertion. See:
+   * https://developers.cloudflare.com/rules/normalization/how-it-works/.
+   */
+  endpoint: string;
+
+  /**
+   * RFC3986-compliant host.
+   */
+  host: string;
+
+  last_updated: string;
+
+  /**
+   * The HTTP method used to access the endpoint.
+   */
+  method: 'GET' | 'POST' | 'HEAD' | 'OPTIONS' | 'PUT' | 'DELETE' | 'CONNECT' | 'PATCH' | 'TRACE';
+
+  /**
+   * UUID
+   */
+  operation_id: string;
 
   features?:
-    | APIShield.APIShieldOperationFeatureThresholds
-    | APIShield.APIShieldOperationFeatureParameterSchemas
-    | APIShield.APIShieldOperationFeatureAPIRouting
-    | APIShield.APIShieldOperationFeatureConfidenceIntervals
-    | APIShield.APIShieldOperationFeatureSchemaInfo;
+    | OperationCreateResponse.APIShieldOperationFeatureThresholds
+    | OperationCreateResponse.APIShieldOperationFeatureParameterSchemas
+    | OperationCreateResponse.APIShieldOperationFeatureAPIRouting
+    | OperationCreateResponse.APIShieldOperationFeatureConfidenceIntervals
+    | OperationCreateResponse.APIShieldOperationFeatureSchemaInfo;
 }
 
-export namespace APIShield {
+export namespace OperationCreateResponse {
   export interface APIShieldOperationFeatureThresholds {
     thresholds?: APIShieldOperationFeatureThresholds.Thresholds;
   }
@@ -355,8 +421,6 @@ export namespace APIShield {
   }
 }
 
-export type OperationCreateResponse = Array<APIShield>;
-
 export interface OperationListResponse {
   /**
    * The endpoint which can contain path parameter templates in curly braces, each
@@ -644,6 +708,297 @@ export interface OperationDeleteResponse {
   success: true;
 }
 
+export type OperationBulkCreateResponse = Array<OperationBulkCreateResponse.OperationBulkCreateResponseItem>;
+
+export namespace OperationBulkCreateResponse {
+  export interface OperationBulkCreateResponseItem {
+    /**
+     * The endpoint which can contain path parameter templates in curly braces, each
+     * will be replaced from left to right with {varN}, starting with {var1}, during
+     * insertion. This will further be Cloudflare-normalized upon insertion. See:
+     * https://developers.cloudflare.com/rules/normalization/how-it-works/.
+     */
+    endpoint: string;
+
+    /**
+     * RFC3986-compliant host.
+     */
+    host: string;
+
+    last_updated: string;
+
+    /**
+     * The HTTP method used to access the endpoint.
+     */
+    method: 'GET' | 'POST' | 'HEAD' | 'OPTIONS' | 'PUT' | 'DELETE' | 'CONNECT' | 'PATCH' | 'TRACE';
+
+    /**
+     * UUID
+     */
+    operation_id: string;
+
+    features?:
+      | OperationBulkCreateResponseItem.APIShieldOperationFeatureThresholds
+      | OperationBulkCreateResponseItem.APIShieldOperationFeatureParameterSchemas
+      | OperationBulkCreateResponseItem.APIShieldOperationFeatureAPIRouting
+      | OperationBulkCreateResponseItem.APIShieldOperationFeatureConfidenceIntervals
+      | OperationBulkCreateResponseItem.APIShieldOperationFeatureSchemaInfo;
+  }
+
+  export namespace OperationBulkCreateResponseItem {
+    export interface APIShieldOperationFeatureThresholds {
+      thresholds?: APIShieldOperationFeatureThresholds.Thresholds;
+    }
+
+    export namespace APIShieldOperationFeatureThresholds {
+      export interface Thresholds {
+        /**
+         * The total number of auth-ids seen across this calculation.
+         */
+        auth_id_tokens?: number;
+
+        /**
+         * The number of data points used for the threshold suggestion calculation.
+         */
+        data_points?: number;
+
+        last_updated?: string;
+
+        /**
+         * The p50 quantile of requests (in period_seconds).
+         */
+        p50?: number;
+
+        /**
+         * The p90 quantile of requests (in period_seconds).
+         */
+        p90?: number;
+
+        /**
+         * The p99 quantile of requests (in period_seconds).
+         */
+        p99?: number;
+
+        /**
+         * The period over which this threshold is suggested.
+         */
+        period_seconds?: number;
+
+        /**
+         * The estimated number of requests covered by these calculations.
+         */
+        requests?: number;
+
+        /**
+         * The suggested threshold in requests done by the same auth_id or period_seconds.
+         */
+        suggested_threshold?: number;
+      }
+    }
+
+    export interface APIShieldOperationFeatureParameterSchemas {
+      parameter_schemas: APIShieldOperationFeatureParameterSchemas.ParameterSchemas;
+    }
+
+    export namespace APIShieldOperationFeatureParameterSchemas {
+      export interface ParameterSchemas {
+        last_updated?: string;
+
+        /**
+         * An operation schema object containing a response.
+         */
+        parameter_schemas?: ParameterSchemas.ParameterSchemas;
+      }
+
+      export namespace ParameterSchemas {
+        /**
+         * An operation schema object containing a response.
+         */
+        export interface ParameterSchemas {
+          /**
+           * An array containing the learned parameter schemas.
+           */
+          parameters?: Array<unknown>;
+
+          /**
+           * An empty response object. This field is required to yield a valid operation
+           * schema.
+           */
+          responses?: unknown | null;
+        }
+      }
+    }
+
+    export interface APIShieldOperationFeatureAPIRouting {
+      /**
+       * API Routing settings on endpoint.
+       */
+      api_routing?: APIShieldOperationFeatureAPIRouting.APIRouting;
+    }
+
+    export namespace APIShieldOperationFeatureAPIRouting {
+      /**
+       * API Routing settings on endpoint.
+       */
+      export interface APIRouting {
+        last_updated?: string;
+
+        /**
+         * Target route.
+         */
+        route?: string;
+      }
+    }
+
+    export interface APIShieldOperationFeatureConfidenceIntervals {
+      confidence_intervals?: APIShieldOperationFeatureConfidenceIntervals.ConfidenceIntervals;
+    }
+
+    export namespace APIShieldOperationFeatureConfidenceIntervals {
+      export interface ConfidenceIntervals {
+        last_updated?: string;
+
+        suggested_threshold?: ConfidenceIntervals.SuggestedThreshold;
+      }
+
+      export namespace ConfidenceIntervals {
+        export interface SuggestedThreshold {
+          confidence_intervals?: SuggestedThreshold.ConfidenceIntervals;
+
+          /**
+           * Suggested threshold.
+           */
+          mean?: number;
+        }
+
+        export namespace SuggestedThreshold {
+          export interface ConfidenceIntervals {
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            p90?: ConfidenceIntervals.P90;
+
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            p95?: ConfidenceIntervals.P95;
+
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            p99?: ConfidenceIntervals.P99;
+          }
+
+          export namespace ConfidenceIntervals {
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            export interface P90 {
+              /**
+               * Lower bound for percentile estimate
+               */
+              lower?: number;
+
+              /**
+               * Upper bound for percentile estimate
+               */
+              upper?: number;
+            }
+
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            export interface P95 {
+              /**
+               * Lower bound for percentile estimate
+               */
+              lower?: number;
+
+              /**
+               * Upper bound for percentile estimate
+               */
+              upper?: number;
+            }
+
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            export interface P99 {
+              /**
+               * Lower bound for percentile estimate
+               */
+              lower?: number;
+
+              /**
+               * Upper bound for percentile estimate
+               */
+              upper?: number;
+            }
+          }
+        }
+      }
+    }
+
+    export interface APIShieldOperationFeatureSchemaInfo {
+      schema_info?: APIShieldOperationFeatureSchemaInfo.SchemaInfo;
+    }
+
+    export namespace APIShieldOperationFeatureSchemaInfo {
+      export interface SchemaInfo {
+        /**
+         * Schema active on endpoint.
+         */
+        active_schema?: SchemaInfo.ActiveSchema;
+
+        /**
+         * True if a Cloudflare-provided learned schema is available for this endpoint.
+         */
+        learned_available?: boolean;
+
+        /**
+         * Action taken on requests failing validation.
+         */
+        mitigation_action?: 'none' | 'log' | 'block' | null;
+      }
+
+      export namespace SchemaInfo {
+        /**
+         * Schema active on endpoint.
+         */
+        export interface ActiveSchema {
+          /**
+           * UUID
+           */
+          id?: string;
+
+          created_at?: string;
+
+          /**
+           * True if schema is Cloudflare-provided.
+           */
+          is_learned?: boolean;
+
+          /**
+           * Schema file name.
+           */
+          name?: string;
+        }
+      }
+    }
+  }
+}
+
+export interface OperationBulkDeleteResponse {
+  errors: UserSchemasAPI.Message;
+
+  messages: UserSchemasAPI.Message;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+}
+
 export interface OperationGetResponse {
   /**
    * The endpoint which can contain path parameter templates in curly braces, each
@@ -927,31 +1282,23 @@ export interface OperationCreateParams {
   zone_id: string;
 
   /**
-   * Body param:
+   * Body param: The endpoint which can contain path parameter templates in curly
+   * braces, each will be replaced from left to right with {varN}, starting with
+   * {var1}, during insertion. This will further be Cloudflare-normalized upon
+   * insertion. See:
+   * https://developers.cloudflare.com/rules/normalization/how-it-works/.
    */
-  body: Array<OperationCreateParams.Body>;
-}
-
-export namespace OperationCreateParams {
-  export interface Body {
-    /**
-     * The endpoint which can contain path parameter templates in curly braces, each
-     * will be replaced from left to right with {varN}, starting with {var1}, during
-     * insertion. This will further be Cloudflare-normalized upon insertion. See:
-     * https://developers.cloudflare.com/rules/normalization/how-it-works/.
-     */
-    endpoint: string;
+  endpoint: string;
 
-    /**
-     * RFC3986-compliant host.
-     */
-    host: string;
+  /**
+   * Body param: RFC3986-compliant host.
+   */
+  host: string;
 
-    /**
-     * The HTTP method used to access the endpoint.
-     */
-    method: 'GET' | 'POST' | 'HEAD' | 'OPTIONS' | 'PUT' | 'DELETE' | 'CONNECT' | 'PATCH' | 'TRACE';
-  }
+  /**
+   * Body param: The HTTP method used to access the endpoint.
+   */
+  method: 'GET' | 'POST' | 'HEAD' | 'OPTIONS' | 'PUT' | 'DELETE' | 'CONNECT' | 'PATCH' | 'TRACE';
 }
 
 export interface OperationListParams extends V4PagePaginationArrayParams {
@@ -1001,6 +1348,47 @@ export interface OperationDeleteParams {
   zone_id: string;
 }
 
+export interface OperationBulkCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  body: Array<OperationBulkCreateParams.Body>;
+}
+
+export namespace OperationBulkCreateParams {
+  export interface Body {
+    /**
+     * The endpoint which can contain path parameter templates in curly braces, each
+     * will be replaced from left to right with {varN}, starting with {var1}, during
+     * insertion. This will further be Cloudflare-normalized upon insertion. See:
+     * https://developers.cloudflare.com/rules/normalization/how-it-works/.
+     */
+    endpoint: string;
+
+    /**
+     * RFC3986-compliant host.
+     */
+    host: string;
+
+    /**
+     * The HTTP method used to access the endpoint.
+     */
+    method: 'GET' | 'POST' | 'HEAD' | 'OPTIONS' | 'PUT' | 'DELETE' | 'CONNECT' | 'PATCH' | 'TRACE';
+  }
+}
+
+export interface OperationBulkDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
 export interface OperationGetParams {
   /**
    * Path param: Identifier
@@ -1015,22 +1403,34 @@ export interface OperationGetParams {
   feature?: Array<'thresholds' | 'parameter_schemas' | 'schema_info'>;
 }
 
-export namespace Operations {
-  export import APIShield = OperationsAPI.APIShield;
-  export import OperationCreateResponse = OperationsAPI.OperationCreateResponse;
-  export import OperationListResponse = OperationsAPI.OperationListResponse;
-  export import OperationDeleteResponse = OperationsAPI.OperationDeleteResponse;
-  export import OperationGetResponse = OperationsAPI.OperationGetResponse;
-  export import OperationListResponsesV4PagePaginationArray = OperationsAPI.OperationListResponsesV4PagePaginationArray;
-  export import OperationCreateParams = OperationsAPI.OperationCreateParams;
-  export import OperationListParams = OperationsAPI.OperationListParams;
-  export import OperationDeleteParams = OperationsAPI.OperationDeleteParams;
-  export import OperationGetParams = OperationsAPI.OperationGetParams;
-  export import SchemaValidation = SchemaValidationAPI.SchemaValidation;
-  export import SettingsMultipleRequest = SchemaValidationAPI.SettingsMultipleRequest;
-  export import SchemaValidationUpdateResponse = SchemaValidationAPI.SchemaValidationUpdateResponse;
-  export import SchemaValidationGetResponse = SchemaValidationAPI.SchemaValidationGetResponse;
-  export import SchemaValidationUpdateParams = SchemaValidationAPI.SchemaValidationUpdateParams;
-  export import SchemaValidationEditParams = SchemaValidationAPI.SchemaValidationEditParams;
-  export import SchemaValidationGetParams = SchemaValidationAPI.SchemaValidationGetParams;
+Operations.OperationListResponsesV4PagePaginationArray = OperationListResponsesV4PagePaginationArray;
+Operations.SchemaValidation = SchemaValidation;
+
+export declare namespace Operations {
+  export {
+    type APIShield as APIShield,
+    type OperationCreateResponse as OperationCreateResponse,
+    type OperationListResponse as OperationListResponse,
+    type OperationDeleteResponse as OperationDeleteResponse,
+    type OperationBulkCreateResponse as OperationBulkCreateResponse,
+    type OperationBulkDeleteResponse as OperationBulkDeleteResponse,
+    type OperationGetResponse as OperationGetResponse,
+    OperationListResponsesV4PagePaginationArray as OperationListResponsesV4PagePaginationArray,
+    type OperationCreateParams as OperationCreateParams,
+    type OperationListParams as OperationListParams,
+    type OperationDeleteParams as OperationDeleteParams,
+    type OperationBulkCreateParams as OperationBulkCreateParams,
+    type OperationBulkDeleteParams as OperationBulkDeleteParams,
+    type OperationGetParams as OperationGetParams,
+  };
+
+  export {
+    SchemaValidation as SchemaValidation,
+    type SettingsMultipleRequest as SettingsMultipleRequest,
+    type SchemaValidationUpdateResponse as SchemaValidationUpdateResponse,
+    type SchemaValidationGetResponse as SchemaValidationGetResponse,
+    type SchemaValidationUpdateParams as SchemaValidationUpdateParams,
+    type SchemaValidationEditParams as SchemaValidationEditParams,
+    type SchemaValidationGetParams as SchemaValidationGetParams,
+  };
 }
diff --git a/src/resources/api-gateway/operations/schema-validation.ts b/src/resources/api-gateway/operations/schema-validation.ts
index ba25ca9792..294137164f 100644
--- a/src/resources/api-gateway/operations/schema-validation.ts
+++ b/src/resources/api-gateway/operations/schema-validation.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as SchemaValidationAPI from './schema-validation';
 
 export class SchemaValidation extends APIResource {
   /**
@@ -52,16 +51,13 @@ export class SchemaValidation extends APIResource {
   }
 }
 
-export type SettingsMultipleRequest = Record<
-  string,
-  SettingsMultipleRequest.api_shield_operation_schema_validation_settings_multiple_request_entry
->;
+export type SettingsMultipleRequest = Record<string, SettingsMultipleRequest.item>;
 
 export namespace SettingsMultipleRequest {
   /**
    * Operation ID to mitigation action mappings
    */
-  export interface api_shield_operation_schema_validation_settings_multiple_request_entry {
+  export interface item {
     /**
      * When set, this applies a mitigation action to this operation
      *
@@ -76,16 +72,13 @@ export namespace SettingsMultipleRequest {
   }
 }
 
-export type SettingsMultipleRequestParam = Record<
-  string,
-  SettingsMultipleRequestParam.api_shield_operation_schema_validation_settings_multiple_request_entry
->;
+export type SettingsMultipleRequestParam = Record<string, SettingsMultipleRequestParam.item>;
 
 export namespace SettingsMultipleRequestParam {
   /**
    * Operation ID to mitigation action mappings
    */
-  export interface api_shield_operation_schema_validation_settings_multiple_request_entry {
+  export interface item {
     /**
      * When set, this applies a mitigation action to this operation
      *
@@ -166,11 +159,13 @@ export interface SchemaValidationGetParams {
   zone_id: string;
 }
 
-export namespace SchemaValidation {
-  export import SettingsMultipleRequest = SchemaValidationAPI.SettingsMultipleRequest;
-  export import SchemaValidationUpdateResponse = SchemaValidationAPI.SchemaValidationUpdateResponse;
-  export import SchemaValidationGetResponse = SchemaValidationAPI.SchemaValidationGetResponse;
-  export import SchemaValidationUpdateParams = SchemaValidationAPI.SchemaValidationUpdateParams;
-  export import SchemaValidationEditParams = SchemaValidationAPI.SchemaValidationEditParams;
-  export import SchemaValidationGetParams = SchemaValidationAPI.SchemaValidationGetParams;
+export declare namespace SchemaValidation {
+  export {
+    type SettingsMultipleRequest as SettingsMultipleRequest,
+    type SchemaValidationUpdateResponse as SchemaValidationUpdateResponse,
+    type SchemaValidationGetResponse as SchemaValidationGetResponse,
+    type SchemaValidationUpdateParams as SchemaValidationUpdateParams,
+    type SchemaValidationEditParams as SchemaValidationEditParams,
+    type SchemaValidationGetParams as SchemaValidationGetParams,
+  };
 }
diff --git a/src/resources/api-gateway/schemas.ts b/src/resources/api-gateway/schemas.ts
index 8fbd8f167f..78078da8d1 100644
--- a/src/resources/api-gateway/schemas.ts
+++ b/src/resources/api-gateway/schemas.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SchemasAPI from './schemas';
 
 export class Schemas extends APIResource {
   /**
@@ -43,7 +42,6 @@ export interface SchemaListParams {
   host?: Array<string>;
 }
 
-export namespace Schemas {
-  export import SchemaListResponse = SchemasAPI.SchemaListResponse;
-  export import SchemaListParams = SchemasAPI.SchemaListParams;
+export declare namespace Schemas {
+  export { type SchemaListResponse as SchemaListResponse, type SchemaListParams as SchemaListParams };
 }
diff --git a/src/resources/api-gateway/settings/index.ts b/src/resources/api-gateway/settings/index.ts
index d7a6691090..086f66ad01 100644
--- a/src/resources/api-gateway/settings/index.ts
+++ b/src/resources/api-gateway/settings/index.ts
@@ -1,9 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  SchemaValidationUpdateParams,
-  SchemaValidationEditParams,
-  SchemaValidationGetParams,
   SchemaValidation,
+  type SchemaValidationUpdateParams,
+  type SchemaValidationEditParams,
+  type SchemaValidationGetParams,
 } from './schema-validation';
 export { Settings } from './settings';
diff --git a/src/resources/api-gateway/settings/schema-validation.ts b/src/resources/api-gateway/settings/schema-validation.ts
index 526cc0d48d..ede2c08181 100644
--- a/src/resources/api-gateway/settings/schema-validation.ts
+++ b/src/resources/api-gateway/settings/schema-validation.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as SchemaValidationAPI from './schema-validation';
 import * as SettingsAPI from './settings';
 
 export class SchemaValidation extends APIResource {
@@ -115,8 +114,10 @@ export interface SchemaValidationGetParams {
   zone_id: string;
 }
 
-export namespace SchemaValidation {
-  export import SchemaValidationUpdateParams = SchemaValidationAPI.SchemaValidationUpdateParams;
-  export import SchemaValidationEditParams = SchemaValidationAPI.SchemaValidationEditParams;
-  export import SchemaValidationGetParams = SchemaValidationAPI.SchemaValidationGetParams;
+export declare namespace SchemaValidation {
+  export {
+    type SchemaValidationUpdateParams as SchemaValidationUpdateParams,
+    type SchemaValidationEditParams as SchemaValidationEditParams,
+    type SchemaValidationGetParams as SchemaValidationGetParams,
+  };
 }
diff --git a/src/resources/api-gateway/settings/settings.ts b/src/resources/api-gateway/settings/settings.ts
index 46c01c9f25..9c7236a309 100644
--- a/src/resources/api-gateway/settings/settings.ts
+++ b/src/resources/api-gateway/settings/settings.ts
@@ -1,8 +1,13 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../resource';
-import * as SettingsAPI from './settings';
 import * as SchemaValidationAPI from './schema-validation';
+import {
+  SchemaValidation,
+  SchemaValidationEditParams,
+  SchemaValidationGetParams,
+  SchemaValidationUpdateParams,
+} from './schema-validation';
 
 export class Settings extends APIResource {
   schemaValidation: SchemaValidationAPI.SchemaValidation = new SchemaValidationAPI.SchemaValidation(
@@ -34,10 +39,15 @@ export interface Settings {
   validation_override_mitigation_action?: 'none' | null;
 }
 
-export namespace Settings {
-  export import Settings = SettingsAPI.Settings;
-  export import SchemaValidation = SchemaValidationAPI.SchemaValidation;
-  export import SchemaValidationUpdateParams = SchemaValidationAPI.SchemaValidationUpdateParams;
-  export import SchemaValidationEditParams = SchemaValidationAPI.SchemaValidationEditParams;
-  export import SchemaValidationGetParams = SchemaValidationAPI.SchemaValidationGetParams;
+Settings.SchemaValidation = SchemaValidation;
+
+export declare namespace Settings {
+  export { type Settings as Settings };
+
+  export {
+    SchemaValidation as SchemaValidation,
+    type SchemaValidationUpdateParams as SchemaValidationUpdateParams,
+    type SchemaValidationEditParams as SchemaValidationEditParams,
+    type SchemaValidationGetParams as SchemaValidationGetParams,
+  };
 }
diff --git a/src/resources/api-gateway/user-schemas/hosts.ts b/src/resources/api-gateway/user-schemas/hosts.ts
new file mode 100644
index 0000000000..01d02af1ef
--- /dev/null
+++ b/src/resources/api-gateway/user-schemas/hosts.ts
@@ -0,0 +1,60 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
+
+export class Hosts extends APIResource {
+  /**
+   * Retrieve schema hosts in a zone
+   */
+  list(
+    params: HostListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<HostListResponsesV4PagePaginationArray, HostListResponse> {
+    const { zone_id, ...query } = params;
+    return this._client.getAPIList(
+      `/zones/${zone_id}/api_gateway/user_schemas/hosts`,
+      HostListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+}
+
+export class HostListResponsesV4PagePaginationArray extends V4PagePaginationArray<HostListResponse> {}
+
+export interface HostListResponse {
+  created_at: string;
+
+  /**
+   * Hosts serving the schema, e.g zone.host.com
+   */
+  hosts: Array<string>;
+
+  /**
+   * Name of the schema
+   */
+  name: string;
+
+  /**
+   * UUID
+   */
+  schema_id: string;
+}
+
+export interface HostListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+}
+
+Hosts.HostListResponsesV4PagePaginationArray = HostListResponsesV4PagePaginationArray;
+
+export declare namespace Hosts {
+  export {
+    type HostListResponse as HostListResponse,
+    HostListResponsesV4PagePaginationArray as HostListResponsesV4PagePaginationArray,
+    type HostListParams as HostListParams,
+  };
+}
diff --git a/src/resources/api-gateway/user-schemas/index.ts b/src/resources/api-gateway/user-schemas/index.ts
index 2d22f3ec5e..867f9925f7 100644
--- a/src/resources/api-gateway/user-schemas/index.ts
+++ b/src/resources/api-gateway/user-schemas/index.ts
@@ -1,21 +1,27 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Message,
-  PublicSchema,
-  SchemaUpload,
-  UserSchemaDeleteResponse,
-  UserSchemaCreateParams,
-  UserSchemaListParams,
-  UserSchemaDeleteParams,
-  UserSchemaEditParams,
-  UserSchemaGetParams,
-  PublicSchemasV4PagePaginationArray,
-  UserSchemas,
-} from './user-schemas';
+  HostListResponsesV4PagePaginationArray,
+  Hosts,
+  type HostListResponse,
+  type HostListParams,
+} from './hosts';
 export {
-  OperationListResponse,
-  OperationListParams,
   OperationListResponsesV4PagePaginationArray,
   Operations,
+  type OperationListResponse,
+  type OperationListParams,
 } from './operations';
+export {
+  PublicSchemasV4PagePaginationArray,
+  UserSchemas,
+  type Message,
+  type PublicSchema,
+  type SchemaUpload,
+  type UserSchemaDeleteResponse,
+  type UserSchemaCreateParams,
+  type UserSchemaListParams,
+  type UserSchemaDeleteParams,
+  type UserSchemaEditParams,
+  type UserSchemaGetParams,
+} from './user-schemas';
diff --git a/src/resources/api-gateway/user-schemas/operations.ts b/src/resources/api-gateway/user-schemas/operations.ts
index 58fd6ad7a5..7f6ddd5f8e 100644
--- a/src/resources/api-gateway/user-schemas/operations.ts
+++ b/src/resources/api-gateway/user-schemas/operations.ts
@@ -2,8 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as UserSchemasOperationsAPI from './operations';
-import * as OperationsAPI from '../operations/operations';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class Operations extends APIResource {
@@ -27,9 +25,287 @@ export class Operations extends APIResource {
 
 export class OperationListResponsesV4PagePaginationArray extends V4PagePaginationArray<OperationListResponse> {}
 
-export type OperationListResponse = OperationsAPI.APIShield | OperationListResponse.APIShieldBasicOperation;
+export type OperationListResponse =
+  | OperationListResponse.APIShieldOperation
+  | OperationListResponse.APIShieldBasicOperation;
 
 export namespace OperationListResponse {
+  export interface APIShieldOperation {
+    /**
+     * The endpoint which can contain path parameter templates in curly braces, each
+     * will be replaced from left to right with {varN}, starting with {var1}, during
+     * insertion. This will further be Cloudflare-normalized upon insertion. See:
+     * https://developers.cloudflare.com/rules/normalization/how-it-works/.
+     */
+    endpoint: string;
+
+    /**
+     * RFC3986-compliant host.
+     */
+    host: string;
+
+    last_updated: string;
+
+    /**
+     * The HTTP method used to access the endpoint.
+     */
+    method: 'GET' | 'POST' | 'HEAD' | 'OPTIONS' | 'PUT' | 'DELETE' | 'CONNECT' | 'PATCH' | 'TRACE';
+
+    /**
+     * UUID
+     */
+    operation_id: string;
+
+    features?:
+      | APIShieldOperation.APIShieldOperationFeatureThresholds
+      | APIShieldOperation.APIShieldOperationFeatureParameterSchemas
+      | APIShieldOperation.APIShieldOperationFeatureAPIRouting
+      | APIShieldOperation.APIShieldOperationFeatureConfidenceIntervals
+      | APIShieldOperation.APIShieldOperationFeatureSchemaInfo;
+  }
+
+  export namespace APIShieldOperation {
+    export interface APIShieldOperationFeatureThresholds {
+      thresholds?: APIShieldOperationFeatureThresholds.Thresholds;
+    }
+
+    export namespace APIShieldOperationFeatureThresholds {
+      export interface Thresholds {
+        /**
+         * The total number of auth-ids seen across this calculation.
+         */
+        auth_id_tokens?: number;
+
+        /**
+         * The number of data points used for the threshold suggestion calculation.
+         */
+        data_points?: number;
+
+        last_updated?: string;
+
+        /**
+         * The p50 quantile of requests (in period_seconds).
+         */
+        p50?: number;
+
+        /**
+         * The p90 quantile of requests (in period_seconds).
+         */
+        p90?: number;
+
+        /**
+         * The p99 quantile of requests (in period_seconds).
+         */
+        p99?: number;
+
+        /**
+         * The period over which this threshold is suggested.
+         */
+        period_seconds?: number;
+
+        /**
+         * The estimated number of requests covered by these calculations.
+         */
+        requests?: number;
+
+        /**
+         * The suggested threshold in requests done by the same auth_id or period_seconds.
+         */
+        suggested_threshold?: number;
+      }
+    }
+
+    export interface APIShieldOperationFeatureParameterSchemas {
+      parameter_schemas: APIShieldOperationFeatureParameterSchemas.ParameterSchemas;
+    }
+
+    export namespace APIShieldOperationFeatureParameterSchemas {
+      export interface ParameterSchemas {
+        last_updated?: string;
+
+        /**
+         * An operation schema object containing a response.
+         */
+        parameter_schemas?: ParameterSchemas.ParameterSchemas;
+      }
+
+      export namespace ParameterSchemas {
+        /**
+         * An operation schema object containing a response.
+         */
+        export interface ParameterSchemas {
+          /**
+           * An array containing the learned parameter schemas.
+           */
+          parameters?: Array<unknown>;
+
+          /**
+           * An empty response object. This field is required to yield a valid operation
+           * schema.
+           */
+          responses?: unknown | null;
+        }
+      }
+    }
+
+    export interface APIShieldOperationFeatureAPIRouting {
+      /**
+       * API Routing settings on endpoint.
+       */
+      api_routing?: APIShieldOperationFeatureAPIRouting.APIRouting;
+    }
+
+    export namespace APIShieldOperationFeatureAPIRouting {
+      /**
+       * API Routing settings on endpoint.
+       */
+      export interface APIRouting {
+        last_updated?: string;
+
+        /**
+         * Target route.
+         */
+        route?: string;
+      }
+    }
+
+    export interface APIShieldOperationFeatureConfidenceIntervals {
+      confidence_intervals?: APIShieldOperationFeatureConfidenceIntervals.ConfidenceIntervals;
+    }
+
+    export namespace APIShieldOperationFeatureConfidenceIntervals {
+      export interface ConfidenceIntervals {
+        last_updated?: string;
+
+        suggested_threshold?: ConfidenceIntervals.SuggestedThreshold;
+      }
+
+      export namespace ConfidenceIntervals {
+        export interface SuggestedThreshold {
+          confidence_intervals?: SuggestedThreshold.ConfidenceIntervals;
+
+          /**
+           * Suggested threshold.
+           */
+          mean?: number;
+        }
+
+        export namespace SuggestedThreshold {
+          export interface ConfidenceIntervals {
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            p90?: ConfidenceIntervals.P90;
+
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            p95?: ConfidenceIntervals.P95;
+
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            p99?: ConfidenceIntervals.P99;
+          }
+
+          export namespace ConfidenceIntervals {
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            export interface P90 {
+              /**
+               * Lower bound for percentile estimate
+               */
+              lower?: number;
+
+              /**
+               * Upper bound for percentile estimate
+               */
+              upper?: number;
+            }
+
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            export interface P95 {
+              /**
+               * Lower bound for percentile estimate
+               */
+              lower?: number;
+
+              /**
+               * Upper bound for percentile estimate
+               */
+              upper?: number;
+            }
+
+            /**
+             * Upper and lower bound for percentile estimate
+             */
+            export interface P99 {
+              /**
+               * Lower bound for percentile estimate
+               */
+              lower?: number;
+
+              /**
+               * Upper bound for percentile estimate
+               */
+              upper?: number;
+            }
+          }
+        }
+      }
+    }
+
+    export interface APIShieldOperationFeatureSchemaInfo {
+      schema_info?: APIShieldOperationFeatureSchemaInfo.SchemaInfo;
+    }
+
+    export namespace APIShieldOperationFeatureSchemaInfo {
+      export interface SchemaInfo {
+        /**
+         * Schema active on endpoint.
+         */
+        active_schema?: SchemaInfo.ActiveSchema;
+
+        /**
+         * True if a Cloudflare-provided learned schema is available for this endpoint.
+         */
+        learned_available?: boolean;
+
+        /**
+         * Action taken on requests failing validation.
+         */
+        mitigation_action?: 'none' | 'log' | 'block' | null;
+      }
+
+      export namespace SchemaInfo {
+        /**
+         * Schema active on endpoint.
+         */
+        export interface ActiveSchema {
+          /**
+           * UUID
+           */
+          id?: string;
+
+          created_at?: string;
+
+          /**
+           * True if schema is Cloudflare-provided.
+           */
+          is_learned?: boolean;
+
+          /**
+           * Schema file name.
+           */
+          name?: string;
+        }
+      }
+    }
+  }
+
   export interface APIShieldBasicOperation {
     /**
      * The endpoint which can contain path parameter templates in curly braces, each
@@ -88,8 +364,12 @@ export interface OperationListParams extends V4PagePaginationArrayParams {
   operation_status?: 'new' | 'existing';
 }
 
-export namespace Operations {
-  export import OperationListResponse = UserSchemasOperationsAPI.OperationListResponse;
-  export import OperationListResponsesV4PagePaginationArray = UserSchemasOperationsAPI.OperationListResponsesV4PagePaginationArray;
-  export import OperationListParams = UserSchemasOperationsAPI.OperationListParams;
+Operations.OperationListResponsesV4PagePaginationArray = OperationListResponsesV4PagePaginationArray;
+
+export declare namespace Operations {
+  export {
+    type OperationListResponse as OperationListResponse,
+    OperationListResponsesV4PagePaginationArray as OperationListResponsesV4PagePaginationArray,
+    type OperationListParams as OperationListParams,
+  };
 }
diff --git a/src/resources/api-gateway/user-schemas/user-schemas.ts b/src/resources/api-gateway/user-schemas/user-schemas.ts
index 98ca4eea83..efec1bd24d 100644
--- a/src/resources/api-gateway/user-schemas/user-schemas.ts
+++ b/src/resources/api-gateway/user-schemas/user-schemas.ts
@@ -2,13 +2,21 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as UserSchemasAPI from './user-schemas';
 import * as Shared from '../../shared';
+import * as HostsAPI from './hosts';
+import { HostListParams, HostListResponse, HostListResponsesV4PagePaginationArray, Hosts } from './hosts';
 import * as OperationsAPI from './operations';
+import {
+  OperationListParams,
+  OperationListResponse,
+  OperationListResponsesV4PagePaginationArray,
+  Operations,
+} from './operations';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class UserSchemas extends APIResource {
   operations: OperationsAPI.Operations = new OperationsAPI.Operations(this._client);
+  hosts: HostsAPI.Hosts = new HostsAPI.Hosts(this._client);
 
   /**
    * Upload a schema to a zone
@@ -47,12 +55,7 @@ export class UserSchemas extends APIResource {
     options?: Core.RequestOptions,
   ): Core.APIPromise<UserSchemaDeleteResponse> {
     const { zone_id } = params;
-    return (
-      this._client.delete(
-        `/zones/${zone_id}/api_gateway/user_schemas/${schemaId}`,
-        options,
-      ) as Core.APIPromise<{ result: UserSchemaDeleteResponse }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.delete(`/zones/${zone_id}/api_gateway/user_schemas/${schemaId}`, options);
   }
 
   /**
@@ -160,7 +163,16 @@ export namespace SchemaUpload {
   }
 }
 
-export type UserSchemaDeleteResponse = unknown | string;
+export interface UserSchemaDeleteResponse {
+  errors: Message;
+
+  messages: Message;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+}
 
 export interface UserSchemaCreateParams {
   /**
@@ -237,19 +249,37 @@ export interface UserSchemaGetParams {
   omit_source?: boolean;
 }
 
-export namespace UserSchemas {
-  export import Message = UserSchemasAPI.Message;
-  export import PublicSchema = UserSchemasAPI.PublicSchema;
-  export import SchemaUpload = UserSchemasAPI.SchemaUpload;
-  export import UserSchemaDeleteResponse = UserSchemasAPI.UserSchemaDeleteResponse;
-  export import PublicSchemasV4PagePaginationArray = UserSchemasAPI.PublicSchemasV4PagePaginationArray;
-  export import UserSchemaCreateParams = UserSchemasAPI.UserSchemaCreateParams;
-  export import UserSchemaListParams = UserSchemasAPI.UserSchemaListParams;
-  export import UserSchemaDeleteParams = UserSchemasAPI.UserSchemaDeleteParams;
-  export import UserSchemaEditParams = UserSchemasAPI.UserSchemaEditParams;
-  export import UserSchemaGetParams = UserSchemasAPI.UserSchemaGetParams;
-  export import Operations = OperationsAPI.Operations;
-  export import OperationListResponse = OperationsAPI.OperationListResponse;
-  export import OperationListResponsesV4PagePaginationArray = OperationsAPI.OperationListResponsesV4PagePaginationArray;
-  export import OperationListParams = OperationsAPI.OperationListParams;
+UserSchemas.PublicSchemasV4PagePaginationArray = PublicSchemasV4PagePaginationArray;
+UserSchemas.Operations = Operations;
+UserSchemas.OperationListResponsesV4PagePaginationArray = OperationListResponsesV4PagePaginationArray;
+UserSchemas.Hosts = Hosts;
+UserSchemas.HostListResponsesV4PagePaginationArray = HostListResponsesV4PagePaginationArray;
+
+export declare namespace UserSchemas {
+  export {
+    type Message as Message,
+    type PublicSchema as PublicSchema,
+    type SchemaUpload as SchemaUpload,
+    type UserSchemaDeleteResponse as UserSchemaDeleteResponse,
+    PublicSchemasV4PagePaginationArray as PublicSchemasV4PagePaginationArray,
+    type UserSchemaCreateParams as UserSchemaCreateParams,
+    type UserSchemaListParams as UserSchemaListParams,
+    type UserSchemaDeleteParams as UserSchemaDeleteParams,
+    type UserSchemaEditParams as UserSchemaEditParams,
+    type UserSchemaGetParams as UserSchemaGetParams,
+  };
+
+  export {
+    Operations as Operations,
+    type OperationListResponse as OperationListResponse,
+    OperationListResponsesV4PagePaginationArray as OperationListResponsesV4PagePaginationArray,
+    type OperationListParams as OperationListParams,
+  };
+
+  export {
+    Hosts as Hosts,
+    type HostListResponse as HostListResponse,
+    HostListResponsesV4PagePaginationArray as HostListResponsesV4PagePaginationArray,
+    type HostListParams as HostListParams,
+  };
 }
diff --git a/src/resources/argo/argo.ts b/src/resources/argo/argo.ts
index 3734991993..3de020a9ef 100644
--- a/src/resources/argo/argo.ts
+++ b/src/resources/argo/argo.ts
@@ -2,22 +2,44 @@
 
 import { APIResource } from '../../resource';
 import * as SmartRoutingAPI from './smart-routing';
+import {
+  SmartRouting,
+  SmartRoutingEditParams,
+  SmartRoutingEditResponse,
+  SmartRoutingGetParams,
+  SmartRoutingGetResponse,
+} from './smart-routing';
 import * as TieredCachingAPI from './tiered-caching';
+import {
+  TieredCaching,
+  TieredCachingEditParams,
+  TieredCachingEditResponse,
+  TieredCachingGetParams,
+  TieredCachingGetResponse,
+} from './tiered-caching';
 
 export class Argo extends APIResource {
   smartRouting: SmartRoutingAPI.SmartRouting = new SmartRoutingAPI.SmartRouting(this._client);
   tieredCaching: TieredCachingAPI.TieredCaching = new TieredCachingAPI.TieredCaching(this._client);
 }
 
-export namespace Argo {
-  export import SmartRouting = SmartRoutingAPI.SmartRouting;
-  export import SmartRoutingEditResponse = SmartRoutingAPI.SmartRoutingEditResponse;
-  export import SmartRoutingGetResponse = SmartRoutingAPI.SmartRoutingGetResponse;
-  export import SmartRoutingEditParams = SmartRoutingAPI.SmartRoutingEditParams;
-  export import SmartRoutingGetParams = SmartRoutingAPI.SmartRoutingGetParams;
-  export import TieredCaching = TieredCachingAPI.TieredCaching;
-  export import TieredCachingEditResponse = TieredCachingAPI.TieredCachingEditResponse;
-  export import TieredCachingGetResponse = TieredCachingAPI.TieredCachingGetResponse;
-  export import TieredCachingEditParams = TieredCachingAPI.TieredCachingEditParams;
-  export import TieredCachingGetParams = TieredCachingAPI.TieredCachingGetParams;
+Argo.SmartRouting = SmartRouting;
+Argo.TieredCaching = TieredCaching;
+
+export declare namespace Argo {
+  export {
+    SmartRouting as SmartRouting,
+    type SmartRoutingEditResponse as SmartRoutingEditResponse,
+    type SmartRoutingGetResponse as SmartRoutingGetResponse,
+    type SmartRoutingEditParams as SmartRoutingEditParams,
+    type SmartRoutingGetParams as SmartRoutingGetParams,
+  };
+
+  export {
+    TieredCaching as TieredCaching,
+    type TieredCachingEditResponse as TieredCachingEditResponse,
+    type TieredCachingGetResponse as TieredCachingGetResponse,
+    type TieredCachingEditParams as TieredCachingEditParams,
+    type TieredCachingGetParams as TieredCachingGetParams,
+  };
 }
diff --git a/src/resources/argo/index.ts b/src/resources/argo/index.ts
index 91f3cd9ee0..3666abc83a 100644
--- a/src/resources/argo/index.ts
+++ b/src/resources/argo/index.ts
@@ -2,16 +2,16 @@
 
 export { Argo } from './argo';
 export {
-  SmartRoutingEditResponse,
-  SmartRoutingGetResponse,
-  SmartRoutingEditParams,
-  SmartRoutingGetParams,
   SmartRouting,
+  type SmartRoutingEditResponse,
+  type SmartRoutingGetResponse,
+  type SmartRoutingEditParams,
+  type SmartRoutingGetParams,
 } from './smart-routing';
 export {
-  TieredCachingEditResponse,
-  TieredCachingGetResponse,
-  TieredCachingEditParams,
-  TieredCachingGetParams,
   TieredCaching,
+  type TieredCachingEditResponse,
+  type TieredCachingGetResponse,
+  type TieredCachingEditParams,
+  type TieredCachingGetParams,
 } from './tiered-caching';
diff --git a/src/resources/argo/smart-routing.ts b/src/resources/argo/smart-routing.ts
index 1e082c71d9..9ff360910b 100644
--- a/src/resources/argo/smart-routing.ts
+++ b/src/resources/argo/smart-routing.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SmartRoutingAPI from './smart-routing';
 
 export class SmartRouting extends APIResource {
   /**
@@ -59,9 +58,11 @@ export interface SmartRoutingGetParams {
   zone_id: string;
 }
 
-export namespace SmartRouting {
-  export import SmartRoutingEditResponse = SmartRoutingAPI.SmartRoutingEditResponse;
-  export import SmartRoutingGetResponse = SmartRoutingAPI.SmartRoutingGetResponse;
-  export import SmartRoutingEditParams = SmartRoutingAPI.SmartRoutingEditParams;
-  export import SmartRoutingGetParams = SmartRoutingAPI.SmartRoutingGetParams;
+export declare namespace SmartRouting {
+  export {
+    type SmartRoutingEditResponse as SmartRoutingEditResponse,
+    type SmartRoutingGetResponse as SmartRoutingGetResponse,
+    type SmartRoutingEditParams as SmartRoutingEditParams,
+    type SmartRoutingGetParams as SmartRoutingGetParams,
+  };
 }
diff --git a/src/resources/argo/tiered-caching.ts b/src/resources/argo/tiered-caching.ts
index e6453b10ce..180a5ab663 100644
--- a/src/resources/argo/tiered-caching.ts
+++ b/src/resources/argo/tiered-caching.ts
@@ -2,11 +2,20 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as TieredCachingAPI from './tiered-caching';
 
 export class TieredCaching extends APIResource {
   /**
-   * Updates enablement of Tiered Caching
+   * Tiered Cache works by dividing Cloudflare's data centers into a hierarchy of
+   * lower-tiers and upper-tiers. If content is not cached in lower-tier data centers
+   * (generally the ones closest to a visitor), the lower-tier must ask an upper-tier
+   * to see if it has the content. If the upper-tier does not have the content, only
+   * the upper-tier can ask the origin for content. This practice improves bandwidth
+   * efficiency by limiting the number of data centers that can ask the origin for
+   * content, which reduces origin load and makes websites more cost-effective to
+   * operate. Additionally, Tiered Cache concentrates connections to origin servers
+   * so they come from a small number of data centers rather than the full set of
+   * network locations. This results in fewer open connections using server
+   * resources.
    */
   edit(
     params: TieredCachingEditParams,
@@ -21,7 +30,17 @@ export class TieredCaching extends APIResource {
   }
 
   /**
-   * Get Tiered Caching setting
+   * Tiered Cache works by dividing Cloudflare's data centers into a hierarchy of
+   * lower-tiers and upper-tiers. If content is not cached in lower-tier data centers
+   * (generally the ones closest to a visitor), the lower-tier must ask an upper-tier
+   * to see if it has the content. If the upper-tier does not have the content, only
+   * the upper-tier can ask the origin for content. This practice improves bandwidth
+   * efficiency by limiting the number of data centers that can ask the origin for
+   * content, which reduces origin load and makes websites more cost-effective to
+   * operate. Additionally, Tiered Cache concentrates connections to origin servers
+   * so they come from a small number of data centers rather than the full set of
+   * network locations. This results in fewer open connections using server
+   * resources.
    */
   get(
     params: TieredCachingGetParams,
@@ -38,9 +57,9 @@ export class TieredCaching extends APIResource {
 
 export interface TieredCachingEditResponse {
   /**
-   * The identifier of the caching setting
+   * ID of the zone setting.
    */
-  id: string;
+  id: 'tiered_caching';
 
   /**
    * Whether the setting is editable
@@ -48,21 +67,21 @@ export interface TieredCachingEditResponse {
   editable: boolean;
 
   /**
-   * The time when the setting was last modified
+   * The value of the feature
    */
-  modified_on: string;
+  value: 'on' | 'off';
 
   /**
-   * The status of the feature being on / off
+   * Last time this setting was modified.
    */
-  value: 'on' | 'off';
+  modified_on?: string | null;
 }
 
 export interface TieredCachingGetResponse {
   /**
-   * The identifier of the caching setting
+   * ID of the zone setting.
    */
-  id: string;
+  id: 'tiered_caching';
 
   /**
    * Whether the setting is editable
@@ -70,14 +89,14 @@ export interface TieredCachingGetResponse {
   editable: boolean;
 
   /**
-   * The time when the setting was last modified
+   * The value of the feature
    */
-  modified_on: string;
+  value: 'on' | 'off';
 
   /**
-   * The status of the feature being on / off
+   * Last time this setting was modified.
    */
-  value: 'on' | 'off';
+  modified_on?: string | null;
 }
 
 export interface TieredCachingEditParams {
@@ -99,9 +118,11 @@ export interface TieredCachingGetParams {
   zone_id: string;
 }
 
-export namespace TieredCaching {
-  export import TieredCachingEditResponse = TieredCachingAPI.TieredCachingEditResponse;
-  export import TieredCachingGetResponse = TieredCachingAPI.TieredCachingGetResponse;
-  export import TieredCachingEditParams = TieredCachingAPI.TieredCachingEditParams;
-  export import TieredCachingGetParams = TieredCachingAPI.TieredCachingGetParams;
+export declare namespace TieredCaching {
+  export {
+    type TieredCachingEditResponse as TieredCachingEditResponse,
+    type TieredCachingGetResponse as TieredCachingGetResponse,
+    type TieredCachingEditParams as TieredCachingEditParams,
+    type TieredCachingGetParams as TieredCachingGetParams,
+  };
 }
diff --git a/src/resources/audit-logs.ts b/src/resources/audit-logs.ts
index 14bd253c83..8d4fdcc2a4 100644
--- a/src/resources/audit-logs.ts
+++ b/src/resources/audit-logs.ts
@@ -46,10 +46,9 @@ export interface AuditLogListParams extends V4PagePaginationArrayParams {
 
   /**
    * Query param: Limits the returned results to logs older than the specified date.
-   * This can be a date string `2019-04-30` or an absolute timestamp that conforms to
-   * RFC3339.
+   * A `full-date` that conforms to RFC3339.
    */
-  before?: string;
+  before?: string | string;
 
   /**
    * Query param: Changes the direction of the chronological sorting.
@@ -68,10 +67,9 @@ export interface AuditLogListParams extends V4PagePaginationArrayParams {
 
   /**
    * Query param: Limits the returned results to logs newer than the specified date.
-   * This can be a date string `2019-04-30` or an absolute timestamp that conforms to
-   * RFC3339.
+   * A `full-date` that conforms to RFC3339.
    */
-  since?: string;
+  since?: string | string;
 
   /**
    * Query param:
diff --git a/src/resources/billing/billing.ts b/src/resources/billing/billing.ts
index 0ba1bf5aeb..0348709db6 100644
--- a/src/resources/billing/billing.ts
+++ b/src/resources/billing/billing.ts
@@ -2,12 +2,18 @@
 
 import { APIResource } from '../../resource';
 import * as ProfilesAPI from './profiles';
+import { ProfileGetParams, ProfileGetResponse, Profiles } from './profiles';
 
 export class Billing extends APIResource {
   profiles: ProfilesAPI.Profiles = new ProfilesAPI.Profiles(this._client);
 }
 
-export namespace Billing {
-  export import Profiles = ProfilesAPI.Profiles;
-  export import ProfileGetResponse = ProfilesAPI.ProfileGetResponse;
+Billing.Profiles = Profiles;
+
+export declare namespace Billing {
+  export {
+    Profiles as Profiles,
+    type ProfileGetResponse as ProfileGetResponse,
+    type ProfileGetParams as ProfileGetParams,
+  };
 }
diff --git a/src/resources/billing/index.ts b/src/resources/billing/index.ts
index 8ddaf23258..76f1a80afd 100644
--- a/src/resources/billing/index.ts
+++ b/src/resources/billing/index.ts
@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Billing } from './billing';
-export { ProfileGetResponse, Profiles } from './profiles';
+export { Profiles, type ProfileGetResponse, type ProfileGetParams } from './profiles';
diff --git a/src/resources/billing/profiles.ts b/src/resources/billing/profiles.ts
index 95b33be537..6638bb6e3c 100644
--- a/src/resources/billing/profiles.ts
+++ b/src/resources/billing/profiles.ts
@@ -2,23 +2,111 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ProfilesAPI from './profiles';
 
 export class Profiles extends APIResource {
   /**
    * Gets the current billing profile for the account.
    */
-  get(accountIdentifier: unknown, options?: Core.RequestOptions): Core.APIPromise<ProfileGetResponse> {
+  get(params: ProfileGetParams, options?: Core.RequestOptions): Core.APIPromise<ProfileGetResponse> {
+    const { account_id } = params;
     return (
-      this._client.get(`/accounts/${accountIdentifier}/billing/profile`, options) as Core.APIPromise<{
+      this._client.get(`/accounts/${account_id}/billing/profile`, options) as Core.APIPromise<{
         result: ProfileGetResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export type ProfileGetResponse = unknown | string | null;
+export interface ProfileGetResponse {
+  /**
+   * Billing item identifier tag.
+   */
+  id?: string;
+
+  account_type?: string;
+
+  address?: string;
+
+  address2?: string;
+
+  balance?: string;
+
+  card_expiry_month?: number;
+
+  card_expiry_year?: number;
+
+  card_number?: string;
+
+  city?: string;
+
+  company?: string;
+
+  country?: string;
+
+  created_on?: string;
+
+  device_data?: string;
+
+  edited_on?: string;
+
+  enterprise_billing_email?: string;
+
+  enterprise_primary_email?: string;
+
+  first_name?: string;
+
+  is_partner?: boolean;
+
+  last_name?: string;
+
+  next_bill_date?: string;
+
+  payment_address?: string;
+
+  payment_address2?: string;
+
+  payment_city?: string;
+
+  payment_country?: string;
+
+  payment_email?: string;
+
+  payment_first_name?: string;
+
+  payment_gateway?: string;
+
+  payment_last_name?: string;
+
+  payment_nonce?: string;
+
+  payment_state?: string;
+
+  payment_zipcode?: string;
+
+  primary_email?: string;
+
+  state?: string;
+
+  tax_id_type?: string;
+
+  telephone?: string;
+
+  use_legacy?: boolean;
+
+  validation_code?: string;
+
+  vat?: string;
+
+  zipcode?: string;
+}
+
+export interface ProfileGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
 
-export namespace Profiles {
-  export import ProfileGetResponse = ProfilesAPI.ProfileGetResponse;
+export declare namespace Profiles {
+  export { type ProfileGetResponse as ProfileGetResponse, type ProfileGetParams as ProfileGetParams };
 }
diff --git a/src/resources/bot-management.ts b/src/resources/bot-management.ts
index 044471321b..7a6976dd47 100644
--- a/src/resources/bot-management.ts
+++ b/src/resources/bot-management.ts
@@ -14,7 +14,58 @@ export class BotManagement extends APIResource {
    * - **Bot Management for Enterprise**
    *
    * See [Bot Plans](https://developers.cloudflare.com/bots/plans/) for more
-   * information on the different plans
+   * information on the different plans \
+   * If you recently upgraded or downgraded your plan, refer to the following examples
+   * to clean up old configurations. Copy and paste the example body to remove old zone
+   * configurations based on your current plan.
+   *
+   * #### Clean up configuration for Bot Fight Mode plan
+   *
+   * ```json
+   * {
+   *   "sbfm_likely_automated": "allow",
+   *   "sbfm_definitely_automated": "allow",
+   *   "sbfm_verified_bots": "allow",
+   *   "sbfm_static_resource_protection": false,
+   *   "optimize_wordpress": false,
+   *   "suppress_session_score": false
+   * }
+   * ```
+   *
+   * #### Clean up configuration for SBFM Pro plan
+   *
+   * ```json
+   * {
+   *   "sbfm_likely_automated": "allow",
+   *   "fight_mode": false
+   * }
+   * ```
+   *
+   * #### Clean up configuration for SBFM Biz plan
+   *
+   * ```json
+   * {
+   *   "fight_mode": false
+   * }
+   * ```
+   *
+   * #### Clean up configuration for BM Enterprise Subscription plan
+   *
+   * It is strongly recommended that you ensure you have
+   * [custom rules](https://developers.cloudflare.com/waf/custom-rules/) in place to
+   * protect your zone before disabling the SBFM rules. Without these protections,
+   * your zone is vulnerable to attacks.
+   *
+   * ```json
+   * {
+   *   "sbfm_likely_automated": "allow",
+   *   "sbfm_definitely_automated": "allow",
+   *   "sbfm_verified_bots": "allow",
+   *   "sbfm_static_resource_protection": false,
+   *   "optimize_wordpress": false,
+   *   "fight_mode": false
+   * }
+   * ```
    */
   update(
     params: BotManagementUpdateParams,
@@ -45,6 +96,11 @@ export class BotManagement extends APIResource {
 }
 
 export interface BotFightModeConfiguration {
+  /**
+   * Enable rule to block AI Scrapers and Crawlers.
+   */
+  ai_bots_protection?: 'block' | 'disabled';
+
   /**
    * Use lightweight, invisible JavaScript detections to improve Bot Management.
    * [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
@@ -56,6 +112,12 @@ export interface BotFightModeConfiguration {
    */
   fight_mode?: boolean;
 
+  /**
+   * A read-only field that shows which unauthorized settings are currently active on
+   * the zone. These settings typically result from upgrades or downgrades.
+   */
+  stale_zone_configuration?: BotFightModeConfiguration.StaleZoneConfiguration;
+
   /**
    * A read-only field that indicates whether the zone currently is running the
    * latest ML model.
@@ -63,7 +125,70 @@ export interface BotFightModeConfiguration {
   using_latest_model?: boolean;
 }
 
+export namespace BotFightModeConfiguration {
+  /**
+   * A read-only field that shows which unauthorized settings are currently active on
+   * the zone. These settings typically result from upgrades or downgrades.
+   */
+  export interface StaleZoneConfiguration {
+    /**
+     * Indicates that the zone's wordpress optimization for SBFM is turned on.
+     */
+    optimize_wordpress?: boolean;
+
+    /**
+     * Indicates that the zone's definitely automated requests are being blocked or
+     * challenged.
+     */
+    sbfm_definitely_automated?: string;
+
+    /**
+     * Indicates that the zone's likely automated requests are being blocked or
+     * challenged.
+     */
+    sbfm_likely_automated?: string;
+
+    /**
+     * Indicates that the zone's static resource protection is turned on.
+     */
+    sbfm_static_resource_protection?: string;
+
+    /**
+     * Indicates that the zone's verified bot requests are being blocked.
+     */
+    sbfm_verified_bots?: string;
+
+    /**
+     * Indicates that the zone's session score tracking is disabled.
+     */
+    suppress_session_score?: boolean;
+  }
+}
+
+export interface BotFightModeConfigurationParam {
+  /**
+   * Enable rule to block AI Scrapers and Crawlers.
+   */
+  ai_bots_protection?: 'block' | 'disabled';
+
+  /**
+   * Use lightweight, invisible JavaScript detections to improve Bot Management.
+   * [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
+   */
+  enable_js?: boolean;
+
+  /**
+   * Whether to enable Bot Fight Mode.
+   */
+  fight_mode?: boolean;
+}
+
 export interface SubscriptionConfiguration {
+  /**
+   * Enable rule to block AI Scrapers and Crawlers.
+   */
+  ai_bots_protection?: 'block' | 'disabled';
+
   /**
    * Automatically update to the newest bot detection models created by Cloudflare as
    * they are released.
@@ -77,6 +202,12 @@ export interface SubscriptionConfiguration {
    */
   enable_js?: boolean;
 
+  /**
+   * A read-only field that shows which unauthorized settings are currently active on
+   * the zone. These settings typically result from upgrades or downgrades.
+   */
+  stale_zone_configuration?: SubscriptionConfiguration.StaleZoneConfiguration;
+
   /**
    * Whether to disable tracking the highest bot score for a session in the Bot
    * Management cookie.
@@ -90,7 +221,78 @@ export interface SubscriptionConfiguration {
   using_latest_model?: boolean;
 }
 
+export namespace SubscriptionConfiguration {
+  /**
+   * A read-only field that shows which unauthorized settings are currently active on
+   * the zone. These settings typically result from upgrades or downgrades.
+   */
+  export interface StaleZoneConfiguration {
+    /**
+     * Indicates that the zone's Bot Fight Mode is turned on.
+     */
+    fight_mode?: boolean;
+
+    /**
+     * Indicates that the zone's wordpress optimization for SBFM is turned on.
+     */
+    optimize_wordpress?: boolean;
+
+    /**
+     * Indicates that the zone's definitely automated requests are being blocked or
+     * challenged.
+     */
+    sbfm_definitely_automated?: string;
+
+    /**
+     * Indicates that the zone's likely automated requests are being blocked or
+     * challenged.
+     */
+    sbfm_likely_automated?: string;
+
+    /**
+     * Indicates that the zone's static resource protection is turned on.
+     */
+    sbfm_static_resource_protection?: string;
+
+    /**
+     * Indicates that the zone's verified bot requests are being blocked.
+     */
+    sbfm_verified_bots?: string;
+  }
+}
+
+export interface SubscriptionConfigurationParam {
+  /**
+   * Enable rule to block AI Scrapers and Crawlers.
+   */
+  ai_bots_protection?: 'block' | 'disabled';
+
+  /**
+   * Automatically update to the newest bot detection models created by Cloudflare as
+   * they are released.
+   * [Learn more.](https://developers.cloudflare.com/bots/reference/machine-learning-models#model-versions-and-release-notes)
+   */
+  auto_update_model?: boolean;
+
+  /**
+   * Use lightweight, invisible JavaScript detections to improve Bot Management.
+   * [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
+   */
+  enable_js?: boolean;
+
+  /**
+   * Whether to disable tracking the highest bot score for a session in the Bot
+   * Management cookie.
+   */
+  suppress_session_score?: boolean;
+}
+
 export interface SuperBotFightModeDefinitelyConfiguration {
+  /**
+   * Enable rule to block AI Scrapers and Crawlers.
+   */
+  ai_bots_protection?: 'block' | 'disabled';
+
   /**
    * Use lightweight, invisible JavaScript detections to improve Bot Management.
    * [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
@@ -119,6 +321,12 @@ export interface SuperBotFightModeDefinitelyConfiguration {
    */
   sbfm_verified_bots?: 'allow' | 'block';
 
+  /**
+   * A read-only field that shows which unauthorized settings are currently active on
+   * the zone. These settings typically result from upgrades or downgrades.
+   */
+  stale_zone_configuration?: SuperBotFightModeDefinitelyConfiguration.StaleZoneConfiguration;
+
   /**
    * A read-only field that indicates whether the zone currently is running the
    * latest ML model.
@@ -126,7 +334,66 @@ export interface SuperBotFightModeDefinitelyConfiguration {
   using_latest_model?: boolean;
 }
 
+export namespace SuperBotFightModeDefinitelyConfiguration {
+  /**
+   * A read-only field that shows which unauthorized settings are currently active on
+   * the zone. These settings typically result from upgrades or downgrades.
+   */
+  export interface StaleZoneConfiguration {
+    /**
+     * Indicates that the zone's Bot Fight Mode is turned on.
+     */
+    fight_mode?: boolean;
+
+    /**
+     * Indicates that the zone's likely automated requests are being blocked or
+     * challenged.
+     */
+    sbfm_likely_automated?: string;
+  }
+}
+
+export interface SuperBotFightModeDefinitelyConfigurationParam {
+  /**
+   * Enable rule to block AI Scrapers and Crawlers.
+   */
+  ai_bots_protection?: 'block' | 'disabled';
+
+  /**
+   * Use lightweight, invisible JavaScript detections to improve Bot Management.
+   * [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
+   */
+  enable_js?: boolean;
+
+  /**
+   * Whether to optimize Super Bot Fight Mode protections for Wordpress.
+   */
+  optimize_wordpress?: boolean;
+
+  /**
+   * Super Bot Fight Mode (SBFM) action to take on definitely automated requests.
+   */
+  sbfm_definitely_automated?: 'allow' | 'block' | 'managed_challenge';
+
+  /**
+   * Super Bot Fight Mode (SBFM) to enable static resource protection. Enable if
+   * static resources on your application need bot protection. Note: Static resource
+   * protection can also result in legitimate traffic being blocked.
+   */
+  sbfm_static_resource_protection?: boolean;
+
+  /**
+   * Super Bot Fight Mode (SBFM) action to take on verified bots requests.
+   */
+  sbfm_verified_bots?: 'allow' | 'block';
+}
+
 export interface SuperBotFightModeLikelyConfiguration {
+  /**
+   * Enable rule to block AI Scrapers and Crawlers.
+   */
+  ai_bots_protection?: 'block' | 'disabled';
+
   /**
    * Use lightweight, invisible JavaScript detections to improve Bot Management.
    * [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
@@ -160,6 +427,12 @@ export interface SuperBotFightModeLikelyConfiguration {
    */
   sbfm_verified_bots?: 'allow' | 'block';
 
+  /**
+   * A read-only field that shows which unauthorized settings are currently active on
+   * the zone. These settings typically result from upgrades or downgrades.
+   */
+  stale_zone_configuration?: SuperBotFightModeLikelyConfiguration.StaleZoneConfiguration;
+
   /**
    * A read-only field that indicates whether the zone currently is running the
    * latest ML model.
@@ -167,6 +440,59 @@ export interface SuperBotFightModeLikelyConfiguration {
   using_latest_model?: boolean;
 }
 
+export namespace SuperBotFightModeLikelyConfiguration {
+  /**
+   * A read-only field that shows which unauthorized settings are currently active on
+   * the zone. These settings typically result from upgrades or downgrades.
+   */
+  export interface StaleZoneConfiguration {
+    /**
+     * Indicates that the zone's Bot Fight Mode is turned on.
+     */
+    fight_mode?: boolean;
+  }
+}
+
+export interface SuperBotFightModeLikelyConfigurationParam {
+  /**
+   * Enable rule to block AI Scrapers and Crawlers.
+   */
+  ai_bots_protection?: 'block' | 'disabled';
+
+  /**
+   * Use lightweight, invisible JavaScript detections to improve Bot Management.
+   * [Learn more about JavaScript Detections](https://developers.cloudflare.com/bots/reference/javascript-detections/).
+   */
+  enable_js?: boolean;
+
+  /**
+   * Whether to optimize Super Bot Fight Mode protections for Wordpress.
+   */
+  optimize_wordpress?: boolean;
+
+  /**
+   * Super Bot Fight Mode (SBFM) action to take on definitely automated requests.
+   */
+  sbfm_definitely_automated?: 'allow' | 'block' | 'managed_challenge';
+
+  /**
+   * Super Bot Fight Mode (SBFM) action to take on likely automated requests.
+   */
+  sbfm_likely_automated?: 'allow' | 'block' | 'managed_challenge';
+
+  /**
+   * Super Bot Fight Mode (SBFM) to enable static resource protection. Enable if
+   * static resources on your application need bot protection. Note: Static resource
+   * protection can also result in legitimate traffic being blocked.
+   */
+  sbfm_static_resource_protection?: boolean;
+
+  /**
+   * Super Bot Fight Mode (SBFM) action to take on verified bots requests.
+   */
+  sbfm_verified_bots?: 'allow' | 'block';
+}
+
 export type BotManagementUpdateResponse =
   | BotFightModeConfiguration
   | SuperBotFightModeDefinitelyConfiguration
@@ -185,13 +511,18 @@ export type BotManagementUpdateParams =
   | BotManagementUpdateParams.SuperBotFightModeLikelyConfiguration
   | BotManagementUpdateParams.SubscriptionConfiguration;
 
-export namespace BotManagementUpdateParams {
+export declare namespace BotManagementUpdateParams {
   export interface BotFightModeConfiguration {
     /**
      * Path param: Identifier
      */
     zone_id: string;
 
+    /**
+     * Body param: Enable rule to block AI Scrapers and Crawlers.
+     */
+    ai_bots_protection?: 'block' | 'disabled';
+
     /**
      * Body param: Use lightweight, invisible JavaScript detections to improve Bot
      * Management.
@@ -211,6 +542,11 @@ export namespace BotManagementUpdateParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Enable rule to block AI Scrapers and Crawlers.
+     */
+    ai_bots_protection?: 'block' | 'disabled';
+
     /**
      * Body param: Use lightweight, invisible JavaScript detections to improve Bot
      * Management.
@@ -249,6 +585,11 @@ export namespace BotManagementUpdateParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Enable rule to block AI Scrapers and Crawlers.
+     */
+    ai_bots_protection?: 'block' | 'disabled';
+
     /**
      * Body param: Use lightweight, invisible JavaScript detections to improve Bot
      * Management.
@@ -293,6 +634,11 @@ export namespace BotManagementUpdateParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Enable rule to block AI Scrapers and Crawlers.
+     */
+    ai_bots_protection?: 'block' | 'disabled';
+
     /**
      * Body param: Automatically update to the newest bot detection models created by
      * Cloudflare as they are released.
diff --git a/src/resources/botnet-feed/asn.ts b/src/resources/botnet-feed/asn.ts
new file mode 100755
index 0000000000..a34bca3c98
--- /dev/null
+++ b/src/resources/botnet-feed/asn.ts
@@ -0,0 +1,87 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+
+export class ASN extends APIResource {
+  /**
+   * Gets all the data the botnet tracking database has for a given ASN registered to
+   * user account for given date. If no date is given, it will return results for the
+   * previous day.
+   */
+  dayReport(
+    asnId: number,
+    params: ASNDayReportParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ASNDayReportResponse> {
+    const { account_id, ...query } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/botnet_feed/asn/${asnId}/day_report`, {
+        query,
+        ...options,
+      }) as Core.APIPromise<{ result: ASNDayReportResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Gets all the data the botnet threat feed tracking database has for a given ASN
+   * registered to user account.
+   */
+  fullReport(
+    asnId: number,
+    params: ASNFullReportParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ASNFullReportResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/botnet_feed/asn/${asnId}/full_report`,
+        options,
+      ) as Core.APIPromise<{ result: ASNFullReportResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface ASNDayReportResponse {
+  cidr?: string;
+
+  date?: string;
+
+  offense_count?: number;
+}
+
+export interface ASNFullReportResponse {
+  cidr?: string;
+
+  date?: string;
+
+  offense_count?: number;
+}
+
+export interface ASNDayReportParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param:
+   */
+  date?: string;
+}
+
+export interface ASNFullReportParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace ASN {
+  export {
+    type ASNDayReportResponse as ASNDayReportResponse,
+    type ASNFullReportResponse as ASNFullReportResponse,
+    type ASNDayReportParams as ASNDayReportParams,
+    type ASNFullReportParams as ASNFullReportParams,
+  };
+}
diff --git a/src/resources/botnet-feed/botnet-feed.ts b/src/resources/botnet-feed/botnet-feed.ts
new file mode 100755
index 0000000000..3bac90ca5f
--- /dev/null
+++ b/src/resources/botnet-feed/botnet-feed.ts
@@ -0,0 +1,33 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as ASNAPI from './asn';
+import {
+  ASN,
+  ASNDayReportParams,
+  ASNDayReportResponse,
+  ASNFullReportParams,
+  ASNFullReportResponse,
+} from './asn';
+import * as ConfigsAPI from './configs/configs';
+import { Configs } from './configs/configs';
+
+export class BotnetFeed extends APIResource {
+  asn: ASNAPI.ASN = new ASNAPI.ASN(this._client);
+  configs: ConfigsAPI.Configs = new ConfigsAPI.Configs(this._client);
+}
+
+BotnetFeed.ASN = ASN;
+BotnetFeed.Configs = Configs;
+
+export declare namespace BotnetFeed {
+  export {
+    ASN as ASN,
+    type ASNDayReportResponse as ASNDayReportResponse,
+    type ASNFullReportResponse as ASNFullReportResponse,
+    type ASNDayReportParams as ASNDayReportParams,
+    type ASNFullReportParams as ASNFullReportParams,
+  };
+
+  export { Configs as Configs };
+}
diff --git a/src/resources/botnet-feed/configs/asn.ts b/src/resources/botnet-feed/configs/asn.ts
new file mode 100755
index 0000000000..9b1d42013d
--- /dev/null
+++ b/src/resources/botnet-feed/configs/asn.ts
@@ -0,0 +1,66 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class ASN extends APIResource {
+  /**
+   * Delete an ASN from botnet threat feed for a given user.
+   */
+  delete(
+    asnId: number,
+    params: ASNDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ASNDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/botnet_feed/configs/asn/${asnId}`,
+        options,
+      ) as Core.APIPromise<{ result: ASNDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Gets a list of all ASNs registered for a user for the DDoS Botnet Feed API.
+   */
+  get(params: ASNGetParams, options?: Core.RequestOptions): Core.APIPromise<ASNGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/botnet_feed/configs/asn`, options) as Core.APIPromise<{
+        result: ASNGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface ASNDeleteResponse {
+  asn?: number;
+}
+
+export interface ASNGetResponse {
+  asn?: number;
+}
+
+export interface ASNDeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface ASNGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace ASN {
+  export {
+    type ASNDeleteResponse as ASNDeleteResponse,
+    type ASNGetResponse as ASNGetResponse,
+    type ASNDeleteParams as ASNDeleteParams,
+    type ASNGetParams as ASNGetParams,
+  };
+}
diff --git a/src/resources/botnet-feed/configs/configs.ts b/src/resources/botnet-feed/configs/configs.ts
new file mode 100755
index 0000000000..8b7ecf787a
--- /dev/null
+++ b/src/resources/botnet-feed/configs/configs.ts
@@ -0,0 +1,21 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as ASNAPI from './asn';
+import { ASN, ASNDeleteParams, ASNDeleteResponse, ASNGetParams, ASNGetResponse } from './asn';
+
+export class Configs extends APIResource {
+  asn: ASNAPI.ASN = new ASNAPI.ASN(this._client);
+}
+
+Configs.ASN = ASN;
+
+export declare namespace Configs {
+  export {
+    ASN as ASN,
+    type ASNDeleteResponse as ASNDeleteResponse,
+    type ASNGetResponse as ASNGetResponse,
+    type ASNDeleteParams as ASNDeleteParams,
+    type ASNGetParams as ASNGetParams,
+  };
+}
diff --git a/src/resources/botnet-feed/configs/index.ts b/src/resources/botnet-feed/configs/index.ts
new file mode 100755
index 0000000000..b3a34edccd
--- /dev/null
+++ b/src/resources/botnet-feed/configs/index.ts
@@ -0,0 +1,10 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  ASN,
+  type ASNDeleteResponse,
+  type ASNGetResponse,
+  type ASNDeleteParams,
+  type ASNGetParams,
+} from './asn';
+export { Configs } from './configs';
diff --git a/src/resources/botnet-feed/index.ts b/src/resources/botnet-feed/index.ts
new file mode 100755
index 0000000000..1a78545f8c
--- /dev/null
+++ b/src/resources/botnet-feed/index.ts
@@ -0,0 +1,11 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  ASN,
+  type ASNDayReportResponse,
+  type ASNFullReportResponse,
+  type ASNDayReportParams,
+  type ASNFullReportParams,
+} from './asn';
+export { BotnetFeed } from './botnet-feed';
+export { Configs } from './configs/index';
diff --git a/src/resources/brand-protection.ts b/src/resources/brand-protection.ts
index d7aa242a2a..c636eabe86 100644
--- a/src/resources/brand-protection.ts
+++ b/src/resources/brand-protection.ts
@@ -18,7 +18,7 @@ export class BrandProtection extends APIResource {
   }
 
   /**
-   * Get results for a URL scan
+   * Gets phishing details about a URL.
    */
   urlInfo(params: BrandProtectionURLInfoParams, options?: Core.RequestOptions): Core.APIPromise<Info> {
     const { account_id, ...query } = params;
@@ -212,21 +212,12 @@ export interface BrandProtectionURLInfoParams {
   account_id: string;
 
   /**
-   * Query param:
+   * Query param: Submission URL(s) to filter submission results by.
    */
-  url?: string;
+  url?: Array<string>;
 
   /**
-   * Query param:
+   * Query param: Submission ID(s) to filter submission results by.
    */
-  url_id_param?: BrandProtectionURLInfoParams.URLIDParam;
-}
-
-export namespace BrandProtectionURLInfoParams {
-  export interface URLIDParam {
-    /**
-     * Submission ID(s) to filter submission results by.
-     */
-    url_id?: number;
-  }
+  url_id?: Array<number>;
 }
diff --git a/src/resources/cache/cache-reserve.ts b/src/resources/cache/cache-reserve.ts
index fff2b92773..ae3f4bcae3 100644
--- a/src/resources/cache/cache-reserve.ts
+++ b/src/resources/cache/cache-reserve.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as CacheReserveAPI from './cache-reserve';
 
 export class CacheReserveResource extends APIResource {
   /**
@@ -110,11 +109,6 @@ export interface CacheReserveClearResponse {
    */
   id: CacheReserveClear;
 
-  /**
-   * last time this setting was modified.
-   */
-  modified_on: string | null;
-
   /**
    * The time that the latest Cache Reserve Clear operation started.
    */
@@ -129,16 +123,13 @@ export interface CacheReserveClearResponse {
    * The time that the latest Cache Reserve Clear operation completed.
    */
   end_ts?: string;
+
+  /**
+   * Last time this setting was modified.
+   */
+  modified_on?: string | null;
 }
 
-/**
- * Increase cache lifetimes by automatically storing all cacheable files into
- * Cloudflare's persistent object storage buckets. Requires Cache Reserve
- * subscription. Note: using Tiered Cache with Cache Reserve is highly recommended
- * to reduce Reserve operations costs. See the
- * [developer docs](https://developers.cloudflare.com/cache/about/cache-reserve)
- * for more information.
- */
 export interface CacheReserveEditResponse {
   /**
    * ID of the zone setting.
@@ -146,24 +137,21 @@ export interface CacheReserveEditResponse {
   id: CacheReserve;
 
   /**
-   * last time this setting was modified.
+   * Whether the setting is editable
    */
-  modified_on: string | null;
+  editable: boolean;
 
   /**
-   * Value of the Cache Reserve zone setting.
+   * The value of the feature
    */
   value: 'on' | 'off';
+
+  /**
+   * Last time this setting was modified.
+   */
+  modified_on?: string | null;
 }
 
-/**
- * Increase cache lifetimes by automatically storing all cacheable files into
- * Cloudflare's persistent object storage buckets. Requires Cache Reserve
- * subscription. Note: using Tiered Cache with Cache Reserve is highly recommended
- * to reduce Reserve operations costs. See the
- * [developer docs](https://developers.cloudflare.com/cache/about/cache-reserve)
- * for more information.
- */
 export interface CacheReserveGetResponse {
   /**
    * ID of the zone setting.
@@ -171,14 +159,19 @@ export interface CacheReserveGetResponse {
   id: CacheReserve;
 
   /**
-   * last time this setting was modified.
+   * Whether the setting is editable
    */
-  modified_on: string | null;
+  editable: boolean;
 
   /**
-   * Value of the Cache Reserve zone setting.
+   * The value of the feature
    */
   value: 'on' | 'off';
+
+  /**
+   * Last time this setting was modified.
+   */
+  modified_on?: string | null;
 }
 
 /**
@@ -193,11 +186,6 @@ export interface CacheReserveStatusResponse {
    */
   id: CacheReserveClear;
 
-  /**
-   * last time this setting was modified.
-   */
-  modified_on: string | null;
-
   /**
    * The time that the latest Cache Reserve Clear operation started.
    */
@@ -212,6 +200,11 @@ export interface CacheReserveStatusResponse {
    * The time that the latest Cache Reserve Clear operation completed.
    */
   end_ts?: string;
+
+  /**
+   * Last time this setting was modified.
+   */
+  modified_on?: string | null;
 }
 
 export interface CacheReserveClearParams {
@@ -252,16 +245,18 @@ export interface CacheReserveStatusParams {
   zone_id: string;
 }
 
-export namespace CacheReserveResource {
-  export import CacheReserve = CacheReserveAPI.CacheReserve;
-  export import CacheReserveClear = CacheReserveAPI.CacheReserveClear;
-  export import State = CacheReserveAPI.State;
-  export import CacheReserveClearResponse = CacheReserveAPI.CacheReserveClearResponse;
-  export import CacheReserveEditResponse = CacheReserveAPI.CacheReserveEditResponse;
-  export import CacheReserveGetResponse = CacheReserveAPI.CacheReserveGetResponse;
-  export import CacheReserveStatusResponse = CacheReserveAPI.CacheReserveStatusResponse;
-  export import CacheReserveClearParams = CacheReserveAPI.CacheReserveClearParams;
-  export import CacheReserveEditParams = CacheReserveAPI.CacheReserveEditParams;
-  export import CacheReserveGetParams = CacheReserveAPI.CacheReserveGetParams;
-  export import CacheReserveStatusParams = CacheReserveAPI.CacheReserveStatusParams;
+export declare namespace CacheReserveResource {
+  export {
+    type CacheReserve as CacheReserve,
+    type CacheReserveClear as CacheReserveClear,
+    type State as State,
+    type CacheReserveClearResponse as CacheReserveClearResponse,
+    type CacheReserveEditResponse as CacheReserveEditResponse,
+    type CacheReserveGetResponse as CacheReserveGetResponse,
+    type CacheReserveStatusResponse as CacheReserveStatusResponse,
+    type CacheReserveClearParams as CacheReserveClearParams,
+    type CacheReserveEditParams as CacheReserveEditParams,
+    type CacheReserveGetParams as CacheReserveGetParams,
+    type CacheReserveStatusParams as CacheReserveStatusParams,
+  };
 }
diff --git a/src/resources/cache/cache.ts b/src/resources/cache/cache.ts
index 352d26d5d7..caa6b78a62 100644
--- a/src/resources/cache/cache.ts
+++ b/src/resources/cache/cache.ts
@@ -3,9 +3,50 @@
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as CacheReserveAPI from './cache-reserve';
+import {
+  CacheReserve,
+  CacheReserveClear,
+  CacheReserveClearParams,
+  CacheReserveClearResponse,
+  CacheReserveEditParams,
+  CacheReserveEditResponse,
+  CacheReserveGetParams,
+  CacheReserveGetResponse,
+  CacheReserveResource,
+  CacheReserveStatusParams,
+  CacheReserveStatusResponse,
+  State,
+} from './cache-reserve';
 import * as RegionalTieredCacheAPI from './regional-tiered-cache';
+import {
+  RegionalTieredCache,
+  RegionalTieredCacheEditParams,
+  RegionalTieredCacheEditResponse,
+  RegionalTieredCacheGetParams,
+  RegionalTieredCacheGetResponse,
+  RegionalTieredCacheResource,
+} from './regional-tiered-cache';
 import * as SmartTieredCacheAPI from './smart-tiered-cache';
+import {
+  SmartTieredCache,
+  SmartTieredCacheDeleteParams,
+  SmartTieredCacheDeleteResponse,
+  SmartTieredCacheEditParams,
+  SmartTieredCacheEditResponse,
+  SmartTieredCacheGetParams,
+  SmartTieredCacheGetResponse,
+} from './smart-tiered-cache';
 import * as VariantsAPI from './variants';
+import {
+  CacheVariant,
+  VariantDeleteParams,
+  VariantDeleteResponse,
+  VariantEditParams,
+  VariantEditResponse,
+  VariantGetParams,
+  VariantGetResponse,
+  Variants,
+} from './variants';
 
 export class Cache extends APIResource {
   cacheReserve: CacheReserveAPI.CacheReserveResource = new CacheReserveAPI.CacheReserveResource(this._client);
@@ -109,7 +150,7 @@ export type CachePurgeParams =
   | CachePurgeParams.CachePurgeSingleFile
   | CachePurgeParams.CachePurgeSingleFileWithURLAndHeaders;
 
-export namespace CachePurgeParams {
+export declare namespace CachePurgeParams {
   export interface CachePurgeFlexPurgeByTags {
     /**
      * Path param:
@@ -199,38 +240,54 @@ export namespace CachePurgeParams {
   }
 }
 
-export namespace Cache {
-  export import CacheReserveResource = CacheReserveAPI.CacheReserveResource;
-  export import CacheReserve = CacheReserveAPI.CacheReserve;
-  export import CacheReserveClear = CacheReserveAPI.CacheReserveClear;
-  export import State = CacheReserveAPI.State;
-  export import CacheReserveClearResponse = CacheReserveAPI.CacheReserveClearResponse;
-  export import CacheReserveEditResponse = CacheReserveAPI.CacheReserveEditResponse;
-  export import CacheReserveGetResponse = CacheReserveAPI.CacheReserveGetResponse;
-  export import CacheReserveStatusResponse = CacheReserveAPI.CacheReserveStatusResponse;
-  export import CacheReserveClearParams = CacheReserveAPI.CacheReserveClearParams;
-  export import CacheReserveEditParams = CacheReserveAPI.CacheReserveEditParams;
-  export import CacheReserveGetParams = CacheReserveAPI.CacheReserveGetParams;
-  export import CacheReserveStatusParams = CacheReserveAPI.CacheReserveStatusParams;
-  export import SmartTieredCache = SmartTieredCacheAPI.SmartTieredCache;
-  export import SmartTieredCacheDeleteResponse = SmartTieredCacheAPI.SmartTieredCacheDeleteResponse;
-  export import SmartTieredCacheEditResponse = SmartTieredCacheAPI.SmartTieredCacheEditResponse;
-  export import SmartTieredCacheGetResponse = SmartTieredCacheAPI.SmartTieredCacheGetResponse;
-  export import SmartTieredCacheDeleteParams = SmartTieredCacheAPI.SmartTieredCacheDeleteParams;
-  export import SmartTieredCacheEditParams = SmartTieredCacheAPI.SmartTieredCacheEditParams;
-  export import SmartTieredCacheGetParams = SmartTieredCacheAPI.SmartTieredCacheGetParams;
-  export import Variants = VariantsAPI.Variants;
-  export import CacheVariant = VariantsAPI.CacheVariant;
-  export import CacheVariantIdentifier = VariantsAPI.CacheVariantIdentifier;
-  export import VariantEditResponse = VariantsAPI.VariantEditResponse;
-  export import VariantGetResponse = VariantsAPI.VariantGetResponse;
-  export import VariantDeleteParams = VariantsAPI.VariantDeleteParams;
-  export import VariantEditParams = VariantsAPI.VariantEditParams;
-  export import VariantGetParams = VariantsAPI.VariantGetParams;
-  export import RegionalTieredCacheResource = RegionalTieredCacheAPI.RegionalTieredCacheResource;
-  export import RegionalTieredCache = RegionalTieredCacheAPI.RegionalTieredCache;
-  export import RegionalTieredCacheEditResponse = RegionalTieredCacheAPI.RegionalTieredCacheEditResponse;
-  export import RegionalTieredCacheGetResponse = RegionalTieredCacheAPI.RegionalTieredCacheGetResponse;
-  export import RegionalTieredCacheEditParams = RegionalTieredCacheAPI.RegionalTieredCacheEditParams;
-  export import RegionalTieredCacheGetParams = RegionalTieredCacheAPI.RegionalTieredCacheGetParams;
+Cache.CacheReserveResource = CacheReserveResource;
+Cache.SmartTieredCache = SmartTieredCache;
+Cache.Variants = Variants;
+Cache.RegionalTieredCacheResource = RegionalTieredCacheResource;
+
+export declare namespace Cache {
+  export {
+    CacheReserveResource as CacheReserveResource,
+    type CacheReserve as CacheReserve,
+    type CacheReserveClear as CacheReserveClear,
+    type State as State,
+    type CacheReserveClearResponse as CacheReserveClearResponse,
+    type CacheReserveEditResponse as CacheReserveEditResponse,
+    type CacheReserveGetResponse as CacheReserveGetResponse,
+    type CacheReserveStatusResponse as CacheReserveStatusResponse,
+    type CacheReserveClearParams as CacheReserveClearParams,
+    type CacheReserveEditParams as CacheReserveEditParams,
+    type CacheReserveGetParams as CacheReserveGetParams,
+    type CacheReserveStatusParams as CacheReserveStatusParams,
+  };
+
+  export {
+    SmartTieredCache as SmartTieredCache,
+    type SmartTieredCacheDeleteResponse as SmartTieredCacheDeleteResponse,
+    type SmartTieredCacheEditResponse as SmartTieredCacheEditResponse,
+    type SmartTieredCacheGetResponse as SmartTieredCacheGetResponse,
+    type SmartTieredCacheDeleteParams as SmartTieredCacheDeleteParams,
+    type SmartTieredCacheEditParams as SmartTieredCacheEditParams,
+    type SmartTieredCacheGetParams as SmartTieredCacheGetParams,
+  };
+
+  export {
+    Variants as Variants,
+    type CacheVariant as CacheVariant,
+    type VariantDeleteResponse as VariantDeleteResponse,
+    type VariantEditResponse as VariantEditResponse,
+    type VariantGetResponse as VariantGetResponse,
+    type VariantDeleteParams as VariantDeleteParams,
+    type VariantEditParams as VariantEditParams,
+    type VariantGetParams as VariantGetParams,
+  };
+
+  export {
+    RegionalTieredCacheResource as RegionalTieredCacheResource,
+    type RegionalTieredCache as RegionalTieredCache,
+    type RegionalTieredCacheEditResponse as RegionalTieredCacheEditResponse,
+    type RegionalTieredCacheGetResponse as RegionalTieredCacheGetResponse,
+    type RegionalTieredCacheEditParams as RegionalTieredCacheEditParams,
+    type RegionalTieredCacheGetParams as RegionalTieredCacheGetParams,
+  };
 }
diff --git a/src/resources/cache/index.ts b/src/resources/cache/index.ts
index bbe41510a5..b7e1d36940 100644
--- a/src/resources/cache/index.ts
+++ b/src/resources/cache/index.ts
@@ -2,43 +2,43 @@
 
 export { Cache } from './cache';
 export {
-  CacheReserve,
-  CacheReserveClear,
-  State,
-  CacheReserveClearResponse,
-  CacheReserveEditResponse,
-  CacheReserveGetResponse,
-  CacheReserveStatusResponse,
-  CacheReserveClearParams,
-  CacheReserveEditParams,
-  CacheReserveGetParams,
-  CacheReserveStatusParams,
   CacheReserveResource,
+  type CacheReserve,
+  type CacheReserveClear,
+  type State,
+  type CacheReserveClearResponse,
+  type CacheReserveEditResponse,
+  type CacheReserveGetResponse,
+  type CacheReserveStatusResponse,
+  type CacheReserveClearParams,
+  type CacheReserveEditParams,
+  type CacheReserveGetParams,
+  type CacheReserveStatusParams,
 } from './cache-reserve';
 export {
-  CacheVariant,
-  CacheVariantIdentifier,
-  VariantEditResponse,
-  VariantGetResponse,
-  VariantDeleteParams,
-  VariantEditParams,
-  VariantGetParams,
-  Variants,
-} from './variants';
-export {
-  RegionalTieredCache,
-  RegionalTieredCacheEditResponse,
-  RegionalTieredCacheGetResponse,
-  RegionalTieredCacheEditParams,
-  RegionalTieredCacheGetParams,
   RegionalTieredCacheResource,
+  type RegionalTieredCache,
+  type RegionalTieredCacheEditResponse,
+  type RegionalTieredCacheGetResponse,
+  type RegionalTieredCacheEditParams,
+  type RegionalTieredCacheGetParams,
 } from './regional-tiered-cache';
 export {
-  SmartTieredCacheDeleteResponse,
-  SmartTieredCacheEditResponse,
-  SmartTieredCacheGetResponse,
-  SmartTieredCacheDeleteParams,
-  SmartTieredCacheEditParams,
-  SmartTieredCacheGetParams,
   SmartTieredCache,
+  type SmartTieredCacheDeleteResponse,
+  type SmartTieredCacheEditResponse,
+  type SmartTieredCacheGetResponse,
+  type SmartTieredCacheDeleteParams,
+  type SmartTieredCacheEditParams,
+  type SmartTieredCacheGetParams,
 } from './smart-tiered-cache';
+export {
+  Variants,
+  type CacheVariant,
+  type VariantDeleteResponse,
+  type VariantEditResponse,
+  type VariantGetResponse,
+  type VariantDeleteParams,
+  type VariantEditParams,
+  type VariantGetParams,
+} from './variants';
diff --git a/src/resources/cache/regional-tiered-cache.ts b/src/resources/cache/regional-tiered-cache.ts
index ca066fb04c..f0c491d4fd 100644
--- a/src/resources/cache/regional-tiered-cache.ts
+++ b/src/resources/cache/regional-tiered-cache.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as RegionalTieredCacheAPI from './regional-tiered-cache';
 
 export class RegionalTieredCacheResource extends APIResource {
   /**
@@ -46,11 +45,6 @@ export class RegionalTieredCacheResource extends APIResource {
  */
 export type RegionalTieredCache = 'tc_regional';
 
-/**
- * Instructs Cloudflare to check a regional hub data center on the way to your
- * upper tier. This can help improve performance for smart and custom tiered cache
- * topologies.
- */
 export interface RegionalTieredCacheEditResponse {
   /**
    * ID of the zone setting.
@@ -58,42 +52,21 @@ export interface RegionalTieredCacheEditResponse {
   id: RegionalTieredCache;
 
   /**
-   * last time this setting was modified.
+   * Whether the setting is editable
    */
-  modified_on: string | null;
+  editable: boolean;
 
   /**
-   * Instructs Cloudflare to check a regional hub data center on the way to your
-   * upper tier. This can help improve performance for smart and custom tiered cache
-   * topologies.
+   * The value of the feature
    */
-  value: RegionalTieredCacheEditResponse.Value;
-}
+  value: 'on' | 'off';
 
-export namespace RegionalTieredCacheEditResponse {
   /**
-   * Instructs Cloudflare to check a regional hub data center on the way to your
-   * upper tier. This can help improve performance for smart and custom tiered cache
-   * topologies.
+   * Last time this setting was modified.
    */
-  export interface Value {
-    /**
-     * ID of the zone setting.
-     */
-    id: RegionalTieredCacheAPI.RegionalTieredCache;
-
-    /**
-     * last time this setting was modified.
-     */
-    modified_on: string | null;
-  }
+  modified_on?: string | null;
 }
 
-/**
- * Instructs Cloudflare to check a regional hub data center on the way to your
- * upper tier. This can help improve performance for smart and custom tiered cache
- * topologies.
- */
 export interface RegionalTieredCacheGetResponse {
   /**
    * ID of the zone setting.
@@ -101,35 +74,19 @@ export interface RegionalTieredCacheGetResponse {
   id: RegionalTieredCache;
 
   /**
-   * last time this setting was modified.
+   * Whether the setting is editable
    */
-  modified_on: string | null;
+  editable: boolean;
 
   /**
-   * Instructs Cloudflare to check a regional hub data center on the way to your
-   * upper tier. This can help improve performance for smart and custom tiered cache
-   * topologies.
+   * The value of the feature
    */
-  value: RegionalTieredCacheGetResponse.Value;
-}
+  value: 'on' | 'off';
 
-export namespace RegionalTieredCacheGetResponse {
   /**
-   * Instructs Cloudflare to check a regional hub data center on the way to your
-   * upper tier. This can help improve performance for smart and custom tiered cache
-   * topologies.
+   * Last time this setting was modified.
    */
-  export interface Value {
-    /**
-     * ID of the zone setting.
-     */
-    id: RegionalTieredCacheAPI.RegionalTieredCache;
-
-    /**
-     * last time this setting was modified.
-     */
-    modified_on: string | null;
-  }
+  modified_on?: string | null;
 }
 
 export interface RegionalTieredCacheEditParams {
@@ -151,10 +108,12 @@ export interface RegionalTieredCacheGetParams {
   zone_id: string;
 }
 
-export namespace RegionalTieredCacheResource {
-  export import RegionalTieredCache = RegionalTieredCacheAPI.RegionalTieredCache;
-  export import RegionalTieredCacheEditResponse = RegionalTieredCacheAPI.RegionalTieredCacheEditResponse;
-  export import RegionalTieredCacheGetResponse = RegionalTieredCacheAPI.RegionalTieredCacheGetResponse;
-  export import RegionalTieredCacheEditParams = RegionalTieredCacheAPI.RegionalTieredCacheEditParams;
-  export import RegionalTieredCacheGetParams = RegionalTieredCacheAPI.RegionalTieredCacheGetParams;
+export declare namespace RegionalTieredCacheResource {
+  export {
+    type RegionalTieredCache as RegionalTieredCache,
+    type RegionalTieredCacheEditResponse as RegionalTieredCacheEditResponse,
+    type RegionalTieredCacheGetResponse as RegionalTieredCacheGetResponse,
+    type RegionalTieredCacheEditParams as RegionalTieredCacheEditParams,
+    type RegionalTieredCacheGetParams as RegionalTieredCacheGetParams,
+  };
 }
diff --git a/src/resources/cache/smart-tiered-cache.ts b/src/resources/cache/smart-tiered-cache.ts
index 3f85c286e5..f8e63bd4f6 100644
--- a/src/resources/cache/smart-tiered-cache.ts
+++ b/src/resources/cache/smart-tiered-cache.ts
@@ -2,11 +2,15 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SmartTieredCacheAPI from './smart-tiered-cache';
 
 export class SmartTieredCache extends APIResource {
   /**
-   * Remvoves enablement of Smart Tiered Cache
+   * Smart Tiered Cache dynamically selects the single closest upper tier for each of
+   * your website’s origins with no configuration required, using our in-house
+   * performance and routing data. Cloudflare collects latency data for each request
+   * to an origin, and uses the latency data to determine how well any upper-tier
+   * data center is connected with an origin. As a result, Cloudflare can select the
+   * data center with the lowest latency to be the upper-tier for an origin.
    */
   delete(
     params: SmartTieredCacheDeleteParams,
@@ -22,7 +26,12 @@ export class SmartTieredCache extends APIResource {
   }
 
   /**
-   * Updates enablement of Tiered Cache
+   * Smart Tiered Cache dynamically selects the single closest upper tier for each of
+   * your website’s origins with no configuration required, using our in-house
+   * performance and routing data. Cloudflare collects latency data for each request
+   * to an origin, and uses the latency data to determine how well any upper-tier
+   * data center is connected with an origin. As a result, Cloudflare can select the
+   * data center with the lowest latency to be the upper-tier for an origin.
    */
   edit(
     params: SmartTieredCacheEditParams,
@@ -38,7 +47,12 @@ export class SmartTieredCache extends APIResource {
   }
 
   /**
-   * Get Smart Tiered Cache setting
+   * Smart Tiered Cache dynamically selects the single closest upper tier for each of
+   * your website’s origins with no configuration required, using our in-house
+   * performance and routing data. Cloudflare collects latency data for each request
+   * to an origin, and uses the latency data to determine how well any upper-tier
+   * data center is connected with an origin. As a result, Cloudflare can select the
+   * data center with the lowest latency to be the upper-tier for an origin.
    */
   get(
     params: SmartTieredCacheGetParams,
@@ -56,9 +70,9 @@ export class SmartTieredCache extends APIResource {
 
 export interface SmartTieredCacheDeleteResponse {
   /**
-   * The identifier of the caching setting
+   * ID of the zone setting.
    */
-  id: string;
+  id: 'tiered_cache_smart_topology_enable';
 
   /**
    * Whether the setting is editable
@@ -66,21 +80,16 @@ export interface SmartTieredCacheDeleteResponse {
   editable: boolean;
 
   /**
-   * The time when the setting was last modified
+   * Last time this setting was modified.
    */
-  modified_on: string;
-
-  /**
-   * The status of the feature being on / off
-   */
-  value: 'on' | 'off';
+  modified_on?: string | null;
 }
 
 export interface SmartTieredCacheEditResponse {
   /**
-   * The identifier of the caching setting
+   * ID of the zone setting.
    */
-  id: string;
+  id: 'tiered_cache_smart_topology_enable';
 
   /**
    * Whether the setting is editable
@@ -88,21 +97,21 @@ export interface SmartTieredCacheEditResponse {
   editable: boolean;
 
   /**
-   * The time when the setting was last modified
+   * The value of the feature
    */
-  modified_on: string;
+  value: 'on' | 'off';
 
   /**
-   * The status of the feature being on / off
+   * Last time this setting was modified.
    */
-  value: 'on' | 'off';
+  modified_on?: string | null;
 }
 
 export interface SmartTieredCacheGetResponse {
   /**
-   * The identifier of the caching setting
+   * ID of the zone setting.
    */
-  id: string;
+  id: 'tiered_cache_smart_topology_enable';
 
   /**
    * Whether the setting is editable
@@ -110,14 +119,14 @@ export interface SmartTieredCacheGetResponse {
   editable: boolean;
 
   /**
-   * The time when the setting was last modified
+   * The value of the feature
    */
-  modified_on: string;
+  value: 'on' | 'off';
 
   /**
-   * The status of the feature being on / off
+   * Last time this setting was modified.
    */
-  value: 'on' | 'off';
+  modified_on?: string | null;
 }
 
 export interface SmartTieredCacheDeleteParams {
@@ -146,11 +155,13 @@ export interface SmartTieredCacheGetParams {
   zone_id: string;
 }
 
-export namespace SmartTieredCache {
-  export import SmartTieredCacheDeleteResponse = SmartTieredCacheAPI.SmartTieredCacheDeleteResponse;
-  export import SmartTieredCacheEditResponse = SmartTieredCacheAPI.SmartTieredCacheEditResponse;
-  export import SmartTieredCacheGetResponse = SmartTieredCacheAPI.SmartTieredCacheGetResponse;
-  export import SmartTieredCacheDeleteParams = SmartTieredCacheAPI.SmartTieredCacheDeleteParams;
-  export import SmartTieredCacheEditParams = SmartTieredCacheAPI.SmartTieredCacheEditParams;
-  export import SmartTieredCacheGetParams = SmartTieredCacheAPI.SmartTieredCacheGetParams;
+export declare namespace SmartTieredCache {
+  export {
+    type SmartTieredCacheDeleteResponse as SmartTieredCacheDeleteResponse,
+    type SmartTieredCacheEditResponse as SmartTieredCacheEditResponse,
+    type SmartTieredCacheGetResponse as SmartTieredCacheGetResponse,
+    type SmartTieredCacheDeleteParams as SmartTieredCacheDeleteParams,
+    type SmartTieredCacheEditParams as SmartTieredCacheEditParams,
+    type SmartTieredCacheGetParams as SmartTieredCacheGetParams,
+  };
 }
diff --git a/src/resources/cache/variants.ts b/src/resources/cache/variants.ts
index eeb4c9b32a..eea3f392ee 100644
--- a/src/resources/cache/variants.ts
+++ b/src/resources/cache/variants.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as VariantsAPI from './variants';
 
 export class Variants extends APIResource {
   /**
@@ -12,11 +11,11 @@ export class Variants extends APIResource {
    * does not serve the variant requested, the response will not be cached. This will
    * be indicated with BYPASS cache status in the response headers.
    */
-  delete(params: VariantDeleteParams, options?: Core.RequestOptions): Core.APIPromise<CacheVariant> {
+  delete(params: VariantDeleteParams, options?: Core.RequestOptions): Core.APIPromise<VariantDeleteResponse> {
     const { zone_id } = params;
     return (
       this._client.delete(`/zones/${zone_id}/cache/variants`, options) as Core.APIPromise<{
-        result: CacheVariant;
+        result: VariantDeleteResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -65,211 +64,73 @@ export interface CacheVariant {
   /**
    * ID of the zone setting.
    */
-  id: CacheVariantIdentifier;
+  id: 'variants';
 
   /**
-   * last time this setting was modified.
+   * Last time this setting was modified.
    */
-  modified_on: string | null;
+  modified_on?: string | null;
 }
 
-/**
- * ID of the zone setting.
- */
-export type CacheVariantIdentifier = 'variants';
-
-/**
- * Variant support enables caching variants of images with certain file extensions
- * in addition to the original. This only applies when the origin server sends the
- * 'Vary: Accept' response header. If the origin server sends 'Vary: Accept' but
- * does not serve the variant requested, the response will not be cached. This will
- * be indicated with BYPASS cache status in the response headers.
- */
-export interface VariantEditResponse {
+export interface VariantDeleteResponse {
   /**
    * ID of the zone setting.
    */
-  id: CacheVariantIdentifier;
+  id: 'variants';
 
   /**
-   * last time this setting was modified.
+   * Whether the setting is editable
    */
-  modified_on: string | null;
+  editable: boolean;
 
   /**
-   * Value of the zone setting.
+   * Last time this setting was modified.
    */
-  value: VariantEditResponse.Value;
+  modified_on?: string | null;
 }
 
-export namespace VariantEditResponse {
+export interface VariantEditResponse {
   /**
-   * Value of the zone setting.
+   * ID of the zone setting.
    */
-  export interface Value {
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for avif.
-     */
-    avif?: Array<string>;
+  id: 'variants';
 
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for bmp.
-     */
-    bmp?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for gif.
-     */
-    gif?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for jp2.
-     */
-    jp2?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for jpeg.
-     */
-    jpeg?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for jpg.
-     */
-    jpg?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for jpg2.
-     */
-    jpg2?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for png.
-     */
-    png?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for tif.
-     */
-    tif?: Array<string>;
+  /**
+   * Whether the setting is editable
+   */
+  editable: boolean;
 
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for tiff.
-     */
-    tiff?: Array<string>;
+  /**
+   * The value of the feature
+   */
+  value: string;
 
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for webp.
-     */
-    webp?: Array<string>;
-  }
+  /**
+   * Last time this setting was modified.
+   */
+  modified_on?: string | null;
 }
 
-/**
- * Variant support enables caching variants of images with certain file extensions
- * in addition to the original. This only applies when the origin server sends the
- * 'Vary: Accept' response header. If the origin server sends 'Vary: Accept' but
- * does not serve the variant requested, the response will not be cached. This will
- * be indicated with BYPASS cache status in the response headers.
- */
 export interface VariantGetResponse {
   /**
    * ID of the zone setting.
    */
-  id: CacheVariantIdentifier;
+  id: 'variants';
 
   /**
-   * last time this setting was modified.
+   * Whether the setting is editable
    */
-  modified_on: string | null;
+  editable: boolean;
 
   /**
-   * Value of the zone setting.
+   * The value of the feature
    */
-  value: VariantGetResponse.Value;
-}
+  value: string;
 
-export namespace VariantGetResponse {
   /**
-   * Value of the zone setting.
+   * Last time this setting was modified.
    */
-  export interface Value {
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for avif.
-     */
-    avif?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for bmp.
-     */
-    bmp?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for gif.
-     */
-    gif?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for jp2.
-     */
-    jp2?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for jpeg.
-     */
-    jpeg?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for jpg.
-     */
-    jpg?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for jpg2.
-     */
-    jpg2?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for png.
-     */
-    png?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for tif.
-     */
-    tif?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for tiff.
-     */
-    tiff?: Array<string>;
-
-    /**
-     * List of strings with the MIME types of all the variants that should be served
-     * for webp.
-     */
-    webp?: Array<string>;
-  }
+  modified_on?: string | null;
 }
 
 export interface VariantDeleteParams {
@@ -371,12 +232,14 @@ export interface VariantGetParams {
   zone_id: string;
 }
 
-export namespace Variants {
-  export import CacheVariant = VariantsAPI.CacheVariant;
-  export import CacheVariantIdentifier = VariantsAPI.CacheVariantIdentifier;
-  export import VariantEditResponse = VariantsAPI.VariantEditResponse;
-  export import VariantGetResponse = VariantsAPI.VariantGetResponse;
-  export import VariantDeleteParams = VariantsAPI.VariantDeleteParams;
-  export import VariantEditParams = VariantsAPI.VariantEditParams;
-  export import VariantGetParams = VariantsAPI.VariantGetParams;
+export declare namespace Variants {
+  export {
+    type CacheVariant as CacheVariant,
+    type VariantDeleteResponse as VariantDeleteResponse,
+    type VariantEditResponse as VariantEditResponse,
+    type VariantGetResponse as VariantGetResponse,
+    type VariantDeleteParams as VariantDeleteParams,
+    type VariantEditParams as VariantEditParams,
+    type VariantGetParams as VariantGetParams,
+  };
 }
diff --git a/src/resources/calls/calls.ts b/src/resources/calls/calls.ts
index 73e71cd37f..3c9904d4f4 100644
--- a/src/resources/calls/calls.ts
+++ b/src/resources/calls/calls.ts
@@ -1,180 +1,75 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as TURNAPI from './turn/turn';
-import { SinglePage } from '../../pagination';
+import * as SFUAPI from './sfu';
+import {
+  SFU,
+  SFUCreateParams,
+  SFUCreateResponse,
+  SFUDeleteParams,
+  SFUDeleteResponse,
+  SFUGetParams,
+  SFUGetResponse,
+  SFUListParams,
+  SFUListResponse,
+  SFUListResponsesSinglePage,
+  SFUUpdateParams,
+  SFUUpdateResponse,
+} from './sfu';
+import * as TURNAPI from './turn';
+import {
+  TURN,
+  TURNCreateParams,
+  TURNCreateResponse,
+  TURNDeleteParams,
+  TURNDeleteResponse,
+  TURNGetParams,
+  TURNGetResponse,
+  TURNListParams,
+  TURNListResponse,
+  TURNListResponsesSinglePage,
+  TURNUpdateParams,
+  TURNUpdateResponse,
+} from './turn';
 
 export class Calls extends APIResource {
+  sfu: SFUAPI.SFU = new SFUAPI.SFU(this._client);
   turn: TURNAPI.TURN = new TURNAPI.TURN(this._client);
-
-  /**
-   * Creates a new Cloudflare calls app. An app is an unique enviroment where each
-   * Session can access all Tracks within the app.
-   */
-  create(params: CallCreateParams, options?: Core.RequestOptions): Core.APIPromise<CallsAppWithSecret> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.post(`/accounts/${account_id}/calls/apps`, { body, ...options }) as Core.APIPromise<{
-        result: CallsAppWithSecret;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Edit details for a single app.
-   */
-  update(appId: string, params: CallUpdateParams, options?: Core.RequestOptions): Core.APIPromise<CallsApp> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.put(`/accounts/${account_id}/calls/apps/${appId}`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: CallsApp }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Lists all apps in the Cloudflare account
-   */
-  list(
-    params: CallListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<CallListResponsesSinglePage, CallListResponse> {
-    const { account_id } = params;
-    return this._client.getAPIList(
-      `/accounts/${account_id}/calls/apps`,
-      CallListResponsesSinglePage,
-      options,
-    );
-  }
-
-  /**
-   * Deletes an app from Cloudflare Calls
-   */
-  delete(appId: string, params: CallDeleteParams, options?: Core.RequestOptions): Core.APIPromise<CallsApp> {
-    const { account_id } = params;
-    return (
-      this._client.delete(`/accounts/${account_id}/calls/apps/${appId}`, options) as Core.APIPromise<{
-        result: CallsApp;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Fetches details for a single Calls app.
-   */
-  get(appId: string, params: CallGetParams, options?: Core.RequestOptions): Core.APIPromise<CallsApp> {
-    const { account_id } = params;
-    return (
-      this._client.get(`/accounts/${account_id}/calls/apps/${appId}`, options) as Core.APIPromise<{
-        result: CallsApp;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export class CallListResponsesSinglePage extends SinglePage<CallListResponse> {}
-
-export interface CallsApp {
-  /**
-   * The date and time the item was created.
-   */
-  created?: string;
-
-  /**
-   * The date and time the item was last modified.
-   */
-  modified?: string;
-
-  /**
-   * A short description of Calls app, not shown to end users.
-   */
-  name?: string;
-
-  /**
-   * A Cloudflare-generated unique identifier for a item.
-   */
-  uid?: string;
-}
-
-export interface CallsAppWithSecret {
-  /**
-   * The date and time the item was created.
-   */
-  created?: string;
-
-  /**
-   * The date and time the item was last modified.
-   */
-  modified?: string;
-
-  /**
-   * A short description of Calls app, not shown to end users.
-   */
-  name?: string;
-
-  /**
-   * Bearer token
-   */
-  secret?: string;
-
-  /**
-   * A Cloudflare-generated unique identifier for a item.
-   */
-  uid?: string;
-}
-
-/**
- * Bearer token
- */
-export type CallListResponse = string;
-
-export interface CallCreateParams {
-  /**
-   * Path param: The account identifier tag.
-   */
-  account_id: string;
-
-  /**
-   * Body param: A short description of Calls app, not shown to end users.
-   */
-  name?: string;
-}
-
-export interface CallUpdateParams {
-  /**
-   * Path param: The account identifier tag.
-   */
-  account_id: string;
-
-  /**
-   * Body param: A short description of Calls app, not shown to end users.
-   */
-  name?: string;
-}
-
-export interface CallListParams {
-  /**
-   * The account identifier tag.
-   */
-  account_id: string;
-}
-
-export interface CallDeleteParams {
-  /**
-   * The account identifier tag.
-   */
-  account_id: string;
-}
-
-export interface CallGetParams {
-  /**
-   * The account identifier tag.
-   */
-  account_id: string;
 }
 
-export namespace Calls {
-  export import TURN = TURNAPI.TURN;
+Calls.SFU = SFU;
+Calls.SFUListResponsesSinglePage = SFUListResponsesSinglePage;
+Calls.TURN = TURN;
+Calls.TURNListResponsesSinglePage = TURNListResponsesSinglePage;
+
+export declare namespace Calls {
+  export {
+    SFU as SFU,
+    type SFUCreateResponse as SFUCreateResponse,
+    type SFUUpdateResponse as SFUUpdateResponse,
+    type SFUListResponse as SFUListResponse,
+    type SFUDeleteResponse as SFUDeleteResponse,
+    type SFUGetResponse as SFUGetResponse,
+    SFUListResponsesSinglePage as SFUListResponsesSinglePage,
+    type SFUCreateParams as SFUCreateParams,
+    type SFUUpdateParams as SFUUpdateParams,
+    type SFUListParams as SFUListParams,
+    type SFUDeleteParams as SFUDeleteParams,
+    type SFUGetParams as SFUGetParams,
+  };
+
+  export {
+    TURN as TURN,
+    type TURNCreateResponse as TURNCreateResponse,
+    type TURNUpdateResponse as TURNUpdateResponse,
+    type TURNListResponse as TURNListResponse,
+    type TURNDeleteResponse as TURNDeleteResponse,
+    type TURNGetResponse as TURNGetResponse,
+    TURNListResponsesSinglePage as TURNListResponsesSinglePage,
+    type TURNCreateParams as TURNCreateParams,
+    type TURNUpdateParams as TURNUpdateParams,
+    type TURNListParams as TURNListParams,
+    type TURNDeleteParams as TURNDeleteParams,
+    type TURNGetParams as TURNGetParams,
+  };
 }
diff --git a/src/resources/calls/index.ts b/src/resources/calls/index.ts
index 46899af8fa..faf86d9e28 100644
--- a/src/resources/calls/index.ts
+++ b/src/resources/calls/index.ts
@@ -1,4 +1,31 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Calls } from './calls';
-export { TURN } from './turn/index';
+export {
+  SFUListResponsesSinglePage,
+  SFU,
+  type SFUCreateResponse,
+  type SFUUpdateResponse,
+  type SFUListResponse,
+  type SFUDeleteResponse,
+  type SFUGetResponse,
+  type SFUCreateParams,
+  type SFUUpdateParams,
+  type SFUListParams,
+  type SFUDeleteParams,
+  type SFUGetParams,
+} from './sfu';
+export {
+  TURNListResponsesSinglePage,
+  TURN,
+  type TURNCreateResponse,
+  type TURNUpdateResponse,
+  type TURNListResponse,
+  type TURNDeleteResponse,
+  type TURNGetResponse,
+  type TURNCreateParams,
+  type TURNUpdateParams,
+  type TURNListParams,
+  type TURNDeleteParams,
+  type TURNGetParams,
+} from './turn';
diff --git a/src/resources/calls/sfu.ts b/src/resources/calls/sfu.ts
new file mode 100644
index 0000000000..84a5b7f04a
--- /dev/null
+++ b/src/resources/calls/sfu.ts
@@ -0,0 +1,256 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { SinglePage } from '../../pagination';
+
+export class SFU extends APIResource {
+  /**
+   * Creates a new Cloudflare calls app. An app is an unique enviroment where each
+   * Session can access all Tracks within the app.
+   */
+  create(params: SFUCreateParams, options?: Core.RequestOptions): Core.APIPromise<SFUCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/calls/apps`, { body, ...options }) as Core.APIPromise<{
+        result: SFUCreateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Edit details for a single app.
+   */
+  update(
+    appId: string,
+    params: SFUUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SFUUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/calls/apps/${appId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: SFUUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists all apps in the Cloudflare account
+   */
+  list(
+    params: SFUListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<SFUListResponsesSinglePage, SFUListResponse> {
+    const { account_id } = params;
+    return this._client.getAPIList(`/accounts/${account_id}/calls/apps`, SFUListResponsesSinglePage, options);
+  }
+
+  /**
+   * Deletes an app from Cloudflare Calls
+   */
+  delete(
+    appId: string,
+    params: SFUDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SFUDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}/calls/apps/${appId}`, options) as Core.APIPromise<{
+        result: SFUDeleteResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches details for a single Calls app.
+   */
+  get(appId: string, params: SFUGetParams, options?: Core.RequestOptions): Core.APIPromise<SFUGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/calls/apps/${appId}`, options) as Core.APIPromise<{
+        result: SFUGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class SFUListResponsesSinglePage extends SinglePage<SFUListResponse> {}
+
+export interface SFUCreateResponse {
+  /**
+   * The date and time the item was created.
+   */
+  created?: string;
+
+  /**
+   * The date and time the item was last modified.
+   */
+  modified?: string;
+
+  /**
+   * A short description of Calls app, not shown to end users.
+   */
+  name?: string;
+
+  /**
+   * Bearer token
+   */
+  secret?: string;
+
+  /**
+   * A Cloudflare-generated unique identifier for a item.
+   */
+  uid?: string;
+}
+
+export interface SFUUpdateResponse {
+  /**
+   * The date and time the item was created.
+   */
+  created?: string;
+
+  /**
+   * The date and time the item was last modified.
+   */
+  modified?: string;
+
+  /**
+   * A short description of Calls app, not shown to end users.
+   */
+  name?: string;
+
+  /**
+   * A Cloudflare-generated unique identifier for a item.
+   */
+  uid?: string;
+}
+
+export interface SFUListResponse {
+  /**
+   * The date and time the item was created.
+   */
+  created?: string;
+
+  /**
+   * The date and time the item was last modified.
+   */
+  modified?: string;
+
+  /**
+   * A short description of Calls app, not shown to end users.
+   */
+  name?: string;
+
+  /**
+   * A Cloudflare-generated unique identifier for a item.
+   */
+  uid?: string;
+}
+
+export interface SFUDeleteResponse {
+  /**
+   * The date and time the item was created.
+   */
+  created?: string;
+
+  /**
+   * The date and time the item was last modified.
+   */
+  modified?: string;
+
+  /**
+   * A short description of Calls app, not shown to end users.
+   */
+  name?: string;
+
+  /**
+   * A Cloudflare-generated unique identifier for a item.
+   */
+  uid?: string;
+}
+
+export interface SFUGetResponse {
+  /**
+   * The date and time the item was created.
+   */
+  created?: string;
+
+  /**
+   * The date and time the item was last modified.
+   */
+  modified?: string;
+
+  /**
+   * A short description of Calls app, not shown to end users.
+   */
+  name?: string;
+
+  /**
+   * A Cloudflare-generated unique identifier for a item.
+   */
+  uid?: string;
+}
+
+export interface SFUCreateParams {
+  /**
+   * Path param: The account identifier tag.
+   */
+  account_id: string;
+
+  /**
+   * Body param: A short description of Calls app, not shown to end users.
+   */
+  name?: string;
+}
+
+export interface SFUUpdateParams {
+  /**
+   * Path param: The account identifier tag.
+   */
+  account_id: string;
+
+  /**
+   * Body param: A short description of Calls app, not shown to end users.
+   */
+  name?: string;
+}
+
+export interface SFUListParams {
+  /**
+   * The account identifier tag.
+   */
+  account_id: string;
+}
+
+export interface SFUDeleteParams {
+  /**
+   * The account identifier tag.
+   */
+  account_id: string;
+}
+
+export interface SFUGetParams {
+  /**
+   * The account identifier tag.
+   */
+  account_id: string;
+}
+
+SFU.SFUListResponsesSinglePage = SFUListResponsesSinglePage;
+
+export declare namespace SFU {
+  export {
+    type SFUCreateResponse as SFUCreateResponse,
+    type SFUUpdateResponse as SFUUpdateResponse,
+    type SFUListResponse as SFUListResponse,
+    type SFUDeleteResponse as SFUDeleteResponse,
+    type SFUGetResponse as SFUGetResponse,
+    SFUListResponsesSinglePage as SFUListResponsesSinglePage,
+    type SFUCreateParams as SFUCreateParams,
+    type SFUUpdateParams as SFUUpdateParams,
+    type SFUListParams as SFUListParams,
+    type SFUDeleteParams as SFUDeleteParams,
+    type SFUGetParams as SFUGetParams,
+  };
+}
diff --git a/src/resources/calls/turn.ts b/src/resources/calls/turn.ts
new file mode 100644
index 0000000000..594b7b580f
--- /dev/null
+++ b/src/resources/calls/turn.ts
@@ -0,0 +1,255 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { SinglePage } from '../../pagination';
+
+export class TURN extends APIResource {
+  /**
+   * Creates a new Cloudflare Calls TURN key.
+   */
+  create(params: TURNCreateParams, options?: Core.RequestOptions): Core.APIPromise<TURNCreateResponse> {
+    const { account_id, ...body } = params;
+    return this._client.post(`/accounts/${account_id}/calls/turn_keys`, { body, ...options });
+  }
+
+  /**
+   * Edit details for a single TURN key.
+   */
+  update(
+    keyId: string,
+    params: TURNUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TURNUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/calls/turn_keys/${keyId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: TURNUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists all TURN keys in the Cloudflare account
+   */
+  list(
+    params: TURNListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<TURNListResponsesSinglePage, TURNListResponse> {
+    const { account_id } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/calls/turn_keys`,
+      TURNListResponsesSinglePage,
+      options,
+    );
+  }
+
+  /**
+   * Deletes a TURN key from Cloudflare Calls
+   */
+  delete(
+    keyId: string,
+    params: TURNDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TURNDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}/calls/turn_keys/${keyId}`, options) as Core.APIPromise<{
+        result: TURNDeleteResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches details for a single TURN key.
+   */
+  get(keyId: string, params: TURNGetParams, options?: Core.RequestOptions): Core.APIPromise<TURNGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/calls/turn_keys/${keyId}`, options) as Core.APIPromise<{
+        result: TURNGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class TURNListResponsesSinglePage extends SinglePage<TURNListResponse> {}
+
+export interface TURNCreateResponse {
+  /**
+   * The date and time the item was created.
+   */
+  created?: string;
+
+  /**
+   * Bearer token
+   */
+  key?: string;
+
+  /**
+   * The date and time the item was last modified.
+   */
+  modified?: string;
+
+  /**
+   * A short description of a TURN key, not shown to end users.
+   */
+  name?: string;
+
+  /**
+   * A Cloudflare-generated unique identifier for a item.
+   */
+  uid?: string;
+}
+
+export interface TURNUpdateResponse {
+  /**
+   * The date and time the item was created.
+   */
+  created?: string;
+
+  /**
+   * The date and time the item was last modified.
+   */
+  modified?: string;
+
+  /**
+   * A short description of Calls app, not shown to end users.
+   */
+  name?: string;
+
+  /**
+   * A Cloudflare-generated unique identifier for a item.
+   */
+  uid?: string;
+}
+
+export interface TURNListResponse {
+  /**
+   * The date and time the item was created.
+   */
+  created?: string;
+
+  /**
+   * The date and time the item was last modified.
+   */
+  modified?: string;
+
+  /**
+   * A short description of Calls app, not shown to end users.
+   */
+  name?: string;
+
+  /**
+   * A Cloudflare-generated unique identifier for a item.
+   */
+  uid?: string;
+}
+
+export interface TURNDeleteResponse {
+  /**
+   * The date and time the item was created.
+   */
+  created?: string;
+
+  /**
+   * The date and time the item was last modified.
+   */
+  modified?: string;
+
+  /**
+   * A short description of Calls app, not shown to end users.
+   */
+  name?: string;
+
+  /**
+   * A Cloudflare-generated unique identifier for a item.
+   */
+  uid?: string;
+}
+
+export interface TURNGetResponse {
+  /**
+   * The date and time the item was created.
+   */
+  created?: string;
+
+  /**
+   * The date and time the item was last modified.
+   */
+  modified?: string;
+
+  /**
+   * A short description of Calls app, not shown to end users.
+   */
+  name?: string;
+
+  /**
+   * A Cloudflare-generated unique identifier for a item.
+   */
+  uid?: string;
+}
+
+export interface TURNCreateParams {
+  /**
+   * Path param: The account identifier tag.
+   */
+  account_id: string;
+
+  /**
+   * Body param: A short description of a TURN key, not shown to end users.
+   */
+  name?: string;
+}
+
+export interface TURNUpdateParams {
+  /**
+   * Path param: The account identifier tag.
+   */
+  account_id: string;
+
+  /**
+   * Body param: A short description of a TURN key, not shown to end users.
+   */
+  name?: string;
+}
+
+export interface TURNListParams {
+  /**
+   * The account identifier tag.
+   */
+  account_id: string;
+}
+
+export interface TURNDeleteParams {
+  /**
+   * The account identifier tag.
+   */
+  account_id: string;
+}
+
+export interface TURNGetParams {
+  /**
+   * The account identifier tag.
+   */
+  account_id: string;
+}
+
+TURN.TURNListResponsesSinglePage = TURNListResponsesSinglePage;
+
+export declare namespace TURN {
+  export {
+    type TURNCreateResponse as TURNCreateResponse,
+    type TURNUpdateResponse as TURNUpdateResponse,
+    type TURNListResponse as TURNListResponse,
+    type TURNDeleteResponse as TURNDeleteResponse,
+    type TURNGetResponse as TURNGetResponse,
+    TURNListResponsesSinglePage as TURNListResponsesSinglePage,
+    type TURNCreateParams as TURNCreateParams,
+    type TURNUpdateParams as TURNUpdateParams,
+    type TURNListParams as TURNListParams,
+    type TURNDeleteParams as TURNDeleteParams,
+    type TURNGetParams as TURNGetParams,
+  };
+}
diff --git a/src/resources/calls/turn/index.ts b/src/resources/calls/turn/index.ts
deleted file mode 100644
index 1f1fa45050..0000000000
--- a/src/resources/calls/turn/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export {
-  KeyCreateResponse,
-  KeyUpdateResponse,
-  KeyListResponse,
-  KeyDeleteResponse,
-  KeyGetResponse,
-  KeyCreateParams,
-  KeyUpdateParams,
-  KeyListParams,
-  KeyDeleteParams,
-  KeyGetParams,
-  KeyListResponsesSinglePage,
-  Keys,
-} from './keys';
-export { TURN } from './turn';
diff --git a/src/resources/calls/turn/keys.ts b/src/resources/calls/turn/keys.ts
deleted file mode 100644
index 9c8d738449..0000000000
--- a/src/resources/calls/turn/keys.ts
+++ /dev/null
@@ -1,184 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../resource';
-import * as Core from '../../../core';
-import * as KeysAPI from './keys';
-import { SinglePage } from '../../../pagination';
-
-export class Keys extends APIResource {
-  /**
-   * Creates a new Cloudflare Calls TURN key.
-   */
-  create(params: KeyCreateParams, options?: Core.RequestOptions): Core.APIPromise<KeyCreateResponse> {
-    const { account_id, ...body } = params;
-    return this._client.post(`/accounts/${account_id}/calls/turn_keys`, { body, ...options });
-  }
-
-  /**
-   * Edit details for a single TURN key.
-   */
-  update(
-    keyId: string,
-    params: KeyUpdateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<KeyUpdateResponse> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.put(`/accounts/${account_id}/calls/turn_keys/${keyId}`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: KeyUpdateResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Lists all TURN keys in the Cloudflare account
-   */
-  list(
-    params: KeyListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<KeyListResponsesSinglePage, KeyListResponse> {
-    const { account_id } = params;
-    return this._client.getAPIList(
-      `/accounts/${account_id}/calls/turn_keys`,
-      KeyListResponsesSinglePage,
-      options,
-    );
-  }
-
-  /**
-   * Deletes a TURN key from Cloudflare Calls
-   */
-  delete(
-    keyId: string,
-    params: KeyDeleteParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<KeyDeleteResponse> {
-    const { account_id } = params;
-    return (
-      this._client.delete(`/accounts/${account_id}/calls/turn_keys/${keyId}`, options) as Core.APIPromise<{
-        result: KeyDeleteResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Fetches details for a single TURN key.
-   */
-  get(keyId: string, params: KeyGetParams, options?: Core.RequestOptions): Core.APIPromise<KeyGetResponse> {
-    const { account_id } = params;
-    return (
-      this._client.get(`/accounts/${account_id}/calls/turn_keys/${keyId}`, options) as Core.APIPromise<{
-        result: KeyGetResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export class KeyListResponsesSinglePage extends SinglePage<KeyListResponse> {}
-
-export interface KeyCreateResponse {
-  /**
-   * The date and time the item was created.
-   */
-  created?: string;
-
-  /**
-   * Bearer token
-   */
-  key?: string;
-
-  /**
-   * The date and time the item was last modified.
-   */
-  modified?: string;
-
-  /**
-   * A short description of a TURN key, not shown to end users.
-   */
-  name?: string;
-
-  /**
-   * A Cloudflare-generated unique identifier for a item.
-   */
-  uid?: string;
-}
-
-/**
- * Bearer token
- */
-export type KeyUpdateResponse = string;
-
-/**
- * Bearer token
- */
-export type KeyListResponse = string;
-
-/**
- * Bearer token
- */
-export type KeyDeleteResponse = string;
-
-/**
- * Bearer token
- */
-export type KeyGetResponse = string;
-
-export interface KeyCreateParams {
-  /**
-   * Path param: The account identifier tag.
-   */
-  account_id: string;
-
-  /**
-   * Body param: A short description of a TURN key, not shown to end users.
-   */
-  name?: string;
-}
-
-export interface KeyUpdateParams {
-  /**
-   * Path param: The account identifier tag.
-   */
-  account_id: string;
-
-  /**
-   * Body param: A short description of a TURN key, not shown to end users.
-   */
-  name?: string;
-}
-
-export interface KeyListParams {
-  /**
-   * The account identifier tag.
-   */
-  account_id: string;
-}
-
-export interface KeyDeleteParams {
-  /**
-   * The account identifier tag.
-   */
-  account_id: string;
-}
-
-export interface KeyGetParams {
-  /**
-   * The account identifier tag.
-   */
-  account_id: string;
-}
-
-export namespace Keys {
-  export import KeyCreateResponse = KeysAPI.KeyCreateResponse;
-  export import KeyUpdateResponse = KeysAPI.KeyUpdateResponse;
-  export import KeyListResponse = KeysAPI.KeyListResponse;
-  export import KeyDeleteResponse = KeysAPI.KeyDeleteResponse;
-  export import KeyGetResponse = KeysAPI.KeyGetResponse;
-  export import KeyListResponsesSinglePage = KeysAPI.KeyListResponsesSinglePage;
-  export import KeyCreateParams = KeysAPI.KeyCreateParams;
-  export import KeyUpdateParams = KeysAPI.KeyUpdateParams;
-  export import KeyListParams = KeysAPI.KeyListParams;
-  export import KeyDeleteParams = KeysAPI.KeyDeleteParams;
-  export import KeyGetParams = KeysAPI.KeyGetParams;
-}
diff --git a/src/resources/calls/turn/turn.ts b/src/resources/calls/turn/turn.ts
deleted file mode 100644
index 8eec8b39a0..0000000000
--- a/src/resources/calls/turn/turn.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../resource';
-import * as KeysAPI from './keys';
-
-export class TURN extends APIResource {
-  keys: KeysAPI.Keys = new KeysAPI.Keys(this._client);
-}
-
-export namespace TURN {
-  export import Keys = KeysAPI.Keys;
-  export import KeyCreateResponse = KeysAPI.KeyCreateResponse;
-  export import KeyUpdateResponse = KeysAPI.KeyUpdateResponse;
-  export import KeyListResponse = KeysAPI.KeyListResponse;
-  export import KeyDeleteResponse = KeysAPI.KeyDeleteResponse;
-  export import KeyGetResponse = KeysAPI.KeyGetResponse;
-  export import KeyListResponsesSinglePage = KeysAPI.KeyListResponsesSinglePage;
-  export import KeyCreateParams = KeysAPI.KeyCreateParams;
-  export import KeyUpdateParams = KeysAPI.KeyUpdateParams;
-  export import KeyListParams = KeysAPI.KeyListParams;
-  export import KeyDeleteParams = KeysAPI.KeyDeleteParams;
-  export import KeyGetParams = KeysAPI.KeyGetParams;
-}
diff --git a/src/resources/certificate-authorities/certificate-authorities.ts b/src/resources/certificate-authorities/certificate-authorities.ts
index ab1cd1a2ab..0221d7ef09 100644
--- a/src/resources/certificate-authorities/certificate-authorities.ts
+++ b/src/resources/certificate-authorities/certificate-authorities.ts
@@ -2,18 +2,31 @@
 
 import { APIResource } from '../../resource';
 import * as HostnameAssociationsAPI from './hostname-associations';
+import {
+  HostnameAssociation,
+  HostnameAssociationGetParams,
+  HostnameAssociationGetResponse,
+  HostnameAssociationUpdateParams,
+  HostnameAssociationUpdateResponse,
+  HostnameAssociations,
+  TLSHostnameAssociation,
+} from './hostname-associations';
 
 export class CertificateAuthorities extends APIResource {
   hostnameAssociations: HostnameAssociationsAPI.HostnameAssociations =
     new HostnameAssociationsAPI.HostnameAssociations(this._client);
 }
 
-export namespace CertificateAuthorities {
-  export import HostnameAssociations = HostnameAssociationsAPI.HostnameAssociations;
-  export import HostnameAssociation = HostnameAssociationsAPI.HostnameAssociation;
-  export import TLSHostnameAssociation = HostnameAssociationsAPI.TLSHostnameAssociation;
-  export import HostnameAssociationUpdateResponse = HostnameAssociationsAPI.HostnameAssociationUpdateResponse;
-  export import HostnameAssociationGetResponse = HostnameAssociationsAPI.HostnameAssociationGetResponse;
-  export import HostnameAssociationUpdateParams = HostnameAssociationsAPI.HostnameAssociationUpdateParams;
-  export import HostnameAssociationGetParams = HostnameAssociationsAPI.HostnameAssociationGetParams;
+CertificateAuthorities.HostnameAssociations = HostnameAssociations;
+
+export declare namespace CertificateAuthorities {
+  export {
+    HostnameAssociations as HostnameAssociations,
+    type HostnameAssociation as HostnameAssociation,
+    type TLSHostnameAssociation as TLSHostnameAssociation,
+    type HostnameAssociationUpdateResponse as HostnameAssociationUpdateResponse,
+    type HostnameAssociationGetResponse as HostnameAssociationGetResponse,
+    type HostnameAssociationUpdateParams as HostnameAssociationUpdateParams,
+    type HostnameAssociationGetParams as HostnameAssociationGetParams,
+  };
 }
diff --git a/src/resources/certificate-authorities/hostname-associations.ts b/src/resources/certificate-authorities/hostname-associations.ts
index 70e0990b31..b88250cede 100644
--- a/src/resources/certificate-authorities/hostname-associations.ts
+++ b/src/resources/certificate-authorities/hostname-associations.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as HostnameAssociationsAPI from './hostname-associations';
 
 export class HostnameAssociations extends APIResource {
   /**
@@ -95,11 +94,13 @@ export interface HostnameAssociationGetParams {
   mtls_certificate_id?: string;
 }
 
-export namespace HostnameAssociations {
-  export import HostnameAssociation = HostnameAssociationsAPI.HostnameAssociation;
-  export import TLSHostnameAssociation = HostnameAssociationsAPI.TLSHostnameAssociation;
-  export import HostnameAssociationUpdateResponse = HostnameAssociationsAPI.HostnameAssociationUpdateResponse;
-  export import HostnameAssociationGetResponse = HostnameAssociationsAPI.HostnameAssociationGetResponse;
-  export import HostnameAssociationUpdateParams = HostnameAssociationsAPI.HostnameAssociationUpdateParams;
-  export import HostnameAssociationGetParams = HostnameAssociationsAPI.HostnameAssociationGetParams;
+export declare namespace HostnameAssociations {
+  export {
+    type HostnameAssociation as HostnameAssociation,
+    type TLSHostnameAssociation as TLSHostnameAssociation,
+    type HostnameAssociationUpdateResponse as HostnameAssociationUpdateResponse,
+    type HostnameAssociationGetResponse as HostnameAssociationGetResponse,
+    type HostnameAssociationUpdateParams as HostnameAssociationUpdateParams,
+    type HostnameAssociationGetParams as HostnameAssociationGetParams,
+  };
 }
diff --git a/src/resources/certificate-authorities/index.ts b/src/resources/certificate-authorities/index.ts
index e84e9da00c..5a057708e1 100644
--- a/src/resources/certificate-authorities/index.ts
+++ b/src/resources/certificate-authorities/index.ts
@@ -2,11 +2,11 @@
 
 export { CertificateAuthorities } from './certificate-authorities';
 export {
-  HostnameAssociation,
-  TLSHostnameAssociation,
-  HostnameAssociationUpdateResponse,
-  HostnameAssociationGetResponse,
-  HostnameAssociationUpdateParams,
-  HostnameAssociationGetParams,
   HostnameAssociations,
+  type HostnameAssociation,
+  type TLSHostnameAssociation,
+  type HostnameAssociationUpdateResponse,
+  type HostnameAssociationGetResponse,
+  type HostnameAssociationUpdateParams,
+  type HostnameAssociationGetParams,
 } from './hostname-associations';
diff --git a/src/resources/challenges/challenges.ts b/src/resources/challenges/challenges.ts
deleted file mode 100644
index 6c4e7c2629..0000000000
--- a/src/resources/challenges/challenges.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../resource';
-import * as WidgetsAPI from './widgets';
-
-export class Challenges extends APIResource {
-  widgets: WidgetsAPI.Widgets = new WidgetsAPI.Widgets(this._client);
-}
-
-export namespace Challenges {
-  export import Widgets = WidgetsAPI.Widgets;
-  export import Widget = WidgetsAPI.Widget;
-  export import WidgetDomain = WidgetsAPI.WidgetDomain;
-  export import WidgetListResponse = WidgetsAPI.WidgetListResponse;
-  export import WidgetListResponsesV4PagePaginationArray = WidgetsAPI.WidgetListResponsesV4PagePaginationArray;
-  export import WidgetCreateParams = WidgetsAPI.WidgetCreateParams;
-  export import WidgetUpdateParams = WidgetsAPI.WidgetUpdateParams;
-  export import WidgetListParams = WidgetsAPI.WidgetListParams;
-  export import WidgetDeleteParams = WidgetsAPI.WidgetDeleteParams;
-  export import WidgetGetParams = WidgetsAPI.WidgetGetParams;
-  export import WidgetRotateSecretParams = WidgetsAPI.WidgetRotateSecretParams;
-}
diff --git a/src/resources/challenges/index.ts b/src/resources/challenges/index.ts
deleted file mode 100644
index 3b0bf982b7..0000000000
--- a/src/resources/challenges/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { Challenges } from './challenges';
-export {
-  Widget,
-  WidgetDomain,
-  WidgetListResponse,
-  WidgetCreateParams,
-  WidgetUpdateParams,
-  WidgetListParams,
-  WidgetDeleteParams,
-  WidgetGetParams,
-  WidgetRotateSecretParams,
-  WidgetListResponsesV4PagePaginationArray,
-  Widgets,
-} from './widgets';
diff --git a/src/resources/cloud-connector/cloud-connector.ts b/src/resources/cloud-connector/cloud-connector.ts
index a2c79bef89..ee73348527 100644
--- a/src/resources/cloud-connector/cloud-connector.ts
+++ b/src/resources/cloud-connector/cloud-connector.ts
@@ -2,16 +2,29 @@
 
 import { APIResource } from '../../resource';
 import * as RulesAPI from './rules';
+import {
+  RuleListParams,
+  RuleListResponse,
+  RuleListResponsesSinglePage,
+  RuleUpdateParams,
+  RuleUpdateResponse,
+  Rules,
+} from './rules';
 
 export class CloudConnector extends APIResource {
   rules: RulesAPI.Rules = new RulesAPI.Rules(this._client);
 }
 
-export namespace CloudConnector {
-  export import Rules = RulesAPI.Rules;
-  export import RuleUpdateResponse = RulesAPI.RuleUpdateResponse;
-  export import RuleListResponse = RulesAPI.RuleListResponse;
-  export import RuleListResponsesSinglePage = RulesAPI.RuleListResponsesSinglePage;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
+CloudConnector.Rules = Rules;
+CloudConnector.RuleListResponsesSinglePage = RuleListResponsesSinglePage;
+
+export declare namespace CloudConnector {
+  export {
+    Rules as Rules,
+    type RuleUpdateResponse as RuleUpdateResponse,
+    type RuleListResponse as RuleListResponse,
+    RuleListResponsesSinglePage as RuleListResponsesSinglePage,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+  };
 }
diff --git a/src/resources/cloud-connector/index.ts b/src/resources/cloud-connector/index.ts
index e9ab704b2a..adc14ea282 100644
--- a/src/resources/cloud-connector/index.ts
+++ b/src/resources/cloud-connector/index.ts
@@ -2,10 +2,10 @@
 
 export { CloudConnector } from './cloud-connector';
 export {
-  RuleUpdateResponse,
-  RuleListResponse,
-  RuleUpdateParams,
-  RuleListParams,
   RuleListResponsesSinglePage,
   Rules,
+  type RuleUpdateResponse,
+  type RuleListResponse,
+  type RuleUpdateParams,
+  type RuleListParams,
 } from './rules';
diff --git a/src/resources/cloud-connector/rules.ts b/src/resources/cloud-connector/rules.ts
index 2b71047aaa..df5197425d 100644
--- a/src/resources/cloud-connector/rules.ts
+++ b/src/resources/cloud-connector/rules.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as RulesAPI from './rules';
 import { SinglePage } from '../../pagination';
 
 export class Rules extends APIResource {
@@ -10,10 +9,10 @@ export class Rules extends APIResource {
    * Put Rules
    */
   update(params: RuleUpdateParams, options?: Core.RequestOptions): Core.APIPromise<RuleUpdateResponse> {
-    const { zone_id, body } = params;
+    const { zone_id, rules } = params;
     return (
       this._client.put(`/zones/${zone_id}/cloud_connector/rules`, {
-        body: body,
+        body: rules,
         ...options,
       }) as Core.APIPromise<{ result: RuleUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -117,11 +116,11 @@ export interface RuleUpdateParams {
   /**
    * Body param: List of Cloud Connector rules
    */
-  body: Array<RuleUpdateParams.Body>;
+  rules: Array<RuleUpdateParams.Rule>;
 }
 
 export namespace RuleUpdateParams {
-  export interface Body {
+  export interface Rule {
     id?: string;
 
     description?: string;
@@ -133,7 +132,7 @@ export namespace RuleUpdateParams {
     /**
      * Parameters of Cloud Connector Rule
      */
-    parameters?: Body.Parameters;
+    parameters?: Rule.Parameters;
 
     /**
      * Cloud Provider type
@@ -141,7 +140,7 @@ export namespace RuleUpdateParams {
     provider?: 'aws_s3' | 'r2' | 'gcp_storage' | 'azure_storage';
   }
 
-  export namespace Body {
+  export namespace Rule {
     /**
      * Parameters of Cloud Connector Rule
      */
@@ -161,10 +160,14 @@ export interface RuleListParams {
   zone_id: string;
 }
 
-export namespace Rules {
-  export import RuleUpdateResponse = RulesAPI.RuleUpdateResponse;
-  export import RuleListResponse = RulesAPI.RuleListResponse;
-  export import RuleListResponsesSinglePage = RulesAPI.RuleListResponsesSinglePage;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
+Rules.RuleListResponsesSinglePage = RuleListResponsesSinglePage;
+
+export declare namespace Rules {
+  export {
+    type RuleUpdateResponse as RuleUpdateResponse,
+    type RuleListResponse as RuleListResponse,
+    RuleListResponsesSinglePage as RuleListResponsesSinglePage,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+  };
 }
diff --git a/src/resources/cloudforce-one/cloudforce-one.ts b/src/resources/cloudforce-one/cloudforce-one.ts
index 5323b87163..c7b91ee872 100644
--- a/src/resources/cloudforce-one/cloudforce-one.ts
+++ b/src/resources/cloudforce-one/cloudforce-one.ts
@@ -2,21 +2,39 @@
 
 import { APIResource } from '../../resource';
 import * as RequestsAPI from './requests/requests';
+import {
+  Item,
+  ListItem,
+  ListItemsV4PagePaginationArray,
+  Quota,
+  RequestConstants,
+  RequestCreateParams,
+  RequestDeleteResponse,
+  RequestListParams,
+  RequestTypes,
+  RequestUpdateParams,
+  Requests,
+} from './requests/requests';
 
 export class CloudforceOne extends APIResource {
   requests: RequestsAPI.Requests = new RequestsAPI.Requests(this._client);
 }
 
-export namespace CloudforceOne {
-  export import Requests = RequestsAPI.Requests;
-  export import Item = RequestsAPI.Item;
-  export import ListItem = RequestsAPI.ListItem;
-  export import Quota = RequestsAPI.Quota;
-  export import RequestConstants = RequestsAPI.RequestConstants;
-  export import RequestTypes = RequestsAPI.RequestTypes;
-  export import RequestDeleteResponse = RequestsAPI.RequestDeleteResponse;
-  export import ListItemsV4PagePaginationArray = RequestsAPI.ListItemsV4PagePaginationArray;
-  export import RequestCreateParams = RequestsAPI.RequestCreateParams;
-  export import RequestUpdateParams = RequestsAPI.RequestUpdateParams;
-  export import RequestListParams = RequestsAPI.RequestListParams;
+CloudforceOne.Requests = Requests;
+CloudforceOne.ListItemsV4PagePaginationArray = ListItemsV4PagePaginationArray;
+
+export declare namespace CloudforceOne {
+  export {
+    Requests as Requests,
+    type Item as Item,
+    type ListItem as ListItem,
+    type Quota as Quota,
+    type RequestConstants as RequestConstants,
+    type RequestTypes as RequestTypes,
+    type RequestDeleteResponse as RequestDeleteResponse,
+    ListItemsV4PagePaginationArray as ListItemsV4PagePaginationArray,
+    type RequestCreateParams as RequestCreateParams,
+    type RequestUpdateParams as RequestUpdateParams,
+    type RequestListParams as RequestListParams,
+  };
 }
diff --git a/src/resources/cloudforce-one/index.ts b/src/resources/cloudforce-one/index.ts
index ffe55bdb29..01e8a3dfc5 100644
--- a/src/resources/cloudforce-one/index.ts
+++ b/src/resources/cloudforce-one/index.ts
@@ -2,15 +2,15 @@
 
 export { CloudforceOne } from './cloudforce-one';
 export {
-  Item,
-  ListItem,
-  Quota,
-  RequestConstants,
-  RequestTypes,
-  RequestDeleteResponse,
-  RequestCreateParams,
-  RequestUpdateParams,
-  RequestListParams,
   ListItemsV4PagePaginationArray,
   Requests,
+  type Item,
+  type ListItem,
+  type Quota,
+  type RequestConstants,
+  type RequestTypes,
+  type RequestDeleteResponse,
+  type RequestCreateParams,
+  type RequestUpdateParams,
+  type RequestListParams,
 } from './requests/index';
diff --git a/src/resources/cloudforce-one/requests/assets.ts b/src/resources/cloudforce-one/requests/assets.ts
new file mode 100644
index 0000000000..0069860938
--- /dev/null
+++ b/src/resources/cloudforce-one/requests/assets.ts
@@ -0,0 +1,204 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as Shared from '../../shared';
+
+export class Assets extends APIResource {
+  /**
+   * List Request Assets
+   */
+  create(
+    accountIdentifier: string,
+    requestIdentifier: string,
+    body: AssetCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AssetCreateResponse> {
+    return (
+      this._client.post(`/accounts/${accountIdentifier}/cloudforce-one/requests/${requestIdentifier}/asset`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: AssetCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update a Request Asset
+   */
+  update(
+    accountIdentifier: string,
+    requestIdentifier: string,
+    assetIdentifer: string,
+    body: AssetUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AssetUpdateResponse> {
+    return (
+      this._client.put(
+        `/accounts/${accountIdentifier}/cloudforce-one/requests/${requestIdentifier}/asset/${assetIdentifer}`,
+        { body, ...options },
+      ) as Core.APIPromise<{ result: AssetUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Delete a Request Asset
+   */
+  delete(
+    accountIdentifier: string,
+    requestIdentifier: string,
+    assetIdentifer: string,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AssetDeleteResponse> {
+    return this._client.delete(
+      `/accounts/${accountIdentifier}/cloudforce-one/requests/${requestIdentifier}/asset/${assetIdentifer}`,
+      options,
+    );
+  }
+
+  /**
+   * Get a Request Asset
+   */
+  get(
+    accountIdentifier: string,
+    requestIdentifier: string,
+    assetIdentifer: string,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AssetGetResponse> {
+    return (
+      this._client.get(
+        `/accounts/${accountIdentifier}/cloudforce-one/requests/${requestIdentifier}/asset/${assetIdentifer}`,
+        options,
+      ) as Core.APIPromise<{ result: AssetGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type AssetCreateResponse = Array<AssetCreateResponse.AssetCreateResponseItem>;
+
+export namespace AssetCreateResponse {
+  export interface AssetCreateResponseItem {
+    /**
+     * Asset ID
+     */
+    id: number;
+
+    /**
+     * Asset name
+     */
+    name: string;
+
+    /**
+     * Asset creation time
+     */
+    created?: string;
+
+    /**
+     * Asset description
+     */
+    description?: string;
+
+    /**
+     * Asset file type
+     */
+    file_type?: string;
+  }
+}
+
+export interface AssetUpdateResponse {
+  /**
+   * Asset ID
+   */
+  id: number;
+
+  /**
+   * Asset name
+   */
+  name: string;
+
+  /**
+   * Asset creation time
+   */
+  created?: string;
+
+  /**
+   * Asset description
+   */
+  description?: string;
+
+  /**
+   * Asset file type
+   */
+  file_type?: string;
+}
+
+export interface AssetDeleteResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+}
+
+export type AssetGetResponse = Array<AssetGetResponse.AssetGetResponseItem>;
+
+export namespace AssetGetResponse {
+  export interface AssetGetResponseItem {
+    /**
+     * Asset ID
+     */
+    id: number;
+
+    /**
+     * Asset name
+     */
+    name: string;
+
+    /**
+     * Asset creation time
+     */
+    created?: string;
+
+    /**
+     * Asset description
+     */
+    description?: string;
+
+    /**
+     * Asset file type
+     */
+    file_type?: string;
+  }
+}
+
+export interface AssetCreateParams {
+  /**
+   * Page number of results
+   */
+  page: number;
+
+  /**
+   * Number of results per page
+   */
+  per_page: number;
+}
+
+export interface AssetUpdateParams {
+  /**
+   * Asset file to upload
+   */
+  source?: string;
+}
+
+export declare namespace Assets {
+  export {
+    type AssetCreateResponse as AssetCreateResponse,
+    type AssetUpdateResponse as AssetUpdateResponse,
+    type AssetDeleteResponse as AssetDeleteResponse,
+    type AssetGetResponse as AssetGetResponse,
+    type AssetCreateParams as AssetCreateParams,
+    type AssetUpdateParams as AssetUpdateParams,
+  };
+}
diff --git a/src/resources/cloudforce-one/requests/index.ts b/src/resources/cloudforce-one/requests/index.ts
index d1a1dac5d8..26ce06e7ea 100644
--- a/src/resources/cloudforce-one/requests/index.ts
+++ b/src/resources/cloudforce-one/requests/index.ts
@@ -1,33 +1,42 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Item,
-  ListItem,
-  Quota,
-  RequestConstants,
-  RequestTypes,
-  RequestDeleteResponse,
-  RequestCreateParams,
-  RequestUpdateParams,
-  RequestListParams,
+  Assets,
+  type AssetCreateResponse,
+  type AssetUpdateResponse,
+  type AssetDeleteResponse,
+  type AssetGetResponse,
+  type AssetCreateParams,
+  type AssetUpdateParams,
+} from './assets';
+export {
   ListItemsV4PagePaginationArray,
   Requests,
+  type Item,
+  type ListItem,
+  type Quota,
+  type RequestConstants,
+  type RequestTypes,
+  type RequestDeleteResponse,
+  type RequestCreateParams,
+  type RequestUpdateParams,
+  type RequestListParams,
 } from './requests';
 export {
-  Label,
-  Priority,
-  PriorityEdit,
-  PriorityDeleteResponse,
-  PriorityCreateParams,
-  PriorityUpdateParams,
-  PriorityResource,
-} from './priority';
-export {
-  Message,
-  MessageDeleteResponse,
-  MessageGetResponse,
-  MessageCreateParams,
-  MessageUpdateParams,
-  MessageGetParams,
   MessageResource,
+  type Message,
+  type MessageDeleteResponse,
+  type MessageGetResponse,
+  type MessageCreateParams,
+  type MessageUpdateParams,
+  type MessageGetParams,
 } from './message';
+export {
+  PriorityResource,
+  type Label,
+  type Priority,
+  type PriorityEdit,
+  type PriorityDeleteResponse,
+  type PriorityCreateParams,
+  type PriorityUpdateParams,
+} from './priority';
diff --git a/src/resources/cloudforce-one/requests/message.ts b/src/resources/cloudforce-one/requests/message.ts
index 94e61b5923..f47705418f 100644
--- a/src/resources/cloudforce-one/requests/message.ts
+++ b/src/resources/cloudforce-one/requests/message.ts
@@ -2,14 +2,11 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as MessageAPI from './message';
 import * as Shared from '../../shared';
 
 export class MessageResource extends APIResource {
   /**
-   * Creating a request adds the request into the Cloudforce One queue for analysis.
-   * In addition to the content, a short title, type, priority, and releasability
-   * should be provided. If one is not provided a default will be assigned.
+   * Create a New Request Message
    */
   create(
     accountIdentifier: string,
@@ -93,7 +90,7 @@ export interface Message {
   content: string;
 
   /**
-   * Message is a follow-on request
+   * Whether the message is a follow-on request
    */
   is_follow_on_request: boolean;
 
@@ -130,29 +127,9 @@ export interface MessageCreateParams {
 
 export interface MessageUpdateParams {
   /**
-   * Request content
+   * Content of message
    */
   content?: string;
-
-  /**
-   * Priority for analyzing the request
-   */
-  priority?: string;
-
-  /**
-   * Requested information from request
-   */
-  request_type?: string;
-
-  /**
-   * Brief description of the request
-   */
-  summary?: string;
-
-  /**
-   * The CISA defined Traffic Light Protocol (TLP)
-   */
-  tlp?: 'clear' | 'amber' | 'amber-strict' | 'green' | 'red';
 }
 
 export interface MessageGetParams {
@@ -187,11 +164,13 @@ export interface MessageGetParams {
   sort_order?: 'asc' | 'desc';
 }
 
-export namespace MessageResource {
-  export import Message = MessageAPI.Message;
-  export import MessageDeleteResponse = MessageAPI.MessageDeleteResponse;
-  export import MessageGetResponse = MessageAPI.MessageGetResponse;
-  export import MessageCreateParams = MessageAPI.MessageCreateParams;
-  export import MessageUpdateParams = MessageAPI.MessageUpdateParams;
-  export import MessageGetParams = MessageAPI.MessageGetParams;
+export declare namespace MessageResource {
+  export {
+    type Message as Message,
+    type MessageDeleteResponse as MessageDeleteResponse,
+    type MessageGetResponse as MessageGetResponse,
+    type MessageCreateParams as MessageCreateParams,
+    type MessageUpdateParams as MessageUpdateParams,
+    type MessageGetParams as MessageGetParams,
+  };
 }
diff --git a/src/resources/cloudforce-one/requests/priority.ts b/src/resources/cloudforce-one/requests/priority.ts
index 02418d77d1..23e56fb99d 100644
--- a/src/resources/cloudforce-one/requests/priority.ts
+++ b/src/resources/cloudforce-one/requests/priority.ts
@@ -2,13 +2,12 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as PriorityAPI from './priority';
 import * as Shared from '../../shared';
 import * as RequestsAPI from './requests';
 
 export class PriorityResource extends APIResource {
   /**
-   * Create a New Priority Requirement
+   * Create a New Priority Intelligence Requirement
    */
   create(
     accountIdentifier: string,
@@ -41,7 +40,7 @@ export class PriorityResource extends APIResource {
   }
 
   /**
-   * Delete a Priority Intelligence Report
+   * Delete a Priority Intelligence Requirement
    */
   delete(
     accountIdentifier: string,
@@ -201,11 +200,13 @@ export interface PriorityUpdateParams {
   tlp: 'clear' | 'amber' | 'amber-strict' | 'green' | 'red';
 }
 
-export namespace PriorityResource {
-  export import Label = PriorityAPI.Label;
-  export import Priority = PriorityAPI.Priority;
-  export import PriorityEdit = PriorityAPI.PriorityEdit;
-  export import PriorityDeleteResponse = PriorityAPI.PriorityDeleteResponse;
-  export import PriorityCreateParams = PriorityAPI.PriorityCreateParams;
-  export import PriorityUpdateParams = PriorityAPI.PriorityUpdateParams;
+export declare namespace PriorityResource {
+  export {
+    type Label as Label,
+    type Priority as Priority,
+    type PriorityEdit as PriorityEdit,
+    type PriorityDeleteResponse as PriorityDeleteResponse,
+    type PriorityCreateParams as PriorityCreateParams,
+    type PriorityUpdateParams as PriorityUpdateParams,
+  };
 }
diff --git a/src/resources/cloudforce-one/requests/requests.ts b/src/resources/cloudforce-one/requests/requests.ts
index 27a49910fa..f7f4ed0cdf 100644
--- a/src/resources/cloudforce-one/requests/requests.ts
+++ b/src/resources/cloudforce-one/requests/requests.ts
@@ -2,20 +2,48 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as RequestsAPI from './requests';
 import * as Shared from '../../shared';
+import * as AssetsAPI from './assets';
+import {
+  AssetCreateParams,
+  AssetCreateResponse,
+  AssetDeleteResponse,
+  AssetGetResponse,
+  AssetUpdateParams,
+  AssetUpdateResponse,
+  Assets,
+} from './assets';
 import * as MessageAPI from './message';
+import {
+  Message,
+  MessageCreateParams,
+  MessageDeleteResponse,
+  MessageGetParams,
+  MessageGetResponse,
+  MessageResource,
+  MessageUpdateParams,
+} from './message';
 import * as PriorityAPI from './priority';
+import {
+  Label,
+  Priority,
+  PriorityCreateParams,
+  PriorityDeleteResponse,
+  PriorityEdit,
+  PriorityResource,
+  PriorityUpdateParams,
+} from './priority';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class Requests extends APIResource {
   message: MessageAPI.MessageResource = new MessageAPI.MessageResource(this._client);
   priority: PriorityAPI.PriorityResource = new PriorityAPI.PriorityResource(this._client);
+  assets: AssetsAPI.Assets = new AssetsAPI.Assets(this._client);
 
   /**
    * Creating a request adds the request into the Cloudforce One queue for analysis.
    * In addition to the content, a short title, type, priority, and releasability
-   * should be provided. If one is not provided a default will be assigned.
+   * should be provided. If one is not provided, a default will be assigned.
    */
   create(
     accountIdentifier: string,
@@ -33,7 +61,7 @@ export class Requests extends APIResource {
   /**
    * Updating a request alters the request in the Cloudforce One queue. This API may
    * be used to update any attributes of the request after the initial submission.
-   * Only fields that you choose to update need to be add to the request body
+   * Only fields that you choose to update need to be add to the request body.
    */
   update(
     accountIdentifier: string,
@@ -386,29 +414,52 @@ export interface RequestListParams extends V4PagePaginationArrayParams {
   status?: 'open' | 'accepted' | 'reported' | 'approved' | 'completed' | 'declined';
 }
 
-export namespace Requests {
-  export import Item = RequestsAPI.Item;
-  export import ListItem = RequestsAPI.ListItem;
-  export import Quota = RequestsAPI.Quota;
-  export import RequestConstants = RequestsAPI.RequestConstants;
-  export import RequestTypes = RequestsAPI.RequestTypes;
-  export import RequestDeleteResponse = RequestsAPI.RequestDeleteResponse;
-  export import ListItemsV4PagePaginationArray = RequestsAPI.ListItemsV4PagePaginationArray;
-  export import RequestCreateParams = RequestsAPI.RequestCreateParams;
-  export import RequestUpdateParams = RequestsAPI.RequestUpdateParams;
-  export import RequestListParams = RequestsAPI.RequestListParams;
-  export import MessageResource = MessageAPI.MessageResource;
-  export import Message = MessageAPI.Message;
-  export import MessageDeleteResponse = MessageAPI.MessageDeleteResponse;
-  export import MessageGetResponse = MessageAPI.MessageGetResponse;
-  export import MessageCreateParams = MessageAPI.MessageCreateParams;
-  export import MessageUpdateParams = MessageAPI.MessageUpdateParams;
-  export import MessageGetParams = MessageAPI.MessageGetParams;
-  export import PriorityResource = PriorityAPI.PriorityResource;
-  export import Label = PriorityAPI.Label;
-  export import Priority = PriorityAPI.Priority;
-  export import PriorityEdit = PriorityAPI.PriorityEdit;
-  export import PriorityDeleteResponse = PriorityAPI.PriorityDeleteResponse;
-  export import PriorityCreateParams = PriorityAPI.PriorityCreateParams;
-  export import PriorityUpdateParams = PriorityAPI.PriorityUpdateParams;
+Requests.ListItemsV4PagePaginationArray = ListItemsV4PagePaginationArray;
+Requests.MessageResource = MessageResource;
+Requests.PriorityResource = PriorityResource;
+Requests.Assets = Assets;
+
+export declare namespace Requests {
+  export {
+    type Item as Item,
+    type ListItem as ListItem,
+    type Quota as Quota,
+    type RequestConstants as RequestConstants,
+    type RequestTypes as RequestTypes,
+    type RequestDeleteResponse as RequestDeleteResponse,
+    ListItemsV4PagePaginationArray as ListItemsV4PagePaginationArray,
+    type RequestCreateParams as RequestCreateParams,
+    type RequestUpdateParams as RequestUpdateParams,
+    type RequestListParams as RequestListParams,
+  };
+
+  export {
+    MessageResource as MessageResource,
+    type Message as Message,
+    type MessageDeleteResponse as MessageDeleteResponse,
+    type MessageGetResponse as MessageGetResponse,
+    type MessageCreateParams as MessageCreateParams,
+    type MessageUpdateParams as MessageUpdateParams,
+    type MessageGetParams as MessageGetParams,
+  };
+
+  export {
+    PriorityResource as PriorityResource,
+    type Label as Label,
+    type Priority as Priority,
+    type PriorityEdit as PriorityEdit,
+    type PriorityDeleteResponse as PriorityDeleteResponse,
+    type PriorityCreateParams as PriorityCreateParams,
+    type PriorityUpdateParams as PriorityUpdateParams,
+  };
+
+  export {
+    Assets as Assets,
+    type AssetCreateResponse as AssetCreateResponse,
+    type AssetUpdateResponse as AssetUpdateResponse,
+    type AssetDeleteResponse as AssetDeleteResponse,
+    type AssetGetResponse as AssetGetResponse,
+    type AssetCreateParams as AssetCreateParams,
+    type AssetUpdateParams as AssetUpdateParams,
+  };
 }
diff --git a/src/resources/content-scanning/content-scanning.ts b/src/resources/content-scanning/content-scanning.ts
new file mode 100644
index 0000000000..ed77e3e8a5
--- /dev/null
+++ b/src/resources/content-scanning/content-scanning.ts
@@ -0,0 +1,93 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import * as PayloadsAPI from './payloads';
+import {
+  PayloadCreateParams,
+  PayloadCreateResponse,
+  PayloadDeleteParams,
+  PayloadDeleteResponse,
+  PayloadListParams,
+  PayloadListResponse,
+  PayloadListResponsesSinglePage,
+  Payloads,
+} from './payloads';
+import * as SettingsAPI from './settings';
+import { SettingGetParams, SettingGetResponse, Settings } from './settings';
+
+export class ContentScanning extends APIResource {
+  payloads: PayloadsAPI.Payloads = new PayloadsAPI.Payloads(this._client);
+  settings: SettingsAPI.Settings = new SettingsAPI.Settings(this._client);
+
+  /**
+   * Disable Content Scanning
+   */
+  disable(
+    params: ContentScanningDisableParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ContentScanningDisableResponse> {
+    const { zone_id } = params;
+    return (
+      this._client.post(`/zones/${zone_id}/content-upload-scan/disable`, options) as Core.APIPromise<{
+        result: ContentScanningDisableResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Enable Content Scanning
+   */
+  enable(
+    params: ContentScanningEnableParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ContentScanningEnableResponse> {
+    const { zone_id } = params;
+    return (
+      this._client.post(`/zones/${zone_id}/content-upload-scan/enable`, options) as Core.APIPromise<{
+        result: ContentScanningEnableResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type ContentScanningDisableResponse = unknown;
+
+export type ContentScanningEnableResponse = unknown;
+
+export interface ContentScanningDisableParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface ContentScanningEnableParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+ContentScanning.Payloads = Payloads;
+ContentScanning.PayloadListResponsesSinglePage = PayloadListResponsesSinglePage;
+ContentScanning.Settings = Settings;
+
+export declare namespace ContentScanning {
+  export {
+    Payloads as Payloads,
+    type PayloadCreateResponse as PayloadCreateResponse,
+    type PayloadListResponse as PayloadListResponse,
+    type PayloadDeleteResponse as PayloadDeleteResponse,
+    PayloadListResponsesSinglePage as PayloadListResponsesSinglePage,
+    type PayloadCreateParams as PayloadCreateParams,
+    type PayloadListParams as PayloadListParams,
+    type PayloadDeleteParams as PayloadDeleteParams,
+  };
+
+  export {
+    Settings as Settings,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingGetParams as SettingGetParams,
+  };
+}
diff --git a/src/resources/content-scanning/index.ts b/src/resources/content-scanning/index.ts
new file mode 100644
index 0000000000..3e6d703e66
--- /dev/null
+++ b/src/resources/content-scanning/index.ts
@@ -0,0 +1,14 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { ContentScanning } from './content-scanning';
+export {
+  PayloadListResponsesSinglePage,
+  Payloads,
+  type PayloadCreateResponse,
+  type PayloadListResponse,
+  type PayloadDeleteResponse,
+  type PayloadCreateParams,
+  type PayloadListParams,
+  type PayloadDeleteParams,
+} from './payloads';
+export { Settings, type SettingGetResponse, type SettingGetParams } from './settings';
diff --git a/src/resources/content-scanning/payloads.ts b/src/resources/content-scanning/payloads.ts
new file mode 100644
index 0000000000..6873efa686
--- /dev/null
+++ b/src/resources/content-scanning/payloads.ts
@@ -0,0 +1,159 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { SinglePage } from '../../pagination';
+
+export class Payloads extends APIResource {
+  /**
+   * Add custom scan expressions for Content Scanning
+   */
+  create(
+    params: PayloadCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PayloadCreateResponse | null> {
+    const { zone_id, body } = params;
+    return (
+      this._client.post(`/zones/${zone_id}/content-upload-scan/payloads`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: PayloadCreateResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get a list of existing custom scan expressions for Content Scanning
+   */
+  list(
+    params: PayloadListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<PayloadListResponsesSinglePage, PayloadListResponse> {
+    const { zone_id } = params;
+    return this._client.getAPIList(
+      `/zones/${zone_id}/content-upload-scan/payloads`,
+      PayloadListResponsesSinglePage,
+      options,
+    );
+  }
+
+  /**
+   * Delete a Content Scan Custom Expression
+   */
+  delete(
+    expressionId: string,
+    params: PayloadDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PayloadDeleteResponse | null> {
+    const { zone_id } = params;
+    return (
+      this._client.delete(
+        `/zones/${zone_id}/content-upload-scan/payloads/${expressionId}`,
+        options,
+      ) as Core.APIPromise<{ result: PayloadDeleteResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class PayloadListResponsesSinglePage extends SinglePage<PayloadListResponse> {}
+
+export type PayloadCreateResponse = Array<PayloadCreateResponse.PayloadCreateResponseItem>;
+
+export namespace PayloadCreateResponse {
+  /**
+   * A custom scan expression to match Content Scanning on
+   */
+  export interface PayloadCreateResponseItem {
+    /**
+     * The unique ID for this custom scan expression
+     */
+    id?: string;
+
+    /**
+     * Ruleset expression to use in matching content objects
+     */
+    payload?: string;
+  }
+}
+
+/**
+ * A custom scan expression to match Content Scanning on
+ */
+export interface PayloadListResponse {
+  /**
+   * The unique ID for this custom scan expression
+   */
+  id?: string;
+
+  /**
+   * Ruleset expression to use in matching content objects
+   */
+  payload?: string;
+}
+
+export type PayloadDeleteResponse = Array<PayloadDeleteResponse.PayloadDeleteResponseItem>;
+
+export namespace PayloadDeleteResponse {
+  /**
+   * A custom scan expression to match Content Scanning on
+   */
+  export interface PayloadDeleteResponseItem {
+    /**
+     * The unique ID for this custom scan expression
+     */
+    id?: string;
+
+    /**
+     * Ruleset expression to use in matching content objects
+     */
+    payload?: string;
+  }
+}
+
+export interface PayloadCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  body: Array<PayloadCreateParams.Body>;
+}
+
+export namespace PayloadCreateParams {
+  export interface Body {
+    /**
+     * Ruleset expression to use in matching content objects
+     */
+    payload: string;
+  }
+}
+
+export interface PayloadListParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface PayloadDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+Payloads.PayloadListResponsesSinglePage = PayloadListResponsesSinglePage;
+
+export declare namespace Payloads {
+  export {
+    type PayloadCreateResponse as PayloadCreateResponse,
+    type PayloadListResponse as PayloadListResponse,
+    type PayloadDeleteResponse as PayloadDeleteResponse,
+    PayloadListResponsesSinglePage as PayloadListResponsesSinglePage,
+    type PayloadCreateParams as PayloadCreateParams,
+    type PayloadListParams as PayloadListParams,
+    type PayloadDeleteParams as PayloadDeleteParams,
+  };
+}
diff --git a/src/resources/content-scanning/settings.ts b/src/resources/content-scanning/settings.ts
new file mode 100644
index 0000000000..d77a303517
--- /dev/null
+++ b/src/resources/content-scanning/settings.ts
@@ -0,0 +1,44 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+
+export class Settings extends APIResource {
+  /**
+   * Retrieve the current status of Content Scanning
+   */
+  get(params: SettingGetParams, options?: Core.RequestOptions): Core.APIPromise<SettingGetResponse> {
+    const { zone_id } = params;
+    return (
+      this._client.get(`/zones/${zone_id}/content-upload-scan/settings`, options) as Core.APIPromise<{
+        result: SettingGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+/**
+ * The status for Content Scanning
+ */
+export interface SettingGetResponse {
+  /**
+   * Last modification date (ISO 8601) of the Content Scanning status
+   */
+  modified?: string;
+
+  /**
+   * Status of Content Scanning
+   */
+  value?: string;
+}
+
+export interface SettingGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export declare namespace Settings {
+  export { type SettingGetResponse as SettingGetResponse, type SettingGetParams as SettingGetParams };
+}
diff --git a/src/resources/custom-certificates/custom-certificates.ts b/src/resources/custom-certificates/custom-certificates.ts
index 4764c5b0c6..8c3726efff 100644
--- a/src/resources/custom-certificates/custom-certificates.ts
+++ b/src/resources/custom-certificates/custom-certificates.ts
@@ -4,6 +4,7 @@ import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as KeylessCertificatesAPI from '../keyless-certificates';
 import * as PrioritizeAPI from './prioritize';
+import { Prioritize, PrioritizeUpdateParams, PrioritizeUpdateResponse } from './prioritize';
 import * as CustomHostnamesAPI from '../custom-hostnames/custom-hostnames';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
@@ -16,11 +17,11 @@ export class CustomCertificates extends APIResource {
   create(
     params: CustomCertificateCreateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomCertificateCreateResponse> {
+  ): Core.APIPromise<CustomCertificate> {
     const { zone_id, ...body } = params;
     return (
       this._client.post(`/zones/${zone_id}/custom_certificates`, { body, ...options }) as Core.APIPromise<{
-        result: CustomCertificateCreateResponse;
+        result: CustomCertificate;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -68,13 +69,13 @@ export class CustomCertificates extends APIResource {
     customCertificateId: string,
     params: CustomCertificateEditParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomCertificateEditResponse> {
+  ): Core.APIPromise<CustomCertificate> {
     const { zone_id, ...body } = params;
     return (
       this._client.patch(`/zones/${zone_id}/custom_certificates/${customCertificateId}`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: CustomCertificateEditResponse }>
+      }) as Core.APIPromise<{ result: CustomCertificate }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -85,13 +86,13 @@ export class CustomCertificates extends APIResource {
     customCertificateId: string,
     params: CustomCertificateGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomCertificateGetResponse> {
+  ): Core.APIPromise<CustomCertificate> {
     const { zone_id } = params;
     return (
       this._client.get(
         `/zones/${zone_id}/custom_certificates/${customCertificateId}`,
         options,
-      ) as Core.APIPromise<{ result: CustomCertificateGetResponse }>
+      ) as Core.APIPromise<{ result: CustomCertificate }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -216,8 +217,6 @@ export interface GeoRestrictionsParam {
  */
 export type Status = 'active' | 'pending_reactivation' | 'pending_revocation' | 'revoked';
 
-export type CustomCertificateCreateResponse = unknown | string | null;
-
 export interface CustomCertificateDeleteResponse {
   /**
    * Identifier
@@ -225,10 +224,6 @@ export interface CustomCertificateDeleteResponse {
   id?: string;
 }
 
-export type CustomCertificateEditResponse = unknown | string | null;
-
-export type CustomCertificateGetResponse = unknown | string | null;
-
 export interface CustomCertificateCreateParams {
   /**
    * Path param: Identifier
@@ -364,8 +359,12 @@ export interface CustomCertificateGetParams {
   zone_id: string;
 }
 
-export namespace CustomCertificates {
-  export import Prioritize = PrioritizeAPI.Prioritize;
-  export import PrioritizeUpdateResponse = PrioritizeAPI.PrioritizeUpdateResponse;
-  export import PrioritizeUpdateParams = PrioritizeAPI.PrioritizeUpdateParams;
+CustomCertificates.Prioritize = Prioritize;
+
+export declare namespace CustomCertificates {
+  export {
+    Prioritize as Prioritize,
+    type PrioritizeUpdateResponse as PrioritizeUpdateResponse,
+    type PrioritizeUpdateParams as PrioritizeUpdateParams,
+  };
 }
diff --git a/src/resources/custom-certificates/index.ts b/src/resources/custom-certificates/index.ts
index 28f1cc799c..fcc5d7cc58 100644
--- a/src/resources/custom-certificates/index.ts
+++ b/src/resources/custom-certificates/index.ts
@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { CustomCertificates } from './custom-certificates';
-export { PrioritizeUpdateResponse, PrioritizeUpdateParams, Prioritize } from './prioritize';
+export { Prioritize, type PrioritizeUpdateResponse, type PrioritizeUpdateParams } from './prioritize';
diff --git a/src/resources/custom-certificates/prioritize.ts b/src/resources/custom-certificates/prioritize.ts
index d439fbe01b..5dcb60c2e0 100644
--- a/src/resources/custom-certificates/prioritize.ts
+++ b/src/resources/custom-certificates/prioritize.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as PrioritizeAPI from './prioritize';
 import * as CustomCertificatesAPI from './custom-certificates';
 
 export class Prioritize extends APIResource {
@@ -14,13 +13,13 @@ export class Prioritize extends APIResource {
   update(
     params: PrioritizeUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<PrioritizeUpdateResponse | null> {
+  ): Core.APIPromise<PrioritizeUpdateResponse> {
     const { zone_id, ...body } = params;
     return (
       this._client.put(`/zones/${zone_id}/custom_certificates/prioritize`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: PrioritizeUpdateResponse | null }>
+      }) as Core.APIPromise<{ result: PrioritizeUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -56,7 +55,9 @@ export namespace PrioritizeUpdateParams {
   }
 }
 
-export namespace Prioritize {
-  export import PrioritizeUpdateResponse = PrioritizeAPI.PrioritizeUpdateResponse;
-  export import PrioritizeUpdateParams = PrioritizeAPI.PrioritizeUpdateParams;
+export declare namespace Prioritize {
+  export {
+    type PrioritizeUpdateResponse as PrioritizeUpdateResponse,
+    type PrioritizeUpdateParams as PrioritizeUpdateParams,
+  };
 }
diff --git a/src/resources/custom-hostnames/custom-hostnames.ts b/src/resources/custom-hostnames/custom-hostnames.ts
index 71e0ec7099..6d042c896f 100644
--- a/src/resources/custom-hostnames/custom-hostnames.ts
+++ b/src/resources/custom-hostnames/custom-hostnames.ts
@@ -5,6 +5,15 @@ import * as Core from '../../core';
 import * as CustomHostnamesAPI from './custom-hostnames';
 import * as Shared from '../shared';
 import * as FallbackOriginAPI from './fallback-origin';
+import {
+  FallbackOrigin,
+  FallbackOriginDeleteParams,
+  FallbackOriginDeleteResponse,
+  FallbackOriginGetParams,
+  FallbackOriginGetResponse,
+  FallbackOriginUpdateParams,
+  FallbackOriginUpdateResponse,
+} from './fallback-origin';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class CustomHostnames extends APIResource {
@@ -124,9 +133,6 @@ export interface CustomHostname {
    */
   hostname: string;
 
-  /**
-   * SSL properties for the custom hostname.
-   */
   ssl: CustomHostname.SSL;
 
   /**
@@ -135,9 +141,10 @@ export interface CustomHostname {
   created_at?: string;
 
   /**
-   * These are per-hostname (customer) settings.
+   * Unique key/value metadata for this hostname. These are per-hostname (customer)
+   * settings.
    */
-  custom_metadata?: CustomHostname.CustomMetadata;
+  custom_metadata?: Record<string, string>;
 
   /**
    * a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME
@@ -189,13 +196,10 @@ export interface CustomHostname {
   /**
    * These are errors that were encountered while trying to activate a hostname.
    */
-  verification_errors?: Array<unknown>;
+  verification_errors?: Array<string>;
 }
 
 export namespace CustomHostname {
-  /**
-   * SSL properties for the custom hostname.
-   */
   export interface SSL {
     /**
      * Custom hostname SSL identifier tag.
@@ -238,7 +242,7 @@ export namespace CustomHostname {
     /**
      * A list of Hostnames on a custom uploaded certificate.
      */
-    hosts?: Array<unknown>;
+    hosts?: Array<string>;
 
     /**
      * The issuer on a custom uploaded certificate.
@@ -255,9 +259,6 @@ export namespace CustomHostname {
      */
     serial_number?: string;
 
-    /**
-     * SSL specific settings.
-     */
     settings?: SSL.Settings;
 
     /**
@@ -317,9 +318,6 @@ export namespace CustomHostname {
   }
 
   export namespace SSL {
-    /**
-     * SSL specific settings.
-     */
     export interface Settings {
       /**
        * An allowlist of ciphers for TLS termination. These ciphers must be in the
@@ -355,15 +353,12 @@ export namespace CustomHostname {
       message?: string;
     }
 
-    /**
-     * Certificate's required validation record.
-     */
     export interface ValidationRecord {
       /**
        * The set of email addresses that the certificate authority (CA) will use to
        * complete domain validation.
        */
-      emails?: Array<unknown>;
+      emails?: Array<string>;
 
       /**
        * The content that the certificate authority (CA) will expect to find at the
@@ -390,16 +385,6 @@ export namespace CustomHostname {
     }
   }
 
-  /**
-   * These are per-hostname (customer) settings.
-   */
-  export interface CustomMetadata {
-    /**
-     * Unique metadata for this hostname.
-     */
-    key?: string;
-  }
-
   /**
    * This is a record which can be placed to activate a hostname.
    */
@@ -471,9 +456,6 @@ export interface CustomHostnameCreateResponse {
    */
   hostname: string;
 
-  /**
-   * SSL properties for the custom hostname.
-   */
   ssl: CustomHostnameCreateResponse.SSL;
 
   /**
@@ -482,9 +464,10 @@ export interface CustomHostnameCreateResponse {
   created_at?: string;
 
   /**
-   * These are per-hostname (customer) settings.
+   * Unique key/value metadata for this hostname. These are per-hostname (customer)
+   * settings.
    */
-  custom_metadata?: CustomHostnameCreateResponse.CustomMetadata;
+  custom_metadata?: Record<string, string>;
 
   /**
    * a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME
@@ -536,13 +519,10 @@ export interface CustomHostnameCreateResponse {
   /**
    * These are errors that were encountered while trying to activate a hostname.
    */
-  verification_errors?: Array<unknown>;
+  verification_errors?: Array<string>;
 }
 
 export namespace CustomHostnameCreateResponse {
-  /**
-   * SSL properties for the custom hostname.
-   */
   export interface SSL {
     /**
      * Custom hostname SSL identifier tag.
@@ -585,7 +565,7 @@ export namespace CustomHostnameCreateResponse {
     /**
      * A list of Hostnames on a custom uploaded certificate.
      */
-    hosts?: Array<unknown>;
+    hosts?: Array<string>;
 
     /**
      * The issuer on a custom uploaded certificate.
@@ -602,9 +582,6 @@ export namespace CustomHostnameCreateResponse {
      */
     serial_number?: string;
 
-    /**
-     * SSL specific settings.
-     */
     settings?: SSL.Settings;
 
     /**
@@ -664,9 +641,6 @@ export namespace CustomHostnameCreateResponse {
   }
 
   export namespace SSL {
-    /**
-     * SSL specific settings.
-     */
     export interface Settings {
       /**
        * An allowlist of ciphers for TLS termination. These ciphers must be in the
@@ -702,15 +676,12 @@ export namespace CustomHostnameCreateResponse {
       message?: string;
     }
 
-    /**
-     * Certificate's required validation record.
-     */
     export interface ValidationRecord {
       /**
        * The set of email addresses that the certificate authority (CA) will use to
        * complete domain validation.
        */
-      emails?: Array<unknown>;
+      emails?: Array<string>;
 
       /**
        * The content that the certificate authority (CA) will expect to find at the
@@ -737,16 +708,6 @@ export namespace CustomHostnameCreateResponse {
     }
   }
 
-  /**
-   * These are per-hostname (customer) settings.
-   */
-  export interface CustomMetadata {
-    /**
-     * Unique metadata for this hostname.
-     */
-    key?: string;
-  }
-
   /**
    * This is a record which can be placed to activate a hostname.
    */
@@ -796,9 +757,6 @@ export interface CustomHostnameListResponse {
    */
   hostname: string;
 
-  /**
-   * SSL properties for the custom hostname.
-   */
   ssl: CustomHostnameListResponse.SSL;
 
   /**
@@ -807,9 +765,10 @@ export interface CustomHostnameListResponse {
   created_at?: string;
 
   /**
-   * These are per-hostname (customer) settings.
+   * Unique key/value metadata for this hostname. These are per-hostname (customer)
+   * settings.
    */
-  custom_metadata?: CustomHostnameListResponse.CustomMetadata;
+  custom_metadata?: Record<string, string>;
 
   /**
    * a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME
@@ -861,13 +820,10 @@ export interface CustomHostnameListResponse {
   /**
    * These are errors that were encountered while trying to activate a hostname.
    */
-  verification_errors?: Array<unknown>;
+  verification_errors?: Array<string>;
 }
 
 export namespace CustomHostnameListResponse {
-  /**
-   * SSL properties for the custom hostname.
-   */
   export interface SSL {
     /**
      * Custom hostname SSL identifier tag.
@@ -910,7 +866,7 @@ export namespace CustomHostnameListResponse {
     /**
      * A list of Hostnames on a custom uploaded certificate.
      */
-    hosts?: Array<unknown>;
+    hosts?: Array<string>;
 
     /**
      * The issuer on a custom uploaded certificate.
@@ -927,9 +883,6 @@ export namespace CustomHostnameListResponse {
      */
     serial_number?: string;
 
-    /**
-     * SSL specific settings.
-     */
     settings?: SSL.Settings;
 
     /**
@@ -989,9 +942,6 @@ export namespace CustomHostnameListResponse {
   }
 
   export namespace SSL {
-    /**
-     * SSL specific settings.
-     */
     export interface Settings {
       /**
        * An allowlist of ciphers for TLS termination. These ciphers must be in the
@@ -1027,15 +977,12 @@ export namespace CustomHostnameListResponse {
       message?: string;
     }
 
-    /**
-     * Certificate's required validation record.
-     */
     export interface ValidationRecord {
       /**
        * The set of email addresses that the certificate authority (CA) will use to
        * complete domain validation.
        */
-      emails?: Array<unknown>;
+      emails?: Array<string>;
 
       /**
        * The content that the certificate authority (CA) will expect to find at the
@@ -1062,16 +1009,6 @@ export namespace CustomHostnameListResponse {
     }
   }
 
-  /**
-   * These are per-hostname (customer) settings.
-   */
-  export interface CustomMetadata {
-    /**
-     * Unique metadata for this hostname.
-     */
-    key?: string;
-  }
-
   /**
    * This is a record which can be placed to activate a hostname.
    */
@@ -1128,9 +1065,6 @@ export interface CustomHostnameEditResponse {
    */
   hostname: string;
 
-  /**
-   * SSL properties for the custom hostname.
-   */
   ssl: CustomHostnameEditResponse.SSL;
 
   /**
@@ -1139,9 +1073,10 @@ export interface CustomHostnameEditResponse {
   created_at?: string;
 
   /**
-   * These are per-hostname (customer) settings.
+   * Unique key/value metadata for this hostname. These are per-hostname (customer)
+   * settings.
    */
-  custom_metadata?: CustomHostnameEditResponse.CustomMetadata;
+  custom_metadata?: Record<string, string>;
 
   /**
    * a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME
@@ -1193,13 +1128,10 @@ export interface CustomHostnameEditResponse {
   /**
    * These are errors that were encountered while trying to activate a hostname.
    */
-  verification_errors?: Array<unknown>;
+  verification_errors?: Array<string>;
 }
 
 export namespace CustomHostnameEditResponse {
-  /**
-   * SSL properties for the custom hostname.
-   */
   export interface SSL {
     /**
      * Custom hostname SSL identifier tag.
@@ -1242,7 +1174,7 @@ export namespace CustomHostnameEditResponse {
     /**
      * A list of Hostnames on a custom uploaded certificate.
      */
-    hosts?: Array<unknown>;
+    hosts?: Array<string>;
 
     /**
      * The issuer on a custom uploaded certificate.
@@ -1259,9 +1191,6 @@ export namespace CustomHostnameEditResponse {
      */
     serial_number?: string;
 
-    /**
-     * SSL specific settings.
-     */
     settings?: SSL.Settings;
 
     /**
@@ -1321,9 +1250,6 @@ export namespace CustomHostnameEditResponse {
   }
 
   export namespace SSL {
-    /**
-     * SSL specific settings.
-     */
     export interface Settings {
       /**
        * An allowlist of ciphers for TLS termination. These ciphers must be in the
@@ -1359,15 +1285,12 @@ export namespace CustomHostnameEditResponse {
       message?: string;
     }
 
-    /**
-     * Certificate's required validation record.
-     */
     export interface ValidationRecord {
       /**
        * The set of email addresses that the certificate authority (CA) will use to
        * complete domain validation.
        */
-      emails?: Array<unknown>;
+      emails?: Array<string>;
 
       /**
        * The content that the certificate authority (CA) will expect to find at the
@@ -1394,16 +1317,6 @@ export namespace CustomHostnameEditResponse {
     }
   }
 
-  /**
-   * These are per-hostname (customer) settings.
-   */
-  export interface CustomMetadata {
-    /**
-     * Unique metadata for this hostname.
-     */
-    key?: string;
-  }
-
   /**
    * This is a record which can be placed to activate a hostname.
    */
@@ -1453,9 +1366,6 @@ export interface CustomHostnameGetResponse {
    */
   hostname: string;
 
-  /**
-   * SSL properties for the custom hostname.
-   */
   ssl: CustomHostnameGetResponse.SSL;
 
   /**
@@ -1464,9 +1374,10 @@ export interface CustomHostnameGetResponse {
   created_at?: string;
 
   /**
-   * These are per-hostname (customer) settings.
+   * Unique key/value metadata for this hostname. These are per-hostname (customer)
+   * settings.
    */
-  custom_metadata?: CustomHostnameGetResponse.CustomMetadata;
+  custom_metadata?: Record<string, string>;
 
   /**
    * a valid hostname that’s been added to your DNS zone as an A, AAAA, or CNAME
@@ -1518,13 +1429,10 @@ export interface CustomHostnameGetResponse {
   /**
    * These are errors that were encountered while trying to activate a hostname.
    */
-  verification_errors?: Array<unknown>;
+  verification_errors?: Array<string>;
 }
 
 export namespace CustomHostnameGetResponse {
-  /**
-   * SSL properties for the custom hostname.
-   */
   export interface SSL {
     /**
      * Custom hostname SSL identifier tag.
@@ -1567,7 +1475,7 @@ export namespace CustomHostnameGetResponse {
     /**
      * A list of Hostnames on a custom uploaded certificate.
      */
-    hosts?: Array<unknown>;
+    hosts?: Array<string>;
 
     /**
      * The issuer on a custom uploaded certificate.
@@ -1584,9 +1492,6 @@ export namespace CustomHostnameGetResponse {
      */
     serial_number?: string;
 
-    /**
-     * SSL specific settings.
-     */
     settings?: SSL.Settings;
 
     /**
@@ -1646,9 +1551,6 @@ export namespace CustomHostnameGetResponse {
   }
 
   export namespace SSL {
-    /**
-     * SSL specific settings.
-     */
     export interface Settings {
       /**
        * An allowlist of ciphers for TLS termination. These ciphers must be in the
@@ -1684,15 +1586,12 @@ export namespace CustomHostnameGetResponse {
       message?: string;
     }
 
-    /**
-     * Certificate's required validation record.
-     */
     export interface ValidationRecord {
       /**
        * The set of email addresses that the certificate authority (CA) will use to
        * complete domain validation.
        */
-      emails?: Array<unknown>;
+      emails?: Array<string>;
 
       /**
        * The content that the certificate authority (CA) will expect to find at the
@@ -1719,16 +1618,6 @@ export namespace CustomHostnameGetResponse {
     }
   }
 
-  /**
-   * These are per-hostname (customer) settings.
-   */
-  export interface CustomMetadata {
-    /**
-     * Unique metadata for this hostname.
-     */
-    key?: string;
-  }
-
   /**
    * This is a record which can be placed to activate a hostname.
    */
@@ -1784,9 +1673,10 @@ export interface CustomHostnameCreateParams {
   ssl: CustomHostnameCreateParams.SSL;
 
   /**
-   * Body param: These are per-hostname (customer) settings.
+   * Body param: Unique key/value metadata for this hostname. These are per-hostname
+   * (customer) settings.
    */
-  custom_metadata?: CustomHostnameCreateParams.CustomMetadata;
+  custom_metadata?: Record<string, string>;
 }
 
 export namespace CustomHostnameCreateParams {
@@ -1807,6 +1697,12 @@ export namespace CustomHostnameCreateParams {
      */
     certificate_authority?: Shared.CertificateCAParam;
 
+    /**
+     * Whether or not to add Cloudflare Branding for the order. This will add a
+     * subdomain of sni.cloudflaressl.com as the Common Name if set to true
+     */
+    cloudflare_branding?: boolean;
+
     /**
      * If a custom uploaded certificate is used.
      */
@@ -1871,16 +1767,6 @@ export namespace CustomHostnameCreateParams {
       tls_1_3?: 'on' | 'off';
     }
   }
-
-  /**
-   * These are per-hostname (customer) settings.
-   */
-  export interface CustomMetadata {
-    /**
-     * Unique metadata for this hostname.
-     */
-    key?: string;
-  }
 }
 
 export interface CustomHostnameListParams extends V4PagePaginationArrayParams {
@@ -1932,9 +1818,10 @@ export interface CustomHostnameEditParams {
   zone_id: string;
 
   /**
-   * Body param: These are per-hostname (customer) settings.
+   * Body param: Unique key/value metadata for this hostname. These are per-hostname
+   * (customer) settings.
    */
-  custom_metadata?: CustomHostnameEditParams.CustomMetadata;
+  custom_metadata?: Record<string, string>;
 
   /**
    * Body param: a valid hostname that’s been added to your DNS zone as an A, AAAA,
@@ -1958,16 +1845,6 @@ export interface CustomHostnameEditParams {
 }
 
 export namespace CustomHostnameEditParams {
-  /**
-   * These are per-hostname (customer) settings.
-   */
-  export interface CustomMetadata {
-    /**
-     * Unique metadata for this hostname.
-     */
-    key?: string;
-  }
-
   /**
    * SSL properties used when creating the custom hostname.
    */
@@ -1985,6 +1862,12 @@ export namespace CustomHostnameEditParams {
      */
     certificate_authority?: Shared.CertificateCAParam;
 
+    /**
+     * Whether or not to add Cloudflare Branding for the order. This will add a
+     * subdomain of sni.cloudflaressl.com as the Common Name if set to true
+     */
+    cloudflare_branding?: boolean;
+
     /**
      * If a custom uploaded certificate is used.
      */
@@ -2058,12 +1941,16 @@ export interface CustomHostnameGetParams {
   zone_id: string;
 }
 
-export namespace CustomHostnames {
-  export import FallbackOrigin = FallbackOriginAPI.FallbackOrigin;
-  export import FallbackOriginUpdateResponse = FallbackOriginAPI.FallbackOriginUpdateResponse;
-  export import FallbackOriginDeleteResponse = FallbackOriginAPI.FallbackOriginDeleteResponse;
-  export import FallbackOriginGetResponse = FallbackOriginAPI.FallbackOriginGetResponse;
-  export import FallbackOriginUpdateParams = FallbackOriginAPI.FallbackOriginUpdateParams;
-  export import FallbackOriginDeleteParams = FallbackOriginAPI.FallbackOriginDeleteParams;
-  export import FallbackOriginGetParams = FallbackOriginAPI.FallbackOriginGetParams;
+CustomHostnames.FallbackOrigin = FallbackOrigin;
+
+export declare namespace CustomHostnames {
+  export {
+    FallbackOrigin as FallbackOrigin,
+    type FallbackOriginUpdateResponse as FallbackOriginUpdateResponse,
+    type FallbackOriginDeleteResponse as FallbackOriginDeleteResponse,
+    type FallbackOriginGetResponse as FallbackOriginGetResponse,
+    type FallbackOriginUpdateParams as FallbackOriginUpdateParams,
+    type FallbackOriginDeleteParams as FallbackOriginDeleteParams,
+    type FallbackOriginGetParams as FallbackOriginGetParams,
+  };
 }
diff --git a/src/resources/custom-hostnames/fallback-origin.ts b/src/resources/custom-hostnames/fallback-origin.ts
index cd14d6926a..b87713c829 100644
--- a/src/resources/custom-hostnames/fallback-origin.ts
+++ b/src/resources/custom-hostnames/fallback-origin.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as FallbackOriginAPI from './fallback-origin';
 
 export class FallbackOrigin extends APIResource {
   /**
@@ -52,11 +51,107 @@ export class FallbackOrigin extends APIResource {
   }
 }
 
-export type FallbackOriginUpdateResponse = unknown | string | null;
+export interface FallbackOriginUpdateResponse {
+  /**
+   * This is the time the fallback origin was created.
+   */
+  created_at?: string;
+
+  /**
+   * These are errors that were encountered while trying to activate a fallback
+   * origin.
+   */
+  errors?: Array<string>;
+
+  /**
+   * Your origin hostname that requests to your custom hostnames will be sent to.
+   */
+  origin?: string;
+
+  /**
+   * Status of the fallback origin's activation.
+   */
+  status?:
+    | 'initializing'
+    | 'pending_deployment'
+    | 'pending_deletion'
+    | 'active'
+    | 'deployment_timed_out'
+    | 'deletion_timed_out';
 
-export type FallbackOriginDeleteResponse = unknown | string | null;
+  /**
+   * This is the time the fallback origin was updated.
+   */
+  updated_at?: string;
+}
+
+export interface FallbackOriginDeleteResponse {
+  /**
+   * This is the time the fallback origin was created.
+   */
+  created_at?: string;
+
+  /**
+   * These are errors that were encountered while trying to activate a fallback
+   * origin.
+   */
+  errors?: Array<string>;
+
+  /**
+   * Your origin hostname that requests to your custom hostnames will be sent to.
+   */
+  origin?: string;
 
-export type FallbackOriginGetResponse = unknown | string | null;
+  /**
+   * Status of the fallback origin's activation.
+   */
+  status?:
+    | 'initializing'
+    | 'pending_deployment'
+    | 'pending_deletion'
+    | 'active'
+    | 'deployment_timed_out'
+    | 'deletion_timed_out';
+
+  /**
+   * This is the time the fallback origin was updated.
+   */
+  updated_at?: string;
+}
+
+export interface FallbackOriginGetResponse {
+  /**
+   * This is the time the fallback origin was created.
+   */
+  created_at?: string;
+
+  /**
+   * These are errors that were encountered while trying to activate a fallback
+   * origin.
+   */
+  errors?: Array<string>;
+
+  /**
+   * Your origin hostname that requests to your custom hostnames will be sent to.
+   */
+  origin?: string;
+
+  /**
+   * Status of the fallback origin's activation.
+   */
+  status?:
+    | 'initializing'
+    | 'pending_deployment'
+    | 'pending_deletion'
+    | 'active'
+    | 'deployment_timed_out'
+    | 'deletion_timed_out';
+
+  /**
+   * This is the time the fallback origin was updated.
+   */
+  updated_at?: string;
+}
 
 export interface FallbackOriginUpdateParams {
   /**
@@ -85,11 +180,13 @@ export interface FallbackOriginGetParams {
   zone_id: string;
 }
 
-export namespace FallbackOrigin {
-  export import FallbackOriginUpdateResponse = FallbackOriginAPI.FallbackOriginUpdateResponse;
-  export import FallbackOriginDeleteResponse = FallbackOriginAPI.FallbackOriginDeleteResponse;
-  export import FallbackOriginGetResponse = FallbackOriginAPI.FallbackOriginGetResponse;
-  export import FallbackOriginUpdateParams = FallbackOriginAPI.FallbackOriginUpdateParams;
-  export import FallbackOriginDeleteParams = FallbackOriginAPI.FallbackOriginDeleteParams;
-  export import FallbackOriginGetParams = FallbackOriginAPI.FallbackOriginGetParams;
+export declare namespace FallbackOrigin {
+  export {
+    type FallbackOriginUpdateResponse as FallbackOriginUpdateResponse,
+    type FallbackOriginDeleteResponse as FallbackOriginDeleteResponse,
+    type FallbackOriginGetResponse as FallbackOriginGetResponse,
+    type FallbackOriginUpdateParams as FallbackOriginUpdateParams,
+    type FallbackOriginDeleteParams as FallbackOriginDeleteParams,
+    type FallbackOriginGetParams as FallbackOriginGetParams,
+  };
 }
diff --git a/src/resources/custom-hostnames/index.ts b/src/resources/custom-hostnames/index.ts
index 08fd489112..8f3f456029 100644
--- a/src/resources/custom-hostnames/index.ts
+++ b/src/resources/custom-hostnames/index.ts
@@ -2,11 +2,11 @@
 
 export { CustomHostnames } from './custom-hostnames';
 export {
-  FallbackOriginUpdateResponse,
-  FallbackOriginDeleteResponse,
-  FallbackOriginGetResponse,
-  FallbackOriginUpdateParams,
-  FallbackOriginDeleteParams,
-  FallbackOriginGetParams,
   FallbackOrigin,
+  type FallbackOriginUpdateResponse,
+  type FallbackOriginDeleteResponse,
+  type FallbackOriginGetResponse,
+  type FallbackOriginUpdateParams,
+  type FallbackOriginDeleteParams,
+  type FallbackOriginGetParams,
 } from './fallback-origin';
diff --git a/src/resources/custom-nameservers.ts b/src/resources/custom-nameservers.ts
index 73bf023a64..370745f3c7 100644
--- a/src/resources/custom-nameservers.ts
+++ b/src/resources/custom-nameservers.ts
@@ -26,11 +26,11 @@ export class CustomNameservers extends APIResource {
     customNSId: string,
     params: CustomNameserverDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomNameserverDeleteResponse | null> {
+  ): Core.APIPromise<CustomNameserverDeleteResponse> {
     const { account_id } = params;
     return (
       this._client.delete(`/accounts/${account_id}/custom_ns/${customNSId}`, options) as Core.APIPromise<{
-        result: CustomNameserverDeleteResponse | null;
+        result: CustomNameserverDeleteResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -41,11 +41,11 @@ export class CustomNameservers extends APIResource {
   availabilty(
     params: CustomNameserverAvailabiltyParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomNameserverAvailabiltyResponse | null> {
+  ): Core.APIPromise<CustomNameserverAvailabiltyResponse> {
     const { account_id } = params;
     return (
       this._client.get(`/accounts/${account_id}/custom_ns/availability`, options) as Core.APIPromise<{
-        result: CustomNameserverAvailabiltyResponse | null;
+        result: CustomNameserverAvailabiltyResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -56,11 +56,11 @@ export class CustomNameservers extends APIResource {
   get(
     params: CustomNameserverGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomNameserverGetResponse | null> {
+  ): Core.APIPromise<CustomNameserverGetResponse> {
     const { account_id } = params;
     return (
       this._client.get(`/accounts/${account_id}/custom_ns`, options) as Core.APIPromise<{
-        result: CustomNameserverGetResponse | null;
+        result: CustomNameserverGetResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -110,7 +110,7 @@ export namespace CustomNameserver {
   }
 }
 
-export type CustomNameserverDeleteResponse = Array<unknown>;
+export type CustomNameserverDeleteResponse = Array<string>;
 
 export type CustomNameserverAvailabiltyResponse = Array<string>;
 
diff --git a/src/resources/d1/d1.ts b/src/resources/d1/d1.ts
index b8f1fa2253..95c850e2af 100644
--- a/src/resources/d1/d1.ts
+++ b/src/resources/d1/d1.ts
@@ -2,6 +2,25 @@
 
 import { APIResource } from '../../resource';
 import * as DatabaseAPI from './database';
+import {
+  Database,
+  DatabaseCreateParams,
+  DatabaseDeleteParams,
+  DatabaseDeleteResponse,
+  DatabaseExportParams,
+  DatabaseExportResponse,
+  DatabaseGetParams,
+  DatabaseImportParams,
+  DatabaseImportResponse,
+  DatabaseListParams,
+  DatabaseListResponse,
+  DatabaseListResponsesV4PagePaginationArray,
+  DatabaseQueryParams,
+  DatabaseQueryResponse,
+  DatabaseRawParams,
+  DatabaseRawResponse,
+  QueryResult,
+} from './database';
 
 export class D1Resource extends APIResource {
   database: DatabaseAPI.Database = new DatabaseAPI.Database(this._client);
@@ -27,19 +46,27 @@ export interface D1 {
   version?: string;
 }
 
-export namespace D1Resource {
-  export import Database = DatabaseAPI.Database;
-  export import QueryResult = DatabaseAPI.QueryResult;
-  export import DatabaseCreateResponse = DatabaseAPI.DatabaseCreateResponse;
-  export import DatabaseListResponse = DatabaseAPI.DatabaseListResponse;
-  export import DatabaseDeleteResponse = DatabaseAPI.DatabaseDeleteResponse;
-  export import DatabaseQueryResponse = DatabaseAPI.DatabaseQueryResponse;
-  export import DatabaseRawResponse = DatabaseAPI.DatabaseRawResponse;
-  export import DatabaseListResponsesV4PagePaginationArray = DatabaseAPI.DatabaseListResponsesV4PagePaginationArray;
-  export import DatabaseCreateParams = DatabaseAPI.DatabaseCreateParams;
-  export import DatabaseListParams = DatabaseAPI.DatabaseListParams;
-  export import DatabaseDeleteParams = DatabaseAPI.DatabaseDeleteParams;
-  export import DatabaseGetParams = DatabaseAPI.DatabaseGetParams;
-  export import DatabaseQueryParams = DatabaseAPI.DatabaseQueryParams;
-  export import DatabaseRawParams = DatabaseAPI.DatabaseRawParams;
+D1Resource.Database = Database;
+D1Resource.DatabaseListResponsesV4PagePaginationArray = DatabaseListResponsesV4PagePaginationArray;
+
+export declare namespace D1Resource {
+  export {
+    Database as Database,
+    type QueryResult as QueryResult,
+    type DatabaseListResponse as DatabaseListResponse,
+    type DatabaseDeleteResponse as DatabaseDeleteResponse,
+    type DatabaseExportResponse as DatabaseExportResponse,
+    type DatabaseImportResponse as DatabaseImportResponse,
+    type DatabaseQueryResponse as DatabaseQueryResponse,
+    type DatabaseRawResponse as DatabaseRawResponse,
+    DatabaseListResponsesV4PagePaginationArray as DatabaseListResponsesV4PagePaginationArray,
+    type DatabaseCreateParams as DatabaseCreateParams,
+    type DatabaseListParams as DatabaseListParams,
+    type DatabaseDeleteParams as DatabaseDeleteParams,
+    type DatabaseExportParams as DatabaseExportParams,
+    type DatabaseGetParams as DatabaseGetParams,
+    type DatabaseImportParams as DatabaseImportParams,
+    type DatabaseQueryParams as DatabaseQueryParams,
+    type DatabaseRawParams as DatabaseRawParams,
+  };
 }
diff --git a/src/resources/d1/database.ts b/src/resources/d1/database.ts
index f1be9d2ae7..f9c39fe386 100644
--- a/src/resources/d1/database.ts
+++ b/src/resources/d1/database.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as DatabaseAPI from './database';
 import * as D1API from './d1';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
@@ -10,14 +9,11 @@ export class Database extends APIResource {
   /**
    * Returns the created D1 database.
    */
-  create(
-    params: DatabaseCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<DatabaseCreateResponse> {
+  create(params: DatabaseCreateParams, options?: Core.RequestOptions): Core.APIPromise<D1API.D1> {
     const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/d1/database`, { body, ...options }) as Core.APIPromise<{
-        result: DatabaseCreateResponse;
+        result: D1API.D1;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -44,15 +40,35 @@ export class Database extends APIResource {
     databaseId: string,
     params: DatabaseDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<DatabaseDeleteResponse> {
+  ): Core.APIPromise<DatabaseDeleteResponse | null> {
     const { account_id } = params;
     return (
       this._client.delete(`/accounts/${account_id}/d1/database/${databaseId}`, options) as Core.APIPromise<{
-        result: DatabaseDeleteResponse;
+        result: DatabaseDeleteResponse | null;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 
+  /**
+   * Returns a URL where the SQL contents of your D1 can be downloaded. Note: this
+   * process may take some time for larger DBs, during which your D1 will be
+   * unavailable to serve queries. To avoid blocking your DB unnecessarily, an
+   * in-progress export must be continually polled or will automatically cancel.
+   */
+  export(
+    databaseId: string,
+    params: DatabaseExportParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DatabaseExportResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/d1/database/${databaseId}/export`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: DatabaseExportResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Returns the specified D1 database.
    */
@@ -69,6 +85,25 @@ export class Database extends APIResource {
     )._thenUnwrap((obj) => obj.result);
   }
 
+  /**
+   * Generates a temporary URL for uploading an SQL file to, then instructing the D1
+   * to import it and polling it for status updates. Imports block the D1 for their
+   * duration.
+   */
+  import(
+    databaseId: string,
+    params: DatabaseImportParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DatabaseImportResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/d1/database/${databaseId}/import`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: DatabaseImportResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Returns the query result as an object.
    */
@@ -133,7 +168,7 @@ export namespace QueryResult {
   }
 }
 
-export interface DatabaseCreateResponse {
+export interface DatabaseListResponse {
   /**
    * Specifies the timestamp the resource was created as an ISO8601 string.
    */
@@ -146,20 +181,134 @@ export interface DatabaseCreateResponse {
   version?: string;
 }
 
-export interface DatabaseListResponse {
+export type DatabaseDeleteResponse = unknown;
+
+export interface DatabaseExportResponse {
   /**
-   * Specifies the timestamp the resource was created as an ISO8601 string.
+   * The current time-travel bookmark for your D1, used to poll for updates. Will not
+   * change for the duration of the export task.
    */
-  created_at?: string;
+  at_bookmark?: string;
 
-  name?: string;
+  /**
+   * Only present when status = 'error'. Contains the error message.
+   */
+  error?: string;
 
-  uuid?: string;
+  /**
+   * Logs since the last time you polled
+   */
+  messages?: Array<string>;
 
-  version?: string;
+  /**
+   * Only present when status = 'complete'
+   */
+  result?: DatabaseExportResponse.Result;
+
+  status?: 'complete' | 'error';
+
+  success?: boolean;
+
+  type?: 'export';
 }
 
-export type DatabaseDeleteResponse = unknown | string | null;
+export namespace DatabaseExportResponse {
+  /**
+   * Only present when status = 'complete'
+   */
+  export interface Result {
+    /**
+     * The generated SQL filename.
+     */
+    filename?: string;
+
+    /**
+     * The URL to download the exported SQL. Available for one hour.
+     */
+    signed_url?: string;
+  }
+}
+
+export interface DatabaseImportResponse {
+  /**
+   * The current time-travel bookmark for your D1, used to poll for updates. Will not
+   * change for the duration of the import. Only returned if an import process is
+   * currently running or recently finished.
+   */
+  at_bookmark?: string;
+
+  /**
+   * Only present when status = 'error'. Contains the error message that prevented
+   * the import from succeeding.
+   */
+  error?: string;
+
+  /**
+   * Derived from the database ID and etag, to use in avoiding repeated uploads. Only
+   * returned when for the 'init' action.
+   */
+  filename?: string;
+
+  /**
+   * Logs since the last time you polled
+   */
+  messages?: Array<string>;
+
+  /**
+   * Only present when status = 'complete'
+   */
+  result?: DatabaseImportResponse.Result;
+
+  status?: 'complete' | 'error';
+
+  success?: boolean;
+
+  type?: 'import';
+
+  /**
+   * The R2 presigned URL to use for uploading. Only returned when for the 'init'
+   * action.
+   */
+  upload_url?: string;
+}
+
+export namespace DatabaseImportResponse {
+  /**
+   * Only present when status = 'complete'
+   */
+  export interface Result {
+    /**
+     * The time-travel bookmark if you need restore your D1 to directly after the
+     * import succeeded.
+     */
+    final_bookmark?: string;
+
+    meta?: Result.Meta;
+
+    /**
+     * The total number of queries that were executed during the import.
+     */
+    num_queries?: number;
+  }
+
+  export namespace Result {
+    export interface Meta {
+      changed_db?: boolean;
+
+      changes?: number;
+
+      duration?: number;
+
+      last_row_id?: number;
+
+      rows_read?: number;
+
+      rows_written?: number;
+
+      size_after?: number;
+    }
+  }
+}
 
 export type DatabaseQueryResponse = Array<QueryResult>;
 
@@ -237,6 +386,50 @@ export interface DatabaseDeleteParams {
   account_id: string;
 }
 
+export interface DatabaseExportParams {
+  /**
+   * Path param: Account identifier tag.
+   */
+  account_id: string;
+
+  /**
+   * Body param: Specifies that you will poll this endpoint until the export
+   * completes
+   */
+  output_format: 'polling';
+
+  /**
+   * Body param: To poll an in-progress export, provide the current bookmark
+   * (returned by your first polling response)
+   */
+  current_bookmark?: string;
+
+  /**
+   * Body param:
+   */
+  dump_options?: DatabaseExportParams.DumpOptions;
+}
+
+export namespace DatabaseExportParams {
+  export interface DumpOptions {
+    /**
+     * Export only the table definitions, not their contents
+     */
+    no_data?: boolean;
+
+    /**
+     * Export only each table's contents, not its definition
+     */
+    no_schema?: boolean;
+
+    /**
+     * Filter the export to just one or more tables. Passing an empty array is the same
+     * as not passing anything and means: export all tables.
+     */
+    tables?: Array<string>;
+  }
+}
+
 export interface DatabaseGetParams {
   /**
    * Account identifier tag.
@@ -244,6 +437,74 @@ export interface DatabaseGetParams {
   account_id: string;
 }
 
+export type DatabaseImportParams =
+  | DatabaseImportParams.Variant0
+  | DatabaseImportParams.Variant1
+  | DatabaseImportParams.Variant2;
+
+export declare namespace DatabaseImportParams {
+  export interface Variant0 {
+    /**
+     * Path param: Account identifier tag.
+     */
+    account_id: string;
+
+    /**
+     * Body param: Indicates you have a new SQL file to upload.
+     */
+    action: 'init';
+
+    /**
+     * Body param: Required when action is 'init' or 'ingest'. An md5 hash of the file
+     * you're uploading. Used to check if it already exists, and validate its contents
+     * before ingesting.
+     */
+    etag: string;
+  }
+
+  export interface Variant1 {
+    /**
+     * Path param: Account identifier tag.
+     */
+    account_id: string;
+
+    /**
+     * Body param: Indicates you've finished uploading to tell the D1 to start
+     * consuming it
+     */
+    action: 'ingest';
+
+    /**
+     * Body param: An md5 hash of the file you're uploading. Used to check if it
+     * already exists, and validate its contents before ingesting.
+     */
+    etag: string;
+
+    /**
+     * Body param: The filename you have successfully uploaded.
+     */
+    filename: string;
+  }
+
+  export interface Variant2 {
+    /**
+     * Path param: Account identifier tag.
+     */
+    account_id: string;
+
+    /**
+     * Body param: Indicates you've finished uploading to tell the D1 to start
+     * consuming it
+     */
+    action: 'poll';
+
+    /**
+     * Body param: This identifies the currently-running import, checking its status.
+     */
+    current_bookmark: string;
+  }
+}
+
 export interface DatabaseQueryParams {
   /**
    * Path param: Account identifier tag.
@@ -280,18 +541,25 @@ export interface DatabaseRawParams {
   params?: Array<string>;
 }
 
-export namespace Database {
-  export import QueryResult = DatabaseAPI.QueryResult;
-  export import DatabaseCreateResponse = DatabaseAPI.DatabaseCreateResponse;
-  export import DatabaseListResponse = DatabaseAPI.DatabaseListResponse;
-  export import DatabaseDeleteResponse = DatabaseAPI.DatabaseDeleteResponse;
-  export import DatabaseQueryResponse = DatabaseAPI.DatabaseQueryResponse;
-  export import DatabaseRawResponse = DatabaseAPI.DatabaseRawResponse;
-  export import DatabaseListResponsesV4PagePaginationArray = DatabaseAPI.DatabaseListResponsesV4PagePaginationArray;
-  export import DatabaseCreateParams = DatabaseAPI.DatabaseCreateParams;
-  export import DatabaseListParams = DatabaseAPI.DatabaseListParams;
-  export import DatabaseDeleteParams = DatabaseAPI.DatabaseDeleteParams;
-  export import DatabaseGetParams = DatabaseAPI.DatabaseGetParams;
-  export import DatabaseQueryParams = DatabaseAPI.DatabaseQueryParams;
-  export import DatabaseRawParams = DatabaseAPI.DatabaseRawParams;
+Database.DatabaseListResponsesV4PagePaginationArray = DatabaseListResponsesV4PagePaginationArray;
+
+export declare namespace Database {
+  export {
+    type QueryResult as QueryResult,
+    type DatabaseListResponse as DatabaseListResponse,
+    type DatabaseDeleteResponse as DatabaseDeleteResponse,
+    type DatabaseExportResponse as DatabaseExportResponse,
+    type DatabaseImportResponse as DatabaseImportResponse,
+    type DatabaseQueryResponse as DatabaseQueryResponse,
+    type DatabaseRawResponse as DatabaseRawResponse,
+    DatabaseListResponsesV4PagePaginationArray as DatabaseListResponsesV4PagePaginationArray,
+    type DatabaseCreateParams as DatabaseCreateParams,
+    type DatabaseListParams as DatabaseListParams,
+    type DatabaseDeleteParams as DatabaseDeleteParams,
+    type DatabaseExportParams as DatabaseExportParams,
+    type DatabaseGetParams as DatabaseGetParams,
+    type DatabaseImportParams as DatabaseImportParams,
+    type DatabaseQueryParams as DatabaseQueryParams,
+    type DatabaseRawParams as DatabaseRawParams,
+  };
 }
diff --git a/src/resources/d1/index.ts b/src/resources/d1/index.ts
index 90d4c26d23..a0d16c70fc 100644
--- a/src/resources/d1/index.ts
+++ b/src/resources/d1/index.ts
@@ -2,18 +2,21 @@
 
 export { D1Resource } from './d1';
 export {
-  QueryResult,
-  DatabaseCreateResponse,
-  DatabaseListResponse,
-  DatabaseDeleteResponse,
-  DatabaseQueryResponse,
-  DatabaseRawResponse,
-  DatabaseCreateParams,
-  DatabaseListParams,
-  DatabaseDeleteParams,
-  DatabaseGetParams,
-  DatabaseQueryParams,
-  DatabaseRawParams,
   DatabaseListResponsesV4PagePaginationArray,
   Database,
+  type QueryResult,
+  type DatabaseListResponse,
+  type DatabaseDeleteResponse,
+  type DatabaseExportResponse,
+  type DatabaseImportResponse,
+  type DatabaseQueryResponse,
+  type DatabaseRawResponse,
+  type DatabaseCreateParams,
+  type DatabaseListParams,
+  type DatabaseDeleteParams,
+  type DatabaseExportParams,
+  type DatabaseGetParams,
+  type DatabaseImportParams,
+  type DatabaseQueryParams,
+  type DatabaseRawParams,
 } from './database';
diff --git a/src/resources/diagnostics/diagnostics.ts b/src/resources/diagnostics/diagnostics.ts
index a67592e655..8fb41593c3 100644
--- a/src/resources/diagnostics/diagnostics.ts
+++ b/src/resources/diagnostics/diagnostics.ts
@@ -2,14 +2,19 @@
 
 import { APIResource } from '../../resource';
 import * as TraceroutesAPI from './traceroutes';
+import { Traceroute, TracerouteCreateParams, TracerouteCreateResponse, Traceroutes } from './traceroutes';
 
 export class Diagnostics extends APIResource {
   traceroutes: TraceroutesAPI.Traceroutes = new TraceroutesAPI.Traceroutes(this._client);
 }
 
-export namespace Diagnostics {
-  export import Traceroutes = TraceroutesAPI.Traceroutes;
-  export import Traceroute = TraceroutesAPI.Traceroute;
-  export import TracerouteCreateResponse = TraceroutesAPI.TracerouteCreateResponse;
-  export import TracerouteCreateParams = TraceroutesAPI.TracerouteCreateParams;
+Diagnostics.Traceroutes = Traceroutes;
+
+export declare namespace Diagnostics {
+  export {
+    Traceroutes as Traceroutes,
+    type Traceroute as Traceroute,
+    type TracerouteCreateResponse as TracerouteCreateResponse,
+    type TracerouteCreateParams as TracerouteCreateParams,
+  };
 }
diff --git a/src/resources/diagnostics/index.ts b/src/resources/diagnostics/index.ts
index bf7990e06e..8b4d13a98d 100644
--- a/src/resources/diagnostics/index.ts
+++ b/src/resources/diagnostics/index.ts
@@ -1,4 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Diagnostics } from './diagnostics';
-export { Traceroute, TracerouteCreateResponse, TracerouteCreateParams, Traceroutes } from './traceroutes';
+export {
+  Traceroutes,
+  type Traceroute,
+  type TracerouteCreateResponse,
+  type TracerouteCreateParams,
+} from './traceroutes';
diff --git a/src/resources/diagnostics/traceroutes.ts b/src/resources/diagnostics/traceroutes.ts
index 4393a9f41e..7a729f3e83 100644
--- a/src/resources/diagnostics/traceroutes.ts
+++ b/src/resources/diagnostics/traceroutes.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as TraceroutesAPI from './traceroutes';
 
 export class Traceroutes extends APIResource {
   /**
@@ -202,8 +201,10 @@ export namespace TracerouteCreateParams {
   }
 }
 
-export namespace Traceroutes {
-  export import Traceroute = TraceroutesAPI.Traceroute;
-  export import TracerouteCreateResponse = TraceroutesAPI.TracerouteCreateResponse;
-  export import TracerouteCreateParams = TraceroutesAPI.TracerouteCreateParams;
+export declare namespace Traceroutes {
+  export {
+    type Traceroute as Traceroute,
+    type TracerouteCreateResponse as TracerouteCreateResponse,
+    type TracerouteCreateParams as TracerouteCreateParams,
+  };
 }
diff --git a/src/resources/dns-firewall/analytics/analytics.ts b/src/resources/dns-firewall/analytics/analytics.ts
new file mode 100644
index 0000000000..7d9727909b
--- /dev/null
+++ b/src/resources/dns-firewall/analytics/analytics.ts
@@ -0,0 +1,15 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as ReportsAPI from './reports/reports';
+import { ReportGetParams, Reports } from './reports/reports';
+
+export class Analytics extends APIResource {
+  reports: ReportsAPI.Reports = new ReportsAPI.Reports(this._client);
+}
+
+Analytics.Reports = Reports;
+
+export declare namespace Analytics {
+  export { Reports as Reports, type ReportGetParams as ReportGetParams };
+}
diff --git a/src/resources/dns-firewall/analytics/index.ts b/src/resources/dns-firewall/analytics/index.ts
new file mode 100644
index 0000000000..0be47a4055
--- /dev/null
+++ b/src/resources/dns-firewall/analytics/index.ts
@@ -0,0 +1,4 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Analytics } from './analytics';
+export { Reports, type ReportGetParams } from './reports/index';
diff --git a/src/resources/dns/firewall/analytics/reports/bytimes.ts b/src/resources/dns-firewall/analytics/reports/bytimes.ts
similarity index 76%
rename from src/resources/dns/firewall/analytics/reports/bytimes.ts
rename to src/resources/dns-firewall/analytics/reports/bytimes.ts
index cd4d5ab9e1..7ca60e9dd8 100644
--- a/src/resources/dns/firewall/analytics/reports/bytimes.ts
+++ b/src/resources/dns-firewall/analytics/reports/bytimes.ts
@@ -1,10 +1,8 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../../../resource';
-import * as Core from '../../../../../core';
-import * as ReportsBytimesAPI from './bytimes';
-import * as BytimesAPI from '../../../analytics/reports/bytimes';
-import * as AnalyticsAPI from '../analytics';
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+import * as ReportsBytimesAPI from '../../../dns/analytics/reports/bytimes';
 
 export class Bytimes extends APIResource {
   /**
@@ -18,13 +16,13 @@ export class Bytimes extends APIResource {
     dnsFirewallId: string,
     params: BytimeGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<BytimesAPI.ByTime> {
+  ): Core.APIPromise<ReportsBytimesAPI.ByTime> {
     const { account_id, ...query } = params;
     return (
       this._client.get(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}/dns_analytics/report/bytime`, {
         query,
         ...options,
-      }) as Core.APIPromise<{ result: BytimesAPI.ByTime }>
+      }) as Core.APIPromise<{ result: ReportsBytimesAPI.ByTime }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -69,7 +67,17 @@ export interface BytimeGetParams {
   /**
    * Query param: Unit of time to group data by.
    */
-  time_delta?: AnalyticsAPI.DeltaParam;
+  time_delta?:
+    | 'all'
+    | 'auto'
+    | 'year'
+    | 'quarter'
+    | 'month'
+    | 'week'
+    | 'day'
+    | 'hour'
+    | 'dekaminute'
+    | 'minute';
 
   /**
    * Query param: End date and time of requesting data period in ISO 8601 format.
@@ -77,6 +85,6 @@ export interface BytimeGetParams {
   until?: string;
 }
 
-export namespace Bytimes {
-  export import BytimeGetParams = ReportsBytimesAPI.BytimeGetParams;
+export declare namespace Bytimes {
+  export { type BytimeGetParams as BytimeGetParams };
 }
diff --git a/src/resources/dns-firewall/analytics/reports/index.ts b/src/resources/dns-firewall/analytics/reports/index.ts
new file mode 100644
index 0000000000..c2fce722e0
--- /dev/null
+++ b/src/resources/dns-firewall/analytics/reports/index.ts
@@ -0,0 +1,4 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Bytimes, type BytimeGetParams } from './bytimes';
+export { Reports, type ReportGetParams } from './reports';
diff --git a/src/resources/dns/firewall/analytics/reports/reports.ts b/src/resources/dns-firewall/analytics/reports/reports.ts
similarity index 76%
rename from src/resources/dns/firewall/analytics/reports/reports.ts
rename to src/resources/dns-firewall/analytics/reports/reports.ts
index b14f7bfcb6..cd051b7d65 100644
--- a/src/resources/dns/firewall/analytics/reports/reports.ts
+++ b/src/resources/dns-firewall/analytics/reports/reports.ts
@@ -1,10 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../../../resource';
-import * as Core from '../../../../../core';
-import * as ReportsReportsAPI from './reports';
-import * as ReportsAPI from '../../../analytics/reports/reports';
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
 import * as BytimesAPI from './bytimes';
+import { BytimeGetParams, Bytimes } from './bytimes';
+import * as ReportsReportsAPI from '../../../dns/analytics/reports/reports';
 
 export class Reports extends APIResource {
   bytimes: BytimesAPI.Bytimes = new BytimesAPI.Bytimes(this._client);
@@ -20,13 +20,13 @@ export class Reports extends APIResource {
     dnsFirewallId: string,
     params: ReportGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ReportsAPI.Report> {
+  ): Core.APIPromise<ReportsReportsAPI.Report> {
     const { account_id, ...query } = params;
     return (
       this._client.get(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}/dns_analytics/report`, {
         query,
         ...options,
-      }) as Core.APIPromise<{ result: ReportsAPI.Report }>
+      }) as Core.APIPromise<{ result: ReportsReportsAPI.Report }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -74,8 +74,10 @@ export interface ReportGetParams {
   until?: string;
 }
 
-export namespace Reports {
-  export import ReportGetParams = ReportsReportsAPI.ReportGetParams;
-  export import Bytimes = BytimesAPI.Bytimes;
-  export import BytimeGetParams = BytimesAPI.BytimeGetParams;
+Reports.Bytimes = Bytimes;
+
+export declare namespace Reports {
+  export { type ReportGetParams as ReportGetParams };
+
+  export { Bytimes as Bytimes, type BytimeGetParams as BytimeGetParams };
 }
diff --git a/src/resources/dns-firewall/dns-firewall.ts b/src/resources/dns-firewall/dns-firewall.ts
new file mode 100644
index 0000000000..820a2910ea
--- /dev/null
+++ b/src/resources/dns-firewall/dns-firewall.ts
@@ -0,0 +1,594 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import * as ReverseDNSAPI from './reverse-dns';
+import {
+  ReverseDNS,
+  ReverseDNSEditParams,
+  ReverseDNSEditResponse,
+  ReverseDNSGetParams,
+  ReverseDNSGetResponse,
+} from './reverse-dns';
+import * as AnalyticsAPI from './analytics/analytics';
+import { Analytics } from './analytics/analytics';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
+
+export class DNSFirewall extends APIResource {
+  analytics: AnalyticsAPI.Analytics = new AnalyticsAPI.Analytics(this._client);
+  reverseDNS: ReverseDNSAPI.ReverseDNS = new ReverseDNSAPI.ReverseDNS(this._client);
+
+  /**
+   * Create a DNS Firewall cluster
+   */
+  create(
+    params: DNSFirewallCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DNSFirewallCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/dns_firewall`, { body, ...options }) as Core.APIPromise<{
+        result: DNSFirewallCreateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List DNS Firewall clusters for an account
+   */
+  list(
+    params: DNSFirewallListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<DNSFirewallListResponsesV4PagePaginationArray, DNSFirewallListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/dns_firewall`,
+      DNSFirewallListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Delete a DNS Firewall cluster
+   */
+  delete(
+    dnsFirewallId: string,
+    params: DNSFirewallDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DNSFirewallDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/dns_firewall/${dnsFirewallId}`,
+        options,
+      ) as Core.APIPromise<{ result: DNSFirewallDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Modify the configuration of a DNS Firewall cluster
+   */
+  edit(
+    dnsFirewallId: string,
+    params: DNSFirewallEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DNSFirewallEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: DNSFirewallEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Show a single DNS Firewall cluster for an account
+   */
+  get(
+    dnsFirewallId: string,
+    params: DNSFirewallGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DNSFirewallGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}`, options) as Core.APIPromise<{
+        result: DNSFirewallGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class DNSFirewallListResponsesV4PagePaginationArray extends V4PagePaginationArray<DNSFirewallListResponse> {}
+
+/**
+ * Attack mitigation settings
+ */
+export interface AttackMitigation {
+  /**
+   * When enabled, automatically mitigate random-prefix attacks to protect upstream
+   * DNS servers
+   */
+  enabled?: boolean;
+
+  /**
+   * Only mitigate attacks when upstream servers seem unhealthy
+   */
+  only_when_upstream_unhealthy?: boolean;
+}
+
+/**
+ * Attack mitigation settings
+ */
+export interface AttackMitigationParam {
+  /**
+   * When enabled, automatically mitigate random-prefix attacks to protect upstream
+   * DNS servers
+   */
+  enabled?: boolean;
+
+  /**
+   * Only mitigate attacks when upstream servers seem unhealthy
+   */
+  only_when_upstream_unhealthy?: boolean;
+}
+
+/**
+ * Cloudflare-assigned DNS IPv4 address
+ */
+export type FirewallIPs = string;
+
+/**
+ * Upstream DNS Server IPv4 address
+ */
+export type UpstreamIPs = string;
+
+/**
+ * Upstream DNS Server IPv4 address
+ */
+export type UpstreamIPsParam = string;
+
+export interface DNSFirewallCreateResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  /**
+   * Whether to refuse to answer queries for the ANY type
+   */
+  deprecate_any_requests: boolean;
+
+  dns_firewall_ips: Array<FirewallIPs>;
+
+  /**
+   * Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent
+   */
+  ecs_fallback: boolean;
+
+  /**
+   * Maximum DNS cache TTL This setting sets an upper bound on DNS TTLs for purposes
+   * of caching between DNS Firewall and the upstream servers. Higher TTLs will be
+   * decreased to the maximum defined here for caching purposes.
+   */
+  maximum_cache_ttl: number;
+
+  /**
+   * Minimum DNS cache TTL This setting sets a lower bound on DNS TTLs for purposes
+   * of caching between DNS Firewall and the upstream servers. Lower TTLs will be
+   * increased to the minimum defined here for caching purposes.
+   */
+  minimum_cache_ttl: number;
+
+  /**
+   * Last modification of DNS Firewall cluster
+   */
+  modified_on: string;
+
+  /**
+   * DNS Firewall cluster name
+   */
+  name: string;
+
+  /**
+   * Negative DNS cache TTL This setting controls how long DNS Firewall should cache
+   * negative responses (e.g., NXDOMAIN) from the upstream servers.
+   */
+  negative_cache_ttl: number | null;
+
+  /**
+   * Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+   * the upstream nameservers configured on the cluster)
+   */
+  ratelimit: number | null;
+
+  /**
+   * Number of retries for fetching DNS responses from upstream nameservers (not
+   * counting the initial attempt)
+   */
+  retries: number;
+
+  upstream_ips: Array<UpstreamIPs>;
+
+  /**
+   * Attack mitigation settings
+   */
+  attack_mitigation?: AttackMitigation | null;
+}
+
+export interface DNSFirewallListResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  /**
+   * Whether to refuse to answer queries for the ANY type
+   */
+  deprecate_any_requests: boolean;
+
+  dns_firewall_ips: Array<FirewallIPs>;
+
+  /**
+   * Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent
+   */
+  ecs_fallback: boolean;
+
+  /**
+   * Maximum DNS cache TTL This setting sets an upper bound on DNS TTLs for purposes
+   * of caching between DNS Firewall and the upstream servers. Higher TTLs will be
+   * decreased to the maximum defined here for caching purposes.
+   */
+  maximum_cache_ttl: number;
+
+  /**
+   * Minimum DNS cache TTL This setting sets a lower bound on DNS TTLs for purposes
+   * of caching between DNS Firewall and the upstream servers. Lower TTLs will be
+   * increased to the minimum defined here for caching purposes.
+   */
+  minimum_cache_ttl: number;
+
+  /**
+   * Last modification of DNS Firewall cluster
+   */
+  modified_on: string;
+
+  /**
+   * DNS Firewall cluster name
+   */
+  name: string;
+
+  /**
+   * Negative DNS cache TTL This setting controls how long DNS Firewall should cache
+   * negative responses (e.g., NXDOMAIN) from the upstream servers.
+   */
+  negative_cache_ttl: number | null;
+
+  /**
+   * Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+   * the upstream nameservers configured on the cluster)
+   */
+  ratelimit: number | null;
+
+  /**
+   * Number of retries for fetching DNS responses from upstream nameservers (not
+   * counting the initial attempt)
+   */
+  retries: number;
+
+  upstream_ips: Array<UpstreamIPs>;
+
+  /**
+   * Attack mitigation settings
+   */
+  attack_mitigation?: AttackMitigation | null;
+}
+
+export interface DNSFirewallDeleteResponse {
+  /**
+   * Identifier
+   */
+  id?: string;
+}
+
+export interface DNSFirewallEditResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  /**
+   * Whether to refuse to answer queries for the ANY type
+   */
+  deprecate_any_requests: boolean;
+
+  dns_firewall_ips: Array<FirewallIPs>;
+
+  /**
+   * Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent
+   */
+  ecs_fallback: boolean;
+
+  /**
+   * Maximum DNS cache TTL This setting sets an upper bound on DNS TTLs for purposes
+   * of caching between DNS Firewall and the upstream servers. Higher TTLs will be
+   * decreased to the maximum defined here for caching purposes.
+   */
+  maximum_cache_ttl: number;
+
+  /**
+   * Minimum DNS cache TTL This setting sets a lower bound on DNS TTLs for purposes
+   * of caching between DNS Firewall and the upstream servers. Lower TTLs will be
+   * increased to the minimum defined here for caching purposes.
+   */
+  minimum_cache_ttl: number;
+
+  /**
+   * Last modification of DNS Firewall cluster
+   */
+  modified_on: string;
+
+  /**
+   * DNS Firewall cluster name
+   */
+  name: string;
+
+  /**
+   * Negative DNS cache TTL This setting controls how long DNS Firewall should cache
+   * negative responses (e.g., NXDOMAIN) from the upstream servers.
+   */
+  negative_cache_ttl: number | null;
+
+  /**
+   * Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+   * the upstream nameservers configured on the cluster)
+   */
+  ratelimit: number | null;
+
+  /**
+   * Number of retries for fetching DNS responses from upstream nameservers (not
+   * counting the initial attempt)
+   */
+  retries: number;
+
+  upstream_ips: Array<UpstreamIPs>;
+
+  /**
+   * Attack mitigation settings
+   */
+  attack_mitigation?: AttackMitigation | null;
+}
+
+export interface DNSFirewallGetResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  /**
+   * Whether to refuse to answer queries for the ANY type
+   */
+  deprecate_any_requests: boolean;
+
+  dns_firewall_ips: Array<FirewallIPs>;
+
+  /**
+   * Whether to forward client IP (resolver) subnet if no EDNS Client Subnet is sent
+   */
+  ecs_fallback: boolean;
+
+  /**
+   * Maximum DNS cache TTL This setting sets an upper bound on DNS TTLs for purposes
+   * of caching between DNS Firewall and the upstream servers. Higher TTLs will be
+   * decreased to the maximum defined here for caching purposes.
+   */
+  maximum_cache_ttl: number;
+
+  /**
+   * Minimum DNS cache TTL This setting sets a lower bound on DNS TTLs for purposes
+   * of caching between DNS Firewall and the upstream servers. Lower TTLs will be
+   * increased to the minimum defined here for caching purposes.
+   */
+  minimum_cache_ttl: number;
+
+  /**
+   * Last modification of DNS Firewall cluster
+   */
+  modified_on: string;
+
+  /**
+   * DNS Firewall cluster name
+   */
+  name: string;
+
+  /**
+   * Negative DNS cache TTL This setting controls how long DNS Firewall should cache
+   * negative responses (e.g., NXDOMAIN) from the upstream servers.
+   */
+  negative_cache_ttl: number | null;
+
+  /**
+   * Ratelimit in queries per second per datacenter (applies to DNS queries sent to
+   * the upstream nameservers configured on the cluster)
+   */
+  ratelimit: number | null;
+
+  /**
+   * Number of retries for fetching DNS responses from upstream nameservers (not
+   * counting the initial attempt)
+   */
+  retries: number;
+
+  upstream_ips: Array<UpstreamIPs>;
+
+  /**
+   * Attack mitigation settings
+   */
+  attack_mitigation?: AttackMitigation | null;
+}
+
+export interface DNSFirewallCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: Attack mitigation settings
+   */
+  attack_mitigation?: AttackMitigationParam | null;
+
+  /**
+   * Body param: Whether to refuse to answer queries for the ANY type
+   */
+  deprecate_any_requests?: boolean;
+
+  /**
+   * Body param: Whether to forward client IP (resolver) subnet if no EDNS Client
+   * Subnet is sent
+   */
+  ecs_fallback?: boolean;
+
+  /**
+   * Body param: Maximum DNS cache TTL This setting sets an upper bound on DNS TTLs
+   * for purposes of caching between DNS Firewall and the upstream servers. Higher
+   * TTLs will be decreased to the maximum defined here for caching purposes.
+   */
+  maximum_cache_ttl?: number;
+
+  /**
+   * Body param: Minimum DNS cache TTL This setting sets a lower bound on DNS TTLs
+   * for purposes of caching between DNS Firewall and the upstream servers. Lower
+   * TTLs will be increased to the minimum defined here for caching purposes.
+   */
+  minimum_cache_ttl?: number;
+
+  /**
+   * Body param: DNS Firewall cluster name
+   */
+  name?: string;
+
+  /**
+   * Body param: Negative DNS cache TTL This setting controls how long DNS Firewall
+   * should cache negative responses (e.g., NXDOMAIN) from the upstream servers.
+   */
+  negative_cache_ttl?: number | null;
+
+  /**
+   * Body param: Ratelimit in queries per second per datacenter (applies to DNS
+   * queries sent to the upstream nameservers configured on the cluster)
+   */
+  ratelimit?: number | null;
+
+  /**
+   * Body param: Number of retries for fetching DNS responses from upstream
+   * nameservers (not counting the initial attempt)
+   */
+  retries?: number;
+
+  /**
+   * Body param:
+   */
+  upstream_ips?: Array<UpstreamIPsParam>;
+}
+
+export interface DNSFirewallListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+}
+
+export interface DNSFirewallDeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface DNSFirewallEditParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: Attack mitigation settings
+   */
+  attack_mitigation?: AttackMitigationParam | null;
+
+  /**
+   * Body param: Whether to refuse to answer queries for the ANY type
+   */
+  deprecate_any_requests?: boolean;
+
+  /**
+   * Body param: Whether to forward client IP (resolver) subnet if no EDNS Client
+   * Subnet is sent
+   */
+  ecs_fallback?: boolean;
+
+  /**
+   * Body param: Maximum DNS cache TTL This setting sets an upper bound on DNS TTLs
+   * for purposes of caching between DNS Firewall and the upstream servers. Higher
+   * TTLs will be decreased to the maximum defined here for caching purposes.
+   */
+  maximum_cache_ttl?: number;
+
+  /**
+   * Body param: Minimum DNS cache TTL This setting sets a lower bound on DNS TTLs
+   * for purposes of caching between DNS Firewall and the upstream servers. Lower
+   * TTLs will be increased to the minimum defined here for caching purposes.
+   */
+  minimum_cache_ttl?: number;
+
+  /**
+   * Body param: DNS Firewall cluster name
+   */
+  name?: string;
+
+  /**
+   * Body param: Negative DNS cache TTL This setting controls how long DNS Firewall
+   * should cache negative responses (e.g., NXDOMAIN) from the upstream servers.
+   */
+  negative_cache_ttl?: number | null;
+
+  /**
+   * Body param: Ratelimit in queries per second per datacenter (applies to DNS
+   * queries sent to the upstream nameservers configured on the cluster)
+   */
+  ratelimit?: number | null;
+
+  /**
+   * Body param: Number of retries for fetching DNS responses from upstream
+   * nameservers (not counting the initial attempt)
+   */
+  retries?: number;
+
+  /**
+   * Body param:
+   */
+  upstream_ips?: Array<UpstreamIPsParam>;
+}
+
+export interface DNSFirewallGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+DNSFirewall.Analytics = Analytics;
+DNSFirewall.ReverseDNS = ReverseDNS;
+
+export declare namespace DNSFirewall {
+  export { Analytics as Analytics };
+
+  export {
+    ReverseDNS as ReverseDNS,
+    type ReverseDNSEditResponse as ReverseDNSEditResponse,
+    type ReverseDNSGetResponse as ReverseDNSGetResponse,
+    type ReverseDNSEditParams as ReverseDNSEditParams,
+    type ReverseDNSGetParams as ReverseDNSGetParams,
+  };
+}
diff --git a/src/resources/dns-firewall/index.ts b/src/resources/dns-firewall/index.ts
new file mode 100644
index 0000000000..71c3af8ddf
--- /dev/null
+++ b/src/resources/dns-firewall/index.ts
@@ -0,0 +1,11 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Analytics } from './analytics/index';
+export { DNSFirewall } from './dns-firewall';
+export {
+  ReverseDNS,
+  type ReverseDNSEditResponse,
+  type ReverseDNSGetResponse,
+  type ReverseDNSEditParams,
+  type ReverseDNSGetParams,
+} from './reverse-dns';
diff --git a/src/resources/dns-firewall/reverse-dns.ts b/src/resources/dns-firewall/reverse-dns.ts
new file mode 100644
index 0000000000..9864357681
--- /dev/null
+++ b/src/resources/dns-firewall/reverse-dns.ts
@@ -0,0 +1,82 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+
+export class ReverseDNS extends APIResource {
+  /**
+   * Update reverse DNS configuration (PTR records) for a DNS Firewall cluster
+   */
+  edit(
+    dnsFirewallId: string,
+    params: ReverseDNSEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ReverseDNSEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}/reverse_dns`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: ReverseDNSEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Show reverse DNS configuration (PTR records) for a DNS Firewall cluster
+   */
+  get(
+    dnsFirewallId: string,
+    params: ReverseDNSGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ReverseDNSGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/dns_firewall/${dnsFirewallId}/reverse_dns`,
+        options,
+      ) as Core.APIPromise<{ result: ReverseDNSGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface ReverseDNSEditResponse {
+  /**
+   * Map of cluster IP addresses to PTR record contents
+   */
+  ptr?: Record<string, string>;
+}
+
+export interface ReverseDNSGetResponse {
+  /**
+   * Map of cluster IP addresses to PTR record contents
+   */
+  ptr?: Record<string, string>;
+}
+
+export interface ReverseDNSEditParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: Map of cluster IP addresses to PTR record contents
+   */
+  ptr?: Record<string, string>;
+}
+
+export interface ReverseDNSGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace ReverseDNS {
+  export {
+    type ReverseDNSEditResponse as ReverseDNSEditResponse,
+    type ReverseDNSGetResponse as ReverseDNSGetResponse,
+    type ReverseDNSEditParams as ReverseDNSEditParams,
+    type ReverseDNSGetParams as ReverseDNSGetParams,
+  };
+}
diff --git a/src/resources/dns/analytics/analytics.ts b/src/resources/dns/analytics/analytics.ts
index 70e8a8b528..5d4aaff95b 100644
--- a/src/resources/dns/analytics/analytics.ts
+++ b/src/resources/dns/analytics/analytics.ts
@@ -2,13 +2,14 @@
 
 import { APIResource } from '../../../resource';
 import * as ReportsAPI from './reports/reports';
+import { Report, ReportGetParams, Reports } from './reports/reports';
 
 export class Analytics extends APIResource {
   reports: ReportsAPI.Reports = new ReportsAPI.Reports(this._client);
 }
 
-export namespace Analytics {
-  export import Reports = ReportsAPI.Reports;
-  export import Report = ReportsAPI.Report;
-  export import ReportGetParams = ReportsAPI.ReportGetParams;
+Analytics.Reports = Reports;
+
+export declare namespace Analytics {
+  export { Reports as Reports, type Report as Report, type ReportGetParams as ReportGetParams };
 }
diff --git a/src/resources/dns/analytics/index.ts b/src/resources/dns/analytics/index.ts
index cd8b9eb0a6..1db5a1b70e 100644
--- a/src/resources/dns/analytics/index.ts
+++ b/src/resources/dns/analytics/index.ts
@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Analytics } from './analytics';
-export { Report, ReportGetParams, Reports } from './reports/index';
+export { Reports, type Report, type ReportGetParams } from './reports/index';
diff --git a/src/resources/dns/analytics/reports/bytimes.ts b/src/resources/dns/analytics/reports/bytimes.ts
index 6637db2e89..f3e3b81c48 100644
--- a/src/resources/dns/analytics/reports/bytimes.ts
+++ b/src/resources/dns/analytics/reports/bytimes.ts
@@ -2,9 +2,7 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as BytimesAPI from './bytimes';
 import * as DNSAPI from '../../dns';
-import * as AnalyticsAPI from '../../firewall/analytics/analytics';
 
 export class Bytimes extends APIResource {
   /**
@@ -125,7 +123,17 @@ export interface BytimeGetParams {
   /**
    * Query param: Unit of time to group data by.
    */
-  time_delta?: AnalyticsAPI.DeltaParam;
+  time_delta?:
+    | 'all'
+    | 'auto'
+    | 'year'
+    | 'quarter'
+    | 'month'
+    | 'week'
+    | 'day'
+    | 'hour'
+    | 'dekaminute'
+    | 'minute';
 
   /**
    * Query param: End date and time of requesting data period in ISO 8601 format.
@@ -133,7 +141,6 @@ export interface BytimeGetParams {
   until?: string;
 }
 
-export namespace Bytimes {
-  export import ByTime = BytimesAPI.ByTime;
-  export import BytimeGetParams = BytimesAPI.BytimeGetParams;
+export declare namespace Bytimes {
+  export { type ByTime as ByTime, type BytimeGetParams as BytimeGetParams };
 }
diff --git a/src/resources/dns/analytics/reports/index.ts b/src/resources/dns/analytics/reports/index.ts
index 7aedfa2ea9..e829e5d6ba 100644
--- a/src/resources/dns/analytics/reports/index.ts
+++ b/src/resources/dns/analytics/reports/index.ts
@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { ByTime, BytimeGetParams, Bytimes } from './bytimes';
-export { Report, ReportGetParams, Reports } from './reports';
+export { Bytimes, type ByTime, type BytimeGetParams } from './bytimes';
+export { Reports, type Report, type ReportGetParams } from './reports';
diff --git a/src/resources/dns/analytics/reports/reports.ts b/src/resources/dns/analytics/reports/reports.ts
index a0ac1dd1d4..5e497635d4 100644
--- a/src/resources/dns/analytics/reports/reports.ts
+++ b/src/resources/dns/analytics/reports/reports.ts
@@ -2,8 +2,8 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as ReportsAPI from './reports';
 import * as BytimesAPI from './bytimes';
+import { ByTime, BytimeGetParams, Bytimes } from './bytimes';
 
 export class Reports extends APIResource {
   bytimes: BytimesAPI.Bytimes = new BytimesAPI.Bytimes(this._client);
@@ -159,10 +159,10 @@ export interface ReportGetParams {
   until?: string;
 }
 
-export namespace Reports {
-  export import Report = ReportsAPI.Report;
-  export import ReportGetParams = ReportsAPI.ReportGetParams;
-  export import Bytimes = BytimesAPI.Bytimes;
-  export import ByTime = BytimesAPI.ByTime;
-  export import BytimeGetParams = BytimesAPI.BytimeGetParams;
+Reports.Bytimes = Bytimes;
+
+export declare namespace Reports {
+  export { type Report as Report, type ReportGetParams as ReportGetParams };
+
+  export { Bytimes as Bytimes, type ByTime as ByTime, type BytimeGetParams as BytimeGetParams };
 }
diff --git a/src/resources/dns/dns.ts b/src/resources/dns/dns.ts
index 727b7f505f..6558685db2 100644
--- a/src/resources/dns/dns.ts
+++ b/src/resources/dns/dns.ts
@@ -1,17 +1,81 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
+import * as DNSSECAPI from './dnssec';
+import {
+  DNSSEC,
+  DNSSECDeleteParams,
+  DNSSECDeleteResponse,
+  DNSSECEditParams,
+  DNSSECGetParams,
+  DNSSECResource,
+} from './dnssec';
 import * as RecordsAPI from './records';
-import * as SettingsAPI from './settings';
+import {
+  AAAARecord,
+  ARecord,
+  BatchPatch,
+  BatchPut,
+  CAARecord,
+  CERTRecord,
+  CNAMERecord,
+  DNSKEYRecord,
+  DSRecord,
+  HTTPSRecord,
+  LOCRecord,
+  MXRecord,
+  NAPTRRecord,
+  NSRecord,
+  PTRRecord,
+  Record,
+  RecordBatchParams,
+  RecordBatchResponse,
+  RecordCreateParams,
+  RecordDeleteParams,
+  RecordDeleteResponse,
+  RecordEditParams,
+  RecordExportParams,
+  RecordExportResponse,
+  RecordGetParams,
+  RecordImportParams,
+  RecordImportResponse,
+  RecordListParams,
+  RecordResponse,
+  RecordResponsesV4PagePaginationArray,
+  RecordScanParams,
+  RecordScanResponse,
+  RecordTags,
+  RecordUpdateParams,
+  Records,
+  SMIMEARecord,
+  SRVRecord,
+  SSHFPRecord,
+  SVCBRecord,
+  TLSARecord,
+  TTL,
+  TXTRecord,
+  URIRecord,
+} from './records';
 import * as AnalyticsAPI from './analytics/analytics';
-import * as FirewallAPI from './firewall/firewall';
-import * as AnalyticsAnalyticsAPI from './firewall/analytics/analytics';
+import { Analytics } from './analytics/analytics';
+import * as SettingsAPI from './settings/settings';
+import {
+  DNSSetting,
+  SettingEditParams,
+  SettingEditResponse,
+  SettingGetParams,
+  SettingGetResponse,
+  Settings,
+} from './settings/settings';
+import * as ZoneTransfersAPI from './zone-transfers/zone-transfers';
+import { ZoneTransfers } from './zone-transfers/zone-transfers';
 
 export class DNS extends APIResource {
+  dnssec: DNSSECAPI.DNSSECResource = new DNSSECAPI.DNSSECResource(this._client);
   records: RecordsAPI.Records = new RecordsAPI.Records(this._client);
   settings: SettingsAPI.Settings = new SettingsAPI.Settings(this._client);
   analytics: AnalyticsAPI.Analytics = new AnalyticsAPI.Analytics(this._client);
-  firewall: FirewallAPI.FirewallResource = new FirewallAPI.FirewallResource(this._client);
+  zoneTransfers: ZoneTransfersAPI.ZoneTransfers = new ZoneTransfersAPI.ZoneTransfers(this._client);
 }
 
 /**
@@ -43,7 +107,17 @@ export interface DNSAnalyticsQuery {
   /**
    * Unit of time to group data by.
    */
-  time_delta: AnalyticsAnalyticsAPI.Delta;
+  time_delta:
+    | 'all'
+    | 'auto'
+    | 'year'
+    | 'quarter'
+    | 'month'
+    | 'week'
+    | 'day'
+    | 'hour'
+    | 'dekaminute'
+    | 'minute';
 
   /**
    * End date and time of requesting data period in ISO 8601 format.
@@ -62,65 +136,79 @@ export interface DNSAnalyticsQuery {
   sort?: Array<string>;
 }
 
-export namespace DNS {
-  export import Records = RecordsAPI.Records;
-  export import ARecord = RecordsAPI.ARecord;
-  export import AAAARecord = RecordsAPI.AAAARecord;
-  export import CAARecord = RecordsAPI.CAARecord;
-  export import CERTRecord = RecordsAPI.CERTRecord;
-  export import CNAMERecord = RecordsAPI.CNAMERecord;
-  export import DNSKEYRecord = RecordsAPI.DNSKEYRecord;
-  export import DSRecord = RecordsAPI.DSRecord;
-  export import HTTPSRecord = RecordsAPI.HTTPSRecord;
-  export import LOCRecord = RecordsAPI.LOCRecord;
-  export import MXRecord = RecordsAPI.MXRecord;
-  export import NAPTRRecord = RecordsAPI.NAPTRRecord;
-  export import NSRecord = RecordsAPI.NSRecord;
-  export import PTRRecord = RecordsAPI.PTRRecord;
-  export import Record = RecordsAPI.Record;
-  export import RecordMetadata = RecordsAPI.RecordMetadata;
-  export import RecordProcessTiming = RecordsAPI.RecordProcessTiming;
-  export import RecordTags = RecordsAPI.RecordTags;
-  export import SMIMEARecord = RecordsAPI.SMIMEARecord;
-  export import SRVRecord = RecordsAPI.SRVRecord;
-  export import SSHFPRecord = RecordsAPI.SSHFPRecord;
-  export import SVCBRecord = RecordsAPI.SVCBRecord;
-  export import TLSARecord = RecordsAPI.TLSARecord;
-  export import TTL = RecordsAPI.TTL;
-  export import TXTRecord = RecordsAPI.TXTRecord;
-  export import URIRecord = RecordsAPI.URIRecord;
-  export import RecordDeleteResponse = RecordsAPI.RecordDeleteResponse;
-  export import RecordExportResponse = RecordsAPI.RecordExportResponse;
-  export import RecordImportResponse = RecordsAPI.RecordImportResponse;
-  export import RecordScanResponse = RecordsAPI.RecordScanResponse;
-  export import RecordsV4PagePaginationArray = RecordsAPI.RecordsV4PagePaginationArray;
-  export import RecordCreateParams = RecordsAPI.RecordCreateParams;
-  export import RecordUpdateParams = RecordsAPI.RecordUpdateParams;
-  export import RecordListParams = RecordsAPI.RecordListParams;
-  export import RecordDeleteParams = RecordsAPI.RecordDeleteParams;
-  export import RecordEditParams = RecordsAPI.RecordEditParams;
-  export import RecordExportParams = RecordsAPI.RecordExportParams;
-  export import RecordGetParams = RecordsAPI.RecordGetParams;
-  export import RecordImportParams = RecordsAPI.RecordImportParams;
-  export import RecordScanParams = RecordsAPI.RecordScanParams;
-  export import Settings = SettingsAPI.Settings;
-  export import DNSSetting = SettingsAPI.DNSSetting;
-  export import Nameserver = SettingsAPI.Nameserver;
-  export import SettingEditResponse = SettingsAPI.SettingEditResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
-  export import Analytics = AnalyticsAPI.Analytics;
-  export import FirewallResource = FirewallAPI.FirewallResource;
-  export import AttackMitigation = FirewallAPI.AttackMitigation;
-  export import Firewall = FirewallAPI.Firewall;
-  export import FirewallIPs = FirewallAPI.FirewallIPs;
-  export import UpstreamIPs = FirewallAPI.UpstreamIPs;
-  export import FirewallDeleteResponse = FirewallAPI.FirewallDeleteResponse;
-  export import FirewallsV4PagePaginationArray = FirewallAPI.FirewallsV4PagePaginationArray;
-  export import FirewallCreateParams = FirewallAPI.FirewallCreateParams;
-  export import FirewallListParams = FirewallAPI.FirewallListParams;
-  export import FirewallDeleteParams = FirewallAPI.FirewallDeleteParams;
-  export import FirewallEditParams = FirewallAPI.FirewallEditParams;
-  export import FirewallGetParams = FirewallAPI.FirewallGetParams;
+DNS.DNSSECResource = DNSSECResource;
+DNS.Records = Records;
+DNS.RecordResponsesV4PagePaginationArray = RecordResponsesV4PagePaginationArray;
+DNS.Settings = Settings;
+DNS.Analytics = Analytics;
+DNS.ZoneTransfers = ZoneTransfers;
+
+export declare namespace DNS {
+  export {
+    DNSSECResource as DNSSECResource,
+    type DNSSEC as DNSSEC,
+    type DNSSECDeleteResponse as DNSSECDeleteResponse,
+    type DNSSECDeleteParams as DNSSECDeleteParams,
+    type DNSSECEditParams as DNSSECEditParams,
+    type DNSSECGetParams as DNSSECGetParams,
+  };
+
+  export {
+    Records as Records,
+    type ARecord as ARecord,
+    type AAAARecord as AAAARecord,
+    type BatchPatch as BatchPatch,
+    type BatchPut as BatchPut,
+    type CAARecord as CAARecord,
+    type CERTRecord as CERTRecord,
+    type CNAMERecord as CNAMERecord,
+    type DNSKEYRecord as DNSKEYRecord,
+    type DSRecord as DSRecord,
+    type HTTPSRecord as HTTPSRecord,
+    type LOCRecord as LOCRecord,
+    type MXRecord as MXRecord,
+    type NAPTRRecord as NAPTRRecord,
+    type NSRecord as NSRecord,
+    type PTRRecord as PTRRecord,
+    type Record as Record,
+    type RecordResponse as RecordResponse,
+    type RecordTags as RecordTags,
+    type SMIMEARecord as SMIMEARecord,
+    type SRVRecord as SRVRecord,
+    type SSHFPRecord as SSHFPRecord,
+    type SVCBRecord as SVCBRecord,
+    type TLSARecord as TLSARecord,
+    type TTL as TTL,
+    type TXTRecord as TXTRecord,
+    type URIRecord as URIRecord,
+    type RecordDeleteResponse as RecordDeleteResponse,
+    type RecordBatchResponse as RecordBatchResponse,
+    type RecordExportResponse as RecordExportResponse,
+    type RecordImportResponse as RecordImportResponse,
+    type RecordScanResponse as RecordScanResponse,
+    RecordResponsesV4PagePaginationArray as RecordResponsesV4PagePaginationArray,
+    type RecordCreateParams as RecordCreateParams,
+    type RecordUpdateParams as RecordUpdateParams,
+    type RecordListParams as RecordListParams,
+    type RecordDeleteParams as RecordDeleteParams,
+    type RecordBatchParams as RecordBatchParams,
+    type RecordEditParams as RecordEditParams,
+    type RecordExportParams as RecordExportParams,
+    type RecordGetParams as RecordGetParams,
+    type RecordImportParams as RecordImportParams,
+    type RecordScanParams as RecordScanParams,
+  };
+
+  export {
+    Settings as Settings,
+    type DNSSetting as DNSSetting,
+    type SettingEditResponse as SettingEditResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingEditParams as SettingEditParams,
+    type SettingGetParams as SettingGetParams,
+  };
+
+  export { Analytics as Analytics };
+
+  export { ZoneTransfers as ZoneTransfers };
 }
diff --git a/src/resources/dnssec.ts b/src/resources/dns/dnssec.ts
similarity index 91%
rename from src/resources/dnssec.ts
rename to src/resources/dns/dnssec.ts
index bba283120c..f89fe503ae 100644
--- a/src/resources/dnssec.ts
+++ b/src/resources/dns/dnssec.ts
@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../resource';
-import * as Core from '../core';
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
 
 export class DNSSECResource extends APIResource {
   /**
@@ -119,7 +119,7 @@ export interface DNSSEC {
   status?: 'active' | 'pending' | 'disabled' | 'pending-disabled' | 'error';
 }
 
-export type DNSSECDeleteResponse = unknown | string;
+export type DNSSECDeleteResponse = string;
 
 export interface DNSSECDeleteParams {
   /**
@@ -170,3 +170,13 @@ export interface DNSSECGetParams {
    */
   zone_id: string;
 }
+
+export declare namespace DNSSECResource {
+  export {
+    type DNSSEC as DNSSEC,
+    type DNSSECDeleteResponse as DNSSECDeleteResponse,
+    type DNSSECDeleteParams as DNSSECDeleteParams,
+    type DNSSECEditParams as DNSSECEditParams,
+    type DNSSECGetParams as DNSSECGetParams,
+  };
+}
diff --git a/src/resources/dns/firewall/analytics/analytics.ts b/src/resources/dns/firewall/analytics/analytics.ts
deleted file mode 100644
index 0e4f718672..0000000000
--- a/src/resources/dns/firewall/analytics/analytics.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../../resource';
-import * as AnalyticsAPI from './analytics';
-import * as ReportsAPI from './reports/reports';
-
-export class Analytics extends APIResource {
-  reports: ReportsAPI.Reports = new ReportsAPI.Reports(this._client);
-}
-
-/**
- * Unit of time to group data by.
- */
-export type Delta =
-  | 'all'
-  | 'auto'
-  | 'year'
-  | 'quarter'
-  | 'month'
-  | 'week'
-  | 'day'
-  | 'hour'
-  | 'dekaminute'
-  | 'minute';
-
-/**
- * Unit of time to group data by.
- */
-export type DeltaParam =
-  | 'all'
-  | 'auto'
-  | 'year'
-  | 'quarter'
-  | 'month'
-  | 'week'
-  | 'day'
-  | 'hour'
-  | 'dekaminute'
-  | 'minute';
-
-export namespace Analytics {
-  export import Delta = AnalyticsAPI.Delta;
-  export import Reports = ReportsAPI.Reports;
-  export import ReportGetParams = ReportsAPI.ReportGetParams;
-}
diff --git a/src/resources/dns/firewall/analytics/index.ts b/src/resources/dns/firewall/analytics/index.ts
deleted file mode 100644
index e841178c20..0000000000
--- a/src/resources/dns/firewall/analytics/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { Delta, Analytics } from './analytics';
-export { ReportGetParams, Reports } from './reports/index';
diff --git a/src/resources/dns/firewall/analytics/reports/index.ts b/src/resources/dns/firewall/analytics/reports/index.ts
deleted file mode 100644
index afad8ed204..0000000000
--- a/src/resources/dns/firewall/analytics/reports/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { BytimeGetParams, Bytimes } from './bytimes';
-export { ReportGetParams, Reports } from './reports';
diff --git a/src/resources/dns/firewall/firewall.ts b/src/resources/dns/firewall/firewall.ts
deleted file mode 100644
index 4ac769a30f..0000000000
--- a/src/resources/dns/firewall/firewall.ts
+++ /dev/null
@@ -1,393 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../resource';
-import * as Core from '../../../core';
-import * as FirewallAPI from './firewall';
-import * as AnalyticsAPI from './analytics/analytics';
-import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
-
-export class FirewallResource extends APIResource {
-  analytics: AnalyticsAPI.Analytics = new AnalyticsAPI.Analytics(this._client);
-
-  /**
-   * Create a configured DNS Firewall Cluster.
-   */
-  create(params: FirewallCreateParams, options?: Core.RequestOptions): Core.APIPromise<Firewall> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.post(`/accounts/${account_id}/dns_firewall`, { body, ...options }) as Core.APIPromise<{
-        result: Firewall;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * List configured DNS Firewall clusters for an account.
-   */
-  list(
-    params: FirewallListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<FirewallsV4PagePaginationArray, Firewall> {
-    const { account_id, ...query } = params;
-    return this._client.getAPIList(`/accounts/${account_id}/dns_firewall`, FirewallsV4PagePaginationArray, {
-      query,
-      ...options,
-    });
-  }
-
-  /**
-   * Delete a configured DNS Firewall Cluster.
-   */
-  delete(
-    dnsFirewallId: string,
-    params: FirewallDeleteParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<FirewallDeleteResponse> {
-    const { account_id } = params;
-    return (
-      this._client.delete(
-        `/accounts/${account_id}/dns_firewall/${dnsFirewallId}`,
-        options,
-      ) as Core.APIPromise<{ result: FirewallDeleteResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Modify a DNS Firewall Cluster configuration.
-   */
-  edit(
-    dnsFirewallId: string,
-    params: FirewallEditParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Firewall> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.patch(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: Firewall }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Show a single configured DNS Firewall cluster for an account.
-   */
-  get(
-    dnsFirewallId: string,
-    params: FirewallGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Firewall> {
-    const { account_id } = params;
-    return (
-      this._client.get(`/accounts/${account_id}/dns_firewall/${dnsFirewallId}`, options) as Core.APIPromise<{
-        result: Firewall;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export class FirewallsV4PagePaginationArray extends V4PagePaginationArray<Firewall> {}
-
-/**
- * Attack mitigation settings.
- */
-export interface AttackMitigation {
-  /**
-   * When enabled, random-prefix attacks are automatically mitigated and the upstream
-   * DNS servers protected.
-   */
-  enabled?: boolean;
-
-  /**
-   * Only mitigate attacks when upstream servers seem unhealthy.
-   */
-  only_when_upstream_unhealthy?: boolean;
-}
-
-/**
- * Attack mitigation settings.
- */
-export interface AttackMitigationParam {
-  /**
-   * When enabled, random-prefix attacks are automatically mitigated and the upstream
-   * DNS servers protected.
-   */
-  enabled?: boolean;
-
-  /**
-   * Only mitigate attacks when upstream servers seem unhealthy.
-   */
-  only_when_upstream_unhealthy?: boolean;
-}
-
-export interface Firewall {
-  /**
-   * Identifier
-   */
-  id: string;
-
-  /**
-   * Deprecate the response to ANY requests.
-   */
-  deprecate_any_requests: boolean;
-
-  dns_firewall_ips: Array<FirewallIPs>;
-
-  /**
-   * Forward client IP (resolver) subnet if no EDNS Client Subnet is sent.
-   */
-  ecs_fallback: boolean;
-
-  /**
-   * Maximum DNS cache TTL. This setting sets an upper bound on DNS TTLs for purposes
-   * of caching between DNS Firewall and the upstream servers. Higher TTLs will be
-   * decreased to the maximum defined here for caching purposes.
-   */
-  maximum_cache_ttl: number;
-
-  /**
-   * Minimum DNS cache TTL. This setting sets a lower bound on DNS TTLs for purposes
-   * of caching between DNS Firewall and the upstream servers. Lower TTLs will be
-   * increased to the minimum defined here for caching purposes.
-   */
-  minimum_cache_ttl: number;
-
-  /**
-   * Last modification of DNS Firewall cluster.
-   */
-  modified_on: string;
-
-  /**
-   * DNS Firewall Cluster Name.
-   */
-  name: string;
-
-  upstream_ips: Array<UpstreamIPs>;
-
-  /**
-   * Attack mitigation settings.
-   */
-  attack_mitigation?: AttackMitigation | null;
-
-  /**
-   * Negative DNS cache TTL. This setting controls how long DNS Firewall should cache
-   * negative responses (e.g., NXDOMAIN) from the upstream servers.
-   */
-  negative_cache_ttl?: number | null;
-
-  /**
-   * Ratelimit in queries per second per datacenter (applies to DNS queries sent to
-   * the upstream nameservers configured on the cluster).
-   */
-  ratelimit?: number | null;
-
-  /**
-   * Number of retries for fetching DNS responses from upstream nameservers (not
-   * counting the initial attempt).
-   */
-  retries?: number;
-}
-
-/**
- * Cloudflare-assigned DNS IPv4 Address.
- */
-export type FirewallIPs = string | string;
-
-/**
- * Cloudflare-assigned DNS IPv4 Address.
- */
-export type FirewallIPsParam = string | string;
-
-/**
- * Upstream DNS Server IPv4 Address.
- */
-export type UpstreamIPs = string | string;
-
-/**
- * Upstream DNS Server IPv4 Address.
- */
-export type UpstreamIPsParam = string | string;
-
-export interface FirewallDeleteResponse {
-  /**
-   * Identifier
-   */
-  id?: string;
-}
-
-export interface FirewallCreateParams {
-  /**
-   * Path param: Identifier
-   */
-  account_id: string;
-
-  /**
-   * Body param: DNS Firewall Cluster Name.
-   */
-  name: string;
-
-  /**
-   * Body param:
-   */
-  upstream_ips: Array<UpstreamIPsParam>;
-
-  /**
-   * Body param: Attack mitigation settings.
-   */
-  attack_mitigation?: AttackMitigationParam | null;
-
-  /**
-   * Body param: Deprecate the response to ANY requests.
-   */
-  deprecate_any_requests?: boolean;
-
-  /**
-   * Body param: Forward client IP (resolver) subnet if no EDNS Client Subnet is
-   * sent.
-   */
-  ecs_fallback?: boolean;
-
-  /**
-   * Body param: Maximum DNS cache TTL. This setting sets an upper bound on DNS TTLs
-   * for purposes of caching between DNS Firewall and the upstream servers. Higher
-   * TTLs will be decreased to the maximum defined here for caching purposes.
-   */
-  maximum_cache_ttl?: number;
-
-  /**
-   * Body param: Minimum DNS cache TTL. This setting sets a lower bound on DNS TTLs
-   * for purposes of caching between DNS Firewall and the upstream servers. Lower
-   * TTLs will be increased to the minimum defined here for caching purposes.
-   */
-  minimum_cache_ttl?: number;
-
-  /**
-   * Body param: Negative DNS cache TTL. This setting controls how long DNS Firewall
-   * should cache negative responses (e.g., NXDOMAIN) from the upstream servers.
-   */
-  negative_cache_ttl?: number | null;
-
-  /**
-   * Body param: Ratelimit in queries per second per datacenter (applies to DNS
-   * queries sent to the upstream nameservers configured on the cluster).
-   */
-  ratelimit?: number | null;
-
-  /**
-   * Body param: Number of retries for fetching DNS responses from upstream
-   * nameservers (not counting the initial attempt).
-   */
-  retries?: number;
-}
-
-export interface FirewallListParams extends V4PagePaginationArrayParams {
-  /**
-   * Path param: Identifier
-   */
-  account_id: string;
-}
-
-export interface FirewallDeleteParams {
-  /**
-   * Identifier
-   */
-  account_id: string;
-}
-
-export interface FirewallEditParams {
-  /**
-   * Path param: Identifier
-   */
-  account_id: string;
-
-  /**
-   * Body param: Identifier
-   */
-  id: string;
-
-  /**
-   * Body param: Deprecate the response to ANY requests.
-   */
-  deprecate_any_requests: boolean;
-
-  /**
-   * Body param:
-   */
-  dns_firewall_ips: Array<FirewallIPsParam>;
-
-  /**
-   * Body param: Forward client IP (resolver) subnet if no EDNS Client Subnet is
-   * sent.
-   */
-  ecs_fallback: boolean;
-
-  /**
-   * Body param: Maximum DNS cache TTL. This setting sets an upper bound on DNS TTLs
-   * for purposes of caching between DNS Firewall and the upstream servers. Higher
-   * TTLs will be decreased to the maximum defined here for caching purposes.
-   */
-  maximum_cache_ttl: number;
-
-  /**
-   * Body param: Minimum DNS cache TTL. This setting sets a lower bound on DNS TTLs
-   * for purposes of caching between DNS Firewall and the upstream servers. Lower
-   * TTLs will be increased to the minimum defined here for caching purposes.
-   */
-  minimum_cache_ttl: number;
-
-  /**
-   * Body param: DNS Firewall Cluster Name.
-   */
-  name: string;
-
-  /**
-   * Body param:
-   */
-  upstream_ips: Array<UpstreamIPsParam>;
-
-  /**
-   * Body param: Attack mitigation settings.
-   */
-  attack_mitigation?: AttackMitigationParam | null;
-
-  /**
-   * Body param: Negative DNS cache TTL. This setting controls how long DNS Firewall
-   * should cache negative responses (e.g., NXDOMAIN) from the upstream servers.
-   */
-  negative_cache_ttl?: number | null;
-
-  /**
-   * Body param: Ratelimit in queries per second per datacenter (applies to DNS
-   * queries sent to the upstream nameservers configured on the cluster).
-   */
-  ratelimit?: number | null;
-
-  /**
-   * Body param: Number of retries for fetching DNS responses from upstream
-   * nameservers (not counting the initial attempt).
-   */
-  retries?: number;
-}
-
-export interface FirewallGetParams {
-  /**
-   * Identifier
-   */
-  account_id: string;
-}
-
-export namespace FirewallResource {
-  export import AttackMitigation = FirewallAPI.AttackMitigation;
-  export import Firewall = FirewallAPI.Firewall;
-  export import FirewallIPs = FirewallAPI.FirewallIPs;
-  export import UpstreamIPs = FirewallAPI.UpstreamIPs;
-  export import FirewallDeleteResponse = FirewallAPI.FirewallDeleteResponse;
-  export import FirewallsV4PagePaginationArray = FirewallAPI.FirewallsV4PagePaginationArray;
-  export import FirewallCreateParams = FirewallAPI.FirewallCreateParams;
-  export import FirewallListParams = FirewallAPI.FirewallListParams;
-  export import FirewallDeleteParams = FirewallAPI.FirewallDeleteParams;
-  export import FirewallEditParams = FirewallAPI.FirewallEditParams;
-  export import FirewallGetParams = FirewallAPI.FirewallGetParams;
-  export import Analytics = AnalyticsAPI.Analytics;
-  export import Delta = AnalyticsAPI.Delta;
-}
diff --git a/src/resources/dns/firewall/index.ts b/src/resources/dns/firewall/index.ts
deleted file mode 100644
index fe9a3e3998..0000000000
--- a/src/resources/dns/firewall/index.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export {
-  AttackMitigation,
-  Firewall,
-  FirewallIPs,
-  UpstreamIPs,
-  FirewallDeleteResponse,
-  FirewallCreateParams,
-  FirewallListParams,
-  FirewallDeleteParams,
-  FirewallEditParams,
-  FirewallGetParams,
-  FirewallsV4PagePaginationArray,
-  FirewallResource,
-} from './firewall';
-export { Delta, Analytics } from './analytics/index';
diff --git a/src/resources/dns/index.ts b/src/resources/dns/index.ts
index 1081c10eb5..de70333072 100644
--- a/src/resources/dns/index.ts
+++ b/src/resources/dns/index.ts
@@ -1,69 +1,66 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export { Analytics } from './analytics/index';
+export { DNS } from './dns';
+export {
+  DNSSECResource,
+  type DNSSEC,
+  type DNSSECDeleteResponse,
+  type DNSSECDeleteParams,
+  type DNSSECEditParams,
+  type DNSSECGetParams,
+} from './dnssec';
 export {
-  ARecord,
-  AAAARecord,
-  CAARecord,
-  CERTRecord,
-  CNAMERecord,
-  DNSKEYRecord,
-  DSRecord,
-  HTTPSRecord,
-  LOCRecord,
-  MXRecord,
-  NAPTRRecord,
-  NSRecord,
-  PTRRecord,
-  Record,
-  RecordMetadata,
-  RecordProcessTiming,
-  RecordTags,
-  SMIMEARecord,
-  SRVRecord,
-  SSHFPRecord,
-  SVCBRecord,
-  TLSARecord,
-  TTL,
-  TXTRecord,
-  URIRecord,
-  RecordDeleteResponse,
-  RecordExportResponse,
-  RecordImportResponse,
-  RecordScanResponse,
-  RecordCreateParams,
-  RecordUpdateParams,
-  RecordListParams,
-  RecordDeleteParams,
-  RecordEditParams,
-  RecordExportParams,
-  RecordGetParams,
-  RecordImportParams,
-  RecordScanParams,
-  RecordsV4PagePaginationArray,
+  RecordResponsesV4PagePaginationArray,
   Records,
+  type ARecord,
+  type AAAARecord,
+  type BatchPatch,
+  type BatchPut,
+  type CAARecord,
+  type CERTRecord,
+  type CNAMERecord,
+  type DNSKEYRecord,
+  type DSRecord,
+  type HTTPSRecord,
+  type LOCRecord,
+  type MXRecord,
+  type NAPTRRecord,
+  type NSRecord,
+  type PTRRecord,
+  type Record,
+  type RecordResponse,
+  type RecordTags,
+  type SMIMEARecord,
+  type SRVRecord,
+  type SSHFPRecord,
+  type SVCBRecord,
+  type TLSARecord,
+  type TTL,
+  type TXTRecord,
+  type URIRecord,
+  type RecordDeleteResponse,
+  type RecordBatchResponse,
+  type RecordExportResponse,
+  type RecordImportResponse,
+  type RecordScanResponse,
+  type RecordCreateParams,
+  type RecordUpdateParams,
+  type RecordListParams,
+  type RecordDeleteParams,
+  type RecordBatchParams,
+  type RecordEditParams,
+  type RecordExportParams,
+  type RecordGetParams,
+  type RecordImportParams,
+  type RecordScanParams,
 } from './records';
-export { Analytics } from './analytics/index';
-export {
-  AttackMitigation,
-  Firewall,
-  FirewallIPs,
-  UpstreamIPs,
-  FirewallDeleteResponse,
-  FirewallCreateParams,
-  FirewallListParams,
-  FirewallDeleteParams,
-  FirewallEditParams,
-  FirewallGetParams,
-  FirewallsV4PagePaginationArray,
-  FirewallResource,
-} from './firewall/index';
-export { DNS } from './dns';
 export {
-  DNSSetting,
-  Nameserver,
-  SettingEditResponse,
-  SettingGetResponse,
-  SettingEditParams,
-  SettingGetParams,
   Settings,
-} from './settings';
+  type DNSSetting,
+  type SettingEditResponse,
+  type SettingGetResponse,
+  type SettingEditParams,
+  type SettingGetParams,
+} from './settings/index';
+export { ZoneTransfers } from './zone-transfers/index';
diff --git a/src/resources/dns/records.ts b/src/resources/dns/records.ts
index 6351007a91..e4d19e06d3 100644
--- a/src/resources/dns/records.ts
+++ b/src/resources/dns/records.ts
@@ -17,17 +17,19 @@ export class Records extends APIResource {
    * - Domain names are always represented in Punycode, even if Unicode characters
    *   were used when creating the record.
    */
-  create(params: RecordCreateParams, options?: Core.RequestOptions): Core.APIPromise<Record> {
+  create(params: RecordCreateParams, options?: Core.RequestOptions): Core.APIPromise<RecordResponse> {
     const { zone_id, ...body } = params;
     return (
       this._client.post(`/zones/${zone_id}/dns_records`, { body, ...options }) as Core.APIPromise<{
-        result: Record;
+        result: RecordResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Overwrite an existing DNS record. Notes:
+   * Overwrite an existing DNS record.
+   *
+   * Notes:
    *
    * - A/AAAA records cannot exist on the same name as CNAME records.
    * - NS records cannot exist on the same name as any other record type.
@@ -38,13 +40,13 @@ export class Records extends APIResource {
     dnsRecordId: string,
     params: RecordUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<Record> {
+  ): Core.APIPromise<RecordResponse> {
     const { zone_id, ...body } = params;
     return (
       this._client.put(`/zones/${zone_id}/dns_records/${dnsRecordId}`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: Record }>
+      }) as Core.APIPromise<{ result: RecordResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -54,9 +56,9 @@ export class Records extends APIResource {
   list(
     params: RecordListParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<RecordsV4PagePaginationArray, Record> {
+  ): Core.PagePromise<RecordResponsesV4PagePaginationArray, RecordResponse> {
     const { zone_id, ...query } = params;
-    return this._client.getAPIList(`/zones/${zone_id}/dns_records`, RecordsV4PagePaginationArray, {
+    return this._client.getAPIList(`/zones/${zone_id}/dns_records`, RecordResponsesV4PagePaginationArray, {
       query,
       ...options,
     });
@@ -79,7 +81,37 @@ export class Records extends APIResource {
   }
 
   /**
-   * Update an existing DNS record. Notes:
+   * Send a Batch of DNS Record API calls to be executed together.
+   *
+   * Notes:
+   *
+   * - Although Cloudflare will execute the batched operations in a single database
+   *   transaction, Cloudflare's distributed KV store must treat each record change
+   *   as a single key-value pair. This means that the propagation of changes is not
+   *   atomic. See
+   *   [the documentation](https://developers.cloudflare.com/dns/manage-dns-records/how-to/batch-record-changes/ "Batch DNS records")
+   *   for more information.
+   * - The operations you specify within the /batch request body are always executed
+   *   in the following order:
+   *
+   *   - Deletes
+   *   - Patches
+   *   - Puts
+   *   - Posts
+   */
+  batch(params: RecordBatchParams, options?: Core.RequestOptions): Core.APIPromise<RecordBatchResponse> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.post(`/zones/${zone_id}/dns_records/batch`, { body, ...options }) as Core.APIPromise<{
+        result: RecordBatchResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update an existing DNS record.
+   *
+   * Notes:
    *
    * - A/AAAA records cannot exist on the same name as CNAME records.
    * - NS records cannot exist on the same name as any other record type.
@@ -90,13 +122,13 @@ export class Records extends APIResource {
     dnsRecordId: string,
     params: RecordEditParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<Record> {
+  ): Core.APIPromise<RecordResponse> {
     const { zone_id, ...body } = params;
     return (
       this._client.patch(`/zones/${zone_id}/dns_records/${dnsRecordId}`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: Record }>
+      }) as Core.APIPromise<{ result: RecordResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -120,11 +152,15 @@ export class Records extends APIResource {
   /**
    * DNS Record Details
    */
-  get(dnsRecordId: string, params: RecordGetParams, options?: Core.RequestOptions): Core.APIPromise<Record> {
+  get(
+    dnsRecordId: string,
+    params: RecordGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RecordResponse> {
     const { zone_id } = params;
     return (
       this._client.get(`/zones/${zone_id}/dns_records/${dnsRecordId}`, options) as Core.APIPromise<{
-        result: Record;
+        result: RecordResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -163,29 +199,9 @@ export class Records extends APIResource {
   }
 }
 
-export class RecordsV4PagePaginationArray extends V4PagePaginationArray<Record> {}
+export class RecordResponsesV4PagePaginationArray extends V4PagePaginationArray<RecordResponse> {}
 
 export interface ARecord {
-  /**
-   * A valid IPv4 address.
-   */
-  content: string;
-
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
-
-  /**
-   * Record type.
-   */
-  type: 'A';
-
-  /**
-   * Identifier
-   */
-  id?: string;
-
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -193,24 +209,14 @@ export interface ARecord {
   comment?: string;
 
   /**
-   * When the record was created.
-   */
-  created_on?: string;
-
-  /**
-   * Extra Cloudflare-specific information about the record.
-   */
-  meta?: RecordMetadata;
-
-  /**
-   * When the record was last modified.
+   * A valid IPv4 address.
    */
-  modified_on?: string;
+  content?: string;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  proxiable?: boolean;
+  name?: string;
 
   /**
    * Whether the record is receiving the performance and security benefits of
@@ -218,6 +224,11 @@ export interface ARecord {
    */
   proxied?: boolean;
 
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: ARecord.Settings;
+
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
    */
@@ -229,29 +240,37 @@ export interface ARecord {
    * Enterprise zones.
    */
   ttl?: TTL;
-}
-
-export interface AAAARecord {
-  /**
-   * A valid IPv6 address.
-   */
-  content: string;
-
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
 
   /**
    * Record type.
    */
-  type: 'AAAA';
+  type?: 'A';
+}
 
+export namespace ARecord {
   /**
-   * Identifier
+   * Settings for the DNS record.
    */
-  id?: string;
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
 
+export interface ARecordParam {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -259,24 +278,14 @@ export interface AAAARecord {
   comment?: string;
 
   /**
-   * When the record was created.
-   */
-  created_on?: string;
-
-  /**
-   * Extra Cloudflare-specific information about the record.
-   */
-  meta?: RecordMetadata;
-
-  /**
-   * When the record was last modified.
+   * A valid IPv4 address.
    */
-  modified_on?: string;
+  content?: string;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  proxiable?: boolean;
+  name?: string;
 
   /**
    * Whether the record is receiving the performance and security benefits of
@@ -284,40 +293,53 @@ export interface AAAARecord {
    */
   proxied?: boolean;
 
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: ARecordParam.Settings;
+
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
    */
-  tags?: Array<RecordTags>;
+  tags?: Array<RecordTagsParam>;
 
   /**
    * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
    * Value must be between 60 and 86400, with the minimum reduced to 30 for
    * Enterprise zones.
    */
-  ttl?: TTL;
-}
-
-export interface CAARecord {
-  /**
-   * Components of a CAA record.
-   */
-  data: CAARecord.Data;
-
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
+  ttl?: TTLParam;
 
   /**
    * Record type.
    */
-  type: 'CAA';
+  type?: 'A';
+}
 
+export namespace ARecordParam {
   /**
-   * Identifier
+   * Settings for the DNS record.
    */
-  id?: string;
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
 
+export interface AAAARecord {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -325,29 +347,25 @@ export interface CAARecord {
   comment?: string;
 
   /**
-   * Formatted CAA content. See 'data' to set CAA properties.
+   * A valid IPv6 address.
    */
   content?: string;
 
   /**
-   * When the record was created.
-   */
-  created_on?: string;
-
-  /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: AAAARecord.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
@@ -360,51 +378,37 @@ export interface CAARecord {
    * Enterprise zones.
    */
   ttl?: TTL;
-}
 
-export namespace CAARecord {
   /**
-   * Components of a CAA record.
+   * Record type.
    */
-  export interface Data {
-    /**
-     * Flags for the CAA record.
-     */
-    flags?: number;
+  type?: 'AAAA';
+}
 
+export namespace AAAARecord {
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
     /**
-     * Name of the property controlled by this record (e.g.: issue, issuewild, iodef).
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
      */
-    tag?: string;
+    ipv4_only?: boolean;
 
     /**
-     * Value of the record. This field's semantics depend on the chosen tag.
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
      */
-    value?: string;
+    ipv6_only?: boolean;
   }
 }
 
-export interface CERTRecord {
-  /**
-   * Components of a CERT record.
-   */
-  data: CERTRecord.Data;
-
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
-
-  /**
-   * Record type.
-   */
-  type: 'CERT';
-
-  /**
-   * Identifier
-   */
-  id?: string;
-
+export interface AAAARecordParam {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -412,428 +416,4104 @@ export interface CERTRecord {
   comment?: string;
 
   /**
-   * Formatted CERT content. See 'data' to set CERT properties.
+   * A valid IPv6 address.
    */
   content?: string;
 
   /**
-   * When the record was created.
-   */
-  created_on?: string;
-
-  /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: AAAARecordParam.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
    */
-  tags?: Array<RecordTags>;
+  tags?: Array<RecordTagsParam>;
 
   /**
    * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
    * Value must be between 60 and 86400, with the minimum reduced to 30 for
    * Enterprise zones.
    */
-  ttl?: TTL;
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'AAAA';
 }
 
-export namespace CERTRecord {
+export namespace AAAARecordParam {
   /**
-   * Components of a CERT record.
+   * Settings for the DNS record.
    */
-  export interface Data {
+  export interface Settings {
     /**
-     * Algorithm.
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
      */
-    algorithm?: number;
+    ipv4_only?: boolean;
 
     /**
-     * Certificate.
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
      */
-    certificate?: string;
+    ipv6_only?: boolean;
+  }
+}
+
+export type BatchPatch =
+  | BatchPatch.ARecord
+  | BatchPatch.AAAARecord
+  | BatchPatch.CAARecord
+  | BatchPatch.CERTRecord
+  | BatchPatch.CNAMERecord
+  | BatchPatch.DNSKEYRecord
+  | BatchPatch.DSRecord
+  | BatchPatch.HTTPSRecord
+  | BatchPatch.LOCRecord
+  | BatchPatch.MXRecord
+  | BatchPatch.NAPTRRecord
+  | BatchPatch.NSRecord
+  | BatchPatch.Openpgpkey
+  | BatchPatch.PTRRecord
+  | BatchPatch.SMIMEARecord
+  | BatchPatch.SRVRecord
+  | BatchPatch.SSHFPRecord
+  | BatchPatch.SVCBRecord
+  | BatchPatch.TLSARecord
+  | BatchPatch.TXTRecord
+  | BatchPatch.URIRecord;
+
+export namespace BatchPatch {
+  export interface ARecord extends RecordsAPI.ARecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
+  export interface AAAARecord extends RecordsAPI.AAAARecord {
     /**
-     * Key Tag.
+     * Identifier
      */
-    key_tag?: number;
+    id: string;
+  }
 
+  export interface CAARecord extends RecordsAPI.CAARecord {
     /**
-     * Type.
+     * Identifier
      */
-    type?: number;
+    id: string;
   }
-}
 
-export interface CNAMERecord {
-  /**
-   * A valid hostname. Must not match the record's name.
-   */
-  content: unknown;
+  export interface CERTRecord extends RecordsAPI.CERTRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
+  export interface CNAMERecord extends RecordsAPI.CNAMERecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Record type.
-   */
-  type: 'CNAME';
+  export interface DNSKEYRecord extends RecordsAPI.DNSKEYRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Identifier
-   */
-  id?: string;
+  export interface DSRecord extends RecordsAPI.DSRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Comments or notes about the DNS record. This field has no effect on DNS
-   * responses.
-   */
-  comment?: string;
+  export interface HTTPSRecord extends RecordsAPI.HTTPSRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * When the record was created.
-   */
-  created_on?: string;
+  export interface LOCRecord extends RecordsAPI.LOCRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Extra Cloudflare-specific information about the record.
-   */
-  meta?: RecordMetadata;
+  export interface MXRecord extends RecordsAPI.MXRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * When the record was last modified.
-   */
-  modified_on?: string;
+  export interface NAPTRRecord extends RecordsAPI.NAPTRRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Whether the record can be proxied by Cloudflare or not.
-   */
-  proxiable?: boolean;
+  export interface NSRecord extends RecordsAPI.NSRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Whether the record is receiving the performance and security benefits of
-   * Cloudflare.
-   */
-  proxied?: boolean;
+  export interface Openpgpkey {
+    /**
+     * Identifier
+     */
+    id: string;
 
-  /**
-   * Custom tags for the DNS record. This field has no effect on DNS responses.
-   */
-  tags?: Array<RecordTags>;
+    /**
+     * Comments or notes about the DNS record. This field has no effect on DNS
+     * responses.
+     */
+    comment?: string;
 
-  /**
-   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-   * Value must be between 60 and 86400, with the minimum reduced to 30 for
-   * Enterprise zones.
-   */
-  ttl?: TTL;
+    /**
+     * A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
+     */
+    content?: string;
+
+    /**
+     * DNS record name (or @ for the zone apex) in Punycode.
+     */
+    name?: string;
+
+    /**
+     * Whether the record is receiving the performance and security benefits of
+     * Cloudflare.
+     */
+    proxied?: boolean;
+
+    /**
+     * Settings for the DNS record.
+     */
+    settings?: Openpgpkey.Settings;
+
+    /**
+     * Custom tags for the DNS record. This field has no effect on DNS responses.
+     */
+    tags?: Array<RecordsAPI.RecordTags>;
+
+    /**
+     * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+     * Value must be between 60 and 86400, with the minimum reduced to 30 for
+     * Enterprise zones.
+     */
+    ttl?: RecordsAPI.TTL;
+
+    /**
+     * Record type.
+     */
+    type?: 'OPENPGPKEY';
+  }
+
+  export namespace Openpgpkey {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
+
+  export interface PTRRecord extends RecordsAPI.PTRRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface SMIMEARecord extends RecordsAPI.SMIMEARecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface SRVRecord extends RecordsAPI.SRVRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface SSHFPRecord extends RecordsAPI.SSHFPRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface SVCBRecord extends RecordsAPI.SVCBRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface TLSARecord extends RecordsAPI.TLSARecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface TXTRecord extends RecordsAPI.TXTRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface URIRecord extends RecordsAPI.URIRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 }
 
-export interface DNSKEYRecord {
-  /**
-   * Components of a DNSKEY record.
-   */
-  data: DNSKEYRecord.Data;
+export type BatchPatchParam =
+  | BatchPatchParam.ARecord
+  | BatchPatchParam.AAAARecord
+  | BatchPatchParam.CAARecord
+  | BatchPatchParam.CERTRecord
+  | BatchPatchParam.CNAMERecord
+  | BatchPatchParam.DNSKEYRecord
+  | BatchPatchParam.DSRecord
+  | BatchPatchParam.HTTPSRecord
+  | BatchPatchParam.LOCRecord
+  | BatchPatchParam.MXRecord
+  | BatchPatchParam.NAPTRRecord
+  | BatchPatchParam.NSRecord
+  | BatchPatchParam.Openpgpkey
+  | BatchPatchParam.PTRRecord
+  | BatchPatchParam.SMIMEARecord
+  | BatchPatchParam.SRVRecord
+  | BatchPatchParam.SSHFPRecord
+  | BatchPatchParam.SVCBRecord
+  | BatchPatchParam.TLSARecord
+  | BatchPatchParam.TXTRecord
+  | BatchPatchParam.URIRecord;
+
+export namespace BatchPatchParam {
+  export interface ARecord extends RecordsAPI.ARecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
+  export interface AAAARecord extends RecordsAPI.AAAARecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Record type.
-   */
-  type: 'DNSKEY';
+  export interface CAARecord extends RecordsAPI.CAARecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Identifier
-   */
-  id?: string;
+  export interface CERTRecord extends RecordsAPI.CERTRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Comments or notes about the DNS record. This field has no effect on DNS
-   * responses.
-   */
-  comment?: string;
+  export interface CNAMERecord extends RecordsAPI.CNAMERecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Formatted DNSKEY content. See 'data' to set DNSKEY properties.
-   */
-  content?: string;
+  export interface DNSKEYRecord extends RecordsAPI.DNSKEYRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * When the record was created.
-   */
-  created_on?: string;
+  export interface DSRecord extends RecordsAPI.DSRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Extra Cloudflare-specific information about the record.
-   */
-  meta?: RecordMetadata;
+  export interface HTTPSRecord extends RecordsAPI.HTTPSRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * When the record was last modified.
-   */
-  modified_on?: string;
+  export interface LOCRecord extends RecordsAPI.LOCRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Whether the record can be proxied by Cloudflare or not.
-   */
-  proxiable?: boolean;
+  export interface MXRecord extends RecordsAPI.MXRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Custom tags for the DNS record. This field has no effect on DNS responses.
-   */
-  tags?: Array<RecordTags>;
+  export interface NAPTRRecord extends RecordsAPI.NAPTRRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 
-  /**
-   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-   * Value must be between 60 and 86400, with the minimum reduced to 30 for
-   * Enterprise zones.
-   */
-  ttl?: TTL;
+  export interface NSRecord extends RecordsAPI.NSRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface Openpgpkey {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * Comments or notes about the DNS record. This field has no effect on DNS
+     * responses.
+     */
+    comment?: string;
+
+    /**
+     * A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
+     */
+    content?: string;
+
+    /**
+     * DNS record name (or @ for the zone apex) in Punycode.
+     */
+    name?: string;
+
+    /**
+     * Whether the record is receiving the performance and security benefits of
+     * Cloudflare.
+     */
+    proxied?: boolean;
+
+    /**
+     * Settings for the DNS record.
+     */
+    settings?: Openpgpkey.Settings;
+
+    /**
+     * Custom tags for the DNS record. This field has no effect on DNS responses.
+     */
+    tags?: Array<RecordsAPI.RecordTagsParam>;
+
+    /**
+     * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+     * Value must be between 60 and 86400, with the minimum reduced to 30 for
+     * Enterprise zones.
+     */
+    ttl?: RecordsAPI.TTLParam;
+
+    /**
+     * Record type.
+     */
+    type?: 'OPENPGPKEY';
+  }
+
+  export namespace Openpgpkey {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
+
+  export interface PTRRecord extends RecordsAPI.PTRRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface SMIMEARecord extends RecordsAPI.SMIMEARecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface SRVRecord extends RecordsAPI.SRVRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface SSHFPRecord extends RecordsAPI.SSHFPRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface SVCBRecord extends RecordsAPI.SVCBRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface TLSARecord extends RecordsAPI.TLSARecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface TXTRecord extends RecordsAPI.TXTRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+
+  export interface URIRecord extends RecordsAPI.URIRecordParam {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
 }
 
-export namespace DNSKEYRecord {
-  /**
-   * Components of a DNSKEY record.
-   */
-  export interface Data {
+export type BatchPut =
+  | BatchPut.ARecord
+  | BatchPut.AAAARecord
+  | BatchPut.CAARecord
+  | BatchPut.CERTRecord
+  | BatchPut.CNAMERecord
+  | BatchPut.DNSKEYRecord
+  | BatchPut.DSRecord
+  | BatchPut.HTTPSRecord
+  | BatchPut.LOCRecord
+  | BatchPut.MXRecord
+  | BatchPut.NAPTRRecord
+  | BatchPut.NSRecord
+  | BatchPut.Openpgpkey
+  | BatchPut.PTRRecord
+  | BatchPut.SMIMEARecord
+  | BatchPut.SRVRecord
+  | BatchPut.SSHFPRecord
+  | BatchPut.SVCBRecord
+  | BatchPut.TLSARecord
+  | BatchPut.TXTRecord
+  | BatchPut.URIRecord;
+
+export namespace BatchPut {
+  export interface ARecord extends RecordsAPI.ARecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface AAAARecord extends RecordsAPI.AAAARecord {
     /**
-     * Algorithm.
+     * Identifier
      */
-    algorithm?: number;
+    id?: string;
+  }
 
+  export interface CAARecord extends RecordsAPI.CAARecord {
     /**
-     * Flags.
+     * Identifier
      */
-    flags?: number;
+    id?: string;
+  }
+
+  export interface CERTRecord extends RecordsAPI.CERTRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface CNAMERecord extends RecordsAPI.CNAMERecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface DNSKEYRecord extends RecordsAPI.DNSKEYRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface DSRecord extends RecordsAPI.DSRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface HTTPSRecord extends RecordsAPI.HTTPSRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface LOCRecord extends RecordsAPI.LOCRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface MXRecord extends RecordsAPI.MXRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface NAPTRRecord extends RecordsAPI.NAPTRRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface NSRecord extends RecordsAPI.NSRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface Openpgpkey {
+    /**
+     * A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
+     */
+    content: string;
+
+    /**
+     * DNS record name (or @ for the zone apex) in Punycode.
+     */
+    name: string;
+
+    /**
+     * Record type.
+     */
+    type: 'OPENPGPKEY';
+
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * Comments or notes about the DNS record. This field has no effect on DNS
+     * responses.
+     */
+    comment?: string;
+
+    /**
+     * Whether the record is receiving the performance and security benefits of
+     * Cloudflare.
+     */
+    proxied?: boolean;
+
+    /**
+     * Settings for the DNS record.
+     */
+    settings?: Openpgpkey.Settings;
+
+    /**
+     * Custom tags for the DNS record. This field has no effect on DNS responses.
+     */
+    tags?: Array<RecordsAPI.RecordTags>;
+
+    /**
+     * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+     * Value must be between 60 and 86400, with the minimum reduced to 30 for
+     * Enterprise zones.
+     */
+    ttl?: RecordsAPI.TTL;
+  }
+
+  export namespace Openpgpkey {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
+
+  export interface PTRRecord extends RecordsAPI.PTRRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface SMIMEARecord extends RecordsAPI.SMIMEARecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface SRVRecord extends RecordsAPI.SRVRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface SSHFPRecord extends RecordsAPI.SSHFPRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface SVCBRecord extends RecordsAPI.SVCBRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface TLSARecord extends RecordsAPI.TLSARecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface TXTRecord extends RecordsAPI.TXTRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface URIRecord extends RecordsAPI.URIRecord {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+}
+
+export type BatchPutParam =
+  | BatchPutParam.ARecord
+  | BatchPutParam.AAAARecord
+  | BatchPutParam.CAARecord
+  | BatchPutParam.CERTRecord
+  | BatchPutParam.CNAMERecord
+  | BatchPutParam.DNSKEYRecord
+  | BatchPutParam.DSRecord
+  | BatchPutParam.HTTPSRecord
+  | BatchPutParam.LOCRecord
+  | BatchPutParam.MXRecord
+  | BatchPutParam.NAPTRRecord
+  | BatchPutParam.NSRecord
+  | BatchPutParam.Openpgpkey
+  | BatchPutParam.PTRRecord
+  | BatchPutParam.SMIMEARecord
+  | BatchPutParam.SRVRecord
+  | BatchPutParam.SSHFPRecord
+  | BatchPutParam.SVCBRecord
+  | BatchPutParam.TLSARecord
+  | BatchPutParam.TXTRecord
+  | BatchPutParam.URIRecord;
+
+export namespace BatchPutParam {
+  export interface ARecord extends RecordsAPI.ARecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface AAAARecord extends RecordsAPI.AAAARecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface CAARecord extends RecordsAPI.CAARecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface CERTRecord extends RecordsAPI.CERTRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface CNAMERecord extends RecordsAPI.CNAMERecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface DNSKEYRecord extends RecordsAPI.DNSKEYRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface DSRecord extends RecordsAPI.DSRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface HTTPSRecord extends RecordsAPI.HTTPSRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface LOCRecord extends RecordsAPI.LOCRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface MXRecord extends RecordsAPI.MXRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface NAPTRRecord extends RecordsAPI.NAPTRRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface NSRecord extends RecordsAPI.NSRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface Openpgpkey {
+    /**
+     * A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
+     */
+    content: string;
+
+    /**
+     * DNS record name (or @ for the zone apex) in Punycode.
+     */
+    name: string;
+
+    /**
+     * Record type.
+     */
+    type: 'OPENPGPKEY';
+
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * Comments or notes about the DNS record. This field has no effect on DNS
+     * responses.
+     */
+    comment?: string;
+
+    /**
+     * Whether the record is receiving the performance and security benefits of
+     * Cloudflare.
+     */
+    proxied?: boolean;
+
+    /**
+     * Settings for the DNS record.
+     */
+    settings?: Openpgpkey.Settings;
+
+    /**
+     * Custom tags for the DNS record. This field has no effect on DNS responses.
+     */
+    tags?: Array<RecordsAPI.RecordTagsParam>;
+
+    /**
+     * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+     * Value must be between 60 and 86400, with the minimum reduced to 30 for
+     * Enterprise zones.
+     */
+    ttl?: RecordsAPI.TTLParam;
+  }
+
+  export namespace Openpgpkey {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
+
+  export interface PTRRecord extends RecordsAPI.PTRRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface SMIMEARecord extends RecordsAPI.SMIMEARecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface SRVRecord extends RecordsAPI.SRVRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface SSHFPRecord extends RecordsAPI.SSHFPRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface SVCBRecord extends RecordsAPI.SVCBRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface TLSARecord extends RecordsAPI.TLSARecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface TXTRecord extends RecordsAPI.TXTRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+
+  export interface URIRecord extends RecordsAPI.URIRecordParam {
+    /**
+     * Identifier
+     */
+    id?: string;
+  }
+}
+
+export interface CAARecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Formatted CAA content. See 'data' to set CAA properties.
+   */
+  content?: string;
+
+  /**
+   * Components of a CAA record.
+   */
+  data?: CAARecord.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: CAARecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'CAA';
+}
+
+export namespace CAARecord {
+  /**
+   * Components of a CAA record.
+   */
+  export interface Data {
+    /**
+     * Flags for the CAA record.
+     */
+    flags?: number;
+
+    /**
+     * Name of the property controlled by this record (e.g.: issue, issuewild, iodef).
+     */
+    tag?: string;
+
+    /**
+     * Value of the record. This field's semantics depend on the chosen tag.
+     */
+    value?: string;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface CAARecordParam {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Components of a CAA record.
+   */
+  data?: CAARecordParam.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: CAARecordParam.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTagsParam>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'CAA';
+}
+
+export namespace CAARecordParam {
+  /**
+   * Components of a CAA record.
+   */
+  export interface Data {
+    /**
+     * Flags for the CAA record.
+     */
+    flags?: number;
+
+    /**
+     * Name of the property controlled by this record (e.g.: issue, issuewild, iodef).
+     */
+    tag?: string;
+
+    /**
+     * Value of the record. This field's semantics depend on the chosen tag.
+     */
+    value?: string;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface CERTRecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Formatted CERT content. See 'data' to set CERT properties.
+   */
+  content?: string;
+
+  /**
+   * Components of a CERT record.
+   */
+  data?: CERTRecord.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: CERTRecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'CERT';
+}
+
+export namespace CERTRecord {
+  /**
+   * Components of a CERT record.
+   */
+  export interface Data {
+    /**
+     * Algorithm.
+     */
+    algorithm?: number;
+
+    /**
+     * Certificate.
+     */
+    certificate?: string;
+
+    /**
+     * Key Tag.
+     */
+    key_tag?: number;
+
+    /**
+     * Type.
+     */
+    type?: number;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface CERTRecordParam {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Components of a CERT record.
+   */
+  data?: CERTRecordParam.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: CERTRecordParam.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTagsParam>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'CERT';
+}
+
+export namespace CERTRecordParam {
+  /**
+   * Components of a CERT record.
+   */
+  export interface Data {
+    /**
+     * Algorithm.
+     */
+    algorithm?: number;
+
+    /**
+     * Certificate.
+     */
+    certificate?: string;
+
+    /**
+     * Key Tag.
+     */
+    key_tag?: number;
+
+    /**
+     * Type.
+     */
+    type?: number;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface CNAMERecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * A valid hostname. Must not match the record's name.
+   */
+  content?: string;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: CNAMERecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'CNAME';
+}
+
+export namespace CNAMERecord {
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * If enabled, causes the CNAME record to be resolved externally and the resulting
+     * address records (e.g., A and AAAA) to be returned instead of the CNAME record
+     * itself. This setting is unavailable for proxied records, since they are always
+     * flattened.
+     */
+    flatten_cname?: boolean;
+
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface CNAMERecordParam {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * A valid hostname. Must not match the record's name.
+   */
+  content?: string;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: CNAMERecordParam.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTagsParam>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'CNAME';
+}
+
+export namespace CNAMERecordParam {
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * If enabled, causes the CNAME record to be resolved externally and the resulting
+     * address records (e.g., A and AAAA) to be returned instead of the CNAME record
+     * itself. This setting is unavailable for proxied records, since they are always
+     * flattened.
+     */
+    flatten_cname?: boolean;
+
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface DNSKEYRecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Formatted DNSKEY content. See 'data' to set DNSKEY properties.
+   */
+  content?: string;
+
+  /**
+   * Components of a DNSKEY record.
+   */
+  data?: DNSKEYRecord.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: DNSKEYRecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'DNSKEY';
+}
+
+export namespace DNSKEYRecord {
+  /**
+   * Components of a DNSKEY record.
+   */
+  export interface Data {
+    /**
+     * Algorithm.
+     */
+    algorithm?: number;
+
+    /**
+     * Flags.
+     */
+    flags?: number;
+
+    /**
+     * Protocol.
+     */
+    protocol?: number;
+
+    /**
+     * Public Key.
+     */
+    public_key?: string;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface DNSKEYRecordParam {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Components of a DNSKEY record.
+   */
+  data?: DNSKEYRecordParam.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: DNSKEYRecordParam.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTagsParam>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'DNSKEY';
+}
+
+export namespace DNSKEYRecordParam {
+  /**
+   * Components of a DNSKEY record.
+   */
+  export interface Data {
+    /**
+     * Algorithm.
+     */
+    algorithm?: number;
+
+    /**
+     * Flags.
+     */
+    flags?: number;
+
+    /**
+     * Protocol.
+     */
+    protocol?: number;
+
+    /**
+     * Public Key.
+     */
+    public_key?: string;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface DSRecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Formatted DS content. See 'data' to set DS properties.
+   */
+  content?: string;
+
+  /**
+   * Components of a DS record.
+   */
+  data?: DSRecord.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: DSRecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'DS';
+}
+
+export namespace DSRecord {
+  /**
+   * Components of a DS record.
+   */
+  export interface Data {
+    /**
+     * Algorithm.
+     */
+    algorithm?: number;
+
+    /**
+     * Digest.
+     */
+    digest?: string;
+
+    /**
+     * Digest Type.
+     */
+    digest_type?: number;
+
+    /**
+     * Key Tag.
+     */
+    key_tag?: number;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface DSRecordParam {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Components of a DS record.
+   */
+  data?: DSRecordParam.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: DSRecordParam.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTagsParam>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'DS';
+}
+
+export namespace DSRecordParam {
+  /**
+   * Components of a DS record.
+   */
+  export interface Data {
+    /**
+     * Algorithm.
+     */
+    algorithm?: number;
+
+    /**
+     * Digest.
+     */
+    digest?: string;
+
+    /**
+     * Digest Type.
+     */
+    digest_type?: number;
+
+    /**
+     * Key Tag.
+     */
+    key_tag?: number;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface HTTPSRecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Formatted HTTPS content. See 'data' to set HTTPS properties.
+   */
+  content?: string;
+
+  /**
+   * Components of a HTTPS record.
+   */
+  data?: HTTPSRecord.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: HTTPSRecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'HTTPS';
+}
+
+export namespace HTTPSRecord {
+  /**
+   * Components of a HTTPS record.
+   */
+  export interface Data {
+    /**
+     * priority.
+     */
+    priority?: number;
+
+    /**
+     * target.
+     */
+    target?: string;
+
+    /**
+     * value.
+     */
+    value?: string;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface HTTPSRecordParam {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Components of a HTTPS record.
+   */
+  data?: HTTPSRecordParam.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: HTTPSRecordParam.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTagsParam>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'HTTPS';
+}
+
+export namespace HTTPSRecordParam {
+  /**
+   * Components of a HTTPS record.
+   */
+  export interface Data {
+    /**
+     * priority.
+     */
+    priority?: number;
+
+    /**
+     * target.
+     */
+    target?: string;
+
+    /**
+     * value.
+     */
+    value?: string;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface LOCRecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Formatted LOC content. See 'data' to set LOC properties.
+   */
+  content?: string;
+
+  /**
+   * Components of a LOC record.
+   */
+  data?: LOCRecord.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: LOCRecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'LOC';
+}
+
+export namespace LOCRecord {
+  /**
+   * Components of a LOC record.
+   */
+  export interface Data {
+    /**
+     * Altitude of location in meters.
+     */
+    altitude?: number;
+
+    /**
+     * Degrees of latitude.
+     */
+    lat_degrees?: number;
+
+    /**
+     * Latitude direction.
+     */
+    lat_direction?: 'N' | 'S';
+
+    /**
+     * Minutes of latitude.
+     */
+    lat_minutes?: number;
+
+    /**
+     * Seconds of latitude.
+     */
+    lat_seconds?: number;
+
+    /**
+     * Degrees of longitude.
+     */
+    long_degrees?: number;
+
+    /**
+     * Longitude direction.
+     */
+    long_direction?: 'E' | 'W';
+
+    /**
+     * Minutes of longitude.
+     */
+    long_minutes?: number;
+
+    /**
+     * Seconds of longitude.
+     */
+    long_seconds?: number;
+
+    /**
+     * Horizontal precision of location.
+     */
+    precision_horz?: number;
+
+    /**
+     * Vertical precision of location.
+     */
+    precision_vert?: number;
+
+    /**
+     * Size of location in meters.
+     */
+    size?: number;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface LOCRecordParam {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Components of a LOC record.
+   */
+  data?: LOCRecordParam.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: LOCRecordParam.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTagsParam>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'LOC';
+}
+
+export namespace LOCRecordParam {
+  /**
+   * Components of a LOC record.
+   */
+  export interface Data {
+    /**
+     * Altitude of location in meters.
+     */
+    altitude?: number;
+
+    /**
+     * Degrees of latitude.
+     */
+    lat_degrees?: number;
+
+    /**
+     * Latitude direction.
+     */
+    lat_direction?: 'N' | 'S';
+
+    /**
+     * Minutes of latitude.
+     */
+    lat_minutes?: number;
+
+    /**
+     * Seconds of latitude.
+     */
+    lat_seconds?: number;
+
+    /**
+     * Degrees of longitude.
+     */
+    long_degrees?: number;
+
+    /**
+     * Longitude direction.
+     */
+    long_direction?: 'E' | 'W';
+
+    /**
+     * Minutes of longitude.
+     */
+    long_minutes?: number;
+
+    /**
+     * Seconds of longitude.
+     */
+    long_seconds?: number;
+
+    /**
+     * Horizontal precision of location.
+     */
+    precision_horz?: number;
+
+    /**
+     * Vertical precision of location.
+     */
+    precision_vert?: number;
+
+    /**
+     * Size of location in meters.
+     */
+    size?: number;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface MXRecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * A valid mail server hostname.
+   */
+  content?: string;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Required for MX, SRV and URI records; unused by other record types. Records with
+   * lower priorities are preferred.
+   */
+  priority?: number;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: MXRecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'MX';
+}
+
+export namespace MXRecord {
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface MXRecordParam {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * A valid mail server hostname.
+   */
+  content?: string;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Required for MX, SRV and URI records; unused by other record types. Records with
+   * lower priorities are preferred.
+   */
+  priority?: number;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: MXRecordParam.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTagsParam>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'MX';
+}
+
+export namespace MXRecordParam {
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface NAPTRRecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Formatted NAPTR content. See 'data' to set NAPTR properties.
+   */
+  content?: string;
+
+  /**
+   * Components of a NAPTR record.
+   */
+  data?: NAPTRRecord.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: NAPTRRecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'NAPTR';
+}
+
+export namespace NAPTRRecord {
+  /**
+   * Components of a NAPTR record.
+   */
+  export interface Data {
+    /**
+     * Flags.
+     */
+    flags?: string;
+
+    /**
+     * Order.
+     */
+    order?: number;
+
+    /**
+     * Preference.
+     */
+    preference?: number;
+
+    /**
+     * Regex.
+     */
+    regex?: string;
+
+    /**
+     * Replacement.
+     */
+    replacement?: string;
+
+    /**
+     * Service.
+     */
+    service?: string;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface NAPTRRecordParam {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Components of a NAPTR record.
+   */
+  data?: NAPTRRecordParam.Data;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: NAPTRRecordParam.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTagsParam>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'NAPTR';
+}
+
+export namespace NAPTRRecordParam {
+  /**
+   * Components of a NAPTR record.
+   */
+  export interface Data {
+    /**
+     * Flags.
+     */
+    flags?: string;
+
+    /**
+     * Order.
+     */
+    order?: number;
+
+    /**
+     * Preference.
+     */
+    preference?: number;
+
+    /**
+     * Regex.
+     */
+    regex?: string;
+
+    /**
+     * Replacement.
+     */
+    replacement?: string;
+
+    /**
+     * Service.
+     */
+    service?: string;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface NSRecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * A valid name server host name.
+   */
+  content?: string;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: NSRecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'NS';
+}
+
+export namespace NSRecord {
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface NSRecordParam {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * A valid name server host name.
+   */
+  content?: string;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: NSRecordParam.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTagsParam>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'NS';
+}
+
+export namespace NSRecordParam {
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface PTRRecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Domain name pointing to the address.
+   */
+  content?: string;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: PTRRecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'PTR';
+}
+
+export namespace PTRRecord {
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface PTRRecordParam {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Domain name pointing to the address.
+   */
+  content?: string;
+
+  /**
+   * DNS record name (or @ for the zone apex) in Punycode.
+   */
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: PTRRecordParam.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTagsParam>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'PTR';
+}
+
+export namespace PTRRecordParam {
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export type Record =
+  | ARecord
+  | AAAARecord
+  | CAARecord
+  | CERTRecord
+  | CNAMERecord
+  | DNSKEYRecord
+  | DSRecord
+  | HTTPSRecord
+  | LOCRecord
+  | MXRecord
+  | NAPTRRecord
+  | NSRecord
+  | Record.Openpgpkey
+  | PTRRecord
+  | SMIMEARecord
+  | SRVRecord
+  | SSHFPRecord
+  | SVCBRecord
+  | TLSARecord
+  | TXTRecord
+  | URIRecord;
+
+export namespace Record {
+  export interface Openpgpkey {
+    /**
+     * Comments or notes about the DNS record. This field has no effect on DNS
+     * responses.
+     */
+    comment?: string;
+
+    /**
+     * A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
+     */
+    content?: string;
+
+    /**
+     * DNS record name (or @ for the zone apex) in Punycode.
+     */
+    name?: string;
+
+    /**
+     * Whether the record is receiving the performance and security benefits of
+     * Cloudflare.
+     */
+    proxied?: boolean;
+
+    /**
+     * Settings for the DNS record.
+     */
+    settings?: Openpgpkey.Settings;
+
+    /**
+     * Custom tags for the DNS record. This field has no effect on DNS responses.
+     */
+    tags?: Array<RecordsAPI.RecordTags>;
+
+    /**
+     * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+     * Value must be between 60 and 86400, with the minimum reduced to 30 for
+     * Enterprise zones.
+     */
+    ttl?: RecordsAPI.TTL;
+
+    /**
+     * Record type.
+     */
+    type?: 'OPENPGPKEY';
+  }
+
+  export namespace Openpgpkey {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
+}
+
+export type RecordParam =
+  | ARecordParam
+  | AAAARecordParam
+  | CAARecordParam
+  | CERTRecordParam
+  | CNAMERecordParam
+  | DNSKEYRecordParam
+  | DSRecordParam
+  | HTTPSRecordParam
+  | LOCRecordParam
+  | MXRecordParam
+  | NAPTRRecordParam
+  | NSRecordParam
+  | RecordParam.Openpgpkey
+  | PTRRecordParam
+  | SMIMEARecordParam
+  | SRVRecordParam
+  | SSHFPRecordParam
+  | SVCBRecordParam
+  | TLSARecordParam
+  | TXTRecordParam
+  | URIRecordParam;
+
+export namespace RecordParam {
+  export interface Openpgpkey {
+    /**
+     * Comments or notes about the DNS record. This field has no effect on DNS
+     * responses.
+     */
+    comment?: string;
+
+    /**
+     * A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
+     */
+    content?: string;
+
+    /**
+     * DNS record name (or @ for the zone apex) in Punycode.
+     */
+    name?: string;
+
+    /**
+     * Whether the record is receiving the performance and security benefits of
+     * Cloudflare.
+     */
+    proxied?: boolean;
+
+    /**
+     * Settings for the DNS record.
+     */
+    settings?: Openpgpkey.Settings;
+
+    /**
+     * Custom tags for the DNS record. This field has no effect on DNS responses.
+     */
+    tags?: Array<RecordsAPI.RecordTagsParam>;
+
+    /**
+     * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+     * Value must be between 60 and 86400, with the minimum reduced to 30 for
+     * Enterprise zones.
+     */
+    ttl?: RecordsAPI.TTLParam;
+
+    /**
+     * Record type.
+     */
+    type?: 'OPENPGPKEY';
+  }
+
+  export namespace Openpgpkey {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
+}
+
+export type RecordResponse =
+  | RecordResponse.ARecord
+  | RecordResponse.AAAARecord
+  | RecordResponse.CAARecord
+  | RecordResponse.CERTRecord
+  | RecordResponse.CNAMERecord
+  | RecordResponse.DNSKEYRecord
+  | RecordResponse.DSRecord
+  | RecordResponse.HTTPSRecord
+  | RecordResponse.LOCRecord
+  | RecordResponse.MXRecord
+  | RecordResponse.NAPTRRecord
+  | RecordResponse.NSRecord
+  | RecordResponse.Openpgpkey
+  | RecordResponse.PTRRecord
+  | RecordResponse.SMIMEARecord
+  | RecordResponse.SRVRecord
+  | RecordResponse.SSHFPRecord
+  | RecordResponse.SVCBRecord
+  | RecordResponse.TLSARecord
+  | RecordResponse.TXTRecord
+  | RecordResponse.URIRecord;
+
+export namespace RecordResponse {
+  export interface ARecord extends RecordsAPI.ARecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface AAAARecord extends RecordsAPI.AAAARecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface CAARecord extends RecordsAPI.CAARecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface CERTRecord extends RecordsAPI.CERTRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface CNAMERecord extends RecordsAPI.CNAMERecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface DNSKEYRecord extends RecordsAPI.DNSKEYRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface DSRecord extends RecordsAPI.DSRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface HTTPSRecord extends RecordsAPI.HTTPSRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface LOCRecord extends RecordsAPI.LOCRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface MXRecord extends RecordsAPI.MXRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface NAPTRRecord extends RecordsAPI.NAPTRRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface NSRecord extends RecordsAPI.NSRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface Openpgpkey {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * Comments or notes about the DNS record. This field has no effect on DNS
+     * responses.
+     */
+    comment: string;
+
+    /**
+     * A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880 Section 11.1)
+     */
+    content: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * DNS record name (or @ for the zone apex) in Punycode.
+     */
+    name: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * Whether the record is receiving the performance and security benefits of
+     * Cloudflare.
+     */
+    proxied: boolean;
+
+    /**
+     * Settings for the DNS record.
+     */
+    settings: Openpgpkey.Settings;
+
+    /**
+     * Custom tags for the DNS record. This field has no effect on DNS responses.
+     */
+    tags: Array<RecordsAPI.RecordTags>;
+
+    /**
+     * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+     * Value must be between 60 and 86400, with the minimum reduced to 30 for
+     * Enterprise zones.
+     */
+    ttl: RecordsAPI.TTL;
+
+    /**
+     * Record type.
+     */
+    type: 'OPENPGPKEY';
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export namespace Openpgpkey {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
+
+  export interface PTRRecord extends RecordsAPI.PTRRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface SMIMEARecord extends RecordsAPI.SMIMEARecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface SRVRecord extends RecordsAPI.SRVRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
+
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
+
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
+
+  export interface SSHFPRecord extends RecordsAPI.SSHFPRecord {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * When the record was created.
+     */
+    created_on: string;
+
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
+
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
 
     /**
-     * Protocol.
+     * When the record comment was last modified. Omitted if there is no comment.
      */
-    protocol?: number;
+    comment_modified_on?: string;
 
     /**
-     * Public Key.
+     * When the record tags were last modified. Omitted if there are no tags.
      */
-    public_key?: string;
+    tags_modified_on?: string;
   }
-}
-
-export interface DSRecord {
-  /**
-   * Components of a DS record.
-   */
-  data: DSRecord.Data;
-
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
 
-  /**
-   * Record type.
-   */
-  type: 'DS';
+  export interface SVCBRecord extends RecordsAPI.SVCBRecord {
+    /**
+     * Identifier
+     */
+    id: string;
 
-  /**
-   * Identifier
-   */
-  id?: string;
+    /**
+     * When the record was created.
+     */
+    created_on: string;
 
-  /**
-   * Comments or notes about the DNS record. This field has no effect on DNS
-   * responses.
-   */
-  comment?: string;
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
 
-  /**
-   * Formatted DS content. See 'data' to set DS properties.
-   */
-  content?: string;
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
 
-  /**
-   * When the record was created.
-   */
-  created_on?: string;
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
 
-  /**
-   * Extra Cloudflare-specific information about the record.
-   */
-  meta?: RecordMetadata;
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
 
-  /**
-   * When the record was last modified.
-   */
-  modified_on?: string;
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
 
-  /**
-   * Whether the record can be proxied by Cloudflare or not.
-   */
-  proxiable?: boolean;
+  export interface TLSARecord extends RecordsAPI.TLSARecord {
+    /**
+     * Identifier
+     */
+    id: string;
 
-  /**
-   * Custom tags for the DNS record. This field has no effect on DNS responses.
-   */
-  tags?: Array<RecordTags>;
+    /**
+     * When the record was created.
+     */
+    created_on: string;
 
-  /**
-   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-   * Value must be between 60 and 86400, with the minimum reduced to 30 for
-   * Enterprise zones.
-   */
-  ttl?: TTL;
-}
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
 
-export namespace DSRecord {
-  /**
-   * Components of a DS record.
-   */
-  export interface Data {
     /**
-     * Algorithm.
+     * When the record was last modified.
      */
-    algorithm?: number;
+    modified_on: string;
 
     /**
-     * Digest.
+     * Whether the record can be proxied by Cloudflare or not.
      */
-    digest?: string;
+    proxiable: boolean;
 
     /**
-     * Digest Type.
+     * When the record comment was last modified. Omitted if there is no comment.
      */
-    digest_type?: number;
+    comment_modified_on?: string;
 
     /**
-     * Key Tag.
+     * When the record tags were last modified. Omitted if there are no tags.
      */
-    key_tag?: number;
+    tags_modified_on?: string;
   }
-}
-
-export interface HTTPSRecord {
-  /**
-   * Components of a HTTPS record.
-   */
-  data: HTTPSRecord.Data;
 
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
+  export interface TXTRecord extends RecordsAPI.TXTRecord {
+    /**
+     * Identifier
+     */
+    id: string;
 
-  /**
-   * Record type.
-   */
-  type: 'HTTPS';
+    /**
+     * When the record was created.
+     */
+    created_on: string;
 
-  /**
-   * Identifier
-   */
-  id?: string;
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
 
-  /**
-   * Comments or notes about the DNS record. This field has no effect on DNS
-   * responses.
-   */
-  comment?: string;
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
 
-  /**
-   * Formatted HTTPS content. See 'data' to set HTTPS properties.
-   */
-  content?: string;
+    /**
+     * Whether the record can be proxied by Cloudflare or not.
+     */
+    proxiable: boolean;
 
-  /**
-   * When the record was created.
-   */
-  created_on?: string;
+    /**
+     * When the record comment was last modified. Omitted if there is no comment.
+     */
+    comment_modified_on?: string;
 
-  /**
-   * Extra Cloudflare-specific information about the record.
-   */
-  meta?: RecordMetadata;
+    /**
+     * When the record tags were last modified. Omitted if there are no tags.
+     */
+    tags_modified_on?: string;
+  }
 
-  /**
-   * When the record was last modified.
-   */
-  modified_on?: string;
+  export interface URIRecord extends RecordsAPI.URIRecord {
+    /**
+     * Identifier
+     */
+    id: string;
 
-  /**
-   * Whether the record can be proxied by Cloudflare or not.
-   */
-  proxiable?: boolean;
+    /**
+     * When the record was created.
+     */
+    created_on: string;
 
-  /**
-   * Custom tags for the DNS record. This field has no effect on DNS responses.
-   */
-  tags?: Array<RecordTags>;
+    /**
+     * Extra Cloudflare-specific information about the record.
+     */
+    meta: unknown;
 
-  /**
-   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
-   * Value must be between 60 and 86400, with the minimum reduced to 30 for
-   * Enterprise zones.
-   */
-  ttl?: TTL;
-}
+    /**
+     * When the record was last modified.
+     */
+    modified_on: string;
 
-export namespace HTTPSRecord {
-  /**
-   * Components of a HTTPS record.
-   */
-  export interface Data {
     /**
-     * priority.
+     * Whether the record can be proxied by Cloudflare or not.
      */
-    priority?: number;
+    proxiable: boolean;
 
     /**
-     * target.
+     * When the record comment was last modified. Omitted if there is no comment.
      */
-    target?: string;
+    comment_modified_on?: string;
 
     /**
-     * value.
+     * When the record tags were last modified. Omitted if there are no tags.
      */
-    value?: string;
+    tags_modified_on?: string;
   }
 }
 
-export interface LOCRecord {
-  /**
-   * Components of a LOC record.
-   */
-  data: LOCRecord.Data;
-
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
-
-  /**
-   * Record type.
-   */
-  type: 'LOC';
+/**
+ * Individual tag of the form name:value (the name must consist of only letters,
+ * numbers, underscores and hyphens)
+ */
+export type RecordTags = string;
 
-  /**
-   * Identifier
-   */
-  id?: string;
+/**
+ * Individual tag of the form name:value (the name must consist of only letters,
+ * numbers, underscores and hyphens)
+ */
+export type RecordTagsParam = string;
 
+export interface SMIMEARecord {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -841,29 +4521,30 @@ export interface LOCRecord {
   comment?: string;
 
   /**
-   * Formatted LOC content. See 'data' to set LOC properties.
+   * Formatted SMIMEA content. See 'data' to set SMIMEA properties.
    */
   content?: string;
 
   /**
-   * When the record was created.
+   * Components of a SMIMEA record.
    */
-  created_on?: string;
+  data?: SMIMEARecord.Data;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: SMIMEARecord.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
@@ -876,102 +4557,62 @@ export interface LOCRecord {
    * Enterprise zones.
    */
   ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'SMIMEA';
 }
 
-export namespace LOCRecord {
+export namespace SMIMEARecord {
   /**
-   * Components of a LOC record.
+   * Components of a SMIMEA record.
    */
   export interface Data {
     /**
-     * Altitude of location in meters.
-     */
-    altitude?: number;
-
-    /**
-     * Degrees of latitude.
-     */
-    lat_degrees?: number;
-
-    /**
-     * Latitude direction.
-     */
-    lat_direction?: 'N' | 'S';
-
-    /**
-     * Minutes of latitude.
-     */
-    lat_minutes?: number;
-
-    /**
-     * Seconds of latitude.
-     */
-    lat_seconds?: number;
-
-    /**
-     * Degrees of longitude.
-     */
-    long_degrees?: number;
-
-    /**
-     * Longitude direction.
-     */
-    long_direction?: 'E' | 'W';
-
-    /**
-     * Minutes of longitude.
-     */
-    long_minutes?: number;
-
-    /**
-     * Seconds of longitude.
+     * Certificate.
      */
-    long_seconds?: number;
+    certificate?: string;
 
     /**
-     * Horizontal precision of location.
+     * Matching Type.
      */
-    precision_horz?: number;
+    matching_type?: number;
 
     /**
-     * Vertical precision of location.
+     * Selector.
      */
-    precision_vert?: number;
+    selector?: number;
 
     /**
-     * Size of location in meters.
+     * Usage.
      */
-    size?: number;
+    usage?: number;
   }
-}
-
-export interface MXRecord {
-  /**
-   * A valid mail server hostname.
-   */
-  content: string;
-
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
-
-  /**
-   * Required for MX, SRV and URI records; unused by other record types. Records with
-   * lower priorities are preferred.
-   */
-  priority: number;
 
   /**
-   * Record type.
+   * Settings for the DNS record.
    */
-  type: 'MX';
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
 
-  /**
-   * Identifier
-   */
-  id?: string;
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
 
+export interface SMIMEARecordParam {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -979,59 +4620,93 @@ export interface MXRecord {
   comment?: string;
 
   /**
-   * When the record was created.
+   * Components of a SMIMEA record.
    */
-  created_on?: string;
+  data?: SMIMEARecordParam.Data;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: SMIMEARecordParam.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
    */
-  tags?: Array<RecordTags>;
+  tags?: Array<RecordTagsParam>;
 
   /**
    * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
    * Value must be between 60 and 86400, with the minimum reduced to 30 for
    * Enterprise zones.
    */
-  ttl?: TTL;
-}
+  ttl?: TTLParam;
 
-export interface NAPTRRecord {
   /**
-   * Components of a NAPTR record.
+   * Record type.
    */
-  data: NAPTRRecord.Data;
+  type?: 'SMIMEA';
+}
 
+export namespace SMIMEARecordParam {
   /**
-   * DNS record name (or @ for the zone apex) in Punycode.
+   * Components of a SMIMEA record.
    */
-  name: string;
+  export interface Data {
+    /**
+     * Certificate.
+     */
+    certificate?: string;
 
-  /**
-   * Record type.
-   */
-  type: 'NAPTR';
+    /**
+     * Matching Type.
+     */
+    matching_type?: number;
+
+    /**
+     * Selector.
+     */
+    selector?: number;
+
+    /**
+     * Usage.
+     */
+    usage?: number;
+  }
 
   /**
-   * Identifier
+   * Settings for the DNS record.
    */
-  id?: string;
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
 
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
+
+export interface SRVRecord {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -1039,29 +4714,31 @@ export interface NAPTRRecord {
   comment?: string;
 
   /**
-   * Formatted NAPTR content. See 'data' to set NAPTR properties.
+   * Priority, weight, port, and SRV target. See 'data' for setting the individual
+   * component values.
    */
   content?: string;
 
   /**
-   * When the record was created.
+   * Components of a SRV record.
    */
-  created_on?: string;
+  data?: SRVRecord.Data;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: SRVRecord.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
@@ -1074,66 +4751,63 @@ export interface NAPTRRecord {
    * Enterprise zones.
    */
   ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'SRV';
 }
 
-export namespace NAPTRRecord {
+export namespace SRVRecord {
   /**
-   * Components of a NAPTR record.
+   * Components of a SRV record.
    */
   export interface Data {
     /**
-     * Flags.
+     * The port of the service.
      */
-    flags?: string;
+    port?: number;
 
     /**
-     * Order.
+     * Required for MX, SRV and URI records; unused by other record types. Records with
+     * lower priorities are preferred.
      */
-    order?: number;
+    priority?: number;
 
     /**
-     * Preference.
+     * A valid hostname.
      */
-    preference?: number;
+    target?: string;
 
     /**
-     * Regex.
+     * The record weight.
      */
-    regex?: string;
+    weight?: number;
+  }
 
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
     /**
-     * Replacement.
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
      */
-    replacement?: string;
+    ipv4_only?: boolean;
 
     /**
-     * Service.
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
      */
-    service?: string;
+    ipv6_only?: boolean;
   }
 }
 
-export interface NSRecord {
-  /**
-   * A valid name server host name.
-   */
-  content: string;
-
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
-
-  /**
-   * Record type.
-   */
-  type: 'NS';
-
-  /**
-   * Identifier
-   */
-  id?: string;
-
+export interface SRVRecordParam {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -1141,59 +4815,94 @@ export interface NSRecord {
   comment?: string;
 
   /**
-   * When the record was created.
+   * Components of a SRV record.
    */
-  created_on?: string;
+  data?: SRVRecordParam.Data;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: SRVRecordParam.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
    */
-  tags?: Array<RecordTags>;
+  tags?: Array<RecordTagsParam>;
 
   /**
    * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
    * Value must be between 60 and 86400, with the minimum reduced to 30 for
    * Enterprise zones.
    */
-  ttl?: TTL;
-}
+  ttl?: TTLParam;
 
-export interface PTRRecord {
   /**
-   * Domain name pointing to the address.
+   * Record type.
    */
-  content: string;
+  type?: 'SRV';
+}
 
+export namespace SRVRecordParam {
   /**
-   * DNS record name (or @ for the zone apex) in Punycode.
+   * Components of a SRV record.
    */
-  name: string;
+  export interface Data {
+    /**
+     * The port of the service.
+     */
+    port?: number;
 
-  /**
-   * Record type.
-   */
-  type: 'PTR';
+    /**
+     * Required for MX, SRV and URI records; unused by other record types. Records with
+     * lower priorities are preferred.
+     */
+    priority?: number;
+
+    /**
+     * A valid hostname.
+     */
+    target?: string;
+
+    /**
+     * The record weight.
+     */
+    weight?: number;
+  }
 
   /**
-   * Identifier
+   * Settings for the DNS record.
    */
-  id?: string;
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
 
+export interface SSHFPRecord {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -1201,24 +4910,30 @@ export interface PTRRecord {
   comment?: string;
 
   /**
-   * When the record was created.
+   * Formatted SSHFP content. See 'data' to set SSHFP properties.
+   */
+  content?: string;
+
+  /**
+   * Components of a SSHFP record.
    */
-  created_on?: string;
+  data?: SSHFPRecord.Data;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: SSHFPRecord.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
@@ -1231,96 +4946,57 @@ export interface PTRRecord {
    * Enterprise zones.
    */
   ttl?: TTL;
-}
-
-export type Record =
-  | ARecord
-  | AAAARecord
-  | CAARecord
-  | CERTRecord
-  | CNAMERecord
-  | DNSKEYRecord
-  | DSRecord
-  | HTTPSRecord
-  | LOCRecord
-  | MXRecord
-  | NAPTRRecord
-  | NSRecord
-  | PTRRecord
-  | SMIMEARecord
-  | SRVRecord
-  | SSHFPRecord
-  | SVCBRecord
-  | TLSARecord
-  | TXTRecord
-  | URIRecord;
-
-/**
- * Extra Cloudflare-specific information about the record.
- */
-export interface RecordMetadata {
-  /**
-   * Will exist if Cloudflare automatically added this DNS record during initial
-   * setup.
-   */
-  auto_added?: boolean;
-
-  /**
-   * Where the record originated from.
-   */
-  source?: string;
-}
-
-export interface RecordProcessTiming {
-  /**
-   * When the file parsing ended.
-   */
-  end_time?: string;
 
   /**
-   * Processing time of the file in seconds.
-   */
-  process_time?: number;
-
-  /**
-   * When the file parsing started.
+   * Record type.
    */
-  start_time?: string;
+  type?: 'SSHFP';
 }
 
-/**
- * Individual tag of the form name:value (the name must consist of only letters,
- * numbers, underscores and hyphens)
- */
-export type RecordTags = string;
-
-/**
- * Individual tag of the form name:value (the name must consist of only letters,
- * numbers, underscores and hyphens)
- */
-export type RecordTagsParam = string;
-
-export interface SMIMEARecord {
+export namespace SSHFPRecord {
   /**
-   * Components of a SMIMEA record.
+   * Components of a SSHFP record.
    */
-  data: SMIMEARecord.Data;
+  export interface Data {
+    /**
+     * algorithm.
+     */
+    algorithm?: number;
 
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
+    /**
+     * fingerprint.
+     */
+    fingerprint?: string;
 
-  /**
-   * Record type.
-   */
-  type: 'SMIMEA';
+    /**
+     * type.
+     */
+    type?: number;
+  }
 
   /**
-   * Identifier
+   * Settings for the DNS record.
    */
-  id?: string;
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
 
+export interface SSHFPRecordParam {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -1328,93 +5004,88 @@ export interface SMIMEARecord {
   comment?: string;
 
   /**
-   * Formatted SMIMEA content. See 'data' to set SMIMEA properties.
-   */
-  content?: string;
-
-  /**
-   * When the record was created.
+   * Components of a SSHFP record.
    */
-  created_on?: string;
+  data?: SSHFPRecordParam.Data;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: SSHFPRecordParam.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
    */
-  tags?: Array<RecordTags>;
+  tags?: Array<RecordTagsParam>;
 
   /**
    * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
    * Value must be between 60 and 86400, with the minimum reduced to 30 for
    * Enterprise zones.
    */
-  ttl?: TTL;
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'SSHFP';
 }
 
-export namespace SMIMEARecord {
+export namespace SSHFPRecordParam {
   /**
-   * Components of a SMIMEA record.
+   * Components of a SSHFP record.
    */
   export interface Data {
     /**
-     * Certificate.
-     */
-    certificate?: string;
-
-    /**
-     * Matching Type.
+     * algorithm.
      */
-    matching_type?: number;
+    algorithm?: number;
 
     /**
-     * Selector.
+     * fingerprint.
      */
-    selector?: number;
+    fingerprint?: string;
 
     /**
-     * Usage.
+     * type.
      */
-    usage?: number;
+    type?: number;
   }
-}
-
-export interface SRVRecord {
-  /**
-   * Components of a SRV record.
-   */
-  data: SRVRecord.Data;
 
   /**
-   * DNS record name (or @ for the zone apex) in Punycode. For SRV records, the first
-   * label is normally a service and the second a protocol name, each starting with
-   * an underscore.
-   */
-  name: string;
-
-  /**
-   * Record type.
+   * Settings for the DNS record.
    */
-  type: 'SRV';
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
 
-  /**
-   * Identifier
-   */
-  id?: string;
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
 
+export interface SVCBRecord {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -1422,30 +5093,30 @@ export interface SRVRecord {
   comment?: string;
 
   /**
-   * Priority, weight, port, and SRV target. See 'data' for setting the individual
-   * component values.
+   * Formatted SVCB content. See 'data' to set SVCB properties.
    */
   content?: string;
 
   /**
-   * When the record was created.
+   * Components of a SVCB record.
    */
-  created_on?: string;
+  data?: SVCBRecord.Data;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: SVCBRecord.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
@@ -1458,78 +5129,57 @@ export interface SRVRecord {
    * Enterprise zones.
    */
   ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'SVCB';
 }
 
-export namespace SRVRecord {
+export namespace SVCBRecord {
   /**
-   * Components of a SRV record.
+   * Components of a SVCB record.
    */
   export interface Data {
     /**
-     * @deprecated: A valid hostname. Deprecated in favor of the regular 'name' outside
-     * the data map. This data map field represents the remainder of the full 'name'
-     * after the service and protocol.
-     */
-    name?: string;
-
-    /**
-     * The port of the service.
-     */
-    port?: number;
-
-    /**
-     * Required for MX, SRV and URI records; unused by other record types. Records with
-     * lower priorities are preferred.
+     * priority.
      */
     priority?: number;
 
     /**
-     * @deprecated: A valid protocol, prefixed with an underscore. Deprecated in favor
-     * of the regular 'name' outside the data map. This data map field normally
-     * represents the second label of that 'name'.
+     * target.
      */
-    proto?: string;
+    target?: string;
 
     /**
-     * @deprecated: A service type, prefixed with an underscore. Deprecated in favor of
-     * the regular 'name' outside the data map. This data map field normally represents
-     * the first label of that 'name'.
+     * value.
      */
-    service?: string;
+    value?: string;
+  }
 
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
     /**
-     * A valid hostname.
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
      */
-    target?: string;
+    ipv4_only?: boolean;
 
     /**
-     * The record weight.
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
      */
-    weight?: number;
+    ipv6_only?: boolean;
   }
 }
 
-export interface SSHFPRecord {
-  /**
-   * Components of a SSHFP record.
-   */
-  data: SSHFPRecord.Data;
-
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
-
-  /**
-   * Record type.
-   */
-  type: 'SSHFP';
-
-  /**
-   * Identifier
-   */
-  id?: string;
-
+export interface SVCBRecordParam {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -1537,86 +5187,88 @@ export interface SSHFPRecord {
   comment?: string;
 
   /**
-   * Formatted SSHFP content. See 'data' to set SSHFP properties.
-   */
-  content?: string;
-
-  /**
-   * When the record was created.
+   * Components of a SVCB record.
    */
-  created_on?: string;
+  data?: SVCBRecordParam.Data;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: SVCBRecordParam.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
    */
-  tags?: Array<RecordTags>;
+  tags?: Array<RecordTagsParam>;
 
   /**
    * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
    * Value must be between 60 and 86400, with the minimum reduced to 30 for
    * Enterprise zones.
    */
-  ttl?: TTL;
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'SVCB';
 }
 
-export namespace SSHFPRecord {
+export namespace SVCBRecordParam {
   /**
-   * Components of a SSHFP record.
+   * Components of a SVCB record.
    */
   export interface Data {
     /**
-     * algorithm.
+     * priority.
      */
-    algorithm?: number;
+    priority?: number;
 
     /**
-     * fingerprint.
+     * target.
      */
-    fingerprint?: string;
+    target?: string;
 
     /**
-     * type.
+     * value.
      */
-    type?: number;
+    value?: string;
   }
-}
-
-export interface SVCBRecord {
-  /**
-   * Components of a SVCB record.
-   */
-  data: SVCBRecord.Data;
-
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
 
   /**
-   * Record type.
+   * Settings for the DNS record.
    */
-  type: 'SVCB';
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
 
-  /**
-   * Identifier
-   */
-  id?: string;
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
 
+export interface TLSARecord {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -1624,29 +5276,30 @@ export interface SVCBRecord {
   comment?: string;
 
   /**
-   * Formatted SVCB content. See 'data' to set SVCB properties.
+   * Formatted TLSA content. See 'data' to set TLSA properties.
    */
   content?: string;
 
   /**
-   * When the record was created.
+   * Components of a TLSA record.
    */
-  created_on?: string;
+  data?: TLSARecord.Data;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: TLSARecord.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
@@ -1659,96 +5312,108 @@ export interface SVCBRecord {
    * Enterprise zones.
    */
   ttl?: TTL;
+
+  /**
+   * Record type.
+   */
+  type?: 'TLSA';
 }
 
-export namespace SVCBRecord {
+export namespace TLSARecord {
   /**
-   * Components of a SVCB record.
+   * Components of a TLSA record.
    */
   export interface Data {
     /**
-     * priority.
+     * certificate.
      */
-    priority?: number;
+    certificate?: string;
 
     /**
-     * target.
+     * Matching Type.
      */
-    target?: string;
+    matching_type?: number;
 
     /**
-     * value.
+     * Selector.
      */
-    value?: string;
-  }
-}
-
-export interface TLSARecord {
-  /**
-   * Components of a TLSA record.
-   */
-  data: TLSARecord.Data;
+    selector?: number;
 
-  /**
-   * DNS record name (or @ for the zone apex) in Punycode.
-   */
-  name: string;
+    /**
+     * Usage.
+     */
+    usage?: number;
+  }
 
   /**
-   * Record type.
+   * Settings for the DNS record.
    */
-  type: 'TLSA';
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
 
-  /**
-   * Identifier
-   */
-  id?: string;
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
 
+export interface TLSARecordParam {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
-   * responses.
-   */
-  comment?: string;
-
-  /**
-   * Formatted TLSA content. See 'data' to set TLSA properties.
+   * responses.
    */
-  content?: string;
+  comment?: string;
 
   /**
-   * When the record was created.
+   * Components of a TLSA record.
    */
-  created_on?: string;
+  data?: TLSARecordParam.Data;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: TLSARecordParam.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
    */
-  tags?: Array<RecordTags>;
+  tags?: Array<RecordTagsParam>;
 
   /**
    * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
    * Value must be between 60 and 86400, with the minimum reduced to 30 for
    * Enterprise zones.
    */
-  ttl?: TTL;
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'TLSA';
 }
 
-export namespace TLSARecord {
+export namespace TLSARecordParam {
   /**
    * Components of a TLSA record.
    */
@@ -1773,6 +5438,27 @@ export namespace TLSARecord {
      */
     usage?: number;
   }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
 }
 
 /**
@@ -1791,25 +5477,79 @@ export type TTLParam = number | 1;
 
 export interface TXTRecord {
   /**
-   * Text content for the record.
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Text content for the record. The content must consist of quoted "character
+   * strings" (RFC 1035), each with a length of up to 255 bytes. Strings exceeding
+   * this allowed maximum length are automatically split.
+   *
+   * Learn more at
+   * <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
    */
-  content: string;
+  content?: string;
 
   /**
    * DNS record name (or @ for the zone apex) in Punycode.
    */
-  name: string;
+  name?: string;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: TXTRecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
 
   /**
    * Record type.
    */
-  type: 'TXT';
+  type?: 'TXT';
+}
 
+export namespace TXTRecord {
   /**
-   * Identifier
+   * Settings for the DNS record.
    */
-  id?: string;
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
 
+export interface TXTRecordParam {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -1817,65 +5557,168 @@ export interface TXTRecord {
   comment?: string;
 
   /**
-   * When the record was created.
+   * Text content for the record. The content must consist of quoted "character
+   * strings" (RFC 1035), each with a length of up to 255 bytes. Strings exceeding
+   * this allowed maximum length are automatically split.
+   *
+   * Learn more at
+   * <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
    */
-  created_on?: string;
+  content?: string;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  meta?: RecordMetadata;
+  name?: string;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: TXTRecordParam.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
    */
-  tags?: Array<RecordTags>;
+  tags?: Array<RecordTagsParam>;
 
   /**
    * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
    * Value must be between 60 and 86400, with the minimum reduced to 30 for
    * Enterprise zones.
    */
-  ttl?: TTL;
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'TXT';
+}
+
+export namespace TXTRecordParam {
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
 }
 
 export interface URIRecord {
+  /**
+   * Comments or notes about the DNS record. This field has no effect on DNS
+   * responses.
+   */
+  comment?: string;
+
+  /**
+   * Formatted URI content. See 'data' to set URI properties.
+   */
+  content?: string;
+
   /**
    * Components of a URI record.
    */
-  data: URIRecord.Data;
+  data?: URIRecord.Data;
 
   /**
    * DNS record name (or @ for the zone apex) in Punycode.
    */
-  name: string;
+  name?: string;
 
   /**
    * Required for MX, SRV and URI records; unused by other record types. Records with
    * lower priorities are preferred.
    */
-  priority: number;
+  priority?: number;
+
+  /**
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
+   */
+  proxied?: boolean;
+
+  /**
+   * Settings for the DNS record.
+   */
+  settings?: URIRecord.Settings;
+
+  /**
+   * Custom tags for the DNS record. This field has no effect on DNS responses.
+   */
+  tags?: Array<RecordTags>;
+
+  /**
+   * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
+   * Value must be between 60 and 86400, with the minimum reduced to 30 for
+   * Enterprise zones.
+   */
+  ttl?: TTL;
 
   /**
    * Record type.
    */
-  type: 'URI';
+  type?: 'URI';
+}
 
+export namespace URIRecord {
   /**
-   * Identifier
+   * Components of a URI record.
    */
-  id?: string;
+  export interface Data {
+    /**
+     * The record content.
+     */
+    target?: string;
+
+    /**
+     * The record weight.
+     */
+    weight?: number;
+  }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
+}
 
+export interface URIRecordParam {
   /**
    * Comments or notes about the DNS record. This field has no effect on DNS
    * responses.
@@ -1883,44 +5726,51 @@ export interface URIRecord {
   comment?: string;
 
   /**
-   * Formatted URI content. See 'data' to set URI properties.
+   * Components of a URI record.
    */
-  content?: string;
+  data?: URIRecordParam.Data;
 
   /**
-   * When the record was created.
+   * DNS record name (or @ for the zone apex) in Punycode.
    */
-  created_on?: string;
+  name?: string;
 
   /**
-   * Extra Cloudflare-specific information about the record.
+   * Required for MX, SRV and URI records; unused by other record types. Records with
+   * lower priorities are preferred.
    */
-  meta?: RecordMetadata;
+  priority?: number;
 
   /**
-   * When the record was last modified.
+   * Whether the record is receiving the performance and security benefits of
+   * Cloudflare.
    */
-  modified_on?: string;
+  proxied?: boolean;
 
   /**
-   * Whether the record can be proxied by Cloudflare or not.
+   * Settings for the DNS record.
    */
-  proxiable?: boolean;
+  settings?: URIRecordParam.Settings;
 
   /**
    * Custom tags for the DNS record. This field has no effect on DNS responses.
    */
-  tags?: Array<RecordTags>;
+  tags?: Array<RecordTagsParam>;
 
   /**
    * Time To Live (TTL) of the DNS record in seconds. Setting to 1 means 'automatic'.
    * Value must be between 60 and 86400, with the minimum reduced to 30 for
    * Enterprise zones.
    */
-  ttl?: TTL;
+  ttl?: TTLParam;
+
+  /**
+   * Record type.
+   */
+  type?: 'URI';
 }
 
-export namespace URIRecord {
+export namespace URIRecordParam {
   /**
    * Components of a URI record.
    */
@@ -1935,6 +5785,27 @@ export namespace URIRecord {
      */
     weight?: number;
   }
+
+  /**
+   * Settings for the DNS record.
+   */
+  export interface Settings {
+    /**
+     * When enabled, only A records will be generated, and AAAA records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv4_only?: boolean;
+
+    /**
+     * When enabled, only AAAA records will be generated, and A records will not be
+     * created. This setting is intended for exceptional cases. Note that this option
+     * only applies to proxied records and it has no effect on whether Cloudflare
+     * communicates with the origin using IPv4 or IPv6.
+     */
+    ipv6_only?: boolean;
+  }
 }
 
 export interface RecordDeleteResponse {
@@ -1944,6 +5815,16 @@ export interface RecordDeleteResponse {
   id?: string;
 }
 
+export interface RecordBatchResponse {
+  deletes?: Array<RecordResponse>;
+
+  patches?: Array<RecordResponse>;
+
+  posts?: Array<RecordResponse>;
+
+  puts?: Array<RecordResponse>;
+}
+
 /**
  * Exported BIND zone file.
  */
@@ -1986,6 +5867,7 @@ export type RecordCreateParams =
   | RecordCreateParams.MXRecord
   | RecordCreateParams.NAPTRRecord
   | RecordCreateParams.NSRecord
+  | RecordCreateParams.DNSRecordsOpenpgpkeyRecord
   | RecordCreateParams.PTRRecord
   | RecordCreateParams.SMIMEARecord
   | RecordCreateParams.SRVRecord
@@ -1995,7 +5877,7 @@ export type RecordCreateParams =
   | RecordCreateParams.TXTRecord
   | RecordCreateParams.URIRecord;
 
-export namespace RecordCreateParams {
+export declare namespace RecordCreateParams {
   export interface ARecord {
     /**
      * Path param: Identifier
@@ -2003,30 +5885,20 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: A valid IPv4 address.
-     */
-    content: string;
-
-    /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
-     */
-    name: string;
-
-    /**
-     * Body param: Record type.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    type: 'A';
+    comment?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: A valid IPv4 address.
      */
-    id?: string;
+    content?: string;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    comment?: string;
+    name?: string;
 
     /**
      * Body param: Whether the record is receiving the performance and security
@@ -2034,6 +5906,11 @@ export namespace RecordCreateParams {
      */
     proxied?: boolean;
 
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordCreateParams.ARecord.Settings;
+
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
      * responses.
@@ -2046,39 +5923,57 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
-  }
 
-  export interface AAAARecord {
     /**
-     * Path param: Identifier
+     * Body param: Record type.
      */
-    zone_id: string;
+    type?: 'A';
+  }
 
+  export namespace ARecord {
     /**
-     * Body param: A valid IPv6 address.
+     * Settings for the DNS record.
      */
-    content: string;
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
 
+  export interface AAAARecord {
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Path param: Identifier
      */
-    name: string;
+    zone_id: string;
 
     /**
-     * Body param: Record type.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    type: 'AAAA';
+    comment?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: A valid IPv6 address.
      */
-    id?: string;
+    content?: string;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    comment?: string;
+    name?: string;
 
     /**
      * Body param: Whether the record is receiving the performance and security
@@ -2086,6 +5981,11 @@ export namespace RecordCreateParams {
      */
     proxied?: boolean;
 
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordCreateParams.AAAARecord.Settings;
+
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
      * responses.
@@ -2098,6 +5998,34 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'AAAA';
+  }
+
+  export namespace AAAARecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface CAARecord {
@@ -2107,30 +6035,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a CAA record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.CAARecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a CAA record.
      */
-    name: string;
+    data?: RecordCreateParams.CAARecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'CAA';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.CAARecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -2144,6 +6073,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'CAA';
   }
 
   export namespace CAARecord {
@@ -2166,6 +6100,27 @@ export namespace RecordCreateParams {
        */
       value?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface CERTRecord {
@@ -2175,30 +6130,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a CERT record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.CERTRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a CERT record.
      */
-    name: string;
+    data?: RecordCreateParams.CERTRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'CERT';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.CERTRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -2212,6 +6168,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'CERT';
   }
 
   export namespace CERTRecord {
@@ -2239,39 +6200,50 @@ export namespace RecordCreateParams {
        */
       type?: number;
     }
-  }
 
-  export interface CNAMERecord {
     /**
-     * Path param: Identifier
+     * Settings for the DNS record.
      */
-    zone_id: string;
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
 
-    /**
-     * Body param: A valid hostname. Must not match the record's name.
-     */
-    content: unknown;
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
 
+  export interface CNAMERecord {
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Path param: Identifier
      */
-    name: string;
+    zone_id: string;
 
     /**
-     * Body param: Record type.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    type: 'CNAME';
+    comment?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: A valid hostname. Must not match the record's name.
      */
-    id?: string;
+    content?: string;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    comment?: string;
+    name?: string;
 
     /**
      * Body param: Whether the record is receiving the performance and security
@@ -2279,6 +6251,11 @@ export namespace RecordCreateParams {
      */
     proxied?: boolean;
 
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordCreateParams.CNAMERecord.Settings;
+
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
      * responses.
@@ -2291,6 +6268,42 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'CNAME';
+  }
+
+  export namespace CNAMERecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * If enabled, causes the CNAME record to be resolved externally and the resulting
+       * address records (e.g., A and AAAA) to be returned instead of the CNAME record
+       * itself. This setting is unavailable for proxied records, since they are always
+       * flattened.
+       */
+      flatten_cname?: boolean;
+
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface DNSKEYRecord {
@@ -2300,30 +6313,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a DNSKEY record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.DNSKEYRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a DNSKEY record.
      */
-    name: string;
+    data?: RecordCreateParams.DNSKEYRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'DNSKEY';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.DNSKEYRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -2337,6 +6351,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'DNSKEY';
   }
 
   export namespace DNSKEYRecord {
@@ -2364,6 +6383,27 @@ export namespace RecordCreateParams {
        */
       public_key?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface DSRecord {
@@ -2373,30 +6413,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a DS record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.DSRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a DS record.
      */
-    name: string;
+    data?: RecordCreateParams.DSRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'DS';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.DSRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -2410,6 +6451,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'DS';
   }
 
   export namespace DSRecord {
@@ -2437,6 +6483,27 @@ export namespace RecordCreateParams {
        */
       key_tag?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface HTTPSRecord {
@@ -2446,30 +6513,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a HTTPS record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.HTTPSRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a HTTPS record.
      */
-    name: string;
+    data?: RecordCreateParams.HTTPSRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'HTTPS';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.HTTPSRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -2483,6 +6551,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'HTTPS';
   }
 
   export namespace HTTPSRecord {
@@ -2505,6 +6578,27 @@ export namespace RecordCreateParams {
        */
       value?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface LOCRecord {
@@ -2514,30 +6608,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a LOC record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.LOCRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a LOC record.
      */
-    name: string;
+    data?: RecordCreateParams.LOCRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'LOC';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.LOCRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -2551,6 +6646,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'LOC';
   }
 
   export namespace LOCRecord {
@@ -2618,6 +6718,27 @@ export namespace RecordCreateParams {
        */
       size?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface MXRecord {
@@ -2626,37 +6747,38 @@ export namespace RecordCreateParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
+     */
+    comment?: string;
+
     /**
      * Body param: A valid mail server hostname.
      */
-    content: string;
+    content?: string;
 
     /**
      * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    name: string;
+    name?: string;
 
     /**
      * Body param: Required for MX, SRV and URI records; unused by other record types.
      * Records with lower priorities are preferred.
      */
-    priority: number;
-
-    /**
-     * Body param: Record type.
-     */
-    type: 'MX';
+    priority?: number;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.MXRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -2670,6 +6792,34 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'MX';
+  }
+
+  export namespace MXRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface NAPTRRecord {
@@ -2679,30 +6829,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a NAPTR record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.NAPTRRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a NAPTR record.
      */
-    name: string;
+    data?: RecordCreateParams.NAPTRRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'NAPTR';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.NAPTRRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -2716,6 +6867,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'NAPTR';
   }
 
   export namespace NAPTRRecord {
@@ -2753,6 +6909,27 @@ export namespace RecordCreateParams {
        */
       service?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface NSRecord {
@@ -2761,25 +6938,80 @@ export namespace RecordCreateParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
+     */
+    comment?: string;
+
     /**
      * Body param: A valid name server host name.
      */
-    content: string;
+    content?: string;
 
     /**
      * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    name: string;
+    name?: string;
+
+    /**
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
+     */
+    proxied?: boolean;
+
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordCreateParams.NSRecord.Settings;
+
+    /**
+     * Body param: Custom tags for the DNS record. This field has no effect on DNS
+     * responses.
+     */
+    tags?: Array<RecordTagsParam>;
+
+    /**
+     * Body param: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means
+     * 'automatic'. Value must be between 60 and 86400, with the minimum reduced to 30
+     * for Enterprise zones.
+     */
+    ttl?: TTLParam;
 
     /**
      * Body param: Record type.
      */
-    type: 'NS';
+    type?: 'NS';
+  }
 
+  export namespace NSRecord {
     /**
-     * Body param: Identifier
+     * Settings for the DNS record.
      */
-    id?: string;
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
+
+  export interface DNSRecordsOpenpgpkeyRecord {
+    /**
+     * Path param: Identifier
+     */
+    zone_id: string;
 
     /**
      * Body param: Comments or notes about the DNS record. This field has no effect on
@@ -2787,6 +7019,28 @@ export namespace RecordCreateParams {
      */
     comment?: string;
 
+    /**
+     * Body param: A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880
+     * Section 11.1)
+     */
+    content?: string;
+
+    /**
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     */
+    name?: string;
+
+    /**
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
+     */
+    proxied?: boolean;
+
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordCreateParams.DNSRecordsOpenpgpkeyRecord.Settings;
+
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
      * responses.
@@ -2799,6 +7053,34 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'OPENPGPKEY';
+  }
+
+  export namespace DNSRecordsOpenpgpkeyRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface PTRRecord {
@@ -2808,30 +7090,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Domain name pointing to the address.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    content: string;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Domain name pointing to the address.
      */
-    name: string;
+    content?: string;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'PTR';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.PTRRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -2845,6 +7128,34 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'PTR';
+  }
+
+  export namespace PTRRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface SMIMEARecord {
@@ -2854,30 +7165,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SMIMEA record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.SMIMEARecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a SMIMEA record.
      */
-    name: string;
+    data?: RecordCreateParams.SMIMEARecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SMIMEA';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.SMIMEARecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -2891,6 +7203,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SMIMEA';
   }
 
   export namespace SMIMEARecord {
@@ -2918,6 +7235,27 @@ export namespace RecordCreateParams {
        */
       usage?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface SRVRecord {
@@ -2927,32 +7265,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SRV record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.SRVRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode. For SRV
-     * records, the first label is normally a service and the second a protocol name,
-     * each starting with an underscore.
+     * Body param: Components of a SRV record.
      */
-    name: string;
+    data?: RecordCreateParams.SRVRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SRV';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.SRVRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -2966,6 +7303,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SRV';
   }
 
   export namespace SRVRecord {
@@ -2973,13 +7315,6 @@ export namespace RecordCreateParams {
      * Components of a SRV record.
      */
     export interface Data {
-      /**
-       * @deprecated: A valid hostname. Deprecated in favor of the regular 'name' outside
-       * the data map. This data map field represents the remainder of the full 'name'
-       * after the service and protocol.
-       */
-      name?: string;
-
       /**
        * The port of the service.
        */
@@ -2992,28 +7327,35 @@ export namespace RecordCreateParams {
       priority?: number;
 
       /**
-       * @deprecated: A valid protocol, prefixed with an underscore. Deprecated in favor
-       * of the regular 'name' outside the data map. This data map field normally
-       * represents the second label of that 'name'.
+       * A valid hostname.
        */
-      proto?: string;
+      target?: string;
 
       /**
-       * @deprecated: A service type, prefixed with an underscore. Deprecated in favor of
-       * the regular 'name' outside the data map. This data map field normally represents
-       * the first label of that 'name'.
+       * The record weight.
        */
-      service?: string;
+      weight?: number;
+    }
 
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
       /**
-       * A valid hostname.
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
        */
-      target?: string;
+      ipv4_only?: boolean;
 
       /**
-       * The record weight.
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
        */
-      weight?: number;
+      ipv6_only?: boolean;
     }
   }
 
@@ -3024,30 +7366,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SSHFP record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.SSHFPRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a SSHFP record.
      */
-    name: string;
+    data?: RecordCreateParams.SSHFPRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SSHFP';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.SSHFPRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -3061,6 +7404,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SSHFP';
   }
 
   export namespace SSHFPRecord {
@@ -3083,6 +7431,27 @@ export namespace RecordCreateParams {
        */
       type?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface SVCBRecord {
@@ -3092,30 +7461,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SVCB record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.SVCBRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a SVCB record.
      */
-    name: string;
+    data?: RecordCreateParams.SVCBRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SVCB';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.SVCBRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -3129,6 +7499,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SVCB';
   }
 
   export namespace SVCBRecord {
@@ -3151,6 +7526,27 @@ export namespace RecordCreateParams {
        */
       value?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface TLSARecord {
@@ -3160,30 +7556,31 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a TLSA record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordCreateParams.TLSARecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a TLSA record.
      */
-    name: string;
+    data?: RecordCreateParams.TLSARecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'TLSA';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.TLSARecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -3197,6 +7594,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'TLSA';
   }
 
   export namespace TLSARecord {
@@ -3224,6 +7626,27 @@ export namespace RecordCreateParams {
        */
       usage?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface TXTRecord {
@@ -3233,30 +7656,36 @@ export namespace RecordCreateParams {
     zone_id: string;
 
     /**
-     * Body param: Text content for the record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    content: string;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Text content for the record. The content must consist of quoted
+     * "character strings" (RFC 1035), each with a length of up to 255 bytes. Strings
+     * exceeding this allowed maximum length are automatically split.
+     *
+     * Learn more at
+     * <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
      */
-    name: string;
+    content?: string;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'TXT';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.TXTRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -3270,6 +7699,34 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'TXT';
+  }
+
+  export namespace TXTRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface URIRecord {
@@ -3278,37 +7735,38 @@ export namespace RecordCreateParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
+     */
+    comment?: string;
+
     /**
      * Body param: Components of a URI record.
      */
-    data: RecordCreateParams.URIRecord.Data;
+    data?: RecordCreateParams.URIRecord.Data;
 
     /**
      * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    name: string;
+    name?: string;
 
     /**
      * Body param: Required for MX, SRV and URI records; unused by other record types.
      * Records with lower priorities are preferred.
      */
-    priority: number;
-
-    /**
-     * Body param: Record type.
-     */
-    type: 'URI';
+    priority?: number;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordCreateParams.URIRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -3322,6 +7780,11 @@ export namespace RecordCreateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'URI';
   }
 
   export namespace URIRecord {
@@ -3339,6 +7802,27 @@ export namespace RecordCreateParams {
        */
       weight?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 }
 
@@ -3355,6 +7839,7 @@ export type RecordUpdateParams =
   | RecordUpdateParams.MXRecord
   | RecordUpdateParams.NAPTRRecord
   | RecordUpdateParams.NSRecord
+  | RecordUpdateParams.DNSRecordsOpenpgpkeyRecord
   | RecordUpdateParams.PTRRecord
   | RecordUpdateParams.SMIMEARecord
   | RecordUpdateParams.SRVRecord
@@ -3364,7 +7849,7 @@ export type RecordUpdateParams =
   | RecordUpdateParams.TXTRecord
   | RecordUpdateParams.URIRecord;
 
-export namespace RecordUpdateParams {
+export declare namespace RecordUpdateParams {
   export interface ARecord {
     /**
      * Path param: Identifier
@@ -3372,30 +7857,20 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: A valid IPv4 address.
-     */
-    content: string;
-
-    /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
-     */
-    name: string;
-
-    /**
-     * Body param: Record type.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    type: 'A';
+    comment?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: A valid IPv4 address.
      */
-    id?: string;
+    content?: string;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    comment?: string;
+    name?: string;
 
     /**
      * Body param: Whether the record is receiving the performance and security
@@ -3403,6 +7878,11 @@ export namespace RecordUpdateParams {
      */
     proxied?: boolean;
 
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordUpdateParams.ARecord.Settings;
+
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
      * responses.
@@ -3415,39 +7895,57 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
-  }
 
-  export interface AAAARecord {
     /**
-     * Path param: Identifier
+     * Body param: Record type.
      */
-    zone_id: string;
+    type?: 'A';
+  }
 
+  export namespace ARecord {
     /**
-     * Body param: A valid IPv6 address.
+     * Settings for the DNS record.
      */
-    content: string;
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
 
+  export interface AAAARecord {
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Path param: Identifier
      */
-    name: string;
+    zone_id: string;
 
     /**
-     * Body param: Record type.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    type: 'AAAA';
+    comment?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: A valid IPv6 address.
      */
-    id?: string;
+    content?: string;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    comment?: string;
+    name?: string;
 
     /**
      * Body param: Whether the record is receiving the performance and security
@@ -3455,6 +7953,11 @@ export namespace RecordUpdateParams {
      */
     proxied?: boolean;
 
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordUpdateParams.AAAARecord.Settings;
+
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
      * responses.
@@ -3467,6 +7970,34 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'AAAA';
+  }
+
+  export namespace AAAARecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface CAARecord {
@@ -3476,30 +8007,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a CAA record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.CAARecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a CAA record.
      */
-    name: string;
+    data?: RecordUpdateParams.CAARecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'CAA';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.CAARecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -3513,6 +8045,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'CAA';
   }
 
   export namespace CAARecord {
@@ -3535,6 +8072,27 @@ export namespace RecordUpdateParams {
        */
       value?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface CERTRecord {
@@ -3544,30 +8102,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a CERT record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.CERTRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a CERT record.
      */
-    name: string;
+    data?: RecordUpdateParams.CERTRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'CERT';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.CERTRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -3581,6 +8140,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'CERT';
   }
 
   export namespace CERTRecord {
@@ -3608,39 +8172,50 @@ export namespace RecordUpdateParams {
        */
       type?: number;
     }
-  }
 
-  export interface CNAMERecord {
     /**
-     * Path param: Identifier
+     * Settings for the DNS record.
      */
-    zone_id: string;
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
 
-    /**
-     * Body param: A valid hostname. Must not match the record's name.
-     */
-    content: unknown;
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
 
+  export interface CNAMERecord {
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Path param: Identifier
      */
-    name: string;
+    zone_id: string;
 
     /**
-     * Body param: Record type.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    type: 'CNAME';
+    comment?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: A valid hostname. Must not match the record's name.
      */
-    id?: string;
+    content?: string;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    comment?: string;
+    name?: string;
 
     /**
      * Body param: Whether the record is receiving the performance and security
@@ -3648,6 +8223,11 @@ export namespace RecordUpdateParams {
      */
     proxied?: boolean;
 
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordUpdateParams.CNAMERecord.Settings;
+
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
      * responses.
@@ -3659,7 +8239,43 @@ export namespace RecordUpdateParams {
      * 'automatic'. Value must be between 60 and 86400, with the minimum reduced to 30
      * for Enterprise zones.
      */
-    ttl?: TTLParam;
+    ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'CNAME';
+  }
+
+  export namespace CNAMERecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * If enabled, causes the CNAME record to be resolved externally and the resulting
+       * address records (e.g., A and AAAA) to be returned instead of the CNAME record
+       * itself. This setting is unavailable for proxied records, since they are always
+       * flattened.
+       */
+      flatten_cname?: boolean;
+
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface DNSKEYRecord {
@@ -3669,30 +8285,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a DNSKEY record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.DNSKEYRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a DNSKEY record.
      */
-    name: string;
+    data?: RecordUpdateParams.DNSKEYRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'DNSKEY';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.DNSKEYRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -3706,6 +8323,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'DNSKEY';
   }
 
   export namespace DNSKEYRecord {
@@ -3733,6 +8355,27 @@ export namespace RecordUpdateParams {
        */
       public_key?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface DSRecord {
@@ -3742,30 +8385,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a DS record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.DSRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a DS record.
      */
-    name: string;
+    data?: RecordUpdateParams.DSRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'DS';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.DSRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -3779,6 +8423,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'DS';
   }
 
   export namespace DSRecord {
@@ -3806,6 +8455,27 @@ export namespace RecordUpdateParams {
        */
       key_tag?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface HTTPSRecord {
@@ -3815,30 +8485,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a HTTPS record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.HTTPSRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a HTTPS record.
      */
-    name: string;
+    data?: RecordUpdateParams.HTTPSRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'HTTPS';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.HTTPSRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -3852,6 +8523,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'HTTPS';
   }
 
   export namespace HTTPSRecord {
@@ -3874,6 +8550,27 @@ export namespace RecordUpdateParams {
        */
       value?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface LOCRecord {
@@ -3883,30 +8580,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a LOC record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.LOCRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a LOC record.
      */
-    name: string;
+    data?: RecordUpdateParams.LOCRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'LOC';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.LOCRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -3920,6 +8618,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'LOC';
   }
 
   export namespace LOCRecord {
@@ -3987,6 +8690,27 @@ export namespace RecordUpdateParams {
        */
       size?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface MXRecord {
@@ -3995,37 +8719,38 @@ export namespace RecordUpdateParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
+     */
+    comment?: string;
+
     /**
      * Body param: A valid mail server hostname.
      */
-    content: string;
+    content?: string;
 
     /**
      * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    name: string;
+    name?: string;
 
     /**
      * Body param: Required for MX, SRV and URI records; unused by other record types.
      * Records with lower priorities are preferred.
      */
-    priority: number;
-
-    /**
-     * Body param: Record type.
-     */
-    type: 'MX';
+    priority?: number;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.MXRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -4039,6 +8764,34 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'MX';
+  }
+
+  export namespace MXRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface NAPTRRecord {
@@ -4048,30 +8801,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a NAPTR record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.NAPTRRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a NAPTR record.
      */
-    name: string;
+    data?: RecordUpdateParams.NAPTRRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'NAPTR';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.NAPTRRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -4085,6 +8839,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'NAPTR';
   }
 
   export namespace NAPTRRecord {
@@ -4122,6 +8881,27 @@ export namespace RecordUpdateParams {
        */
       service?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface NSRecord {
@@ -4130,31 +8910,108 @@ export namespace RecordUpdateParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
+     */
+    comment?: string;
+
     /**
      * Body param: A valid name server host name.
      */
-    content: string;
+    content?: string;
+
+    /**
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     */
+    name?: string;
+
+    /**
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
+     */
+    proxied?: boolean;
+
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordUpdateParams.NSRecord.Settings;
+
+    /**
+     * Body param: Custom tags for the DNS record. This field has no effect on DNS
+     * responses.
+     */
+    tags?: Array<RecordTagsParam>;
+
+    /**
+     * Body param: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means
+     * 'automatic'. Value must be between 60 and 86400, with the minimum reduced to 30
+     * for Enterprise zones.
+     */
+    ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'NS';
+  }
+
+  export namespace NSRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
+
+  export interface DNSRecordsOpenpgpkeyRecord {
+    /**
+     * Path param: Identifier
+     */
+    zone_id: string;
+
+    /**
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
+     */
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880
+     * Section 11.1)
      */
-    name: string;
+    content?: string;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'NS';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.DNSRecordsOpenpgpkeyRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -4168,6 +9025,34 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'OPENPGPKEY';
+  }
+
+  export namespace DNSRecordsOpenpgpkeyRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface PTRRecord {
@@ -4177,30 +9062,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Domain name pointing to the address.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    content: string;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Domain name pointing to the address.
      */
-    name: string;
+    content?: string;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'PTR';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.PTRRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -4214,6 +9100,34 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'PTR';
+  }
+
+  export namespace PTRRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface SMIMEARecord {
@@ -4223,30 +9137,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SMIMEA record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.SMIMEARecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a SMIMEA record.
      */
-    name: string;
+    data?: RecordUpdateParams.SMIMEARecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SMIMEA';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.SMIMEARecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -4260,6 +9175,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SMIMEA';
   }
 
   export namespace SMIMEARecord {
@@ -4287,6 +9207,27 @@ export namespace RecordUpdateParams {
        */
       usage?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface SRVRecord {
@@ -4296,32 +9237,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SRV record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.SRVRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode. For SRV
-     * records, the first label is normally a service and the second a protocol name,
-     * each starting with an underscore.
+     * Body param: Components of a SRV record.
      */
-    name: string;
+    data?: RecordUpdateParams.SRVRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SRV';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.SRVRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -4335,6 +9275,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SRV';
   }
 
   export namespace SRVRecord {
@@ -4342,13 +9287,6 @@ export namespace RecordUpdateParams {
      * Components of a SRV record.
      */
     export interface Data {
-      /**
-       * @deprecated: A valid hostname. Deprecated in favor of the regular 'name' outside
-       * the data map. This data map field represents the remainder of the full 'name'
-       * after the service and protocol.
-       */
-      name?: string;
-
       /**
        * The port of the service.
        */
@@ -4361,28 +9299,35 @@ export namespace RecordUpdateParams {
       priority?: number;
 
       /**
-       * @deprecated: A valid protocol, prefixed with an underscore. Deprecated in favor
-       * of the regular 'name' outside the data map. This data map field normally
-       * represents the second label of that 'name'.
+       * A valid hostname.
        */
-      proto?: string;
+      target?: string;
 
       /**
-       * @deprecated: A service type, prefixed with an underscore. Deprecated in favor of
-       * the regular 'name' outside the data map. This data map field normally represents
-       * the first label of that 'name'.
+       * The record weight.
        */
-      service?: string;
+      weight?: number;
+    }
 
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
       /**
-       * A valid hostname.
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
        */
-      target?: string;
+      ipv4_only?: boolean;
 
       /**
-       * The record weight.
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
        */
-      weight?: number;
+      ipv6_only?: boolean;
     }
   }
 
@@ -4393,30 +9338,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SSHFP record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.SSHFPRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a SSHFP record.
      */
-    name: string;
+    data?: RecordUpdateParams.SSHFPRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SSHFP';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.SSHFPRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -4430,6 +9376,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SSHFP';
   }
 
   export namespace SSHFPRecord {
@@ -4452,6 +9403,27 @@ export namespace RecordUpdateParams {
        */
       type?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface SVCBRecord {
@@ -4461,30 +9433,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SVCB record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.SVCBRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a SVCB record.
      */
-    name: string;
+    data?: RecordUpdateParams.SVCBRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SVCB';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.SVCBRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -4498,6 +9471,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SVCB';
   }
 
   export namespace SVCBRecord {
@@ -4520,6 +9498,27 @@ export namespace RecordUpdateParams {
        */
       value?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface TLSARecord {
@@ -4529,30 +9528,31 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a TLSA record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordUpdateParams.TLSARecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a TLSA record.
      */
-    name: string;
+    data?: RecordUpdateParams.TLSARecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'TLSA';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.TLSARecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -4566,6 +9566,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'TLSA';
   }
 
   export namespace TLSARecord {
@@ -4593,6 +9598,27 @@ export namespace RecordUpdateParams {
        */
       usage?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface TXTRecord {
@@ -4602,30 +9628,36 @@ export namespace RecordUpdateParams {
     zone_id: string;
 
     /**
-     * Body param: Text content for the record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    content: string;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Text content for the record. The content must consist of quoted
+     * "character strings" (RFC 1035), each with a length of up to 255 bytes. Strings
+     * exceeding this allowed maximum length are automatically split.
+     *
+     * Learn more at
+     * <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
      */
-    name: string;
+    content?: string;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'TXT';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.TXTRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -4639,6 +9671,34 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'TXT';
+  }
+
+  export namespace TXTRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface URIRecord {
@@ -4647,37 +9707,38 @@ export namespace RecordUpdateParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
+     */
+    comment?: string;
+
     /**
      * Body param: Components of a URI record.
      */
-    data: RecordUpdateParams.URIRecord.Data;
+    data?: RecordUpdateParams.URIRecord.Data;
 
     /**
      * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    name: string;
+    name?: string;
 
     /**
      * Body param: Required for MX, SRV and URI records; unused by other record types.
      * Records with lower priorities are preferred.
      */
-    priority: number;
-
-    /**
-     * Body param: Record type.
-     */
-    type: 'URI';
+    priority?: number;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordUpdateParams.URIRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -4691,6 +9752,11 @@ export namespace RecordUpdateParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'URI';
   }
 
   export namespace URIRecord {
@@ -4708,6 +9774,27 @@ export namespace RecordUpdateParams {
        */
       weight?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 }
 
@@ -4723,9 +9810,9 @@ export interface RecordListParams extends V4PagePaginationArrayParams {
   comment?: RecordListParams.Comment;
 
   /**
-   * Query param: DNS record content.
+   * Query param:
    */
-  content?: string;
+  content?: RecordListParams.Content;
 
   /**
    * Query param: Direction to order DNS records in.
@@ -4741,9 +9828,9 @@ export interface RecordListParams extends V4PagePaginationArrayParams {
   match?: 'any' | 'all';
 
   /**
-   * Query param: DNS record name (or @ for the zone apex) in Punycode.
+   * Query param:
    */
-  name?: string;
+  name?: RecordListParams.Name;
 
   /**
    * Query param: Field to order DNS records by.
@@ -4795,6 +9882,7 @@ export interface RecordListParams extends V4PagePaginationArrayParams {
     | 'MX'
     | 'NAPTR'
     | 'NS'
+    | 'OPENPGPKEY'
     | 'PTR'
     | 'SMIMEA'
     | 'SRV'
@@ -4838,6 +9926,50 @@ export namespace RecordListParams {
     startswith?: string;
   }
 
+  export interface Content {
+    /**
+     * Substring of the DNS record content. Content filters are case-insensitive.
+     */
+    contains?: string;
+
+    /**
+     * Suffix of the DNS record content. Content filters are case-insensitive.
+     */
+    endswith?: string;
+
+    /**
+     * Exact value of the DNS record content. Content filters are case-insensitive.
+     */
+    exact?: string;
+
+    /**
+     * Prefix of the DNS record content. Content filters are case-insensitive.
+     */
+    startswith?: string;
+  }
+
+  export interface Name {
+    /**
+     * Substring of the DNS record name. Name filters are case-insensitive.
+     */
+    contains?: string;
+
+    /**
+     * Suffix of the DNS record name. Name filters are case-insensitive.
+     */
+    endswith?: string;
+
+    /**
+     * Exact value of the DNS record name. Name filters are case-insensitive.
+     */
+    exact?: string;
+
+    /**
+     * Prefix of the DNS record name. Name filters are case-insensitive.
+     */
+    startswith?: string;
+  }
+
   export interface Tag {
     /**
      * Name of a tag which must _not_ be present on the DNS record. Tag filters are
@@ -4888,6 +10020,42 @@ export interface RecordDeleteParams {
   zone_id: string;
 }
 
+export interface RecordBatchParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  deletes?: Array<RecordBatchParams.Delete>;
+
+  /**
+   * Body param:
+   */
+  patches?: Array<BatchPatchParam>;
+
+  /**
+   * Body param:
+   */
+  posts?: Array<RecordParam>;
+
+  /**
+   * Body param:
+   */
+  puts?: Array<BatchPutParam>;
+}
+
+export namespace RecordBatchParams {
+  export interface Delete {
+    /**
+     * Identifier
+     */
+    id: string;
+  }
+}
+
 export type RecordEditParams =
   | RecordEditParams.ARecord
   | RecordEditParams.AAAARecord
@@ -4901,6 +10069,7 @@ export type RecordEditParams =
   | RecordEditParams.MXRecord
   | RecordEditParams.NAPTRRecord
   | RecordEditParams.NSRecord
+  | RecordEditParams.DNSRecordsOpenpgpkeyRecord
   | RecordEditParams.PTRRecord
   | RecordEditParams.SMIMEARecord
   | RecordEditParams.SRVRecord
@@ -4910,7 +10079,7 @@ export type RecordEditParams =
   | RecordEditParams.TXTRecord
   | RecordEditParams.URIRecord;
 
-export namespace RecordEditParams {
+export declare namespace RecordEditParams {
   export interface ARecord {
     /**
      * Path param: Identifier
@@ -4918,30 +10087,20 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: A valid IPv4 address.
-     */
-    content: string;
-
-    /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
-     */
-    name: string;
-
-    /**
-     * Body param: Record type.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    type: 'A';
+    comment?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: A valid IPv4 address.
      */
-    id?: string;
+    content?: string;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    comment?: string;
+    name?: string;
 
     /**
      * Body param: Whether the record is receiving the performance and security
@@ -4949,6 +10108,11 @@ export namespace RecordEditParams {
      */
     proxied?: boolean;
 
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordEditParams.ARecord.Settings;
+
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
      * responses.
@@ -4961,39 +10125,57 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
-  }
 
-  export interface AAAARecord {
     /**
-     * Path param: Identifier
+     * Body param: Record type.
      */
-    zone_id: string;
+    type?: 'A';
+  }
 
+  export namespace ARecord {
     /**
-     * Body param: A valid IPv6 address.
+     * Settings for the DNS record.
      */
-    content: string;
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
 
+  export interface AAAARecord {
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Path param: Identifier
      */
-    name: string;
+    zone_id: string;
 
     /**
-     * Body param: Record type.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    type: 'AAAA';
+    comment?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: A valid IPv6 address.
      */
-    id?: string;
+    content?: string;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    comment?: string;
+    name?: string;
 
     /**
      * Body param: Whether the record is receiving the performance and security
@@ -5001,6 +10183,11 @@ export namespace RecordEditParams {
      */
     proxied?: boolean;
 
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordEditParams.AAAARecord.Settings;
+
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
      * responses.
@@ -5013,6 +10200,34 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'AAAA';
+  }
+
+  export namespace AAAARecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface CAARecord {
@@ -5022,30 +10237,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a CAA record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.CAARecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a CAA record.
      */
-    name: string;
+    data?: RecordEditParams.CAARecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'CAA';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.CAARecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5059,6 +10275,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'CAA';
   }
 
   export namespace CAARecord {
@@ -5081,6 +10302,27 @@ export namespace RecordEditParams {
        */
       value?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface CERTRecord {
@@ -5090,30 +10332,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a CERT record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.CERTRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a CERT record.
      */
-    name: string;
+    data?: RecordEditParams.CERTRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'CERT';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.CERTRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5127,6 +10370,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'CERT';
   }
 
   export namespace CERTRecord {
@@ -5154,39 +10402,50 @@ export namespace RecordEditParams {
        */
       type?: number;
     }
-  }
 
-  export interface CNAMERecord {
     /**
-     * Path param: Identifier
+     * Settings for the DNS record.
      */
-    zone_id: string;
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
 
-    /**
-     * Body param: A valid hostname. Must not match the record's name.
-     */
-    content: unknown;
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
 
+  export interface CNAMERecord {
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Path param: Identifier
      */
-    name: string;
+    zone_id: string;
 
     /**
-     * Body param: Record type.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    type: 'CNAME';
+    comment?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: A valid hostname. Must not match the record's name.
      */
-    id?: string;
+    content?: string;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    comment?: string;
+    name?: string;
 
     /**
      * Body param: Whether the record is receiving the performance and security
@@ -5194,6 +10453,11 @@ export namespace RecordEditParams {
      */
     proxied?: boolean;
 
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordEditParams.CNAMERecord.Settings;
+
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
      * responses.
@@ -5206,6 +10470,42 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'CNAME';
+  }
+
+  export namespace CNAMERecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * If enabled, causes the CNAME record to be resolved externally and the resulting
+       * address records (e.g., A and AAAA) to be returned instead of the CNAME record
+       * itself. This setting is unavailable for proxied records, since they are always
+       * flattened.
+       */
+      flatten_cname?: boolean;
+
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface DNSKEYRecord {
@@ -5215,30 +10515,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a DNSKEY record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.DNSKEYRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a DNSKEY record.
      */
-    name: string;
+    data?: RecordEditParams.DNSKEYRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'DNSKEY';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.DNSKEYRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5252,6 +10553,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'DNSKEY';
   }
 
   export namespace DNSKEYRecord {
@@ -5279,6 +10585,27 @@ export namespace RecordEditParams {
        */
       public_key?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface DSRecord {
@@ -5288,30 +10615,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a DS record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.DSRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a DS record.
      */
-    name: string;
+    data?: RecordEditParams.DSRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'DS';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.DSRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5325,6 +10653,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'DS';
   }
 
   export namespace DSRecord {
@@ -5352,6 +10685,27 @@ export namespace RecordEditParams {
        */
       key_tag?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface HTTPSRecord {
@@ -5361,30 +10715,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a HTTPS record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.HTTPSRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a HTTPS record.
      */
-    name: string;
+    data?: RecordEditParams.HTTPSRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'HTTPS';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.HTTPSRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5398,6 +10753,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'HTTPS';
   }
 
   export namespace HTTPSRecord {
@@ -5420,6 +10780,27 @@ export namespace RecordEditParams {
        */
       value?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface LOCRecord {
@@ -5429,30 +10810,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a LOC record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.LOCRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a LOC record.
      */
-    name: string;
+    data?: RecordEditParams.LOCRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'LOC';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.LOCRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5466,6 +10848,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'LOC';
   }
 
   export namespace LOCRecord {
@@ -5533,6 +10920,27 @@ export namespace RecordEditParams {
        */
       size?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface MXRecord {
@@ -5541,37 +10949,38 @@ export namespace RecordEditParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
+     */
+    comment?: string;
+
     /**
      * Body param: A valid mail server hostname.
      */
-    content: string;
+    content?: string;
 
     /**
      * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    name: string;
+    name?: string;
 
     /**
      * Body param: Required for MX, SRV and URI records; unused by other record types.
      * Records with lower priorities are preferred.
      */
-    priority: number;
-
-    /**
-     * Body param: Record type.
-     */
-    type: 'MX';
+    priority?: number;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.MXRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5585,6 +10994,34 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'MX';
+  }
+
+  export namespace MXRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface NAPTRRecord {
@@ -5594,30 +11031,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a NAPTR record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.NAPTRRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a NAPTR record.
      */
-    name: string;
+    data?: RecordEditParams.NAPTRRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'NAPTR';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.NAPTRRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5631,6 +11069,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'NAPTR';
   }
 
   export namespace NAPTRRecord {
@@ -5668,6 +11111,27 @@ export namespace RecordEditParams {
        */
       service?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface NSRecord {
@@ -5676,25 +11140,80 @@ export namespace RecordEditParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
+     */
+    comment?: string;
+
     /**
      * Body param: A valid name server host name.
      */
-    content: string;
+    content?: string;
 
     /**
      * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    name: string;
+    name?: string;
+
+    /**
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
+     */
+    proxied?: boolean;
+
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordEditParams.NSRecord.Settings;
+
+    /**
+     * Body param: Custom tags for the DNS record. This field has no effect on DNS
+     * responses.
+     */
+    tags?: Array<RecordTagsParam>;
+
+    /**
+     * Body param: Time To Live (TTL) of the DNS record in seconds. Setting to 1 means
+     * 'automatic'. Value must be between 60 and 86400, with the minimum reduced to 30
+     * for Enterprise zones.
+     */
+    ttl?: TTLParam;
 
     /**
      * Body param: Record type.
      */
-    type: 'NS';
+    type?: 'NS';
+  }
 
+  export namespace NSRecord {
     /**
-     * Body param: Identifier
+     * Settings for the DNS record.
      */
-    id?: string;
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
+  }
+
+  export interface DNSRecordsOpenpgpkeyRecord {
+    /**
+     * Path param: Identifier
+     */
+    zone_id: string;
 
     /**
      * Body param: Comments or notes about the DNS record. This field has no effect on
@@ -5702,6 +11221,28 @@ export namespace RecordEditParams {
      */
     comment?: string;
 
+    /**
+     * Body param: A single Base64-encoded OpenPGP Transferable Public Key (RFC 4880
+     * Section 11.1)
+     */
+    content?: string;
+
+    /**
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     */
+    name?: string;
+
+    /**
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
+     */
+    proxied?: boolean;
+
+    /**
+     * Body param: Settings for the DNS record.
+     */
+    settings?: RecordEditParams.DNSRecordsOpenpgpkeyRecord.Settings;
+
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
      * responses.
@@ -5714,6 +11255,34 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'OPENPGPKEY';
+  }
+
+  export namespace DNSRecordsOpenpgpkeyRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface PTRRecord {
@@ -5723,30 +11292,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Domain name pointing to the address.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    content: string;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Domain name pointing to the address.
      */
-    name: string;
+    content?: string;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'PTR';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.PTRRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5760,6 +11330,34 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'PTR';
+  }
+
+  export namespace PTRRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface SMIMEARecord {
@@ -5769,30 +11367,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SMIMEA record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.SMIMEARecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a SMIMEA record.
      */
-    name: string;
+    data?: RecordEditParams.SMIMEARecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SMIMEA';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.SMIMEARecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5806,6 +11405,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SMIMEA';
   }
 
   export namespace SMIMEARecord {
@@ -5833,6 +11437,27 @@ export namespace RecordEditParams {
        */
       usage?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface SRVRecord {
@@ -5842,32 +11467,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SRV record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.SRVRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode. For SRV
-     * records, the first label is normally a service and the second a protocol name,
-     * each starting with an underscore.
+     * Body param: Components of a SRV record.
      */
-    name: string;
+    data?: RecordEditParams.SRVRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SRV';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.SRVRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5881,6 +11505,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SRV';
   }
 
   export namespace SRVRecord {
@@ -5888,13 +11517,6 @@ export namespace RecordEditParams {
      * Components of a SRV record.
      */
     export interface Data {
-      /**
-       * @deprecated: A valid hostname. Deprecated in favor of the regular 'name' outside
-       * the data map. This data map field represents the remainder of the full 'name'
-       * after the service and protocol.
-       */
-      name?: string;
-
       /**
        * The port of the service.
        */
@@ -5907,28 +11529,35 @@ export namespace RecordEditParams {
       priority?: number;
 
       /**
-       * @deprecated: A valid protocol, prefixed with an underscore. Deprecated in favor
-       * of the regular 'name' outside the data map. This data map field normally
-       * represents the second label of that 'name'.
+       * A valid hostname.
        */
-      proto?: string;
+      target?: string;
 
       /**
-       * @deprecated: A service type, prefixed with an underscore. Deprecated in favor of
-       * the regular 'name' outside the data map. This data map field normally represents
-       * the first label of that 'name'.
+       * The record weight.
        */
-      service?: string;
+      weight?: number;
+    }
 
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
       /**
-       * A valid hostname.
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
        */
-      target?: string;
+      ipv4_only?: boolean;
 
       /**
-       * The record weight.
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
        */
-      weight?: number;
+      ipv6_only?: boolean;
     }
   }
 
@@ -5939,30 +11568,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SSHFP record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.SSHFPRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a SSHFP record.
      */
-    name: string;
+    data?: RecordEditParams.SSHFPRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SSHFP';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.SSHFPRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -5976,6 +11606,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SSHFP';
   }
 
   export namespace SSHFPRecord {
@@ -5998,6 +11633,27 @@ export namespace RecordEditParams {
        */
       type?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface SVCBRecord {
@@ -6007,30 +11663,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a SVCB record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.SVCBRecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a SVCB record.
      */
-    name: string;
+    data?: RecordEditParams.SVCBRecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'SVCB';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.SVCBRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -6044,6 +11701,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'SVCB';
   }
 
   export namespace SVCBRecord {
@@ -6066,6 +11728,27 @@ export namespace RecordEditParams {
        */
       value?: string;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface TLSARecord {
@@ -6075,30 +11758,31 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Components of a TLSA record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    data: RecordEditParams.TLSARecord.Data;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Components of a TLSA record.
      */
-    name: string;
+    data?: RecordEditParams.TLSARecord.Data;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'TLSA';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.TLSARecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -6112,6 +11796,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'TLSA';
   }
 
   export namespace TLSARecord {
@@ -6139,6 +11828,27 @@ export namespace RecordEditParams {
        */
       usage?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface TXTRecord {
@@ -6148,30 +11858,36 @@ export namespace RecordEditParams {
     zone_id: string;
 
     /**
-     * Body param: Text content for the record.
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
      */
-    content: string;
+    comment?: string;
 
     /**
-     * Body param: DNS record name (or @ for the zone apex) in Punycode.
+     * Body param: Text content for the record. The content must consist of quoted
+     * "character strings" (RFC 1035), each with a length of up to 255 bytes. Strings
+     * exceeding this allowed maximum length are automatically split.
+     *
+     * Learn more at
+     * <https://www.cloudflare.com/learning/dns/dns-records/dns-txt-record/>.
      */
-    name: string;
+    content?: string;
 
     /**
-     * Body param: Record type.
+     * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    type: 'TXT';
+    name?: string;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.TXTRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -6185,6 +11901,34 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'TXT';
+  }
+
+  export namespace TXTRecord {
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 
   export interface URIRecord {
@@ -6193,37 +11937,38 @@ export namespace RecordEditParams {
      */
     zone_id: string;
 
+    /**
+     * Body param: Comments or notes about the DNS record. This field has no effect on
+     * DNS responses.
+     */
+    comment?: string;
+
     /**
      * Body param: Components of a URI record.
      */
-    data: RecordEditParams.URIRecord.Data;
+    data?: RecordEditParams.URIRecord.Data;
 
     /**
      * Body param: DNS record name (or @ for the zone apex) in Punycode.
      */
-    name: string;
+    name?: string;
 
     /**
      * Body param: Required for MX, SRV and URI records; unused by other record types.
      * Records with lower priorities are preferred.
      */
-    priority: number;
-
-    /**
-     * Body param: Record type.
-     */
-    type: 'URI';
+    priority?: number;
 
     /**
-     * Body param: Identifier
+     * Body param: Whether the record is receiving the performance and security
+     * benefits of Cloudflare.
      */
-    id?: string;
+    proxied?: boolean;
 
     /**
-     * Body param: Comments or notes about the DNS record. This field has no effect on
-     * DNS responses.
+     * Body param: Settings for the DNS record.
      */
-    comment?: string;
+    settings?: RecordEditParams.URIRecord.Settings;
 
     /**
      * Body param: Custom tags for the DNS record. This field has no effect on DNS
@@ -6237,6 +11982,11 @@ export namespace RecordEditParams {
      * for Enterprise zones.
      */
     ttl?: TTLParam;
+
+    /**
+     * Body param: Record type.
+     */
+    type?: 'URI';
   }
 
   export namespace URIRecord {
@@ -6254,6 +12004,27 @@ export namespace RecordEditParams {
        */
       weight?: number;
     }
+
+    /**
+     * Settings for the DNS record.
+     */
+    export interface Settings {
+      /**
+       * When enabled, only A records will be generated, and AAAA records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv4_only?: boolean;
+
+      /**
+       * When enabled, only AAAA records will be generated, and A records will not be
+       * created. This setting is intended for exceptional cases. Note that this option
+       * only applies to proxied records and it has no effect on whether Cloudflare
+       * communicates with the origin using IPv4 or IPv6.
+       */
+      ipv6_only?: boolean;
+    }
   }
 }
 
@@ -6306,44 +12077,51 @@ export interface RecordScanParams {
   body: unknown;
 }
 
-export namespace Records {
-  export import ARecord = RecordsAPI.ARecord;
-  export import AAAARecord = RecordsAPI.AAAARecord;
-  export import CAARecord = RecordsAPI.CAARecord;
-  export import CERTRecord = RecordsAPI.CERTRecord;
-  export import CNAMERecord = RecordsAPI.CNAMERecord;
-  export import DNSKEYRecord = RecordsAPI.DNSKEYRecord;
-  export import DSRecord = RecordsAPI.DSRecord;
-  export import HTTPSRecord = RecordsAPI.HTTPSRecord;
-  export import LOCRecord = RecordsAPI.LOCRecord;
-  export import MXRecord = RecordsAPI.MXRecord;
-  export import NAPTRRecord = RecordsAPI.NAPTRRecord;
-  export import NSRecord = RecordsAPI.NSRecord;
-  export import PTRRecord = RecordsAPI.PTRRecord;
-  export import Record = RecordsAPI.Record;
-  export import RecordMetadata = RecordsAPI.RecordMetadata;
-  export import RecordProcessTiming = RecordsAPI.RecordProcessTiming;
-  export import RecordTags = RecordsAPI.RecordTags;
-  export import SMIMEARecord = RecordsAPI.SMIMEARecord;
-  export import SRVRecord = RecordsAPI.SRVRecord;
-  export import SSHFPRecord = RecordsAPI.SSHFPRecord;
-  export import SVCBRecord = RecordsAPI.SVCBRecord;
-  export import TLSARecord = RecordsAPI.TLSARecord;
-  export import TTL = RecordsAPI.TTL;
-  export import TXTRecord = RecordsAPI.TXTRecord;
-  export import URIRecord = RecordsAPI.URIRecord;
-  export import RecordDeleteResponse = RecordsAPI.RecordDeleteResponse;
-  export import RecordExportResponse = RecordsAPI.RecordExportResponse;
-  export import RecordImportResponse = RecordsAPI.RecordImportResponse;
-  export import RecordScanResponse = RecordsAPI.RecordScanResponse;
-  export import RecordsV4PagePaginationArray = RecordsAPI.RecordsV4PagePaginationArray;
-  export import RecordCreateParams = RecordsAPI.RecordCreateParams;
-  export import RecordUpdateParams = RecordsAPI.RecordUpdateParams;
-  export import RecordListParams = RecordsAPI.RecordListParams;
-  export import RecordDeleteParams = RecordsAPI.RecordDeleteParams;
-  export import RecordEditParams = RecordsAPI.RecordEditParams;
-  export import RecordExportParams = RecordsAPI.RecordExportParams;
-  export import RecordGetParams = RecordsAPI.RecordGetParams;
-  export import RecordImportParams = RecordsAPI.RecordImportParams;
-  export import RecordScanParams = RecordsAPI.RecordScanParams;
+Records.RecordResponsesV4PagePaginationArray = RecordResponsesV4PagePaginationArray;
+
+export declare namespace Records {
+  export {
+    type ARecord as ARecord,
+    type AAAARecord as AAAARecord,
+    type BatchPatch as BatchPatch,
+    type BatchPut as BatchPut,
+    type CAARecord as CAARecord,
+    type CERTRecord as CERTRecord,
+    type CNAMERecord as CNAMERecord,
+    type DNSKEYRecord as DNSKEYRecord,
+    type DSRecord as DSRecord,
+    type HTTPSRecord as HTTPSRecord,
+    type LOCRecord as LOCRecord,
+    type MXRecord as MXRecord,
+    type NAPTRRecord as NAPTRRecord,
+    type NSRecord as NSRecord,
+    type PTRRecord as PTRRecord,
+    type Record as Record,
+    type RecordResponse as RecordResponse,
+    type RecordTags as RecordTags,
+    type SMIMEARecord as SMIMEARecord,
+    type SRVRecord as SRVRecord,
+    type SSHFPRecord as SSHFPRecord,
+    type SVCBRecord as SVCBRecord,
+    type TLSARecord as TLSARecord,
+    type TTL as TTL,
+    type TXTRecord as TXTRecord,
+    type URIRecord as URIRecord,
+    type RecordDeleteResponse as RecordDeleteResponse,
+    type RecordBatchResponse as RecordBatchResponse,
+    type RecordExportResponse as RecordExportResponse,
+    type RecordImportResponse as RecordImportResponse,
+    type RecordScanResponse as RecordScanResponse,
+    RecordResponsesV4PagePaginationArray as RecordResponsesV4PagePaginationArray,
+    type RecordCreateParams as RecordCreateParams,
+    type RecordUpdateParams as RecordUpdateParams,
+    type RecordListParams as RecordListParams,
+    type RecordDeleteParams as RecordDeleteParams,
+    type RecordBatchParams as RecordBatchParams,
+    type RecordEditParams as RecordEditParams,
+    type RecordExportParams as RecordExportParams,
+    type RecordGetParams as RecordGetParams,
+    type RecordImportParams as RecordImportParams,
+    type RecordScanParams as RecordScanParams,
+  };
 }
diff --git a/src/resources/dns/settings.ts b/src/resources/dns/settings.ts
deleted file mode 100644
index c9c2ff6ec5..0000000000
--- a/src/resources/dns/settings.ts
+++ /dev/null
@@ -1,314 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../resource';
-import { isRequestOptions } from '../../core';
-import * as Core from '../../core';
-import { CloudflareError } from '../../error';
-import * as SettingsAPI from './settings';
-
-export class Settings extends APIResource {
-  /**
-   * Update DNS settings for an account or zone
-   */
-  edit(params: SettingEditParams, options?: Core.RequestOptions): Core.APIPromise<SettingEditResponse> {
-    const { account_id, zone_id, ...body } = params;
-    if (!account_id && !zone_id) {
-      throw new CloudflareError('You must provide either account_id or zone_id.');
-    }
-    if (account_id && zone_id) {
-      throw new CloudflareError('You cannot provide both account_id and zone_id.');
-    }
-    const { accountOrZone, accountOrZoneId } =
-      account_id ?
-        {
-          accountOrZone: 'accounts',
-          accountOrZoneId: account_id,
-        }
-      : {
-          accountOrZone: 'zones',
-          accountOrZoneId: zone_id,
-        };
-    return (
-      this._client.patch(`/${accountOrZone}/${accountOrZoneId}/dns_settings`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: SettingEditResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Show DNS settings for an account or zone
-   */
-  get(params?: SettingGetParams, options?: Core.RequestOptions): Core.APIPromise<SettingGetResponse>;
-  get(options?: Core.RequestOptions): Core.APIPromise<SettingGetResponse>;
-  get(
-    params: SettingGetParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SettingGetResponse> {
-    if (isRequestOptions(params)) {
-      return this.get({}, params);
-    }
-    const { account_id, zone_id } = params;
-    if (!account_id && !zone_id) {
-      throw new CloudflareError('You must provide either account_id or zone_id.');
-    }
-    if (account_id && zone_id) {
-      throw new CloudflareError('You cannot provide both account_id and zone_id.');
-    }
-    const { accountOrZone, accountOrZoneId } =
-      account_id ?
-        {
-          accountOrZone: 'accounts',
-          accountOrZoneId: account_id,
-        }
-      : {
-          accountOrZone: 'zones',
-          accountOrZoneId: zone_id,
-        };
-    return (
-      this._client.get(`/${accountOrZone}/${accountOrZoneId}/dns_settings`, options) as Core.APIPromise<{
-        result: SettingGetResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export interface DNSSetting {
-  /**
-   * Whether to enable Foundation DNS Advanced Nameservers on the zone.
-   */
-  foundation_dns?: boolean;
-
-  /**
-   * Whether to enable multi-provider DNS, which causes Cloudflare to activate the
-   * zone even when non-Cloudflare NS records exist, and to respect NS records at the
-   * zone apex during outbound zone transfers.
-   */
-  multi_provider?: boolean;
-
-  /**
-   * Settings determining the nameservers through which the zone should be available.
-   */
-  nameservers?: Nameserver;
-
-  /**
-   * The time to live (TTL) of the zone's nameserver (NS) records.
-   */
-  ns_ttl?: number;
-
-  /**
-   * Allows a Secondary DNS zone to use (proxied) override records and CNAME
-   * flattening at the zone apex.
-   */
-  secondary_overrides?: boolean;
-
-  /**
-   * Components of the zone's SOA record.
-   */
-  soa?: DNSSetting.SOA;
-
-  /**
-   * Whether the zone mode is a regular or CDN/DNS only zone.
-   */
-  zone_mode?: 'standard' | 'cdn_only' | 'dns_only';
-}
-
-export namespace DNSSetting {
-  /**
-   * Components of the zone's SOA record.
-   */
-  export interface SOA {
-    /**
-     * Time in seconds of being unable to query the primary server after which
-     * secondary servers should stop serving the zone.
-     */
-    expire: number;
-
-    /**
-     * The time to live (TTL) for negative caching of records within the zone.
-     */
-    min_ttl: number;
-
-    /**
-     * The primary nameserver, which may be used for outbound zone transfers.
-     */
-    mname: string;
-
-    /**
-     * Time in seconds after which secondary servers should re-check the SOA record to
-     * see if the zone has been updated.
-     */
-    refresh: number;
-
-    /**
-     * Time in seconds after which secondary servers should retry queries after the
-     * primary server was unresponsive.
-     */
-    retry: number;
-
-    /**
-     * The email address of the zone administrator, with the first label representing
-     * the local part of the email address.
-     */
-    rname: string;
-
-    /**
-     * The time to live (TTL) of the SOA record itself.
-     */
-    ttl: number;
-  }
-}
-
-export interface DNSSettingParam {
-  /**
-   * Whether to enable Foundation DNS Advanced Nameservers on the zone.
-   */
-  foundation_dns?: boolean;
-
-  /**
-   * Whether to enable multi-provider DNS, which causes Cloudflare to activate the
-   * zone even when non-Cloudflare NS records exist, and to respect NS records at the
-   * zone apex during outbound zone transfers.
-   */
-  multi_provider?: boolean;
-
-  /**
-   * Settings determining the nameservers through which the zone should be available.
-   */
-  nameservers?: NameserverParam;
-
-  /**
-   * The time to live (TTL) of the zone's nameserver (NS) records.
-   */
-  ns_ttl?: number;
-
-  /**
-   * Allows a Secondary DNS zone to use (proxied) override records and CNAME
-   * flattening at the zone apex.
-   */
-  secondary_overrides?: boolean;
-
-  /**
-   * Components of the zone's SOA record.
-   */
-  soa?: DNSSettingParam.SOA;
-
-  /**
-   * Whether the zone mode is a regular or CDN/DNS only zone.
-   */
-  zone_mode?: 'standard' | 'cdn_only' | 'dns_only';
-}
-
-export namespace DNSSettingParam {
-  /**
-   * Components of the zone's SOA record.
-   */
-  export interface SOA {
-    /**
-     * Time in seconds of being unable to query the primary server after which
-     * secondary servers should stop serving the zone.
-     */
-    expire: number;
-
-    /**
-     * The time to live (TTL) for negative caching of records within the zone.
-     */
-    min_ttl: number;
-
-    /**
-     * The primary nameserver, which may be used for outbound zone transfers.
-     */
-    mname: string;
-
-    /**
-     * Time in seconds after which secondary servers should re-check the SOA record to
-     * see if the zone has been updated.
-     */
-    refresh: number;
-
-    /**
-     * Time in seconds after which secondary servers should retry queries after the
-     * primary server was unresponsive.
-     */
-    retry: number;
-
-    /**
-     * The email address of the zone administrator, with the first label representing
-     * the local part of the email address.
-     */
-    rname: string;
-
-    /**
-     * The time to live (TTL) of the SOA record itself.
-     */
-    ttl: number;
-  }
-}
-
-/**
- * Settings determining the nameservers through which the zone should be available.
- */
-export interface Nameserver {
-  /**
-   * Nameserver type
-   */
-  type: 'cloudflare.standard';
-}
-
-/**
- * Settings determining the nameservers through which the zone should be available.
- */
-export interface NameserverParam {
-  /**
-   * Nameserver type
-   */
-  type: 'cloudflare.standard';
-}
-
-export interface SettingEditResponse {
-  zone_defaults?: DNSSetting;
-}
-
-export interface SettingGetResponse {
-  zone_defaults?: DNSSetting;
-}
-
-export interface SettingEditParams {
-  /**
-   * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
-   * Zone ID.
-   */
-  account_id?: string;
-
-  /**
-   * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
-   * Account ID.
-   */
-  zone_id?: string;
-
-  /**
-   * Body param:
-   */
-  zone_defaults?: DNSSettingParam;
-}
-
-export interface SettingGetParams {
-  /**
-   * The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
-   */
-  account_id?: string;
-
-  /**
-   * The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
-   */
-  zone_id?: string;
-}
-
-export namespace Settings {
-  export import DNSSetting = SettingsAPI.DNSSetting;
-  export import Nameserver = SettingsAPI.Nameserver;
-  export import SettingEditResponse = SettingsAPI.SettingEditResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
-}
diff --git a/src/resources/dns/settings/index.ts b/src/resources/dns/settings/index.ts
new file mode 100644
index 0000000000..2cd53dbf09
--- /dev/null
+++ b/src/resources/dns/settings/index.ts
@@ -0,0 +1,24 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  Settings,
+  type DNSSetting,
+  type SettingEditResponse,
+  type SettingGetResponse,
+  type SettingEditParams,
+  type SettingGetParams,
+} from './settings';
+export {
+  ViewListResponsesV4PagePaginationArray,
+  Views,
+  type ViewCreateResponse,
+  type ViewListResponse,
+  type ViewDeleteResponse,
+  type ViewEditResponse,
+  type ViewGetResponse,
+  type ViewCreateParams,
+  type ViewListParams,
+  type ViewDeleteParams,
+  type ViewEditParams,
+  type ViewGetParams,
+} from './views';
diff --git a/src/resources/dns/settings/settings.ts b/src/resources/dns/settings/settings.ts
new file mode 100644
index 0000000000..d9460abb7e
--- /dev/null
+++ b/src/resources/dns/settings/settings.ts
@@ -0,0 +1,556 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import { isRequestOptions } from '../../../core';
+import * as Core from '../../../core';
+import { CloudflareError } from 'cloudflare/error';
+import * as ViewsAPI from './views';
+import {
+  ViewCreateParams,
+  ViewCreateResponse,
+  ViewDeleteParams,
+  ViewDeleteResponse,
+  ViewEditParams,
+  ViewEditResponse,
+  ViewGetParams,
+  ViewGetResponse,
+  ViewListParams,
+  ViewListResponse,
+  ViewListResponsesV4PagePaginationArray,
+  Views,
+} from './views';
+
+export class Settings extends APIResource {
+  views: ViewsAPI.Views = new ViewsAPI.Views(this._client);
+
+  /**
+   * Update DNS settings for an account or zone
+   */
+  edit(params: SettingEditParams, options?: Core.RequestOptions): Core.APIPromise<SettingEditResponse> {
+    const { account_id, zone_id, ...body } = params;
+    if (!account_id && !zone_id) {
+      throw new CloudflareError('You must provide either account_id or zone_id.');
+    }
+    if (account_id && zone_id) {
+      throw new CloudflareError('You cannot provide both account_id and zone_id.');
+    }
+    const { accountOrZone, accountOrZoneId } =
+      account_id ?
+        {
+          accountOrZone: 'accounts',
+          accountOrZoneId: account_id,
+        }
+      : {
+          accountOrZone: 'zones',
+          accountOrZoneId: zone_id,
+        };
+    return (
+      this._client.patch(`/${accountOrZone}/${accountOrZoneId}/dns_settings`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: SettingEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Show DNS settings for an account or zone
+   */
+  get(params?: SettingGetParams, options?: Core.RequestOptions): Core.APIPromise<SettingGetResponse>;
+  get(options?: Core.RequestOptions): Core.APIPromise<SettingGetResponse>;
+  get(
+    params: SettingGetParams | Core.RequestOptions = {},
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SettingGetResponse> {
+    if (isRequestOptions(params)) {
+      return this.get({}, params);
+    }
+    const { account_id, zone_id } = params;
+    if (!account_id && !zone_id) {
+      throw new CloudflareError('You must provide either account_id or zone_id.');
+    }
+    if (account_id && zone_id) {
+      throw new CloudflareError('You cannot provide both account_id and zone_id.');
+    }
+    const { accountOrZone, accountOrZoneId } =
+      account_id ?
+        {
+          accountOrZone: 'accounts',
+          accountOrZoneId: account_id,
+        }
+      : {
+          accountOrZone: 'zones',
+          accountOrZoneId: zone_id,
+        };
+    return (
+      this._client.get(`/${accountOrZone}/${accountOrZoneId}/dns_settings`, options) as Core.APIPromise<{
+        result: SettingGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface DNSSetting {
+  /**
+   * Whether to flatten all CNAME records in the zone. Note that, due to DNS
+   * limitations, a CNAME record at the zone apex will always be flattened.
+   */
+  flatten_all_cnames?: boolean;
+
+  /**
+   * Whether to enable Foundation DNS Advanced Nameservers on the zone.
+   */
+  foundation_dns?: boolean;
+
+  /**
+   * Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+   * zone even when non-Cloudflare NS records exist, and to respect NS records at the
+   * zone apex during outbound zone transfers.
+   */
+  multi_provider?: boolean;
+
+  /**
+   * The time to live (TTL) of the zone's nameserver (NS) records.
+   */
+  ns_ttl?: number;
+
+  /**
+   * Allows a Secondary DNS zone to use (proxied) override records and CNAME
+   * flattening at the zone apex.
+   */
+  secondary_overrides?: boolean;
+
+  /**
+   * Components of the zone's SOA record.
+   */
+  soa?: DNSSetting.SOA;
+
+  /**
+   * Whether the zone mode is a regular or CDN/DNS only zone.
+   */
+  zone_mode?: 'standard' | 'cdn_only' | 'dns_only';
+}
+
+export namespace DNSSetting {
+  /**
+   * Components of the zone's SOA record.
+   */
+  export interface SOA {
+    /**
+     * Time in seconds of being unable to query the primary server after which
+     * secondary servers should stop serving the zone.
+     */
+    expire: number;
+
+    /**
+     * The time to live (TTL) for negative caching of records within the zone.
+     */
+    min_ttl: number;
+
+    /**
+     * The primary nameserver, which may be used for outbound zone transfers.
+     */
+    mname: string;
+
+    /**
+     * Time in seconds after which secondary servers should re-check the SOA record to
+     * see if the zone has been updated.
+     */
+    refresh: number;
+
+    /**
+     * Time in seconds after which secondary servers should retry queries after the
+     * primary server was unresponsive.
+     */
+    retry: number;
+
+    /**
+     * The email address of the zone administrator, with the first label representing
+     * the local part of the email address.
+     */
+    rname: string;
+
+    /**
+     * The time to live (TTL) of the SOA record itself.
+     */
+    ttl: number;
+  }
+}
+
+export interface SettingEditResponse {
+  zone_defaults?: SettingEditResponse.ZoneDefaults;
+}
+
+export namespace SettingEditResponse {
+  export interface ZoneDefaults {
+    /**
+     * Whether to flatten all CNAME records in the zone. Note that, due to DNS
+     * limitations, a CNAME record at the zone apex will always be flattened.
+     */
+    flatten_all_cnames?: boolean;
+
+    /**
+     * Whether to enable Foundation DNS Advanced Nameservers on the zone.
+     */
+    foundation_dns?: boolean;
+
+    /**
+     * Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+     * zone even when non-Cloudflare NS records exist, and to respect NS records at the
+     * zone apex during outbound zone transfers.
+     */
+    multi_provider?: boolean;
+
+    /**
+     * Settings determining the nameservers through which the zone should be available.
+     */
+    nameservers?: ZoneDefaults.Nameservers;
+
+    /**
+     * The time to live (TTL) of the zone's nameserver (NS) records.
+     */
+    ns_ttl?: number;
+
+    /**
+     * Allows a Secondary DNS zone to use (proxied) override records and CNAME
+     * flattening at the zone apex.
+     */
+    secondary_overrides?: boolean;
+
+    /**
+     * Components of the zone's SOA record.
+     */
+    soa?: ZoneDefaults.SOA;
+
+    /**
+     * Whether the zone mode is a regular or CDN/DNS only zone.
+     */
+    zone_mode?: 'standard' | 'cdn_only' | 'dns_only';
+  }
+
+  export namespace ZoneDefaults {
+    /**
+     * Settings determining the nameservers through which the zone should be available.
+     */
+    export interface Nameservers {
+      /**
+       * Nameserver type
+       */
+      type: 'cloudflare.standard' | 'cloudflare.standard.random' | 'custom.account' | 'custom.tenant';
+    }
+
+    /**
+     * Components of the zone's SOA record.
+     */
+    export interface SOA {
+      /**
+       * Time in seconds of being unable to query the primary server after which
+       * secondary servers should stop serving the zone.
+       */
+      expire: number;
+
+      /**
+       * The time to live (TTL) for negative caching of records within the zone.
+       */
+      min_ttl: number;
+
+      /**
+       * The primary nameserver, which may be used for outbound zone transfers.
+       */
+      mname: string;
+
+      /**
+       * Time in seconds after which secondary servers should re-check the SOA record to
+       * see if the zone has been updated.
+       */
+      refresh: number;
+
+      /**
+       * Time in seconds after which secondary servers should retry queries after the
+       * primary server was unresponsive.
+       */
+      retry: number;
+
+      /**
+       * The email address of the zone administrator, with the first label representing
+       * the local part of the email address.
+       */
+      rname: string;
+
+      /**
+       * The time to live (TTL) of the SOA record itself.
+       */
+      ttl: number;
+    }
+  }
+}
+
+export interface SettingGetResponse {
+  zone_defaults?: SettingGetResponse.ZoneDefaults;
+}
+
+export namespace SettingGetResponse {
+  export interface ZoneDefaults {
+    /**
+     * Whether to flatten all CNAME records in the zone. Note that, due to DNS
+     * limitations, a CNAME record at the zone apex will always be flattened.
+     */
+    flatten_all_cnames?: boolean;
+
+    /**
+     * Whether to enable Foundation DNS Advanced Nameservers on the zone.
+     */
+    foundation_dns?: boolean;
+
+    /**
+     * Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+     * zone even when non-Cloudflare NS records exist, and to respect NS records at the
+     * zone apex during outbound zone transfers.
+     */
+    multi_provider?: boolean;
+
+    /**
+     * Settings determining the nameservers through which the zone should be available.
+     */
+    nameservers?: ZoneDefaults.Nameservers;
+
+    /**
+     * The time to live (TTL) of the zone's nameserver (NS) records.
+     */
+    ns_ttl?: number;
+
+    /**
+     * Allows a Secondary DNS zone to use (proxied) override records and CNAME
+     * flattening at the zone apex.
+     */
+    secondary_overrides?: boolean;
+
+    /**
+     * Components of the zone's SOA record.
+     */
+    soa?: ZoneDefaults.SOA;
+
+    /**
+     * Whether the zone mode is a regular or CDN/DNS only zone.
+     */
+    zone_mode?: 'standard' | 'cdn_only' | 'dns_only';
+  }
+
+  export namespace ZoneDefaults {
+    /**
+     * Settings determining the nameservers through which the zone should be available.
+     */
+    export interface Nameservers {
+      /**
+       * Nameserver type
+       */
+      type: 'cloudflare.standard' | 'cloudflare.standard.random' | 'custom.account' | 'custom.tenant';
+    }
+
+    /**
+     * Components of the zone's SOA record.
+     */
+    export interface SOA {
+      /**
+       * Time in seconds of being unable to query the primary server after which
+       * secondary servers should stop serving the zone.
+       */
+      expire: number;
+
+      /**
+       * The time to live (TTL) for negative caching of records within the zone.
+       */
+      min_ttl: number;
+
+      /**
+       * The primary nameserver, which may be used for outbound zone transfers.
+       */
+      mname: string;
+
+      /**
+       * Time in seconds after which secondary servers should re-check the SOA record to
+       * see if the zone has been updated.
+       */
+      refresh: number;
+
+      /**
+       * Time in seconds after which secondary servers should retry queries after the
+       * primary server was unresponsive.
+       */
+      retry: number;
+
+      /**
+       * The email address of the zone administrator, with the first label representing
+       * the local part of the email address.
+       */
+      rname: string;
+
+      /**
+       * The time to live (TTL) of the SOA record itself.
+       */
+      ttl: number;
+    }
+  }
+}
+
+export interface SettingEditParams {
+  /**
+   * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
+   * Zone ID.
+   */
+  account_id?: string;
+
+  /**
+   * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
+   * Account ID.
+   */
+  zone_id?: string;
+
+  /**
+   * Body param:
+   */
+  zone_defaults?: SettingEditParams.ZoneDefaults;
+}
+
+export namespace SettingEditParams {
+  export interface ZoneDefaults {
+    /**
+     * Whether to flatten all CNAME records in the zone. Note that, due to DNS
+     * limitations, a CNAME record at the zone apex will always be flattened.
+     */
+    flatten_all_cnames?: boolean;
+
+    /**
+     * Whether to enable Foundation DNS Advanced Nameservers on the zone.
+     */
+    foundation_dns?: boolean;
+
+    /**
+     * Whether to enable multi-provider DNS, which causes Cloudflare to activate the
+     * zone even when non-Cloudflare NS records exist, and to respect NS records at the
+     * zone apex during outbound zone transfers.
+     */
+    multi_provider?: boolean;
+
+    /**
+     * Settings determining the nameservers through which the zone should be available.
+     */
+    nameservers?: ZoneDefaults.Nameservers;
+
+    /**
+     * The time to live (TTL) of the zone's nameserver (NS) records.
+     */
+    ns_ttl?: number;
+
+    /**
+     * Allows a Secondary DNS zone to use (proxied) override records and CNAME
+     * flattening at the zone apex.
+     */
+    secondary_overrides?: boolean;
+
+    /**
+     * Components of the zone's SOA record.
+     */
+    soa?: ZoneDefaults.SOA;
+
+    /**
+     * Whether the zone mode is a regular or CDN/DNS only zone.
+     */
+    zone_mode?: 'standard' | 'cdn_only' | 'dns_only';
+  }
+
+  export namespace ZoneDefaults {
+    /**
+     * Settings determining the nameservers through which the zone should be available.
+     */
+    export interface Nameservers {
+      /**
+       * Nameserver type
+       */
+      type: 'cloudflare.standard' | 'cloudflare.standard.random' | 'custom.account' | 'custom.tenant';
+    }
+
+    /**
+     * Components of the zone's SOA record.
+     */
+    export interface SOA {
+      /**
+       * Time in seconds of being unable to query the primary server after which
+       * secondary servers should stop serving the zone.
+       */
+      expire: number;
+
+      /**
+       * The time to live (TTL) for negative caching of records within the zone.
+       */
+      min_ttl: number;
+
+      /**
+       * The primary nameserver, which may be used for outbound zone transfers.
+       */
+      mname: string;
+
+      /**
+       * Time in seconds after which secondary servers should re-check the SOA record to
+       * see if the zone has been updated.
+       */
+      refresh: number;
+
+      /**
+       * Time in seconds after which secondary servers should retry queries after the
+       * primary server was unresponsive.
+       */
+      retry: number;
+
+      /**
+       * The email address of the zone administrator, with the first label representing
+       * the local part of the email address.
+       */
+      rname: string;
+
+      /**
+       * The time to live (TTL) of the SOA record itself.
+       */
+      ttl: number;
+    }
+  }
+}
+
+export interface SettingGetParams {
+  /**
+   * The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+   */
+  account_id?: string;
+
+  /**
+   * The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+   */
+  zone_id?: string;
+}
+
+Settings.Views = Views;
+Settings.ViewListResponsesV4PagePaginationArray = ViewListResponsesV4PagePaginationArray;
+
+export declare namespace Settings {
+  export {
+    type DNSSetting as DNSSetting,
+    type SettingEditResponse as SettingEditResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingEditParams as SettingEditParams,
+    type SettingGetParams as SettingGetParams,
+  };
+
+  export {
+    Views as Views,
+    type ViewCreateResponse as ViewCreateResponse,
+    type ViewListResponse as ViewListResponse,
+    type ViewDeleteResponse as ViewDeleteResponse,
+    type ViewEditResponse as ViewEditResponse,
+    type ViewGetResponse as ViewGetResponse,
+    ViewListResponsesV4PagePaginationArray as ViewListResponsesV4PagePaginationArray,
+    type ViewCreateParams as ViewCreateParams,
+    type ViewListParams as ViewListParams,
+    type ViewDeleteParams as ViewDeleteParams,
+    type ViewEditParams as ViewEditParams,
+    type ViewGetParams as ViewGetParams,
+  };
+}
diff --git a/src/resources/dns/settings/views.ts b/src/resources/dns/settings/views.ts
new file mode 100644
index 0000000000..a6cf88d7a8
--- /dev/null
+++ b/src/resources/dns/settings/views.ts
@@ -0,0 +1,331 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
+
+export class Views extends APIResource {
+  /**
+   * Create Internal DNS View for an account
+   */
+  create(params: ViewCreateParams, options?: Core.RequestOptions): Core.APIPromise<ViewCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/dns_settings/views`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: ViewCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List DNS Internal Views for an Account
+   */
+  list(
+    params: ViewListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<ViewListResponsesV4PagePaginationArray, ViewListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/dns_settings/views`,
+      ViewListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Delete an existing Internal DNS View
+   */
+  delete(
+    viewId: string,
+    params: ViewDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ViewDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/dns_settings/views/${viewId}`,
+        options,
+      ) as Core.APIPromise<{ result: ViewDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update an existing Internal DNS View
+   */
+  edit(
+    viewId: string,
+    params: ViewEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ViewEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/dns_settings/views/${viewId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: ViewEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get DNS Internal View
+   */
+  get(
+    viewId: string,
+    params: ViewGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ViewGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/dns_settings/views/${viewId}`, options) as Core.APIPromise<{
+        result: ViewGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class ViewListResponsesV4PagePaginationArray extends V4PagePaginationArray<ViewListResponse> {}
+
+export interface ViewCreateResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  /**
+   * When the view was created.
+   */
+  created_time: string;
+
+  /**
+   * When the view was last modified.
+   */
+  modified_time: string;
+
+  /**
+   * The name of the view.
+   */
+  name: string;
+
+  /**
+   * The list of zones linked to this view.
+   */
+  zones: Array<string>;
+}
+
+export interface ViewListResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  /**
+   * When the view was created.
+   */
+  created_time: string;
+
+  /**
+   * When the view was last modified.
+   */
+  modified_time: string;
+
+  /**
+   * The name of the view.
+   */
+  name: string;
+
+  /**
+   * The list of zones linked to this view.
+   */
+  zones: Array<string>;
+}
+
+export interface ViewDeleteResponse {
+  /**
+   * Identifier
+   */
+  id?: string;
+}
+
+export interface ViewEditResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  /**
+   * When the view was created.
+   */
+  created_time: string;
+
+  /**
+   * When the view was last modified.
+   */
+  modified_time: string;
+
+  /**
+   * The name of the view.
+   */
+  name: string;
+
+  /**
+   * The list of zones linked to this view.
+   */
+  zones: Array<string>;
+}
+
+export interface ViewGetResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  /**
+   * When the view was created.
+   */
+  created_time: string;
+
+  /**
+   * When the view was last modified.
+   */
+  modified_time: string;
+
+  /**
+   * The name of the view.
+   */
+  name: string;
+
+  /**
+   * The list of zones linked to this view.
+   */
+  zones: Array<string>;
+}
+
+export interface ViewCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: The name of the view.
+   */
+  name?: string;
+
+  /**
+   * Body param: The list of zones linked to this view.
+   */
+  zones?: Array<string>;
+}
+
+export interface ViewListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param: Direction to order DNS views in.
+   */
+  direction?: 'asc' | 'desc';
+
+  /**
+   * Query param: Whether to match all search requirements or at least one (any). If
+   * set to `all`, acts like a logical AND between filters. If set to `any`, acts
+   * like a logical OR instead.
+   */
+  match?: 'any' | 'all';
+
+  /**
+   * Query param:
+   */
+  name?: ViewListParams.Name;
+
+  /**
+   * Query param: Field to order DNS views by.
+   */
+  order?: 'name' | 'created_on' | 'modified_on';
+
+  /**
+   * Query param: A zone ID that exists in the zones list for the view.
+   */
+  zone_id?: string;
+
+  /**
+   * Query param: A zone name that exists in the zones list for the view.
+   */
+  zone_name?: string;
+}
+
+export namespace ViewListParams {
+  export interface Name {
+    /**
+     * Substring of the DNS view name.
+     */
+    contains?: string;
+
+    /**
+     * Suffix of the DNS view name.
+     */
+    endswith?: string;
+
+    /**
+     * Exact value of the DNS view name.
+     */
+    exact?: string;
+
+    /**
+     * Prefix of the DNS view name.
+     */
+    startswith?: string;
+  }
+}
+
+export interface ViewDeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface ViewEditParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: The name of the view.
+   */
+  name?: string;
+
+  /**
+   * Body param: The list of zones linked to this view.
+   */
+  zones?: Array<string>;
+}
+
+export interface ViewGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+Views.ViewListResponsesV4PagePaginationArray = ViewListResponsesV4PagePaginationArray;
+
+export declare namespace Views {
+  export {
+    type ViewCreateResponse as ViewCreateResponse,
+    type ViewListResponse as ViewListResponse,
+    type ViewDeleteResponse as ViewDeleteResponse,
+    type ViewEditResponse as ViewEditResponse,
+    type ViewGetResponse as ViewGetResponse,
+    ViewListResponsesV4PagePaginationArray as ViewListResponsesV4PagePaginationArray,
+    type ViewCreateParams as ViewCreateParams,
+    type ViewListParams as ViewListParams,
+    type ViewDeleteParams as ViewDeleteParams,
+    type ViewEditParams as ViewEditParams,
+    type ViewGetParams as ViewGetParams,
+  };
+}
diff --git a/src/resources/secondary-dns/acls.ts b/src/resources/dns/zone-transfers/acls.ts
similarity index 75%
rename from src/resources/secondary-dns/acls.ts
rename to src/resources/dns/zone-transfers/acls.ts
index 9cc90149b8..95ffb2e64a 100644
--- a/src/resources/secondary-dns/acls.ts
+++ b/src/resources/dns/zone-transfers/acls.ts
@@ -1,19 +1,18 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as ACLsAPI from './acls';
-import { SinglePage } from '../../pagination';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { SinglePage } from '../../../pagination';
 
 export class ACLs extends APIResource {
   /**
    * Create ACL.
    */
   create(params: ACLCreateParams, options?: Core.RequestOptions): Core.APIPromise<ACL> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/secondary_dns/acls`, {
-        body: body,
+        body,
         ...options,
       }) as Core.APIPromise<{ result: ACL }>
     )._thenUnwrap((obj) => obj.result);
@@ -100,9 +99,18 @@ export interface ACLCreateParams {
   account_id: string;
 
   /**
-   * Body param:
+   * Body param: Allowed IPv4/IPv6 address range of primary or secondary nameservers.
+   * This will be applied for the entire account. The IP range is used to allow
+   * additional NOTIFY IPs for secondary zones and IPs Cloudflare allows AXFR/IXFR
+   * requests from for primary zones. CIDRs are limited to a maximum of /24 for IPv4
+   * and /64 for IPv6 respectively.
    */
-  body: unknown;
+  ip_range: string;
+
+  /**
+   * Body param: The name of the acl.
+   */
+  name: string;
 }
 
 export interface ACLUpdateParams {
@@ -138,13 +146,17 @@ export interface ACLGetParams {
   account_id: string;
 }
 
-export namespace ACLs {
-  export import ACL = ACLsAPI.ACL;
-  export import ACLDeleteResponse = ACLsAPI.ACLDeleteResponse;
-  export import ACLsSinglePage = ACLsAPI.ACLsSinglePage;
-  export import ACLCreateParams = ACLsAPI.ACLCreateParams;
-  export import ACLUpdateParams = ACLsAPI.ACLUpdateParams;
-  export import ACLListParams = ACLsAPI.ACLListParams;
-  export import ACLDeleteParams = ACLsAPI.ACLDeleteParams;
-  export import ACLGetParams = ACLsAPI.ACLGetParams;
+ACLs.ACLsSinglePage = ACLsSinglePage;
+
+export declare namespace ACLs {
+  export {
+    type ACL as ACL,
+    type ACLDeleteResponse as ACLDeleteResponse,
+    ACLsSinglePage as ACLsSinglePage,
+    type ACLCreateParams as ACLCreateParams,
+    type ACLUpdateParams as ACLUpdateParams,
+    type ACLListParams as ACLListParams,
+    type ACLDeleteParams as ACLDeleteParams,
+    type ACLGetParams as ACLGetParams,
+  };
 }
diff --git a/src/resources/secondary-dns/force-axfr.ts b/src/resources/dns/zone-transfers/force-axfr.ts
similarity index 74%
rename from src/resources/secondary-dns/force-axfr.ts
rename to src/resources/dns/zone-transfers/force-axfr.ts
index e44c8c0ff5..95ed1788b6 100644
--- a/src/resources/secondary-dns/force-axfr.ts
+++ b/src/resources/dns/zone-transfers/force-axfr.ts
@@ -1,8 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as ForceAXFRAPI from './force-axfr';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
 
 export class ForceAXFRResource extends APIResource {
   /**
@@ -36,7 +35,6 @@ export interface ForceAXFRCreateParams {
   body: unknown;
 }
 
-export namespace ForceAXFRResource {
-  export import ForceAXFR = ForceAXFRAPI.ForceAXFR;
-  export import ForceAXFRCreateParams = ForceAXFRAPI.ForceAXFRCreateParams;
+export declare namespace ForceAXFRResource {
+  export { type ForceAXFR as ForceAXFR, type ForceAXFRCreateParams as ForceAXFRCreateParams };
 }
diff --git a/src/resources/secondary-dns/incoming.ts b/src/resources/dns/zone-transfers/incoming.ts
similarity index 84%
rename from src/resources/secondary-dns/incoming.ts
rename to src/resources/dns/zone-transfers/incoming.ts
index 322d2615eb..505b692b2a 100644
--- a/src/resources/secondary-dns/incoming.ts
+++ b/src/resources/dns/zone-transfers/incoming.ts
@@ -1,8 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as IncomingAPI from './incoming';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
 
 export class IncomingResource extends APIResource {
   /**
@@ -95,7 +94,7 @@ export interface Incoming {
   /**
    * A list of peer tags.
    */
-  peers?: Array<unknown>;
+  peers?: Array<string>;
 
   /**
    * The serial number of the SOA for the given zone.
@@ -135,7 +134,7 @@ export interface IncomingCreateResponse {
   /**
    * A list of peer tags.
    */
-  peers?: Array<unknown>;
+  peers?: Array<string>;
 
   /**
    * The serial number of the SOA for the given zone.
@@ -175,7 +174,7 @@ export interface IncomingUpdateResponse {
   /**
    * A list of peer tags.
    */
-  peers?: Array<unknown>;
+  peers?: Array<string>;
 
   /**
    * The serial number of the SOA for the given zone.
@@ -219,7 +218,7 @@ export interface IncomingGetResponse {
   /**
    * A list of peer tags.
    */
-  peers?: Array<unknown>;
+  peers?: Array<string>;
 
   /**
    * The serial number of the SOA for the given zone.
@@ -247,7 +246,7 @@ export interface IncomingCreateParams {
   /**
    * Body param: A list of peer tags.
    */
-  peers: Array<unknown>;
+  peers: Array<string>;
 }
 
 export interface IncomingUpdateParams {
@@ -270,7 +269,7 @@ export interface IncomingUpdateParams {
   /**
    * Body param: A list of peer tags.
    */
-  peers: Array<unknown>;
+  peers: Array<string>;
 }
 
 export interface IncomingDeleteParams {
@@ -281,14 +280,16 @@ export interface IncomingGetParams {
   zone_id: string;
 }
 
-export namespace IncomingResource {
-  export import Incoming = IncomingAPI.Incoming;
-  export import IncomingCreateResponse = IncomingAPI.IncomingCreateResponse;
-  export import IncomingUpdateResponse = IncomingAPI.IncomingUpdateResponse;
-  export import IncomingDeleteResponse = IncomingAPI.IncomingDeleteResponse;
-  export import IncomingGetResponse = IncomingAPI.IncomingGetResponse;
-  export import IncomingCreateParams = IncomingAPI.IncomingCreateParams;
-  export import IncomingUpdateParams = IncomingAPI.IncomingUpdateParams;
-  export import IncomingDeleteParams = IncomingAPI.IncomingDeleteParams;
-  export import IncomingGetParams = IncomingAPI.IncomingGetParams;
+export declare namespace IncomingResource {
+  export {
+    type Incoming as Incoming,
+    type IncomingCreateResponse as IncomingCreateResponse,
+    type IncomingUpdateResponse as IncomingUpdateResponse,
+    type IncomingDeleteResponse as IncomingDeleteResponse,
+    type IncomingGetResponse as IncomingGetResponse,
+    type IncomingCreateParams as IncomingCreateParams,
+    type IncomingUpdateParams as IncomingUpdateParams,
+    type IncomingDeleteParams as IncomingDeleteParams,
+    type IncomingGetParams as IncomingGetParams,
+  };
 }
diff --git a/src/resources/dns/zone-transfers/index.ts b/src/resources/dns/zone-transfers/index.ts
new file mode 100644
index 0000000000..eaabf60acb
--- /dev/null
+++ b/src/resources/dns/zone-transfers/index.ts
@@ -0,0 +1,68 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  ACLsSinglePage,
+  ACLs,
+  type ACL,
+  type ACLDeleteResponse,
+  type ACLCreateParams,
+  type ACLUpdateParams,
+  type ACLListParams,
+  type ACLDeleteParams,
+  type ACLGetParams,
+} from './acls';
+export { ForceAXFRResource, type ForceAXFR, type ForceAXFRCreateParams } from './force-axfr';
+export {
+  IncomingResource,
+  type Incoming,
+  type IncomingCreateResponse,
+  type IncomingUpdateResponse,
+  type IncomingDeleteResponse,
+  type IncomingGetResponse,
+  type IncomingCreateParams,
+  type IncomingUpdateParams,
+  type IncomingDeleteParams,
+  type IncomingGetParams,
+} from './incoming';
+export {
+  OutgoingResource,
+  type DisableTransfer,
+  type EnableTransfer,
+  type Outgoing,
+  type OutgoingStatus,
+  type OutgoingCreateResponse,
+  type OutgoingUpdateResponse,
+  type OutgoingDeleteResponse,
+  type OutgoingForceNotifyResponse,
+  type OutgoingGetResponse,
+  type OutgoingCreateParams,
+  type OutgoingUpdateParams,
+  type OutgoingDeleteParams,
+  type OutgoingDisableParams,
+  type OutgoingEnableParams,
+  type OutgoingForceNotifyParams,
+  type OutgoingGetParams,
+} from './outgoing/index';
+export {
+  PeersSinglePage,
+  Peers,
+  type Peer,
+  type PeerDeleteResponse,
+  type PeerCreateParams,
+  type PeerUpdateParams,
+  type PeerListParams,
+  type PeerDeleteParams,
+  type PeerGetParams,
+} from './peers';
+export {
+  TSIGsSinglePage,
+  TSIGs,
+  type TSIG,
+  type TSIGDeleteResponse,
+  type TSIGCreateParams,
+  type TSIGUpdateParams,
+  type TSIGListParams,
+  type TSIGDeleteParams,
+  type TSIGGetParams,
+} from './tsigs';
+export { ZoneTransfers } from './zone-transfers';
diff --git a/src/resources/dns/zone-transfers/outgoing/index.ts b/src/resources/dns/zone-transfers/outgoing/index.ts
new file mode 100644
index 0000000000..0cd49edd64
--- /dev/null
+++ b/src/resources/dns/zone-transfers/outgoing/index.ts
@@ -0,0 +1,22 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  OutgoingResource,
+  type DisableTransfer,
+  type EnableTransfer,
+  type Outgoing,
+  type OutgoingStatus,
+  type OutgoingCreateResponse,
+  type OutgoingUpdateResponse,
+  type OutgoingDeleteResponse,
+  type OutgoingForceNotifyResponse,
+  type OutgoingGetResponse,
+  type OutgoingCreateParams,
+  type OutgoingUpdateParams,
+  type OutgoingDeleteParams,
+  type OutgoingDisableParams,
+  type OutgoingEnableParams,
+  type OutgoingForceNotifyParams,
+  type OutgoingGetParams,
+} from './outgoing';
+export { Status, type StatusGetParams } from './status';
diff --git a/src/resources/secondary-dns/outgoing/outgoing.ts b/src/resources/dns/zone-transfers/outgoing/outgoing.ts
similarity index 81%
rename from src/resources/secondary-dns/outgoing/outgoing.ts
rename to src/resources/dns/zone-transfers/outgoing/outgoing.ts
index 9a6b616ba0..a7dd05a120 100644
--- a/src/resources/secondary-dns/outgoing/outgoing.ts
+++ b/src/resources/dns/zone-transfers/outgoing/outgoing.ts
@@ -1,9 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../resource';
-import * as Core from '../../../core';
-import * as OutgoingAPI from './outgoing';
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
 import * as StatusAPI from './status';
+import { Status, StatusGetParams } from './status';
 
 export class OutgoingResource extends APIResource {
   status: StatusAPI.Status = new StatusAPI.Status(this._client);
@@ -145,7 +145,7 @@ export interface Outgoing {
   /**
    * A list of peer tags.
    */
-  peers?: Array<unknown>;
+  peers?: Array<string>;
 
   /**
    * The serial number of the SOA for the given zone.
@@ -184,7 +184,7 @@ export interface OutgoingCreateResponse {
   /**
    * A list of peer tags.
    */
-  peers?: Array<unknown>;
+  peers?: Array<string>;
 
   /**
    * The serial number of the SOA for the given zone.
@@ -218,7 +218,7 @@ export interface OutgoingUpdateResponse {
   /**
    * A list of peer tags.
    */
-  peers?: Array<unknown>;
+  peers?: Array<string>;
 
   /**
    * The serial number of the SOA for the given zone.
@@ -262,7 +262,7 @@ export interface OutgoingGetResponse {
   /**
    * A list of peer tags.
    */
-  peers?: Array<unknown>;
+  peers?: Array<string>;
 
   /**
    * The serial number of the SOA for the given zone.
@@ -284,7 +284,7 @@ export interface OutgoingCreateParams {
   /**
    * Body param: A list of peer tags.
    */
-  peers: Array<unknown>;
+  peers: Array<string>;
 }
 
 export interface OutgoingUpdateParams {
@@ -301,7 +301,7 @@ export interface OutgoingUpdateParams {
   /**
    * Body param: A list of peer tags.
    */
-  peers: Array<unknown>;
+  peers: Array<string>;
 }
 
 export interface OutgoingDeleteParams {
@@ -348,23 +348,27 @@ export interface OutgoingGetParams {
   zone_id: string;
 }
 
-export namespace OutgoingResource {
-  export import DisableTransfer = OutgoingAPI.DisableTransfer;
-  export import EnableTransfer = OutgoingAPI.EnableTransfer;
-  export import Outgoing = OutgoingAPI.Outgoing;
-  export import OutgoingStatus = OutgoingAPI.OutgoingStatus;
-  export import OutgoingCreateResponse = OutgoingAPI.OutgoingCreateResponse;
-  export import OutgoingUpdateResponse = OutgoingAPI.OutgoingUpdateResponse;
-  export import OutgoingDeleteResponse = OutgoingAPI.OutgoingDeleteResponse;
-  export import OutgoingForceNotifyResponse = OutgoingAPI.OutgoingForceNotifyResponse;
-  export import OutgoingGetResponse = OutgoingAPI.OutgoingGetResponse;
-  export import OutgoingCreateParams = OutgoingAPI.OutgoingCreateParams;
-  export import OutgoingUpdateParams = OutgoingAPI.OutgoingUpdateParams;
-  export import OutgoingDeleteParams = OutgoingAPI.OutgoingDeleteParams;
-  export import OutgoingDisableParams = OutgoingAPI.OutgoingDisableParams;
-  export import OutgoingEnableParams = OutgoingAPI.OutgoingEnableParams;
-  export import OutgoingForceNotifyParams = OutgoingAPI.OutgoingForceNotifyParams;
-  export import OutgoingGetParams = OutgoingAPI.OutgoingGetParams;
-  export import Status = StatusAPI.Status;
-  export import StatusGetParams = StatusAPI.StatusGetParams;
+OutgoingResource.Status = Status;
+
+export declare namespace OutgoingResource {
+  export {
+    type DisableTransfer as DisableTransfer,
+    type EnableTransfer as EnableTransfer,
+    type Outgoing as Outgoing,
+    type OutgoingStatus as OutgoingStatus,
+    type OutgoingCreateResponse as OutgoingCreateResponse,
+    type OutgoingUpdateResponse as OutgoingUpdateResponse,
+    type OutgoingDeleteResponse as OutgoingDeleteResponse,
+    type OutgoingForceNotifyResponse as OutgoingForceNotifyResponse,
+    type OutgoingGetResponse as OutgoingGetResponse,
+    type OutgoingCreateParams as OutgoingCreateParams,
+    type OutgoingUpdateParams as OutgoingUpdateParams,
+    type OutgoingDeleteParams as OutgoingDeleteParams,
+    type OutgoingDisableParams as OutgoingDisableParams,
+    type OutgoingEnableParams as OutgoingEnableParams,
+    type OutgoingForceNotifyParams as OutgoingForceNotifyParams,
+    type OutgoingGetParams as OutgoingGetParams,
+  };
+
+  export { Status as Status, type StatusGetParams as StatusGetParams };
 }
diff --git a/src/resources/secondary-dns/outgoing/status.ts b/src/resources/dns/zone-transfers/outgoing/status.ts
similarity index 75%
rename from src/resources/secondary-dns/outgoing/status.ts
rename to src/resources/dns/zone-transfers/outgoing/status.ts
index e244b7945a..e47bc7df5c 100644
--- a/src/resources/secondary-dns/outgoing/status.ts
+++ b/src/resources/dns/zone-transfers/outgoing/status.ts
@@ -1,8 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../resource';
-import * as Core from '../../../core';
-import * as StatusAPI from './status';
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
 import * as OutgoingAPI from './outgoing';
 
 export class Status extends APIResource {
@@ -23,6 +22,6 @@ export interface StatusGetParams {
   zone_id: string;
 }
 
-export namespace Status {
-  export import StatusGetParams = StatusAPI.StatusGetParams;
+export declare namespace Status {
+  export { type StatusGetParams as StatusGetParams };
 }
diff --git a/src/resources/secondary-dns/peers.ts b/src/resources/dns/zone-transfers/peers.ts
similarity index 84%
rename from src/resources/secondary-dns/peers.ts
rename to src/resources/dns/zone-transfers/peers.ts
index 46be80df78..2370f0e27d 100644
--- a/src/resources/secondary-dns/peers.ts
+++ b/src/resources/dns/zone-transfers/peers.ts
@@ -1,19 +1,18 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as PeersAPI from './peers';
-import { SinglePage } from '../../pagination';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { SinglePage } from '../../../pagination';
 
 export class Peers extends APIResource {
   /**
    * Create Peer.
    */
   create(params: PeerCreateParams, options?: Core.RequestOptions): Core.APIPromise<Peer> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/secondary_dns/peers`, {
-        body: body,
+        body,
         ...options,
       }) as Core.APIPromise<{ result: Peer }>
     )._thenUnwrap((obj) => obj.result);
@@ -118,9 +117,9 @@ export interface PeerCreateParams {
   account_id: string;
 
   /**
-   * Body param:
+   * Body param: The name of the peer.
    */
-  body: unknown;
+  name: string;
 }
 
 export interface PeerUpdateParams {
@@ -173,13 +172,17 @@ export interface PeerGetParams {
   account_id: string;
 }
 
-export namespace Peers {
-  export import Peer = PeersAPI.Peer;
-  export import PeerDeleteResponse = PeersAPI.PeerDeleteResponse;
-  export import PeersSinglePage = PeersAPI.PeersSinglePage;
-  export import PeerCreateParams = PeersAPI.PeerCreateParams;
-  export import PeerUpdateParams = PeersAPI.PeerUpdateParams;
-  export import PeerListParams = PeersAPI.PeerListParams;
-  export import PeerDeleteParams = PeersAPI.PeerDeleteParams;
-  export import PeerGetParams = PeersAPI.PeerGetParams;
+Peers.PeersSinglePage = PeersSinglePage;
+
+export declare namespace Peers {
+  export {
+    type Peer as Peer,
+    type PeerDeleteResponse as PeerDeleteResponse,
+    PeersSinglePage as PeersSinglePage,
+    type PeerCreateParams as PeerCreateParams,
+    type PeerUpdateParams as PeerUpdateParams,
+    type PeerListParams as PeerListParams,
+    type PeerDeleteParams as PeerDeleteParams,
+    type PeerGetParams as PeerGetParams,
+  };
 }
diff --git a/src/resources/secondary-dns/tsigs.ts b/src/resources/dns/zone-transfers/tsigs.ts
similarity index 82%
rename from src/resources/secondary-dns/tsigs.ts
rename to src/resources/dns/zone-transfers/tsigs.ts
index 203112c56e..889afad783 100644
--- a/src/resources/secondary-dns/tsigs.ts
+++ b/src/resources/dns/zone-transfers/tsigs.ts
@@ -1,9 +1,8 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as TSIGsAPI from './tsigs';
-import { SinglePage } from '../../pagination';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { SinglePage } from '../../../pagination';
 
 export class TSIGs extends APIResource {
   /**
@@ -151,13 +150,17 @@ export interface TSIGGetParams {
   account_id: string;
 }
 
-export namespace TSIGs {
-  export import TSIG = TSIGsAPI.TSIG;
-  export import TSIGDeleteResponse = TSIGsAPI.TSIGDeleteResponse;
-  export import TSIGsSinglePage = TSIGsAPI.TSIGsSinglePage;
-  export import TSIGCreateParams = TSIGsAPI.TSIGCreateParams;
-  export import TSIGUpdateParams = TSIGsAPI.TSIGUpdateParams;
-  export import TSIGListParams = TSIGsAPI.TSIGListParams;
-  export import TSIGDeleteParams = TSIGsAPI.TSIGDeleteParams;
-  export import TSIGGetParams = TSIGsAPI.TSIGGetParams;
+TSIGs.TSIGsSinglePage = TSIGsSinglePage;
+
+export declare namespace TSIGs {
+  export {
+    type TSIG as TSIG,
+    type TSIGDeleteResponse as TSIGDeleteResponse,
+    TSIGsSinglePage as TSIGsSinglePage,
+    type TSIGCreateParams as TSIGCreateParams,
+    type TSIGUpdateParams as TSIGUpdateParams,
+    type TSIGListParams as TSIGListParams,
+    type TSIGDeleteParams as TSIGDeleteParams,
+    type TSIGGetParams as TSIGGetParams,
+  };
 }
diff --git a/src/resources/dns/zone-transfers/zone-transfers.ts b/src/resources/dns/zone-transfers/zone-transfers.ts
new file mode 100644
index 0000000000..32e4c523b6
--- /dev/null
+++ b/src/resources/dns/zone-transfers/zone-transfers.ts
@@ -0,0 +1,170 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as ACLsAPI from './acls';
+import {
+  ACL,
+  ACLCreateParams,
+  ACLDeleteParams,
+  ACLDeleteResponse,
+  ACLGetParams,
+  ACLListParams,
+  ACLUpdateParams,
+  ACLs,
+  ACLsSinglePage,
+} from './acls';
+import * as ForceAXFRAPI from './force-axfr';
+import { ForceAXFR, ForceAXFRCreateParams, ForceAXFRResource } from './force-axfr';
+import * as IncomingAPI from './incoming';
+import {
+  Incoming,
+  IncomingCreateParams,
+  IncomingCreateResponse,
+  IncomingDeleteParams,
+  IncomingDeleteResponse,
+  IncomingGetParams,
+  IncomingGetResponse,
+  IncomingResource,
+  IncomingUpdateParams,
+  IncomingUpdateResponse,
+} from './incoming';
+import * as PeersAPI from './peers';
+import {
+  Peer,
+  PeerCreateParams,
+  PeerDeleteParams,
+  PeerDeleteResponse,
+  PeerGetParams,
+  PeerListParams,
+  PeerUpdateParams,
+  Peers,
+  PeersSinglePage,
+} from './peers';
+import * as TSIGsAPI from './tsigs';
+import {
+  TSIG,
+  TSIGCreateParams,
+  TSIGDeleteParams,
+  TSIGDeleteResponse,
+  TSIGGetParams,
+  TSIGListParams,
+  TSIGUpdateParams,
+  TSIGs,
+  TSIGsSinglePage,
+} from './tsigs';
+import * as OutgoingAPI from './outgoing/outgoing';
+import {
+  DisableTransfer,
+  EnableTransfer,
+  Outgoing,
+  OutgoingCreateParams,
+  OutgoingCreateResponse,
+  OutgoingDeleteParams,
+  OutgoingDeleteResponse,
+  OutgoingDisableParams,
+  OutgoingEnableParams,
+  OutgoingForceNotifyParams,
+  OutgoingForceNotifyResponse,
+  OutgoingGetParams,
+  OutgoingGetResponse,
+  OutgoingResource,
+  OutgoingStatus,
+  OutgoingUpdateParams,
+  OutgoingUpdateResponse,
+} from './outgoing/outgoing';
+
+export class ZoneTransfers extends APIResource {
+  forceAXFR: ForceAXFRAPI.ForceAXFRResource = new ForceAXFRAPI.ForceAXFRResource(this._client);
+  incoming: IncomingAPI.IncomingResource = new IncomingAPI.IncomingResource(this._client);
+  outgoing: OutgoingAPI.OutgoingResource = new OutgoingAPI.OutgoingResource(this._client);
+  acls: ACLsAPI.ACLs = new ACLsAPI.ACLs(this._client);
+  peers: PeersAPI.Peers = new PeersAPI.Peers(this._client);
+  tsigs: TSIGsAPI.TSIGs = new TSIGsAPI.TSIGs(this._client);
+}
+
+ZoneTransfers.ForceAXFRResource = ForceAXFRResource;
+ZoneTransfers.IncomingResource = IncomingResource;
+ZoneTransfers.OutgoingResource = OutgoingResource;
+ZoneTransfers.ACLs = ACLs;
+ZoneTransfers.ACLsSinglePage = ACLsSinglePage;
+ZoneTransfers.Peers = Peers;
+ZoneTransfers.PeersSinglePage = PeersSinglePage;
+ZoneTransfers.TSIGs = TSIGs;
+ZoneTransfers.TSIGsSinglePage = TSIGsSinglePage;
+
+export declare namespace ZoneTransfers {
+  export {
+    ForceAXFRResource as ForceAXFRResource,
+    type ForceAXFR as ForceAXFR,
+    type ForceAXFRCreateParams as ForceAXFRCreateParams,
+  };
+
+  export {
+    IncomingResource as IncomingResource,
+    type Incoming as Incoming,
+    type IncomingCreateResponse as IncomingCreateResponse,
+    type IncomingUpdateResponse as IncomingUpdateResponse,
+    type IncomingDeleteResponse as IncomingDeleteResponse,
+    type IncomingGetResponse as IncomingGetResponse,
+    type IncomingCreateParams as IncomingCreateParams,
+    type IncomingUpdateParams as IncomingUpdateParams,
+    type IncomingDeleteParams as IncomingDeleteParams,
+    type IncomingGetParams as IncomingGetParams,
+  };
+
+  export {
+    OutgoingResource as OutgoingResource,
+    type DisableTransfer as DisableTransfer,
+    type EnableTransfer as EnableTransfer,
+    type Outgoing as Outgoing,
+    type OutgoingStatus as OutgoingStatus,
+    type OutgoingCreateResponse as OutgoingCreateResponse,
+    type OutgoingUpdateResponse as OutgoingUpdateResponse,
+    type OutgoingDeleteResponse as OutgoingDeleteResponse,
+    type OutgoingForceNotifyResponse as OutgoingForceNotifyResponse,
+    type OutgoingGetResponse as OutgoingGetResponse,
+    type OutgoingCreateParams as OutgoingCreateParams,
+    type OutgoingUpdateParams as OutgoingUpdateParams,
+    type OutgoingDeleteParams as OutgoingDeleteParams,
+    type OutgoingDisableParams as OutgoingDisableParams,
+    type OutgoingEnableParams as OutgoingEnableParams,
+    type OutgoingForceNotifyParams as OutgoingForceNotifyParams,
+    type OutgoingGetParams as OutgoingGetParams,
+  };
+
+  export {
+    ACLs as ACLs,
+    type ACL as ACL,
+    type ACLDeleteResponse as ACLDeleteResponse,
+    ACLsSinglePage as ACLsSinglePage,
+    type ACLCreateParams as ACLCreateParams,
+    type ACLUpdateParams as ACLUpdateParams,
+    type ACLListParams as ACLListParams,
+    type ACLDeleteParams as ACLDeleteParams,
+    type ACLGetParams as ACLGetParams,
+  };
+
+  export {
+    Peers as Peers,
+    type Peer as Peer,
+    type PeerDeleteResponse as PeerDeleteResponse,
+    PeersSinglePage as PeersSinglePage,
+    type PeerCreateParams as PeerCreateParams,
+    type PeerUpdateParams as PeerUpdateParams,
+    type PeerListParams as PeerListParams,
+    type PeerDeleteParams as PeerDeleteParams,
+    type PeerGetParams as PeerGetParams,
+  };
+
+  export {
+    TSIGs as TSIGs,
+    type TSIG as TSIG,
+    type TSIGDeleteResponse as TSIGDeleteResponse,
+    TSIGsSinglePage as TSIGsSinglePage,
+    type TSIGCreateParams as TSIGCreateParams,
+    type TSIGUpdateParams as TSIGUpdateParams,
+    type TSIGListParams as TSIGListParams,
+    type TSIGDeleteParams as TSIGDeleteParams,
+    type TSIGGetParams as TSIGGetParams,
+  };
+}
diff --git a/src/resources/durable-objects/durable-objects.ts b/src/resources/durable-objects/durable-objects.ts
index a79041c6f0..0fb700ec65 100644
--- a/src/resources/durable-objects/durable-objects.ts
+++ b/src/resources/durable-objects/durable-objects.ts
@@ -2,14 +2,20 @@
 
 import { APIResource } from '../../resource';
 import * as NamespacesAPI from './namespaces/namespaces';
+import { Namespace, NamespaceListParams, Namespaces, NamespacesSinglePage } from './namespaces/namespaces';
 
 export class DurableObjects extends APIResource {
   namespaces: NamespacesAPI.Namespaces = new NamespacesAPI.Namespaces(this._client);
 }
 
-export namespace DurableObjects {
-  export import Namespaces = NamespacesAPI.Namespaces;
-  export import Namespace = NamespacesAPI.Namespace;
-  export import NamespacesSinglePage = NamespacesAPI.NamespacesSinglePage;
-  export import NamespaceListParams = NamespacesAPI.NamespaceListParams;
+DurableObjects.Namespaces = Namespaces;
+DurableObjects.NamespacesSinglePage = NamespacesSinglePage;
+
+export declare namespace DurableObjects {
+  export {
+    Namespaces as Namespaces,
+    type Namespace as Namespace,
+    NamespacesSinglePage as NamespacesSinglePage,
+    type NamespaceListParams as NamespaceListParams,
+  };
 }
diff --git a/src/resources/durable-objects/index.ts b/src/resources/durable-objects/index.ts
index bbf88b4e01..9ad42425bf 100644
--- a/src/resources/durable-objects/index.ts
+++ b/src/resources/durable-objects/index.ts
@@ -1,4 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { DurableObjects } from './durable-objects';
-export { Namespace, NamespaceListParams, NamespacesSinglePage, Namespaces } from './namespaces/index';
+export {
+  NamespacesSinglePage,
+  Namespaces,
+  type Namespace,
+  type NamespaceListParams,
+} from './namespaces/index';
diff --git a/src/resources/durable-objects/namespaces/index.ts b/src/resources/durable-objects/namespaces/index.ts
index 456b5e106c..eb373cf46d 100644
--- a/src/resources/durable-objects/namespaces/index.ts
+++ b/src/resources/durable-objects/namespaces/index.ts
@@ -1,4 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { DurableObject, ObjectListParams, DurableObjectsCursorLimitPagination, Objects } from './objects';
-export { Namespace, NamespaceListParams, NamespacesSinglePage, Namespaces } from './namespaces';
+export {
+  DurableObjectsCursorLimitPagination,
+  Objects,
+  type DurableObject,
+  type ObjectListParams,
+} from './objects';
+export { NamespacesSinglePage, Namespaces, type Namespace, type NamespaceListParams } from './namespaces';
diff --git a/src/resources/durable-objects/namespaces/namespaces.ts b/src/resources/durable-objects/namespaces/namespaces.ts
index d5f37ea204..ca1cf78b5a 100644
--- a/src/resources/durable-objects/namespaces/namespaces.ts
+++ b/src/resources/durable-objects/namespaces/namespaces.ts
@@ -2,8 +2,8 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as NamespacesAPI from './namespaces';
 import * as ObjectsAPI from './objects';
+import { DurableObject, DurableObjectsCursorLimitPagination, ObjectListParams, Objects } from './objects';
 import { SinglePage } from '../../../pagination';
 
 export class Namespaces extends APIResource {
@@ -28,13 +28,15 @@ export class Namespaces extends APIResource {
 export class NamespacesSinglePage extends SinglePage<Namespace> {}
 
 export interface Namespace {
-  id?: unknown;
+  id?: string;
 
-  class?: unknown;
+  class?: string;
 
-  name?: unknown;
+  name?: string;
 
-  script?: unknown;
+  script?: string;
+
+  use_sqlite?: boolean;
 }
 
 export interface NamespaceListParams {
@@ -44,12 +46,21 @@ export interface NamespaceListParams {
   account_id: string;
 }
 
-export namespace Namespaces {
-  export import Namespace = NamespacesAPI.Namespace;
-  export import NamespacesSinglePage = NamespacesAPI.NamespacesSinglePage;
-  export import NamespaceListParams = NamespacesAPI.NamespaceListParams;
-  export import Objects = ObjectsAPI.Objects;
-  export import DurableObject = ObjectsAPI.DurableObject;
-  export import DurableObjectsCursorLimitPagination = ObjectsAPI.DurableObjectsCursorLimitPagination;
-  export import ObjectListParams = ObjectsAPI.ObjectListParams;
+Namespaces.NamespacesSinglePage = NamespacesSinglePage;
+Namespaces.Objects = Objects;
+Namespaces.DurableObjectsCursorLimitPagination = DurableObjectsCursorLimitPagination;
+
+export declare namespace Namespaces {
+  export {
+    type Namespace as Namespace,
+    NamespacesSinglePage as NamespacesSinglePage,
+    type NamespaceListParams as NamespaceListParams,
+  };
+
+  export {
+    Objects as Objects,
+    type DurableObject as DurableObject,
+    DurableObjectsCursorLimitPagination as DurableObjectsCursorLimitPagination,
+    type ObjectListParams as ObjectListParams,
+  };
 }
diff --git a/src/resources/durable-objects/namespaces/objects.ts b/src/resources/durable-objects/namespaces/objects.ts
index 98ac0fa7c4..ef4d1b0659 100644
--- a/src/resources/durable-objects/namespaces/objects.ts
+++ b/src/resources/durable-objects/namespaces/objects.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ObjectsAPI from './objects';
 import { CursorLimitPagination, type CursorLimitPaginationParams } from '../../../pagination';
 
 export class Objects extends APIResource {
@@ -44,8 +43,12 @@ export interface ObjectListParams extends CursorLimitPaginationParams {
   account_id: string;
 }
 
-export namespace Objects {
-  export import DurableObject = ObjectsAPI.DurableObject;
-  export import DurableObjectsCursorLimitPagination = ObjectsAPI.DurableObjectsCursorLimitPagination;
-  export import ObjectListParams = ObjectsAPI.ObjectListParams;
+Objects.DurableObjectsCursorLimitPagination = DurableObjectsCursorLimitPagination;
+
+export declare namespace Objects {
+  export {
+    type DurableObject as DurableObject,
+    DurableObjectsCursorLimitPagination as DurableObjectsCursorLimitPagination,
+    type ObjectListParams as ObjectListParams,
+  };
 }
diff --git a/src/resources/email-routing/addresses.ts b/src/resources/email-routing/addresses.ts
index f939d15e54..06e4291c0f 100644
--- a/src/resources/email-routing/addresses.ts
+++ b/src/resources/email-routing/addresses.ts
@@ -1,9 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
-import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as AddressesAPI from './addresses';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class Addresses extends APIResource {
@@ -11,13 +9,10 @@ export class Addresses extends APIResource {
    * Create a destination address to forward your emails to. Destination addresses
    * need to be verified before they can be used.
    */
-  create(
-    accountIdentifier: string,
-    body: AddressCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Address> {
+  create(params: AddressCreateParams, options?: Core.RequestOptions): Core.APIPromise<Address> {
+    const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${accountIdentifier}/email/routing/addresses`, {
+      this._client.post(`/accounts/${account_id}/email/routing/addresses`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: Address }>
@@ -28,24 +23,12 @@ export class Addresses extends APIResource {
    * Lists existing destination addresses.
    */
   list(
-    accountIdentifier: string,
-    query?: AddressListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<AddressesV4PagePaginationArray, Address>;
-  list(
-    accountIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<AddressesV4PagePaginationArray, Address>;
-  list(
-    accountIdentifier: string,
-    query: AddressListParams | Core.RequestOptions = {},
+    params: AddressListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<AddressesV4PagePaginationArray, Address> {
-    if (isRequestOptions(query)) {
-      return this.list(accountIdentifier, {}, query);
-    }
+    const { account_id, ...query } = params;
     return this._client.getAPIList(
-      `/accounts/${accountIdentifier}/email/routing/addresses`,
+      `/accounts/${account_id}/email/routing/addresses`,
       AddressesV4PagePaginationArray,
       { query, ...options },
     );
@@ -55,13 +38,14 @@ export class Addresses extends APIResource {
    * Deletes a specific destination address.
    */
   delete(
-    accountIdentifier: string,
     destinationAddressIdentifier: string,
+    params: AddressDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<Address> {
+    const { account_id } = params;
     return (
       this._client.delete(
-        `/accounts/${accountIdentifier}/email/routing/addresses/${destinationAddressIdentifier}`,
+        `/accounts/${account_id}/email/routing/addresses/${destinationAddressIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: Address }>
     )._thenUnwrap((obj) => obj.result);
@@ -71,13 +55,14 @@ export class Addresses extends APIResource {
    * Gets information for a specific destination email already created.
    */
   get(
-    accountIdentifier: string,
     destinationAddressIdentifier: string,
+    params: AddressGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<Address> {
+    const { account_id } = params;
     return (
       this._client.get(
-        `/accounts/${accountIdentifier}/email/routing/addresses/${destinationAddressIdentifier}`,
+        `/accounts/${account_id}/email/routing/addresses/${destinationAddressIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: Address }>
     )._thenUnwrap((obj) => obj.result);
@@ -122,26 +107,56 @@ export interface Address {
 
 export interface AddressCreateParams {
   /**
-   * The contact email address of the user.
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: The contact email address of the user.
    */
   email: string;
 }
 
 export interface AddressListParams extends V4PagePaginationArrayParams {
   /**
-   * Sorts results in an ascending or descending order.
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param: Sorts results in an ascending or descending order.
    */
   direction?: 'asc' | 'desc';
 
   /**
-   * Filter by verified destination addresses.
+   * Query param: Filter by verified destination addresses.
    */
   verified?: true | false;
 }
 
-export namespace Addresses {
-  export import Address = AddressesAPI.Address;
-  export import AddressesV4PagePaginationArray = AddressesAPI.AddressesV4PagePaginationArray;
-  export import AddressCreateParams = AddressesAPI.AddressCreateParams;
-  export import AddressListParams = AddressesAPI.AddressListParams;
+export interface AddressDeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface AddressGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+Addresses.AddressesV4PagePaginationArray = AddressesV4PagePaginationArray;
+
+export declare namespace Addresses {
+  export {
+    type Address as Address,
+    AddressesV4PagePaginationArray as AddressesV4PagePaginationArray,
+    type AddressCreateParams as AddressCreateParams,
+    type AddressListParams as AddressListParams,
+    type AddressDeleteParams as AddressDeleteParams,
+    type AddressGetParams as AddressGetParams,
+  };
 }
diff --git a/src/resources/email-routing/dns.ts b/src/resources/email-routing/dns.ts
index 3f0ad71534..216ae952fe 100644
--- a/src/resources/email-routing/dns.ts
+++ b/src/resources/email-routing/dns.ts
@@ -3,18 +3,50 @@
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as DNSAPI from './dns';
+import * as Shared from '../shared';
+import * as EmailRoutingAPI from './email-routing';
 
 export class DNS extends APIResource {
   /**
-   * Show the DNS records needed to configure your Email Routing zone.
+   * Enable you Email Routing zone. Add and lock the necessary MX and SPF records.
+   */
+  create(params: DNSCreateParams, options?: Core.RequestOptions): Core.APIPromise<EmailRoutingAPI.Settings> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.post(`/zones/${zone_id}/email/routing/dns`, { body, ...options }) as Core.APIPromise<{
+        result: EmailRoutingAPI.Settings;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Disable your Email Routing zone. Also removes additional MX records previously
+   * required for Email Routing to work.
+   */
+  delete(params: DNSDeleteParams, options?: Core.RequestOptions): Core.APIPromise<DNSDeleteResponse> {
+    const { zone_id } = params;
+    return this._client.delete(`/zones/${zone_id}/email/routing/dns`, options);
+  }
+
+  /**
+   * Unlock MX Records previously locked by Email Routing.
    */
-  get(zoneIdentifier: string, options?: Core.RequestOptions): Core.APIPromise<DNSGetResponse | null> {
+  edit(params: DNSEditParams, options?: Core.RequestOptions): Core.APIPromise<EmailRoutingAPI.Settings> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.get(`/zones/${zoneIdentifier}/email/routing/dns`, options) as Core.APIPromise<{
-        result: DNSGetResponse | null;
+      this._client.patch(`/zones/${zone_id}/email/routing/dns`, { body, ...options }) as Core.APIPromise<{
+        result: EmailRoutingAPI.Settings;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
+
+  /**
+   * Show the DNS records needed to configure your Email Routing zone.
+   */
+  get(params: DNSGetParams, options?: Core.RequestOptions): Core.APIPromise<DNSGetResponse> {
+    const { zone_id, ...query } = params;
+    return this._client.get(`/zones/${zone_id}/email/routing/dns`, { query, ...options });
+  }
 }
 
 /**
@@ -67,9 +99,214 @@ export interface DNSRecord {
     | 'URI';
 }
 
-export type DNSGetResponse = Array<DNSRecord>;
+export type DNSDeleteResponse =
+  | DNSDeleteResponse.EmailAPIResponseCommon
+  | DNSDeleteResponse.EmailDNSSettingsResponseCollection;
+
+export namespace DNSDeleteResponse {
+  export interface EmailAPIResponseCommon {
+    errors: Array<Shared.ResponseInfo>;
+
+    messages: Array<Shared.ResponseInfo>;
+
+    /**
+     * Whether the API call was successful
+     */
+    success: true;
+  }
+
+  export interface EmailDNSSettingsResponseCollection {
+    errors: Array<Shared.ResponseInfo>;
+
+    messages: Array<Shared.ResponseInfo>;
+
+    /**
+     * Whether the API call was successful
+     */
+    success: true;
+
+    result?: Array<DNSAPI.DNSRecord>;
+
+    result_info?: EmailDNSSettingsResponseCollection.ResultInfo;
+  }
+
+  export namespace EmailDNSSettingsResponseCollection {
+    export interface ResultInfo {
+      /**
+       * Total number of results for the requested service
+       */
+      count?: number;
+
+      /**
+       * Current page within paginated list of results
+       */
+      page?: number;
+
+      /**
+       * Number of results per page of results
+       */
+      per_page?: number;
+
+      /**
+       * Total results available without any search parameters
+       */
+      total_count?: number;
+    }
+  }
+}
+
+export type DNSGetResponse =
+  | DNSGetResponse.EmailEmailRoutingDNSQueryResponse
+  | DNSGetResponse.EmailDNSSettingsResponseCollection;
+
+export namespace DNSGetResponse {
+  export interface EmailEmailRoutingDNSQueryResponse {
+    errors: Array<Shared.ResponseInfo>;
+
+    messages: Array<Shared.ResponseInfo>;
+
+    /**
+     * Whether the API call was successful
+     */
+    success: true;
+
+    result?: EmailEmailRoutingDNSQueryResponse.Result;
+
+    result_info?: EmailEmailRoutingDNSQueryResponse.ResultInfo;
+  }
+
+  export namespace EmailEmailRoutingDNSQueryResponse {
+    export interface Result {
+      errors?: Array<Result.Error>;
+
+      record?: Array<DNSAPI.DNSRecord>;
+    }
+
+    export namespace Result {
+      export interface Error {
+        code?: string;
+
+        /**
+         * List of records needed to enable an Email Routing zone.
+         */
+        missing?: DNSAPI.DNSRecord;
+      }
+    }
+
+    export interface ResultInfo {
+      /**
+       * Total number of results for the requested service
+       */
+      count?: number;
+
+      /**
+       * Current page within paginated list of results
+       */
+      page?: number;
+
+      /**
+       * Number of results per page of results
+       */
+      per_page?: number;
+
+      /**
+       * Total results available without any search parameters
+       */
+      total_count?: number;
+    }
+  }
+
+  export interface EmailDNSSettingsResponseCollection {
+    errors: Array<Shared.ResponseInfo>;
+
+    messages: Array<Shared.ResponseInfo>;
+
+    /**
+     * Whether the API call was successful
+     */
+    success: true;
+
+    result?: Array<DNSAPI.DNSRecord>;
+
+    result_info?: EmailDNSSettingsResponseCollection.ResultInfo;
+  }
+
+  export namespace EmailDNSSettingsResponseCollection {
+    export interface ResultInfo {
+      /**
+       * Total number of results for the requested service
+       */
+      count?: number;
+
+      /**
+       * Current page within paginated list of results
+       */
+      page?: number;
+
+      /**
+       * Number of results per page of results
+       */
+      per_page?: number;
+
+      /**
+       * Total results available without any search parameters
+       */
+      total_count?: number;
+    }
+  }
+}
+
+export interface DNSCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: Domain of your zone.
+   */
+  name: string;
+}
+
+export interface DNSDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface DNSEditParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: Domain of your zone.
+   */
+  name: string;
+}
+
+export interface DNSGetParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: Domain of your zone.
+   */
+  subdomain?: string;
+}
 
-export namespace DNS {
-  export import DNSRecord = DNSAPI.DNSRecord;
-  export import DNSGetResponse = DNSAPI.DNSGetResponse;
+export declare namespace DNS {
+  export {
+    type DNSRecord as DNSRecord,
+    type DNSDeleteResponse as DNSDeleteResponse,
+    type DNSGetResponse as DNSGetResponse,
+    type DNSCreateParams as DNSCreateParams,
+    type DNSDeleteParams as DNSDeleteParams,
+    type DNSEditParams as DNSEditParams,
+    type DNSGetParams as DNSGetParams,
+  };
 }
diff --git a/src/resources/email-routing/email-routing.ts b/src/resources/email-routing/email-routing.ts
index c537495118..b42b67f0b9 100644
--- a/src/resources/email-routing/email-routing.ts
+++ b/src/resources/email-routing/email-routing.ts
@@ -3,8 +3,39 @@
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as AddressesAPI from './addresses';
+import {
+  Address,
+  AddressCreateParams,
+  AddressDeleteParams,
+  AddressGetParams,
+  AddressListParams,
+  Addresses,
+  AddressesV4PagePaginationArray,
+} from './addresses';
 import * as DNSAPI from './dns';
+import {
+  DNS,
+  DNSCreateParams,
+  DNSDeleteParams,
+  DNSDeleteResponse,
+  DNSEditParams,
+  DNSGetParams,
+  DNSGetResponse,
+  DNSRecord,
+} from './dns';
 import * as RulesAPI from './rules/rules';
+import {
+  Action,
+  EmailRoutingRule,
+  EmailRoutingRulesV4PagePaginationArray,
+  Matcher,
+  RuleCreateParams,
+  RuleDeleteParams,
+  RuleGetParams,
+  RuleListParams,
+  RuleUpdateParams,
+  Rules,
+} from './rules/rules';
 
 export class EmailRouting extends APIResource {
   dns: DNSAPI.DNS = new DNSAPI.DNS(this._client);
@@ -15,14 +46,11 @@ export class EmailRouting extends APIResource {
    * Disable your Email Routing zone. Also removes additional MX records previously
    * required for Email Routing to work.
    */
-  disable(
-    zoneIdentifier: string,
-    body: EmailRoutingDisableParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Settings> {
+  disable(params: EmailRoutingDisableParams, options?: Core.RequestOptions): Core.APIPromise<Settings> {
+    const { zone_id, body } = params;
     return (
-      this._client.post(`/zones/${zoneIdentifier}/email/routing/disable`, {
-        body,
+      this._client.post(`/zones/${zone_id}/email/routing/disable`, {
+        body: body,
         ...options,
       }) as Core.APIPromise<{ result: Settings }>
     )._thenUnwrap((obj) => obj.result);
@@ -31,14 +59,11 @@ export class EmailRouting extends APIResource {
   /**
    * Enable you Email Routing zone. Add and lock the necessary MX and SPF records.
    */
-  enable(
-    zoneIdentifier: string,
-    body: EmailRoutingEnableParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Settings> {
+  enable(params: EmailRoutingEnableParams, options?: Core.RequestOptions): Core.APIPromise<Settings> {
+    const { zone_id, body } = params;
     return (
-      this._client.post(`/zones/${zoneIdentifier}/email/routing/enable`, {
-        body,
+      this._client.post(`/zones/${zone_id}/email/routing/enable`, {
+        body: body,
         ...options,
       }) as Core.APIPromise<{ result: Settings }>
     )._thenUnwrap((obj) => obj.result);
@@ -47,11 +72,10 @@ export class EmailRouting extends APIResource {
   /**
    * Get information about the settings for your Email Routing zone.
    */
-  get(zoneIdentifier: string, options?: Core.RequestOptions): Core.APIPromise<Settings> {
+  get(params: EmailRoutingGetParams, options?: Core.RequestOptions): Core.APIPromise<Settings> {
+    const { zone_id } = params;
     return (
-      this._client.get(`/zones/${zoneIdentifier}/email/routing`, options) as Core.APIPromise<{
-        result: Settings;
-      }>
+      this._client.get(`/zones/${zone_id}/email/routing`, options) as Core.APIPromise<{ result: Settings }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -60,27 +84,27 @@ export interface Settings {
   /**
    * Email Routing settings identifier.
    */
-  id?: string;
+  id: string;
 
   /**
-   * The date and time the settings have been created.
+   * State of the zone settings for Email Routing.
    */
-  created?: string;
+  enabled: true | false;
 
   /**
-   * State of the zone settings for Email Routing.
+   * Domain of your zone.
    */
-  enabled?: true | false;
+  name: string;
 
   /**
-   * The date and time the settings have been modified.
+   * The date and time the settings have been created.
    */
-  modified?: string;
+  created?: string;
 
   /**
-   * Domain of your zone.
+   * The date and time the settings have been modified.
    */
-  name?: string;
+  modified?: string;
 
   /**
    * Flag to check if the user skipped the configuration wizard.
@@ -99,25 +123,75 @@ export interface Settings {
   tag?: string;
 }
 
-export type EmailRoutingDisableParams = unknown;
-
-export type EmailRoutingEnableParams = unknown;
-
-export namespace EmailRouting {
-  export import DNS = DNSAPI.DNS;
-  export import DNSRecord = DNSAPI.DNSRecord;
-  export import DNSGetResponse = DNSAPI.DNSGetResponse;
-  export import Rules = RulesAPI.Rules;
-  export import Action = RulesAPI.Action;
-  export import EmailRoutingRule = RulesAPI.EmailRoutingRule;
-  export import Matcher = RulesAPI.Matcher;
-  export import EmailRoutingRulesV4PagePaginationArray = RulesAPI.EmailRoutingRulesV4PagePaginationArray;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import Addresses = AddressesAPI.Addresses;
-  export import Address = AddressesAPI.Address;
-  export import AddressesV4PagePaginationArray = AddressesAPI.AddressesV4PagePaginationArray;
-  export import AddressCreateParams = AddressesAPI.AddressCreateParams;
-  export import AddressListParams = AddressesAPI.AddressListParams;
+export interface EmailRoutingDisableParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+}
+
+export interface EmailRoutingEnableParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+}
+
+export interface EmailRoutingGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+EmailRouting.DNS = DNS;
+EmailRouting.Rules = Rules;
+EmailRouting.EmailRoutingRulesV4PagePaginationArray = EmailRoutingRulesV4PagePaginationArray;
+EmailRouting.Addresses = Addresses;
+EmailRouting.AddressesV4PagePaginationArray = AddressesV4PagePaginationArray;
+
+export declare namespace EmailRouting {
+  export {
+    DNS as DNS,
+    type DNSRecord as DNSRecord,
+    type DNSDeleteResponse as DNSDeleteResponse,
+    type DNSGetResponse as DNSGetResponse,
+    type DNSCreateParams as DNSCreateParams,
+    type DNSDeleteParams as DNSDeleteParams,
+    type DNSEditParams as DNSEditParams,
+    type DNSGetParams as DNSGetParams,
+  };
+
+  export {
+    Rules as Rules,
+    type Action as Action,
+    type EmailRoutingRule as EmailRoutingRule,
+    type Matcher as Matcher,
+    EmailRoutingRulesV4PagePaginationArray as EmailRoutingRulesV4PagePaginationArray,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleGetParams as RuleGetParams,
+  };
+
+  export {
+    Addresses as Addresses,
+    type Address as Address,
+    AddressesV4PagePaginationArray as AddressesV4PagePaginationArray,
+    type AddressCreateParams as AddressCreateParams,
+    type AddressListParams as AddressListParams,
+    type AddressDeleteParams as AddressDeleteParams,
+    type AddressGetParams as AddressGetParams,
+  };
 }
diff --git a/src/resources/email-routing/index.ts b/src/resources/email-routing/index.ts
index 52bc9a59a3..4d05479877 100644
--- a/src/resources/email-routing/index.ts
+++ b/src/resources/email-routing/index.ts
@@ -1,21 +1,34 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Action,
-  EmailRoutingRule,
-  Matcher,
-  RuleCreateParams,
-  RuleUpdateParams,
-  RuleListParams,
-  EmailRoutingRulesV4PagePaginationArray,
-  Rules,
-} from './rules/index';
-export {
-  Address,
-  AddressCreateParams,
-  AddressListParams,
   AddressesV4PagePaginationArray,
   Addresses,
+  type Address,
+  type AddressCreateParams,
+  type AddressListParams,
+  type AddressDeleteParams,
+  type AddressGetParams,
 } from './addresses';
-export { DNSRecord, DNSGetResponse, DNS } from './dns';
+export {
+  DNS,
+  type DNSRecord,
+  type DNSDeleteResponse,
+  type DNSGetResponse,
+  type DNSCreateParams,
+  type DNSDeleteParams,
+  type DNSEditParams,
+  type DNSGetParams,
+} from './dns';
 export { EmailRouting } from './email-routing';
+export {
+  EmailRoutingRulesV4PagePaginationArray,
+  Rules,
+  type Action,
+  type EmailRoutingRule,
+  type Matcher,
+  type RuleCreateParams,
+  type RuleUpdateParams,
+  type RuleListParams,
+  type RuleDeleteParams,
+  type RuleGetParams,
+} from './rules/index';
diff --git a/src/resources/email-routing/rules/catch-alls.ts b/src/resources/email-routing/rules/catch-alls.ts
index 2b7e328c2b..288d4ff0b2 100644
--- a/src/resources/email-routing/rules/catch-alls.ts
+++ b/src/resources/email-routing/rules/catch-alls.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as CatchAllsAPI from './catch-alls';
 
 export class CatchAlls extends APIResource {
   /**
@@ -10,12 +9,12 @@ export class CatchAlls extends APIResource {
    * specific destination address.
    */
   update(
-    zoneIdentifier: string,
-    body: CatchAllUpdateParams,
+    params: CatchAllUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<CatchAllUpdateResponse> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.put(`/zones/${zoneIdentifier}/email/routing/rules/catch_all`, {
+      this._client.put(`/zones/${zone_id}/email/routing/rules/catch_all`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: CatchAllUpdateResponse }>
@@ -25,9 +24,10 @@ export class CatchAlls extends APIResource {
   /**
    * Get information on the default catch-all routing rule.
    */
-  get(zoneIdentifier: string, options?: Core.RequestOptions): Core.APIPromise<CatchAllGetResponse> {
+  get(params: CatchAllGetParams, options?: Core.RequestOptions): Core.APIPromise<CatchAllGetResponse> {
+    const { zone_id } = params;
     return (
-      this._client.get(`/zones/${zoneIdentifier}/email/routing/rules/catch_all`, options) as Core.APIPromise<{
+      this._client.get(`/zones/${zone_id}/email/routing/rules/catch_all`, options) as Core.APIPromise<{
         result: CatchAllGetResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -144,30 +144,45 @@ export interface CatchAllGetResponse {
 
 export interface CatchAllUpdateParams {
   /**
-   * List actions for the catch-all routing rule.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: List actions for the catch-all routing rule.
    */
   actions: Array<CatchAllActionParam>;
 
   /**
-   * List of matchers for the catch-all routing rule.
+   * Body param: List of matchers for the catch-all routing rule.
    */
   matchers: Array<CatchAllMatcherParam>;
 
   /**
-   * Routing rule status.
+   * Body param: Routing rule status.
    */
   enabled?: true | false;
 
   /**
-   * Routing rule name.
+   * Body param: Routing rule name.
    */
   name?: string;
 }
 
-export namespace CatchAlls {
-  export import CatchAllAction = CatchAllsAPI.CatchAllAction;
-  export import CatchAllMatcher = CatchAllsAPI.CatchAllMatcher;
-  export import CatchAllUpdateResponse = CatchAllsAPI.CatchAllUpdateResponse;
-  export import CatchAllGetResponse = CatchAllsAPI.CatchAllGetResponse;
-  export import CatchAllUpdateParams = CatchAllsAPI.CatchAllUpdateParams;
+export interface CatchAllGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export declare namespace CatchAlls {
+  export {
+    type CatchAllAction as CatchAllAction,
+    type CatchAllMatcher as CatchAllMatcher,
+    type CatchAllUpdateResponse as CatchAllUpdateResponse,
+    type CatchAllGetResponse as CatchAllGetResponse,
+    type CatchAllUpdateParams as CatchAllUpdateParams,
+    type CatchAllGetParams as CatchAllGetParams,
+  };
 }
diff --git a/src/resources/email-routing/rules/index.ts b/src/resources/email-routing/rules/index.ts
index 5229ecd72e..a3d3d0d738 100644
--- a/src/resources/email-routing/rules/index.ts
+++ b/src/resources/email-routing/rules/index.ts
@@ -1,20 +1,23 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Action,
-  EmailRoutingRule,
-  Matcher,
-  RuleCreateParams,
-  RuleUpdateParams,
-  RuleListParams,
+  CatchAlls,
+  type CatchAllAction,
+  type CatchAllMatcher,
+  type CatchAllUpdateResponse,
+  type CatchAllGetResponse,
+  type CatchAllUpdateParams,
+  type CatchAllGetParams,
+} from './catch-alls';
+export {
   EmailRoutingRulesV4PagePaginationArray,
   Rules,
+  type Action,
+  type EmailRoutingRule,
+  type Matcher,
+  type RuleCreateParams,
+  type RuleUpdateParams,
+  type RuleListParams,
+  type RuleDeleteParams,
+  type RuleGetParams,
 } from './rules';
-export {
-  CatchAllAction,
-  CatchAllMatcher,
-  CatchAllUpdateResponse,
-  CatchAllGetResponse,
-  CatchAllUpdateParams,
-  CatchAlls,
-} from './catch-alls';
diff --git a/src/resources/email-routing/rules/rules.ts b/src/resources/email-routing/rules/rules.ts
index 97d05b4968..208bff7aff 100644
--- a/src/resources/email-routing/rules/rules.ts
+++ b/src/resources/email-routing/rules/rules.ts
@@ -1,10 +1,17 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../resource';
-import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as RulesAPI from './rules';
 import * as CatchAllsAPI from './catch-alls';
+import {
+  CatchAllAction,
+  CatchAllGetParams,
+  CatchAllGetResponse,
+  CatchAllMatcher,
+  CatchAllUpdateParams,
+  CatchAllUpdateResponse,
+  CatchAlls,
+} from './catch-alls';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class Rules extends APIResource {
@@ -15,16 +22,12 @@ export class Rules extends APIResource {
    * sent to a specific custom email address) plus a set of actions to take on the
    * email (like forwarding it to a specific destination address).
    */
-  create(
-    zoneIdentifier: string,
-    body: RuleCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<EmailRoutingRule> {
+  create(params: RuleCreateParams, options?: Core.RequestOptions): Core.APIPromise<EmailRoutingRule> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.post(`/zones/${zoneIdentifier}/email/routing/rules`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: EmailRoutingRule }>
+      this._client.post(`/zones/${zone_id}/email/routing/rules`, { body, ...options }) as Core.APIPromise<{
+        result: EmailRoutingRule;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -32,13 +35,13 @@ export class Rules extends APIResource {
    * Update actions and matches, or enable/disable specific routing rules.
    */
   update(
-    zoneIdentifier: string,
     ruleIdentifier: string,
-    body: RuleUpdateParams,
+    params: RuleUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<EmailRoutingRule> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.put(`/zones/${zoneIdentifier}/email/routing/rules/${ruleIdentifier}`, {
+      this._client.put(`/zones/${zone_id}/email/routing/rules/${ruleIdentifier}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: EmailRoutingRule }>
@@ -49,24 +52,12 @@ export class Rules extends APIResource {
    * Lists existing routing rules.
    */
   list(
-    zoneIdentifier: string,
-    query?: RuleListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<EmailRoutingRulesV4PagePaginationArray, EmailRoutingRule>;
-  list(
-    zoneIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<EmailRoutingRulesV4PagePaginationArray, EmailRoutingRule>;
-  list(
-    zoneIdentifier: string,
-    query: RuleListParams | Core.RequestOptions = {},
+    params: RuleListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<EmailRoutingRulesV4PagePaginationArray, EmailRoutingRule> {
-    if (isRequestOptions(query)) {
-      return this.list(zoneIdentifier, {}, query);
-    }
+    const { zone_id, ...query } = params;
     return this._client.getAPIList(
-      `/zones/${zoneIdentifier}/email/routing/rules`,
+      `/zones/${zone_id}/email/routing/rules`,
       EmailRoutingRulesV4PagePaginationArray,
       { query, ...options },
     );
@@ -76,13 +67,14 @@ export class Rules extends APIResource {
    * Delete a specific routing rule.
    */
   delete(
-    zoneIdentifier: string,
     ruleIdentifier: string,
+    params: RuleDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<EmailRoutingRule> {
+    const { zone_id } = params;
     return (
       this._client.delete(
-        `/zones/${zoneIdentifier}/email/routing/rules/${ruleIdentifier}`,
+        `/zones/${zone_id}/email/routing/rules/${ruleIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: EmailRoutingRule }>
     )._thenUnwrap((obj) => obj.result);
@@ -92,13 +84,14 @@ export class Rules extends APIResource {
    * Get information for a specific routing rule already created.
    */
   get(
-    zoneIdentifier: string,
     ruleIdentifier: string,
+    params: RuleGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<EmailRoutingRule> {
+    const { zone_id } = params;
     return (
       this._client.get(
-        `/zones/${zoneIdentifier}/email/routing/rules/${ruleIdentifier}`,
+        `/zones/${zone_id}/email/routing/rules/${ruleIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: EmailRoutingRule }>
     )._thenUnwrap((obj) => obj.result);
@@ -210,77 +203,117 @@ export interface MatcherParam {
 
 export interface RuleCreateParams {
   /**
-   * List actions patterns.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: List actions patterns.
    */
   actions: Array<ActionParam>;
 
   /**
-   * Matching patterns to forward to your actions.
+   * Body param: Matching patterns to forward to your actions.
    */
   matchers: Array<MatcherParam>;
 
   /**
-   * Routing rule status.
+   * Body param: Routing rule status.
    */
   enabled?: true | false;
 
   /**
-   * Routing rule name.
+   * Body param: Routing rule name.
    */
   name?: string;
 
   /**
-   * Priority of the routing rule.
+   * Body param: Priority of the routing rule.
    */
   priority?: number;
 }
 
 export interface RuleUpdateParams {
   /**
-   * List actions patterns.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: List actions patterns.
    */
   actions: Array<ActionParam>;
 
   /**
-   * Matching patterns to forward to your actions.
+   * Body param: Matching patterns to forward to your actions.
    */
   matchers: Array<MatcherParam>;
 
   /**
-   * Routing rule status.
+   * Body param: Routing rule status.
    */
   enabled?: true | false;
 
   /**
-   * Routing rule name.
+   * Body param: Routing rule name.
    */
   name?: string;
 
   /**
-   * Priority of the routing rule.
+   * Body param: Priority of the routing rule.
    */
   priority?: number;
 }
 
 export interface RuleListParams extends V4PagePaginationArrayParams {
   /**
-   * Filter by enabled routing rules.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: Filter by enabled routing rules.
    */
   enabled?: true | false;
 }
 
-export namespace Rules {
-  export import Action = RulesAPI.Action;
-  export import EmailRoutingRule = RulesAPI.EmailRoutingRule;
-  export import Matcher = RulesAPI.Matcher;
-  export import EmailRoutingRulesV4PagePaginationArray = RulesAPI.EmailRoutingRulesV4PagePaginationArray;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import CatchAlls = CatchAllsAPI.CatchAlls;
-  export import CatchAllAction = CatchAllsAPI.CatchAllAction;
-  export import CatchAllMatcher = CatchAllsAPI.CatchAllMatcher;
-  export import CatchAllUpdateResponse = CatchAllsAPI.CatchAllUpdateResponse;
-  export import CatchAllGetResponse = CatchAllsAPI.CatchAllGetResponse;
-  export import CatchAllUpdateParams = CatchAllsAPI.CatchAllUpdateParams;
+export interface RuleDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface RuleGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+Rules.EmailRoutingRulesV4PagePaginationArray = EmailRoutingRulesV4PagePaginationArray;
+Rules.CatchAlls = CatchAlls;
+
+export declare namespace Rules {
+  export {
+    type Action as Action,
+    type EmailRoutingRule as EmailRoutingRule,
+    type Matcher as Matcher,
+    EmailRoutingRulesV4PagePaginationArray as EmailRoutingRulesV4PagePaginationArray,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleGetParams as RuleGetParams,
+  };
+
+  export {
+    CatchAlls as CatchAlls,
+    type CatchAllAction as CatchAllAction,
+    type CatchAllMatcher as CatchAllMatcher,
+    type CatchAllUpdateResponse as CatchAllUpdateResponse,
+    type CatchAllGetResponse as CatchAllGetResponse,
+    type CatchAllUpdateParams as CatchAllUpdateParams,
+    type CatchAllGetParams as CatchAllGetParams,
+  };
 }
diff --git a/src/resources/email-security/email-security.ts b/src/resources/email-security/email-security.ts
new file mode 100644
index 0000000000..36038ed702
--- /dev/null
+++ b/src/resources/email-security/email-security.ts
@@ -0,0 +1,53 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as SubmissionsAPI from './submissions';
+import {
+  SubmissionListParams,
+  SubmissionListResponse,
+  SubmissionListResponsesV4PagePaginationArray,
+  Submissions,
+} from './submissions';
+import * as InvestigateAPI from './investigate/investigate';
+import {
+  Investigate,
+  InvestigateGetParams,
+  InvestigateGetResponse,
+  InvestigateListParams,
+  InvestigateListResponse,
+  InvestigateListResponsesV4PagePaginationArray,
+} from './investigate/investigate';
+import * as SettingsAPI from './settings/settings';
+import { Settings } from './settings/settings';
+
+export class EmailSecurity extends APIResource {
+  investigate: InvestigateAPI.Investigate = new InvestigateAPI.Investigate(this._client);
+  settings: SettingsAPI.Settings = new SettingsAPI.Settings(this._client);
+  submissions: SubmissionsAPI.Submissions = new SubmissionsAPI.Submissions(this._client);
+}
+
+EmailSecurity.Investigate = Investigate;
+EmailSecurity.InvestigateListResponsesV4PagePaginationArray = InvestigateListResponsesV4PagePaginationArray;
+EmailSecurity.Settings = Settings;
+EmailSecurity.Submissions = Submissions;
+EmailSecurity.SubmissionListResponsesV4PagePaginationArray = SubmissionListResponsesV4PagePaginationArray;
+
+export declare namespace EmailSecurity {
+  export {
+    Investigate as Investigate,
+    type InvestigateListResponse as InvestigateListResponse,
+    type InvestigateGetResponse as InvestigateGetResponse,
+    InvestigateListResponsesV4PagePaginationArray as InvestigateListResponsesV4PagePaginationArray,
+    type InvestigateListParams as InvestigateListParams,
+    type InvestigateGetParams as InvestigateGetParams,
+  };
+
+  export { Settings as Settings };
+
+  export {
+    Submissions as Submissions,
+    type SubmissionListResponse as SubmissionListResponse,
+    SubmissionListResponsesV4PagePaginationArray as SubmissionListResponsesV4PagePaginationArray,
+    type SubmissionListParams as SubmissionListParams,
+  };
+}
diff --git a/src/resources/email-security/index.ts b/src/resources/email-security/index.ts
new file mode 100644
index 0000000000..fea9a511e2
--- /dev/null
+++ b/src/resources/email-security/index.ts
@@ -0,0 +1,18 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { EmailSecurity } from './email-security';
+export {
+  InvestigateListResponsesV4PagePaginationArray,
+  Investigate,
+  type InvestigateListResponse,
+  type InvestigateGetResponse,
+  type InvestigateListParams,
+  type InvestigateGetParams,
+} from './investigate/index';
+export { Settings } from './settings/index';
+export {
+  SubmissionListResponsesV4PagePaginationArray,
+  Submissions,
+  type SubmissionListResponse,
+  type SubmissionListParams,
+} from './submissions';
diff --git a/src/resources/email-security/investigate/detections.ts b/src/resources/email-security/investigate/detections.ts
new file mode 100644
index 0000000000..23c45cc5c0
--- /dev/null
+++ b/src/resources/email-security/investigate/detections.ts
@@ -0,0 +1,137 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Detections extends APIResource {
+  /**
+   * Returns detection details such as threat categories and sender information for
+   * non-benign messages.
+   */
+  get(
+    postfixId: string,
+    params: DetectionGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DetectionGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/email-security/investigate/${postfixId}/detections`,
+        options,
+      ) as Core.APIPromise<{ result: DetectionGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface DetectionGetResponse {
+  action: string;
+
+  attachments: Array<DetectionGetResponse.Attachment>;
+
+  headers: Array<DetectionGetResponse.Header>;
+
+  links: Array<DetectionGetResponse.Link>;
+
+  sender_info: DetectionGetResponse.SenderInfo;
+
+  threat_categories: Array<DetectionGetResponse.ThreatCategory>;
+
+  validation: DetectionGetResponse.Validation;
+
+  final_disposition?:
+    | 'MALICIOUS'
+    | 'MALICIOUS-BEC'
+    | 'SUSPICIOUS'
+    | 'SPOOF'
+    | 'SPAM'
+    | 'BULK'
+    | 'ENCRYPTED'
+    | 'EXTERNAL'
+    | 'UNKNOWN'
+    | 'NONE'
+    | null;
+}
+
+export namespace DetectionGetResponse {
+  export interface Attachment {
+    size: number;
+
+    content_type?: string | null;
+
+    detection?:
+      | 'MALICIOUS'
+      | 'MALICIOUS-BEC'
+      | 'SUSPICIOUS'
+      | 'SPOOF'
+      | 'SPAM'
+      | 'BULK'
+      | 'ENCRYPTED'
+      | 'EXTERNAL'
+      | 'UNKNOWN'
+      | 'NONE'
+      | null;
+
+    encrypted?: boolean | null;
+
+    name?: string | null;
+  }
+
+  export interface Header {
+    name: string;
+
+    value: string;
+  }
+
+  export interface Link {
+    href: string;
+
+    text?: string | null;
+  }
+
+  export interface SenderInfo {
+    /**
+     * The name of the autonomous system.
+     */
+    as_name?: string | null;
+
+    /**
+     * The number of the autonomous system.
+     */
+    as_number?: number | null;
+
+    geo?: string | null;
+
+    ip?: string | null;
+
+    pld?: string | null;
+  }
+
+  export interface ThreatCategory {
+    id: number;
+
+    description?: string | null;
+
+    name?: string | null;
+  }
+
+  export interface Validation {
+    comment?: string | null;
+
+    dkim?: 'pass' | 'neutral' | 'fail' | 'error' | 'none' | null;
+
+    dmarc?: 'pass' | 'neutral' | 'fail' | 'error' | 'none' | null;
+
+    spf?: 'pass' | 'neutral' | 'fail' | 'error' | 'none' | null;
+  }
+}
+
+export interface DetectionGetParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace Detections {
+  export { type DetectionGetResponse as DetectionGetResponse, type DetectionGetParams as DetectionGetParams };
+}
diff --git a/src/resources/email-security/investigate/index.ts b/src/resources/email-security/investigate/index.ts
new file mode 100644
index 0000000000..cde8e584e9
--- /dev/null
+++ b/src/resources/email-security/investigate/index.ts
@@ -0,0 +1,29 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Detections, type DetectionGetResponse, type DetectionGetParams } from './detections';
+export {
+  InvestigateListResponsesV4PagePaginationArray,
+  Investigate,
+  type InvestigateListResponse,
+  type InvestigateGetResponse,
+  type InvestigateListParams,
+  type InvestigateGetParams,
+} from './investigate';
+export {
+  Move,
+  type MoveCreateResponse,
+  type MoveBulkResponse,
+  type MoveCreateParams,
+  type MoveBulkParams,
+} from './move';
+export {
+  Preview,
+  type PreviewCreateResponse,
+  type PreviewGetResponse,
+  type PreviewCreateParams,
+  type PreviewGetParams,
+} from './preview';
+export { Raw, type RawGetResponse, type RawGetParams } from './raw';
+export { Reclassify, type ReclassifyCreateResponse, type ReclassifyCreateParams } from './reclassify';
+export { Release, type ReleaseBulkResponse, type ReleaseBulkParams } from './release';
+export { Trace, type TraceGetResponse, type TraceGetParams } from './trace';
diff --git a/src/resources/email-security/investigate/investigate.ts b/src/resources/email-security/investigate/investigate.ts
new file mode 100644
index 0000000000..ab0a2e952f
--- /dev/null
+++ b/src/resources/email-security/investigate/investigate.ts
@@ -0,0 +1,394 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as DetectionsAPI from './detections';
+import { DetectionGetParams, DetectionGetResponse, Detections } from './detections';
+import * as MoveAPI from './move';
+import { Move, MoveBulkParams, MoveBulkResponse, MoveCreateParams, MoveCreateResponse } from './move';
+import * as PreviewAPI from './preview';
+import {
+  Preview,
+  PreviewCreateParams,
+  PreviewCreateResponse,
+  PreviewGetParams,
+  PreviewGetResponse,
+} from './preview';
+import * as RawAPI from './raw';
+import { Raw, RawGetParams, RawGetResponse } from './raw';
+import * as ReclassifyAPI from './reclassify';
+import { Reclassify, ReclassifyCreateParams, ReclassifyCreateResponse } from './reclassify';
+import * as ReleaseAPI from './release';
+import { Release, ReleaseBulkParams, ReleaseBulkResponse } from './release';
+import * as TraceAPI from './trace';
+import { Trace, TraceGetParams, TraceGetResponse } from './trace';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
+
+export class Investigate extends APIResource {
+  detections: DetectionsAPI.Detections = new DetectionsAPI.Detections(this._client);
+  preview: PreviewAPI.Preview = new PreviewAPI.Preview(this._client);
+  raw: RawAPI.Raw = new RawAPI.Raw(this._client);
+  trace: TraceAPI.Trace = new TraceAPI.Trace(this._client);
+  move: MoveAPI.Move = new MoveAPI.Move(this._client);
+  reclassify: ReclassifyAPI.Reclassify = new ReclassifyAPI.Reclassify(this._client);
+  release: ReleaseAPI.Release = new ReleaseAPI.Release(this._client);
+
+  /**
+   * Returns information for each email that matches the search parameter(s).
+   */
+  list(
+    params: InvestigateListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<InvestigateListResponsesV4PagePaginationArray, InvestigateListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/email-security/investigate`,
+      InvestigateListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Get message details
+   */
+  get(
+    postfixId: string,
+    params: InvestigateGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<InvestigateGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/email-security/investigate/${postfixId}`,
+        options,
+      ) as Core.APIPromise<{ result: InvestigateGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class InvestigateListResponsesV4PagePaginationArray extends V4PagePaginationArray<InvestigateListResponse> {}
+
+export interface InvestigateListResponse {
+  id: string;
+
+  action_log: unknown;
+
+  client_recipients: Array<string>;
+
+  detection_reasons: Array<string>;
+
+  is_phish_submission: boolean;
+
+  is_quarantined: boolean;
+
+  /**
+   * The identifier of the message.
+   */
+  postfix_id: string;
+
+  ts: string;
+
+  alert_id?: string | null;
+
+  delivery_mode?:
+    | 'DIRECT'
+    | 'BCC'
+    | 'JOURNAL'
+    | 'REVIEW_SUBMISSION'
+    | 'DMARC_UNVERIFIED'
+    | 'DMARC_FAILURE_REPORT'
+    | 'DMARC_AGGREGATE_REPORT'
+    | 'THREAT_INTEL_SUBMISSION'
+    | 'SIMULATION_SUBMISSION'
+    | 'API'
+    | 'RETRO_SCAN'
+    | null;
+
+  edf_hash?: string | null;
+
+  final_disposition?:
+    | 'MALICIOUS'
+    | 'MALICIOUS-BEC'
+    | 'SUSPICIOUS'
+    | 'SPOOF'
+    | 'SPAM'
+    | 'BULK'
+    | 'ENCRYPTED'
+    | 'EXTERNAL'
+    | 'UNKNOWN'
+    | 'NONE'
+    | null;
+
+  from?: string | null;
+
+  from_name?: string | null;
+
+  message_id?: string | null;
+
+  sent_date?: string | null;
+
+  subject?: string | null;
+
+  threat_categories?: Array<string> | null;
+
+  to?: Array<string> | null;
+
+  to_name?: Array<string> | null;
+
+  validation?: InvestigateListResponse.Validation | null;
+}
+
+export namespace InvestigateListResponse {
+  export interface Validation {
+    comment?: string | null;
+
+    dkim?: 'pass' | 'neutral' | 'fail' | 'error' | 'none' | null;
+
+    dmarc?: 'pass' | 'neutral' | 'fail' | 'error' | 'none' | null;
+
+    spf?: 'pass' | 'neutral' | 'fail' | 'error' | 'none' | null;
+  }
+}
+
+export interface InvestigateGetResponse {
+  id: string;
+
+  action_log: unknown;
+
+  client_recipients: Array<string>;
+
+  detection_reasons: Array<string>;
+
+  is_phish_submission: boolean;
+
+  is_quarantined: boolean;
+
+  /**
+   * The identifier of the message.
+   */
+  postfix_id: string;
+
+  ts: string;
+
+  alert_id?: string | null;
+
+  delivery_mode?:
+    | 'DIRECT'
+    | 'BCC'
+    | 'JOURNAL'
+    | 'REVIEW_SUBMISSION'
+    | 'DMARC_UNVERIFIED'
+    | 'DMARC_FAILURE_REPORT'
+    | 'DMARC_AGGREGATE_REPORT'
+    | 'THREAT_INTEL_SUBMISSION'
+    | 'SIMULATION_SUBMISSION'
+    | 'API'
+    | 'RETRO_SCAN'
+    | null;
+
+  edf_hash?: string | null;
+
+  final_disposition?:
+    | 'MALICIOUS'
+    | 'MALICIOUS-BEC'
+    | 'SUSPICIOUS'
+    | 'SPOOF'
+    | 'SPAM'
+    | 'BULK'
+    | 'ENCRYPTED'
+    | 'EXTERNAL'
+    | 'UNKNOWN'
+    | 'NONE'
+    | null;
+
+  from?: string | null;
+
+  from_name?: string | null;
+
+  message_id?: string | null;
+
+  sent_date?: string | null;
+
+  subject?: string | null;
+
+  threat_categories?: Array<string> | null;
+
+  to?: Array<string> | null;
+
+  to_name?: Array<string> | null;
+
+  validation?: InvestigateGetResponse.Validation | null;
+}
+
+export namespace InvestigateGetResponse {
+  export interface Validation {
+    comment?: string | null;
+
+    dkim?: 'pass' | 'neutral' | 'fail' | 'error' | 'none' | null;
+
+    dmarc?: 'pass' | 'neutral' | 'fail' | 'error' | 'none' | null;
+
+    spf?: 'pass' | 'neutral' | 'fail' | 'error' | 'none' | null;
+  }
+}
+
+export interface InvestigateListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param: Determines if the message action log is included in the response.
+   */
+  action_log?: boolean;
+
+  /**
+   * Query param:
+   */
+  alert_id?: string;
+
+  /**
+   * Query param: Determines if the search results will include detections or not.
+   */
+  detections_only?: boolean;
+
+  /**
+   * Query param: The sender domains the search filters by.
+   */
+  domain?: string;
+
+  /**
+   * Query param: The end of the search date range. Defaults to `now`.
+   */
+  end?: string;
+
+  /**
+   * Query param: The dispositions the search filters by.
+   */
+  final_disposition?: 'MALICIOUS' | 'SUSPICIOUS' | 'SPOOF' | 'SPAM' | 'BULK';
+
+  /**
+   * Query param: The message actions the search filters by.
+   */
+  message_action?: 'PREVIEW' | 'QUARANTINE_RELEASED' | 'MOVED';
+
+  /**
+   * Query param:
+   */
+  message_id?: string;
+
+  /**
+   * Query param:
+   */
+  metric?: string;
+
+  /**
+   * Query param: The space-delimited term used in the query. The search is
+   * case-insensitive.
+   *
+   * The content of the following email metadata fields are searched:
+   *
+   * - alert_id
+   * - CC
+   * - From (envelope_from)
+   * - From Name
+   * - final_disposition
+   * - md5 hash (of any attachment)
+   * - sha1 hash (of any attachment)
+   * - sha256 hash (of any attachment)
+   * - name (of any attachment)
+   * - Reason
+   * - Received DateTime (yyyy-mm-ddThh:mm:ss)
+   * - Sent DateTime (yyyy-mm-ddThh:mm:ss)
+   * - ReplyTo
+   * - To (envelope_to)
+   * - To Name
+   * - Message-ID
+   * - smtp_helo_server_ip
+   * - smtp_previous_hop_ip
+   * - x_originating_ip
+   * - Subject
+   */
+  query?: string;
+
+  /**
+   * Query param:
+   */
+  recipient?: string;
+
+  /**
+   * Query param:
+   */
+  sender?: string;
+
+  /**
+   * Query param: The beginning of the search date range. Defaults to
+   * `now - 30 days`.
+   */
+  start?: string;
+}
+
+export interface InvestigateGetParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+Investigate.InvestigateListResponsesV4PagePaginationArray = InvestigateListResponsesV4PagePaginationArray;
+Investigate.Detections = Detections;
+Investigate.Preview = Preview;
+Investigate.Raw = Raw;
+Investigate.Trace = Trace;
+Investigate.Move = Move;
+Investigate.Reclassify = Reclassify;
+Investigate.Release = Release;
+
+export declare namespace Investigate {
+  export {
+    type InvestigateListResponse as InvestigateListResponse,
+    type InvestigateGetResponse as InvestigateGetResponse,
+    InvestigateListResponsesV4PagePaginationArray as InvestigateListResponsesV4PagePaginationArray,
+    type InvestigateListParams as InvestigateListParams,
+    type InvestigateGetParams as InvestigateGetParams,
+  };
+
+  export {
+    Detections as Detections,
+    type DetectionGetResponse as DetectionGetResponse,
+    type DetectionGetParams as DetectionGetParams,
+  };
+
+  export {
+    Preview as Preview,
+    type PreviewCreateResponse as PreviewCreateResponse,
+    type PreviewGetResponse as PreviewGetResponse,
+    type PreviewCreateParams as PreviewCreateParams,
+    type PreviewGetParams as PreviewGetParams,
+  };
+
+  export { Raw as Raw, type RawGetResponse as RawGetResponse, type RawGetParams as RawGetParams };
+
+  export { Trace as Trace, type TraceGetResponse as TraceGetResponse, type TraceGetParams as TraceGetParams };
+
+  export {
+    Move as Move,
+    type MoveCreateResponse as MoveCreateResponse,
+    type MoveBulkResponse as MoveBulkResponse,
+    type MoveCreateParams as MoveCreateParams,
+    type MoveBulkParams as MoveBulkParams,
+  };
+
+  export {
+    Reclassify as Reclassify,
+    type ReclassifyCreateResponse as ReclassifyCreateResponse,
+    type ReclassifyCreateParams as ReclassifyCreateParams,
+  };
+
+  export {
+    Release as Release,
+    type ReleaseBulkResponse as ReleaseBulkResponse,
+    type ReleaseBulkParams as ReleaseBulkParams,
+  };
+}
diff --git a/src/resources/email-security/investigate/move.ts b/src/resources/email-security/investigate/move.ts
new file mode 100644
index 0000000000..67218ad04c
--- /dev/null
+++ b/src/resources/email-security/investigate/move.ts
@@ -0,0 +1,124 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Move extends APIResource {
+  /**
+   * Move a message
+   */
+  create(
+    postfixId: string,
+    params: MoveCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<MoveCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/email-security/investigate/${postfixId}/move`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: MoveCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Move multiple messages
+   */
+  bulk(params: MoveBulkParams, options?: Core.RequestOptions): Core.APIPromise<MoveBulkResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/email-security/investigate/move`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: MoveBulkResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type MoveCreateResponse = Array<MoveCreateResponse.MoveCreateResponseItem>;
+
+export namespace MoveCreateResponse {
+  export interface MoveCreateResponseItem {
+    completed_timestamp: string;
+
+    destination: string;
+
+    item_count: number;
+
+    message_id: string;
+
+    operation: string;
+
+    recipient: string;
+
+    status: string;
+  }
+}
+
+export type MoveBulkResponse = Array<MoveBulkResponse.MoveBulkResponseItem>;
+
+export namespace MoveBulkResponse {
+  export interface MoveBulkResponseItem {
+    completed_timestamp: string;
+
+    destination: string;
+
+    item_count: number;
+
+    message_id: string;
+
+    operation: string;
+
+    recipient: string;
+
+    status: string;
+  }
+}
+
+export interface MoveCreateParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  destination:
+    | 'Inbox'
+    | 'JunkEmail'
+    | 'DeletedItems'
+    | 'RecoverableItemsDeletions'
+    | 'RecoverableItemsPurges';
+}
+
+export interface MoveBulkParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  destination:
+    | 'Inbox'
+    | 'JunkEmail'
+    | 'DeletedItems'
+    | 'RecoverableItemsDeletions'
+    | 'RecoverableItemsPurges';
+
+  /**
+   * Body param:
+   */
+  postfix_ids: Array<string>;
+}
+
+export declare namespace Move {
+  export {
+    type MoveCreateResponse as MoveCreateResponse,
+    type MoveBulkResponse as MoveBulkResponse,
+    type MoveCreateParams as MoveCreateParams,
+    type MoveBulkParams as MoveBulkParams,
+  };
+}
diff --git a/src/resources/email-security/investigate/preview.ts b/src/resources/email-security/investigate/preview.ts
new file mode 100644
index 0000000000..5ee20b3331
--- /dev/null
+++ b/src/resources/email-security/investigate/preview.ts
@@ -0,0 +1,79 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Preview extends APIResource {
+  /**
+   * Preview for non-detection messages
+   */
+  create(params: PreviewCreateParams, options?: Core.RequestOptions): Core.APIPromise<PreviewCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/email-security/investigate/preview`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: PreviewCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Returns a preview of the message body as a base64 encoded PNG image for
+   * non-benign messages.
+   */
+  get(
+    postfixId: string,
+    params: PreviewGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PreviewGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/email-security/investigate/${postfixId}/preview`,
+        options,
+      ) as Core.APIPromise<{ result: PreviewGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface PreviewCreateResponse {
+  /**
+   * A base64 encoded PNG image of the email.
+   */
+  screenshot: string;
+}
+
+export interface PreviewGetResponse {
+  /**
+   * A base64 encoded PNG image of the email.
+   */
+  screenshot: string;
+}
+
+export interface PreviewCreateParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: The identifier of the message.
+   */
+  postfix_id: string;
+}
+
+export interface PreviewGetParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace Preview {
+  export {
+    type PreviewCreateResponse as PreviewCreateResponse,
+    type PreviewGetResponse as PreviewGetResponse,
+    type PreviewCreateParams as PreviewCreateParams,
+    type PreviewGetParams as PreviewGetParams,
+  };
+}
diff --git a/src/resources/email-security/investigate/raw.ts b/src/resources/email-security/investigate/raw.ts
new file mode 100644
index 0000000000..611179b942
--- /dev/null
+++ b/src/resources/email-security/investigate/raw.ts
@@ -0,0 +1,41 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Raw extends APIResource {
+  /**
+   * Returns the raw eml of any non-benign message.
+   */
+  get(
+    postfixId: string,
+    params: RawGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RawGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/email-security/investigate/${postfixId}/raw`,
+        options,
+      ) as Core.APIPromise<{ result: RawGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface RawGetResponse {
+  /**
+   * A UTF-8 encoded eml file of the email.
+   */
+  raw: string;
+}
+
+export interface RawGetParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace Raw {
+  export { type RawGetResponse as RawGetResponse, type RawGetParams as RawGetParams };
+}
diff --git a/src/resources/email-security/investigate/reclassify.ts b/src/resources/email-security/investigate/reclassify.ts
new file mode 100644
index 0000000000..bbb0b5b7aa
--- /dev/null
+++ b/src/resources/email-security/investigate/reclassify.ts
@@ -0,0 +1,49 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Reclassify extends APIResource {
+  /**
+   * Change email classfication
+   */
+  create(
+    postfixId: string,
+    params: ReclassifyCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ReclassifyCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/email-security/investigate/${postfixId}/reclassify`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: ReclassifyCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type ReclassifyCreateResponse = unknown;
+
+export interface ReclassifyCreateParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  expected_disposition: 'NONE' | 'BULK' | 'MALICIOUS' | 'SPAM' | 'SPOOF' | 'SUSPICIOUS';
+
+  /**
+   * Body param: Base64 encoded content of the EML file
+   */
+  eml_content?: string | null;
+}
+
+export declare namespace Reclassify {
+  export {
+    type ReclassifyCreateResponse as ReclassifyCreateResponse,
+    type ReclassifyCreateParams as ReclassifyCreateParams,
+  };
+}
diff --git a/src/resources/email-security/investigate/release.ts b/src/resources/email-security/investigate/release.ts
new file mode 100644
index 0000000000..370e614f4f
--- /dev/null
+++ b/src/resources/email-security/investigate/release.ts
@@ -0,0 +1,53 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Release extends APIResource {
+  /**
+   * Release messages from quarantine
+   */
+  bulk(params: ReleaseBulkParams, options?: Core.RequestOptions): Core.APIPromise<ReleaseBulkResponse> {
+    const { account_id, body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/email-security/investigate/release`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: ReleaseBulkResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type ReleaseBulkResponse = Array<ReleaseBulkResponse.ReleaseBulkResponseItem>;
+
+export namespace ReleaseBulkResponse {
+  export interface ReleaseBulkResponseItem {
+    /**
+     * The identifier of the message.
+     */
+    postfix_id: string;
+
+    delivered?: Array<string> | null;
+
+    failed?: Array<string> | null;
+
+    undelivered?: Array<string> | null;
+  }
+}
+
+export interface ReleaseBulkParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: A list of messages identfied by their `postfix_id`s that should be
+   * released.
+   */
+  body: Array<string>;
+}
+
+export declare namespace Release {
+  export { type ReleaseBulkResponse as ReleaseBulkResponse, type ReleaseBulkParams as ReleaseBulkParams };
+}
diff --git a/src/resources/email-security/investigate/trace.ts b/src/resources/email-security/investigate/trace.ts
new file mode 100644
index 0000000000..8d69f6acf0
--- /dev/null
+++ b/src/resources/email-security/investigate/trace.ts
@@ -0,0 +1,70 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Trace extends APIResource {
+  /**
+   * Get email trace
+   */
+  get(
+    postfixId: string,
+    params: TraceGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TraceGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/email-security/investigate/${postfixId}/trace`,
+        options,
+      ) as Core.APIPromise<{ result: TraceGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface TraceGetResponse {
+  inbound: TraceGetResponse.Inbound;
+
+  outbound: TraceGetResponse.Outbound;
+}
+
+export namespace TraceGetResponse {
+  export interface Inbound {
+    lines?: Array<Inbound.Line> | null;
+  }
+
+  export namespace Inbound {
+    export interface Line {
+      lineno: number;
+
+      message: string;
+
+      ts: string;
+    }
+  }
+
+  export interface Outbound {
+    lines?: Array<Outbound.Line> | null;
+  }
+
+  export namespace Outbound {
+    export interface Line {
+      lineno: number;
+
+      message: string;
+
+      ts: string;
+    }
+  }
+}
+
+export interface TraceGetParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace Trace {
+  export { type TraceGetResponse as TraceGetResponse, type TraceGetParams as TraceGetParams };
+}
diff --git a/src/resources/email-security/settings/allow-policies.ts b/src/resources/email-security/settings/allow-policies.ts
new file mode 100644
index 0000000000..a146ed87d7
--- /dev/null
+++ b/src/resources/email-security/settings/allow-policies.ts
@@ -0,0 +1,539 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
+
+export class AllowPolicies extends APIResource {
+  /**
+   * Create an email allow policy
+   */
+  create(
+    params: AllowPolicyCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AllowPolicyCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/email-security/settings/allow_policies`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: AllowPolicyCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists, searches, and sorts an account’s email allow policies.
+   */
+  list(
+    params: AllowPolicyListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<AllowPolicyListResponsesV4PagePaginationArray, AllowPolicyListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/email-security/settings/allow_policies`,
+      AllowPolicyListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Delete an email allow policy
+   */
+  delete(
+    policyId: number,
+    params: AllowPolicyDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AllowPolicyDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/email-security/settings/allow_policies/${policyId}`,
+        options,
+      ) as Core.APIPromise<{ result: AllowPolicyDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update an email allow policy
+   */
+  edit(
+    policyId: number,
+    params: AllowPolicyEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AllowPolicyEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/email-security/settings/allow_policies/${policyId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: AllowPolicyEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get an email allow policy
+   */
+  get(
+    policyId: number,
+    params: AllowPolicyGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AllowPolicyGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/email-security/settings/allow_policies/${policyId}`,
+        options,
+      ) as Core.APIPromise<{ result: AllowPolicyGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class AllowPolicyListResponsesV4PagePaginationArray extends V4PagePaginationArray<AllowPolicyListResponse> {}
+
+export interface AllowPolicyCreateResponse {
+  /**
+   * The unique identifier for the allow policy.
+   */
+  id: number;
+
+  created_at: string;
+
+  /**
+   * Messages from this sender will be exempted from Spam, Spoof and Bulk
+   * dispositions. Note: This will not exempt messages with Malicious or Suspicious
+   * dispositions.
+   */
+  is_acceptable_sender: boolean;
+
+  /**
+   * Messages to this recipient will bypass all detections.
+   */
+  is_exempt_recipient: boolean;
+
+  is_regex: boolean;
+
+  /**
+   * Messages from this sender will bypass all detections and link following.
+   */
+  is_trusted_sender: boolean;
+
+  last_modified: string;
+
+  pattern: string;
+
+  pattern_type: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  /**
+   * Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+   * policies that pass authentication.
+   */
+  verify_sender: boolean;
+
+  comments?: string | null;
+
+  /**
+   * @deprecated
+   */
+  is_recipient?: boolean;
+
+  /**
+   * @deprecated
+   */
+  is_sender?: boolean;
+
+  /**
+   * @deprecated
+   */
+  is_spoof?: boolean;
+}
+
+export interface AllowPolicyListResponse {
+  /**
+   * The unique identifier for the allow policy.
+   */
+  id: number;
+
+  created_at: string;
+
+  /**
+   * Messages from this sender will be exempted from Spam, Spoof and Bulk
+   * dispositions. Note: This will not exempt messages with Malicious or Suspicious
+   * dispositions.
+   */
+  is_acceptable_sender: boolean;
+
+  /**
+   * Messages to this recipient will bypass all detections.
+   */
+  is_exempt_recipient: boolean;
+
+  is_regex: boolean;
+
+  /**
+   * Messages from this sender will bypass all detections and link following.
+   */
+  is_trusted_sender: boolean;
+
+  last_modified: string;
+
+  pattern: string;
+
+  pattern_type: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  /**
+   * Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+   * policies that pass authentication.
+   */
+  verify_sender: boolean;
+
+  comments?: string | null;
+
+  /**
+   * @deprecated
+   */
+  is_recipient?: boolean;
+
+  /**
+   * @deprecated
+   */
+  is_sender?: boolean;
+
+  /**
+   * @deprecated
+   */
+  is_spoof?: boolean;
+}
+
+export interface AllowPolicyDeleteResponse {
+  /**
+   * The unique identifier for the allow policy.
+   */
+  id: number;
+}
+
+export interface AllowPolicyEditResponse {
+  /**
+   * The unique identifier for the allow policy.
+   */
+  id: number;
+
+  created_at: string;
+
+  /**
+   * Messages from this sender will be exempted from Spam, Spoof and Bulk
+   * dispositions. Note: This will not exempt messages with Malicious or Suspicious
+   * dispositions.
+   */
+  is_acceptable_sender: boolean;
+
+  /**
+   * Messages to this recipient will bypass all detections.
+   */
+  is_exempt_recipient: boolean;
+
+  is_regex: boolean;
+
+  /**
+   * Messages from this sender will bypass all detections and link following.
+   */
+  is_trusted_sender: boolean;
+
+  last_modified: string;
+
+  pattern: string;
+
+  pattern_type: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  /**
+   * Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+   * policies that pass authentication.
+   */
+  verify_sender: boolean;
+
+  comments?: string | null;
+
+  /**
+   * @deprecated
+   */
+  is_recipient?: boolean;
+
+  /**
+   * @deprecated
+   */
+  is_sender?: boolean;
+
+  /**
+   * @deprecated
+   */
+  is_spoof?: boolean;
+}
+
+export interface AllowPolicyGetResponse {
+  /**
+   * The unique identifier for the allow policy.
+   */
+  id: number;
+
+  created_at: string;
+
+  /**
+   * Messages from this sender will be exempted from Spam, Spoof and Bulk
+   * dispositions. Note: This will not exempt messages with Malicious or Suspicious
+   * dispositions.
+   */
+  is_acceptable_sender: boolean;
+
+  /**
+   * Messages to this recipient will bypass all detections.
+   */
+  is_exempt_recipient: boolean;
+
+  is_regex: boolean;
+
+  /**
+   * Messages from this sender will bypass all detections and link following.
+   */
+  is_trusted_sender: boolean;
+
+  last_modified: string;
+
+  pattern: string;
+
+  pattern_type: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  /**
+   * Enforce DMARC, SPF or DKIM authentication. When on, Email Security only honors
+   * policies that pass authentication.
+   */
+  verify_sender: boolean;
+
+  comments?: string | null;
+
+  /**
+   * @deprecated
+   */
+  is_recipient?: boolean;
+
+  /**
+   * @deprecated
+   */
+  is_sender?: boolean;
+
+  /**
+   * @deprecated
+   */
+  is_spoof?: boolean;
+}
+
+export interface AllowPolicyCreateParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: Messages from this sender will be exempted from Spam, Spoof and Bulk
+   * dispositions. Note: This will not exempt messages with Malicious or Suspicious
+   * dispositions.
+   */
+  is_acceptable_sender: boolean;
+
+  /**
+   * Body param: Messages to this recipient will bypass all detections.
+   */
+  is_exempt_recipient: boolean;
+
+  /**
+   * Body param:
+   */
+  is_regex: boolean;
+
+  /**
+   * Body param: Messages from this sender will bypass all detections and link
+   * following.
+   */
+  is_trusted_sender: boolean;
+
+  /**
+   * Body param:
+   */
+  pattern: string;
+
+  /**
+   * Body param:
+   */
+  pattern_type: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  /**
+   * Body param: Enforce DMARC, SPF or DKIM authentication. When on, Email Security
+   * only honors policies that pass authentication.
+   */
+  verify_sender: boolean;
+
+  /**
+   * Body param:
+   */
+  comments?: string | null;
+
+  /**
+   * Body param:
+   */
+  is_recipient?: boolean;
+
+  /**
+   * Body param:
+   */
+  is_sender?: boolean;
+
+  /**
+   * Body param:
+   */
+  is_spoof?: boolean;
+}
+
+export interface AllowPolicyListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param: The sorting direction.
+   */
+  direction?: 'asc' | 'desc';
+
+  /**
+   * Query param:
+   */
+  is_acceptable_sender?: boolean;
+
+  /**
+   * Query param:
+   */
+  is_exempt_recipient?: boolean;
+
+  /**
+   * Query param:
+   */
+  is_recipient?: boolean;
+
+  /**
+   * Query param:
+   */
+  is_sender?: boolean;
+
+  /**
+   * Query param:
+   */
+  is_spoof?: boolean;
+
+  /**
+   * Query param:
+   */
+  is_trusted_sender?: boolean;
+
+  /**
+   * Query param: The field to sort by.
+   */
+  order?: 'pattern' | 'created_at';
+
+  /**
+   * Query param:
+   */
+  pattern_type?: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  /**
+   * Query param: Allows searching in multiple properties of a record simultaneously.
+   * This parameter is intended for human users, not automation. Its exact behavior
+   * is intentionally left unspecified and is subject to change in the future.
+   */
+  search?: string;
+
+  /**
+   * Query param:
+   */
+  verify_sender?: boolean;
+}
+
+export interface AllowPolicyDeleteParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+export interface AllowPolicyEditParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  comments?: string | null;
+
+  /**
+   * Body param: Messages from this sender will be exempted from Spam, Spoof and Bulk
+   * dispositions. Note: This will not exempt messages with Malicious or Suspicious
+   * dispositions.
+   */
+  is_acceptable_sender?: boolean | null;
+
+  /**
+   * Body param: Messages to this recipient will bypass all detections.
+   */
+  is_exempt_recipient?: boolean | null;
+
+  /**
+   * Body param:
+   */
+  is_regex?: boolean | null;
+
+  /**
+   * Body param: Messages from this sender will bypass all detections and link
+   * following.
+   */
+  is_trusted_sender?: boolean | null;
+
+  /**
+   * Body param:
+   */
+  pattern?: string | null;
+
+  /**
+   * Body param:
+   */
+  pattern_type?: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN' | null;
+
+  /**
+   * Body param: Enforce DMARC, SPF or DKIM authentication. When on, Email Security
+   * only honors policies that pass authentication.
+   */
+  verify_sender?: boolean | null;
+}
+
+export interface AllowPolicyGetParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+AllowPolicies.AllowPolicyListResponsesV4PagePaginationArray = AllowPolicyListResponsesV4PagePaginationArray;
+
+export declare namespace AllowPolicies {
+  export {
+    type AllowPolicyCreateResponse as AllowPolicyCreateResponse,
+    type AllowPolicyListResponse as AllowPolicyListResponse,
+    type AllowPolicyDeleteResponse as AllowPolicyDeleteResponse,
+    type AllowPolicyEditResponse as AllowPolicyEditResponse,
+    type AllowPolicyGetResponse as AllowPolicyGetResponse,
+    AllowPolicyListResponsesV4PagePaginationArray as AllowPolicyListResponsesV4PagePaginationArray,
+    type AllowPolicyCreateParams as AllowPolicyCreateParams,
+    type AllowPolicyListParams as AllowPolicyListParams,
+    type AllowPolicyDeleteParams as AllowPolicyDeleteParams,
+    type AllowPolicyEditParams as AllowPolicyEditParams,
+    type AllowPolicyGetParams as AllowPolicyGetParams,
+  };
+}
diff --git a/src/resources/email-security/settings/block-senders.ts b/src/resources/email-security/settings/block-senders.ts
new file mode 100644
index 0000000000..96dcd050d5
--- /dev/null
+++ b/src/resources/email-security/settings/block-senders.ts
@@ -0,0 +1,289 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
+
+export class BlockSenders extends APIResource {
+  /**
+   * Create a blocked email sender
+   */
+  create(
+    params: BlockSenderCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BlockSenderCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/email-security/settings/block_senders`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: BlockSenderCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List blocked email senders
+   */
+  list(
+    params: BlockSenderListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<BlockSenderListResponsesV4PagePaginationArray, BlockSenderListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/email-security/settings/block_senders`,
+      BlockSenderListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Delete a blocked email sender
+   */
+  delete(
+    patternId: number,
+    params: BlockSenderDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BlockSenderDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/email-security/settings/block_senders/${patternId}`,
+        options,
+      ) as Core.APIPromise<{ result: BlockSenderDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update a blocked email sender
+   */
+  edit(
+    patternId: number,
+    params: BlockSenderEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BlockSenderEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/email-security/settings/block_senders/${patternId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: BlockSenderEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get a blocked email sender
+   */
+  get(
+    patternId: number,
+    params: BlockSenderGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BlockSenderGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/email-security/settings/block_senders/${patternId}`,
+        options,
+      ) as Core.APIPromise<{ result: BlockSenderGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class BlockSenderListResponsesV4PagePaginationArray extends V4PagePaginationArray<BlockSenderListResponse> {}
+
+export interface BlockSenderCreateResponse {
+  /**
+   * The unique identifier for the allow policy.
+   */
+  id: number;
+
+  created_at: string;
+
+  is_regex: boolean;
+
+  last_modified: string;
+
+  pattern: string;
+
+  pattern_type: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  comments?: string | null;
+}
+
+export interface BlockSenderListResponse {
+  /**
+   * The unique identifier for the allow policy.
+   */
+  id: number;
+
+  created_at: string;
+
+  is_regex: boolean;
+
+  last_modified: string;
+
+  pattern: string;
+
+  pattern_type: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  comments?: string | null;
+}
+
+export interface BlockSenderDeleteResponse {
+  /**
+   * The unique identifier for the allow policy.
+   */
+  id: number;
+}
+
+export interface BlockSenderEditResponse {
+  /**
+   * The unique identifier for the allow policy.
+   */
+  id: number;
+
+  created_at: string;
+
+  is_regex: boolean;
+
+  last_modified: string;
+
+  pattern: string;
+
+  pattern_type: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  comments?: string | null;
+}
+
+export interface BlockSenderGetResponse {
+  /**
+   * The unique identifier for the allow policy.
+   */
+  id: number;
+
+  created_at: string;
+
+  is_regex: boolean;
+
+  last_modified: string;
+
+  pattern: string;
+
+  pattern_type: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  comments?: string | null;
+}
+
+export interface BlockSenderCreateParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  is_regex: boolean;
+
+  /**
+   * Body param:
+   */
+  pattern: string;
+
+  /**
+   * Body param:
+   */
+  pattern_type: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  /**
+   * Body param:
+   */
+  comments?: string | null;
+}
+
+export interface BlockSenderListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param: The sorting direction.
+   */
+  direction?: 'asc' | 'desc';
+
+  /**
+   * Query param: The field to sort by.
+   */
+  order?: 'pattern' | 'created_at';
+
+  /**
+   * Query param:
+   */
+  pattern_type?: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN';
+
+  /**
+   * Query param: Allows searching in multiple properties of a record simultaneously.
+   * This parameter is intended for human users, not automation. Its exact behavior
+   * is intentionally left unspecified and is subject to change in the future.
+   */
+  search?: string;
+}
+
+export interface BlockSenderDeleteParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+export interface BlockSenderEditParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  comments?: string | null;
+
+  /**
+   * Body param:
+   */
+  is_regex?: boolean | null;
+
+  /**
+   * Body param:
+   */
+  pattern?: string | null;
+
+  /**
+   * Body param:
+   */
+  pattern_type?: 'EMAIL' | 'DOMAIN' | 'IP' | 'UNKNOWN' | null;
+}
+
+export interface BlockSenderGetParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+BlockSenders.BlockSenderListResponsesV4PagePaginationArray = BlockSenderListResponsesV4PagePaginationArray;
+
+export declare namespace BlockSenders {
+  export {
+    type BlockSenderCreateResponse as BlockSenderCreateResponse,
+    type BlockSenderListResponse as BlockSenderListResponse,
+    type BlockSenderDeleteResponse as BlockSenderDeleteResponse,
+    type BlockSenderEditResponse as BlockSenderEditResponse,
+    type BlockSenderGetResponse as BlockSenderGetResponse,
+    BlockSenderListResponsesV4PagePaginationArray as BlockSenderListResponsesV4PagePaginationArray,
+    type BlockSenderCreateParams as BlockSenderCreateParams,
+    type BlockSenderListParams as BlockSenderListParams,
+    type BlockSenderDeleteParams as BlockSenderDeleteParams,
+    type BlockSenderEditParams as BlockSenderEditParams,
+    type BlockSenderGetParams as BlockSenderGetParams,
+  };
+}
diff --git a/src/resources/email-security/settings/domains.ts b/src/resources/email-security/settings/domains.ts
new file mode 100644
index 0000000000..a62726afae
--- /dev/null
+++ b/src/resources/email-security/settings/domains.ts
@@ -0,0 +1,384 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
+
+export class Domains extends APIResource {
+  /**
+   * Lists, searches, and sorts an account’s email domains.
+   */
+  list(
+    params: DomainListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<DomainListResponsesV4PagePaginationArray, DomainListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/email-security/settings/domains`,
+      DomainListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Unprotect an email domain
+   */
+  delete(
+    domainId: number,
+    params: DomainDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DomainDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/email-security/settings/domains/${domainId}`,
+        options,
+      ) as Core.APIPromise<{ result: DomainDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Unprotect multiple email domains
+   */
+  bulkDelete(
+    params: DomainBulkDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DomainBulkDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/email-security/settings/domains`,
+        options,
+      ) as Core.APIPromise<{ result: DomainBulkDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update an email domain
+   */
+  edit(
+    domainId: number,
+    params: DomainEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DomainEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/email-security/settings/domains/${domainId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: DomainEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get an email domain
+   */
+  get(
+    domainId: number,
+    params: DomainGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DomainGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/email-security/settings/domains/${domainId}`,
+        options,
+      ) as Core.APIPromise<{ result: DomainGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class DomainListResponsesV4PagePaginationArray extends V4PagePaginationArray<DomainListResponse> {}
+
+export interface DomainListResponse {
+  /**
+   * The unique identifier for the domain.
+   */
+  id: number;
+
+  allowed_delivery_modes: Array<'DIRECT' | 'BCC' | 'JOURNAL' | 'API' | 'RETRO_SCAN'>;
+
+  created_at: string;
+
+  domain: string;
+
+  drop_dispositions: Array<
+    | 'MALICIOUS'
+    | 'MALICIOUS-BEC'
+    | 'SUSPICIOUS'
+    | 'SPOOF'
+    | 'SPAM'
+    | 'BULK'
+    | 'ENCRYPTED'
+    | 'EXTERNAL'
+    | 'UNKNOWN'
+    | 'NONE'
+  >;
+
+  ip_restrictions: Array<string>;
+
+  last_modified: string;
+
+  lookback_hops: number;
+
+  transport: string;
+
+  folder?: 'AllItems' | 'Inbox' | null;
+
+  inbox_provider?: 'Microsoft' | 'Google' | null;
+
+  integration_id?: string | null;
+
+  o365_tenant_id?: string | null;
+
+  require_tls_inbound?: boolean | null;
+
+  require_tls_outbound?: boolean | null;
+}
+
+export interface DomainDeleteResponse {
+  /**
+   * The unique identifier for the domain.
+   */
+  id: number;
+}
+
+export type DomainBulkDeleteResponse = Array<DomainBulkDeleteResponse.DomainBulkDeleteResponseItem>;
+
+export namespace DomainBulkDeleteResponse {
+  export interface DomainBulkDeleteResponseItem {
+    /**
+     * The unique identifier for the domain.
+     */
+    id: number;
+  }
+}
+
+export interface DomainEditResponse {
+  /**
+   * The unique identifier for the domain.
+   */
+  id: number;
+
+  allowed_delivery_modes: Array<'DIRECT' | 'BCC' | 'JOURNAL' | 'API' | 'RETRO_SCAN'>;
+
+  created_at: string;
+
+  domain: string;
+
+  drop_dispositions: Array<
+    | 'MALICIOUS'
+    | 'MALICIOUS-BEC'
+    | 'SUSPICIOUS'
+    | 'SPOOF'
+    | 'SPAM'
+    | 'BULK'
+    | 'ENCRYPTED'
+    | 'EXTERNAL'
+    | 'UNKNOWN'
+    | 'NONE'
+  >;
+
+  ip_restrictions: Array<string>;
+
+  last_modified: string;
+
+  lookback_hops: number;
+
+  transport: string;
+
+  folder?: 'AllItems' | 'Inbox' | null;
+
+  inbox_provider?: 'Microsoft' | 'Google' | null;
+
+  integration_id?: string | null;
+
+  o365_tenant_id?: string | null;
+
+  require_tls_inbound?: boolean | null;
+
+  require_tls_outbound?: boolean | null;
+}
+
+export interface DomainGetResponse {
+  /**
+   * The unique identifier for the domain.
+   */
+  id: number;
+
+  allowed_delivery_modes: Array<'DIRECT' | 'BCC' | 'JOURNAL' | 'API' | 'RETRO_SCAN'>;
+
+  created_at: string;
+
+  domain: string;
+
+  drop_dispositions: Array<
+    | 'MALICIOUS'
+    | 'MALICIOUS-BEC'
+    | 'SUSPICIOUS'
+    | 'SPOOF'
+    | 'SPAM'
+    | 'BULK'
+    | 'ENCRYPTED'
+    | 'EXTERNAL'
+    | 'UNKNOWN'
+    | 'NONE'
+  >;
+
+  ip_restrictions: Array<string>;
+
+  last_modified: string;
+
+  lookback_hops: number;
+
+  transport: string;
+
+  folder?: 'AllItems' | 'Inbox' | null;
+
+  inbox_provider?: 'Microsoft' | 'Google' | null;
+
+  integration_id?: string | null;
+
+  o365_tenant_id?: string | null;
+
+  require_tls_inbound?: boolean | null;
+
+  require_tls_outbound?: boolean | null;
+}
+
+export interface DomainListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param: Filters response to domains with the provided delivery mode.
+   */
+  allowed_delivery_mode?: 'DIRECT' | 'BCC' | 'JOURNAL' | 'API' | 'RETRO_SCAN';
+
+  /**
+   * Query param: The sorting direction.
+   */
+  direction?: 'asc' | 'desc';
+
+  /**
+   * Query param: Filters results by the provided domains, allowing for multiple
+   * occurrences.
+   */
+  domain?: Array<string>;
+
+  /**
+   * Query param: The field to sort by.
+   */
+  order?: 'domain' | 'created_at';
+
+  /**
+   * Query param: Allows searching in multiple properties of a record simultaneously.
+   * This parameter is intended for human users, not automation. Its exact behavior
+   * is intentionally left unspecified and is subject to change in the future.
+   */
+  search?: string;
+}
+
+export interface DomainDeleteParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+export interface DomainBulkDeleteParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+export interface DomainEditParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  ip_restrictions: Array<string>;
+
+  /**
+   * Body param:
+   */
+  domain?: string | null;
+
+  /**
+   * Body param:
+   */
+  drop_dispositions?: Array<
+    | 'MALICIOUS'
+    | 'MALICIOUS-BEC'
+    | 'SUSPICIOUS'
+    | 'SPOOF'
+    | 'SPAM'
+    | 'BULK'
+    | 'ENCRYPTED'
+    | 'EXTERNAL'
+    | 'UNKNOWN'
+    | 'NONE'
+  >;
+
+  /**
+   * Body param:
+   */
+  folder?: 'AllItems' | 'Inbox';
+
+  /**
+   * Body param:
+   */
+  integration_id?: string | null;
+
+  /**
+   * Body param:
+   */
+  lookback_hops?: number | null;
+
+  /**
+   * Body param:
+   */
+  require_tls_inbound?: boolean;
+
+  /**
+   * Body param:
+   */
+  require_tls_outbound?: boolean;
+
+  /**
+   * Body param:
+   */
+  transport?: string;
+}
+
+export interface DomainGetParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+Domains.DomainListResponsesV4PagePaginationArray = DomainListResponsesV4PagePaginationArray;
+
+export declare namespace Domains {
+  export {
+    type DomainListResponse as DomainListResponse,
+    type DomainDeleteResponse as DomainDeleteResponse,
+    type DomainBulkDeleteResponse as DomainBulkDeleteResponse,
+    type DomainEditResponse as DomainEditResponse,
+    type DomainGetResponse as DomainGetResponse,
+    DomainListResponsesV4PagePaginationArray as DomainListResponsesV4PagePaginationArray,
+    type DomainListParams as DomainListParams,
+    type DomainDeleteParams as DomainDeleteParams,
+    type DomainBulkDeleteParams as DomainBulkDeleteParams,
+    type DomainEditParams as DomainEditParams,
+    type DomainGetParams as DomainGetParams,
+  };
+}
diff --git a/src/resources/email-security/settings/impersonation-registry.ts b/src/resources/email-security/settings/impersonation-registry.ts
new file mode 100644
index 0000000000..0d59379ccd
--- /dev/null
+++ b/src/resources/email-security/settings/impersonation-registry.ts
@@ -0,0 +1,312 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
+
+export class ImpersonationRegistry extends APIResource {
+  /**
+   * Create an entry in impersonation registry
+   */
+  create(
+    params: ImpersonationRegistryCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ImpersonationRegistryCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/email-security/settings/impersonation_registry`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: ImpersonationRegistryCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists, searches, and sorts entries in the impersonation registry.
+   */
+  list(
+    params: ImpersonationRegistryListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<
+    ImpersonationRegistryListResponsesV4PagePaginationArray,
+    ImpersonationRegistryListResponse
+  > {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/email-security/settings/impersonation_registry`,
+      ImpersonationRegistryListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Delete an entry from impersonation registry
+   */
+  delete(
+    displayNameId: number,
+    params: ImpersonationRegistryDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ImpersonationRegistryDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/email-security/settings/impersonation_registry/${displayNameId}`,
+        options,
+      ) as Core.APIPromise<{ result: ImpersonationRegistryDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update an entry in impersonation registry
+   */
+  edit(
+    displayNameId: number,
+    params: ImpersonationRegistryEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ImpersonationRegistryEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(
+        `/accounts/${account_id}/email-security/settings/impersonation_registry/${displayNameId}`,
+        { body, ...options },
+      ) as Core.APIPromise<{ result: ImpersonationRegistryEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get an entry in impersonation registry
+   */
+  get(
+    displayNameId: number,
+    params: ImpersonationRegistryGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ImpersonationRegistryGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/email-security/settings/impersonation_registry/${displayNameId}`,
+        options,
+      ) as Core.APIPromise<{ result: ImpersonationRegistryGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class ImpersonationRegistryListResponsesV4PagePaginationArray extends V4PagePaginationArray<ImpersonationRegistryListResponse> {}
+
+export interface ImpersonationRegistryCreateResponse {
+  id: number;
+
+  created_at: string;
+
+  email: string;
+
+  is_email_regex: boolean;
+
+  last_modified: string;
+
+  name: string;
+
+  comments?: string | null;
+
+  directory_id?: number | null;
+
+  directory_node_id?: number | null;
+
+  /**
+   * @deprecated
+   */
+  external_directory_node_id?: string | null;
+
+  provenance?: string | null;
+}
+
+export interface ImpersonationRegistryListResponse {
+  id: number;
+
+  created_at: string;
+
+  email: string;
+
+  is_email_regex: boolean;
+
+  last_modified: string;
+
+  name: string;
+
+  comments?: string | null;
+
+  directory_id?: number | null;
+
+  directory_node_id?: number | null;
+
+  /**
+   * @deprecated
+   */
+  external_directory_node_id?: string | null;
+
+  provenance?: string | null;
+}
+
+export interface ImpersonationRegistryDeleteResponse {
+  id: number;
+}
+
+export interface ImpersonationRegistryEditResponse {
+  id: number;
+
+  created_at: string;
+
+  email: string;
+
+  is_email_regex: boolean;
+
+  last_modified: string;
+
+  name: string;
+
+  comments?: string | null;
+
+  directory_id?: number | null;
+
+  directory_node_id?: number | null;
+
+  /**
+   * @deprecated
+   */
+  external_directory_node_id?: string | null;
+
+  provenance?: string | null;
+}
+
+export interface ImpersonationRegistryGetResponse {
+  id: number;
+
+  created_at: string;
+
+  email: string;
+
+  is_email_regex: boolean;
+
+  last_modified: string;
+
+  name: string;
+
+  comments?: string | null;
+
+  directory_id?: number | null;
+
+  directory_node_id?: number | null;
+
+  /**
+   * @deprecated
+   */
+  external_directory_node_id?: string | null;
+
+  provenance?: string | null;
+}
+
+export interface ImpersonationRegistryCreateParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  email: string;
+
+  /**
+   * Body param:
+   */
+  is_email_regex: boolean;
+
+  /**
+   * Body param:
+   */
+  name: string;
+}
+
+export interface ImpersonationRegistryListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param: The sorting direction.
+   */
+  direction?: 'asc' | 'desc';
+
+  /**
+   * Query param: The field to sort by.
+   */
+  order?: 'name' | 'email' | 'created_at';
+
+  /**
+   * Query param:
+   */
+  provenance?: 'A1S_INTERNAL' | 'SNOOPY-CASB_OFFICE_365' | 'SNOOPY-OFFICE_365' | 'SNOOPY-GOOGLE_DIRECTORY';
+
+  /**
+   * Query param: Allows searching in multiple properties of a record simultaneously.
+   * This parameter is intended for human users, not automation. Its exact behavior
+   * is intentionally left unspecified and is subject to change in the future.
+   */
+  search?: string;
+}
+
+export interface ImpersonationRegistryDeleteParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+export interface ImpersonationRegistryEditParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  email?: string | null;
+
+  /**
+   * Body param:
+   */
+  is_email_regex?: boolean | null;
+
+  /**
+   * Body param:
+   */
+  name?: string | null;
+}
+
+export interface ImpersonationRegistryGetParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+ImpersonationRegistry.ImpersonationRegistryListResponsesV4PagePaginationArray =
+  ImpersonationRegistryListResponsesV4PagePaginationArray;
+
+export declare namespace ImpersonationRegistry {
+  export {
+    type ImpersonationRegistryCreateResponse as ImpersonationRegistryCreateResponse,
+    type ImpersonationRegistryListResponse as ImpersonationRegistryListResponse,
+    type ImpersonationRegistryDeleteResponse as ImpersonationRegistryDeleteResponse,
+    type ImpersonationRegistryEditResponse as ImpersonationRegistryEditResponse,
+    type ImpersonationRegistryGetResponse as ImpersonationRegistryGetResponse,
+    ImpersonationRegistryListResponsesV4PagePaginationArray as ImpersonationRegistryListResponsesV4PagePaginationArray,
+    type ImpersonationRegistryCreateParams as ImpersonationRegistryCreateParams,
+    type ImpersonationRegistryListParams as ImpersonationRegistryListParams,
+    type ImpersonationRegistryDeleteParams as ImpersonationRegistryDeleteParams,
+    type ImpersonationRegistryEditParams as ImpersonationRegistryEditParams,
+    type ImpersonationRegistryGetParams as ImpersonationRegistryGetParams,
+  };
+}
diff --git a/src/resources/email-security/settings/index.ts b/src/resources/email-security/settings/index.ts
new file mode 100644
index 0000000000..5091578987
--- /dev/null
+++ b/src/resources/email-security/settings/index.ts
@@ -0,0 +1,73 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  AllowPolicyListResponsesV4PagePaginationArray,
+  AllowPolicies,
+  type AllowPolicyCreateResponse,
+  type AllowPolicyListResponse,
+  type AllowPolicyDeleteResponse,
+  type AllowPolicyEditResponse,
+  type AllowPolicyGetResponse,
+  type AllowPolicyCreateParams,
+  type AllowPolicyListParams,
+  type AllowPolicyDeleteParams,
+  type AllowPolicyEditParams,
+  type AllowPolicyGetParams,
+} from './allow-policies';
+export {
+  BlockSenderListResponsesV4PagePaginationArray,
+  BlockSenders,
+  type BlockSenderCreateResponse,
+  type BlockSenderListResponse,
+  type BlockSenderDeleteResponse,
+  type BlockSenderEditResponse,
+  type BlockSenderGetResponse,
+  type BlockSenderCreateParams,
+  type BlockSenderListParams,
+  type BlockSenderDeleteParams,
+  type BlockSenderEditParams,
+  type BlockSenderGetParams,
+} from './block-senders';
+export {
+  DomainListResponsesV4PagePaginationArray,
+  Domains,
+  type DomainListResponse,
+  type DomainDeleteResponse,
+  type DomainBulkDeleteResponse,
+  type DomainEditResponse,
+  type DomainGetResponse,
+  type DomainListParams,
+  type DomainDeleteParams,
+  type DomainBulkDeleteParams,
+  type DomainEditParams,
+  type DomainGetParams,
+} from './domains';
+export {
+  ImpersonationRegistryListResponsesV4PagePaginationArray,
+  ImpersonationRegistry,
+  type ImpersonationRegistryCreateResponse,
+  type ImpersonationRegistryListResponse,
+  type ImpersonationRegistryDeleteResponse,
+  type ImpersonationRegistryEditResponse,
+  type ImpersonationRegistryGetResponse,
+  type ImpersonationRegistryCreateParams,
+  type ImpersonationRegistryListParams,
+  type ImpersonationRegistryDeleteParams,
+  type ImpersonationRegistryEditParams,
+  type ImpersonationRegistryGetParams,
+} from './impersonation-registry';
+export { Settings } from './settings';
+export {
+  TrustedDomainListResponsesV4PagePaginationArray,
+  TrustedDomains,
+  type TrustedDomainCreateResponse,
+  type TrustedDomainListResponse,
+  type TrustedDomainDeleteResponse,
+  type TrustedDomainEditResponse,
+  type TrustedDomainGetResponse,
+  type TrustedDomainCreateParams,
+  type TrustedDomainListParams,
+  type TrustedDomainDeleteParams,
+  type TrustedDomainEditParams,
+  type TrustedDomainGetParams,
+} from './trusted-domains';
diff --git a/src/resources/email-security/settings/settings.ts b/src/resources/email-security/settings/settings.ts
new file mode 100644
index 0000000000..968a3c4023
--- /dev/null
+++ b/src/resources/email-security/settings/settings.ts
@@ -0,0 +1,176 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as AllowPoliciesAPI from './allow-policies';
+import {
+  AllowPolicies,
+  AllowPolicyCreateParams,
+  AllowPolicyCreateResponse,
+  AllowPolicyDeleteParams,
+  AllowPolicyDeleteResponse,
+  AllowPolicyEditParams,
+  AllowPolicyEditResponse,
+  AllowPolicyGetParams,
+  AllowPolicyGetResponse,
+  AllowPolicyListParams,
+  AllowPolicyListResponse,
+  AllowPolicyListResponsesV4PagePaginationArray,
+} from './allow-policies';
+import * as BlockSendersAPI from './block-senders';
+import {
+  BlockSenderCreateParams,
+  BlockSenderCreateResponse,
+  BlockSenderDeleteParams,
+  BlockSenderDeleteResponse,
+  BlockSenderEditParams,
+  BlockSenderEditResponse,
+  BlockSenderGetParams,
+  BlockSenderGetResponse,
+  BlockSenderListParams,
+  BlockSenderListResponse,
+  BlockSenderListResponsesV4PagePaginationArray,
+  BlockSenders,
+} from './block-senders';
+import * as DomainsAPI from './domains';
+import {
+  DomainBulkDeleteParams,
+  DomainBulkDeleteResponse,
+  DomainDeleteParams,
+  DomainDeleteResponse,
+  DomainEditParams,
+  DomainEditResponse,
+  DomainGetParams,
+  DomainGetResponse,
+  DomainListParams,
+  DomainListResponse,
+  DomainListResponsesV4PagePaginationArray,
+  Domains,
+} from './domains';
+import * as ImpersonationRegistryAPI from './impersonation-registry';
+import {
+  ImpersonationRegistry,
+  ImpersonationRegistryCreateParams,
+  ImpersonationRegistryCreateResponse,
+  ImpersonationRegistryDeleteParams,
+  ImpersonationRegistryDeleteResponse,
+  ImpersonationRegistryEditParams,
+  ImpersonationRegistryEditResponse,
+  ImpersonationRegistryGetParams,
+  ImpersonationRegistryGetResponse,
+  ImpersonationRegistryListParams,
+  ImpersonationRegistryListResponse,
+  ImpersonationRegistryListResponsesV4PagePaginationArray,
+} from './impersonation-registry';
+import * as TrustedDomainsAPI from './trusted-domains';
+import {
+  TrustedDomainCreateParams,
+  TrustedDomainCreateResponse,
+  TrustedDomainDeleteParams,
+  TrustedDomainDeleteResponse,
+  TrustedDomainEditParams,
+  TrustedDomainEditResponse,
+  TrustedDomainGetParams,
+  TrustedDomainGetResponse,
+  TrustedDomainListParams,
+  TrustedDomainListResponse,
+  TrustedDomainListResponsesV4PagePaginationArray,
+  TrustedDomains,
+} from './trusted-domains';
+
+export class Settings extends APIResource {
+  allowPolicies: AllowPoliciesAPI.AllowPolicies = new AllowPoliciesAPI.AllowPolicies(this._client);
+  blockSenders: BlockSendersAPI.BlockSenders = new BlockSendersAPI.BlockSenders(this._client);
+  domains: DomainsAPI.Domains = new DomainsAPI.Domains(this._client);
+  impersonationRegistry: ImpersonationRegistryAPI.ImpersonationRegistry =
+    new ImpersonationRegistryAPI.ImpersonationRegistry(this._client);
+  trustedDomains: TrustedDomainsAPI.TrustedDomains = new TrustedDomainsAPI.TrustedDomains(this._client);
+}
+
+Settings.AllowPolicies = AllowPolicies;
+Settings.AllowPolicyListResponsesV4PagePaginationArray = AllowPolicyListResponsesV4PagePaginationArray;
+Settings.BlockSenders = BlockSenders;
+Settings.BlockSenderListResponsesV4PagePaginationArray = BlockSenderListResponsesV4PagePaginationArray;
+Settings.Domains = Domains;
+Settings.DomainListResponsesV4PagePaginationArray = DomainListResponsesV4PagePaginationArray;
+Settings.ImpersonationRegistry = ImpersonationRegistry;
+Settings.ImpersonationRegistryListResponsesV4PagePaginationArray =
+  ImpersonationRegistryListResponsesV4PagePaginationArray;
+Settings.TrustedDomains = TrustedDomains;
+Settings.TrustedDomainListResponsesV4PagePaginationArray = TrustedDomainListResponsesV4PagePaginationArray;
+
+export declare namespace Settings {
+  export {
+    AllowPolicies as AllowPolicies,
+    type AllowPolicyCreateResponse as AllowPolicyCreateResponse,
+    type AllowPolicyListResponse as AllowPolicyListResponse,
+    type AllowPolicyDeleteResponse as AllowPolicyDeleteResponse,
+    type AllowPolicyEditResponse as AllowPolicyEditResponse,
+    type AllowPolicyGetResponse as AllowPolicyGetResponse,
+    AllowPolicyListResponsesV4PagePaginationArray as AllowPolicyListResponsesV4PagePaginationArray,
+    type AllowPolicyCreateParams as AllowPolicyCreateParams,
+    type AllowPolicyListParams as AllowPolicyListParams,
+    type AllowPolicyDeleteParams as AllowPolicyDeleteParams,
+    type AllowPolicyEditParams as AllowPolicyEditParams,
+    type AllowPolicyGetParams as AllowPolicyGetParams,
+  };
+
+  export {
+    BlockSenders as BlockSenders,
+    type BlockSenderCreateResponse as BlockSenderCreateResponse,
+    type BlockSenderListResponse as BlockSenderListResponse,
+    type BlockSenderDeleteResponse as BlockSenderDeleteResponse,
+    type BlockSenderEditResponse as BlockSenderEditResponse,
+    type BlockSenderGetResponse as BlockSenderGetResponse,
+    BlockSenderListResponsesV4PagePaginationArray as BlockSenderListResponsesV4PagePaginationArray,
+    type BlockSenderCreateParams as BlockSenderCreateParams,
+    type BlockSenderListParams as BlockSenderListParams,
+    type BlockSenderDeleteParams as BlockSenderDeleteParams,
+    type BlockSenderEditParams as BlockSenderEditParams,
+    type BlockSenderGetParams as BlockSenderGetParams,
+  };
+
+  export {
+    Domains as Domains,
+    type DomainListResponse as DomainListResponse,
+    type DomainDeleteResponse as DomainDeleteResponse,
+    type DomainBulkDeleteResponse as DomainBulkDeleteResponse,
+    type DomainEditResponse as DomainEditResponse,
+    type DomainGetResponse as DomainGetResponse,
+    DomainListResponsesV4PagePaginationArray as DomainListResponsesV4PagePaginationArray,
+    type DomainListParams as DomainListParams,
+    type DomainDeleteParams as DomainDeleteParams,
+    type DomainBulkDeleteParams as DomainBulkDeleteParams,
+    type DomainEditParams as DomainEditParams,
+    type DomainGetParams as DomainGetParams,
+  };
+
+  export {
+    ImpersonationRegistry as ImpersonationRegistry,
+    type ImpersonationRegistryCreateResponse as ImpersonationRegistryCreateResponse,
+    type ImpersonationRegistryListResponse as ImpersonationRegistryListResponse,
+    type ImpersonationRegistryDeleteResponse as ImpersonationRegistryDeleteResponse,
+    type ImpersonationRegistryEditResponse as ImpersonationRegistryEditResponse,
+    type ImpersonationRegistryGetResponse as ImpersonationRegistryGetResponse,
+    ImpersonationRegistryListResponsesV4PagePaginationArray as ImpersonationRegistryListResponsesV4PagePaginationArray,
+    type ImpersonationRegistryCreateParams as ImpersonationRegistryCreateParams,
+    type ImpersonationRegistryListParams as ImpersonationRegistryListParams,
+    type ImpersonationRegistryDeleteParams as ImpersonationRegistryDeleteParams,
+    type ImpersonationRegistryEditParams as ImpersonationRegistryEditParams,
+    type ImpersonationRegistryGetParams as ImpersonationRegistryGetParams,
+  };
+
+  export {
+    TrustedDomains as TrustedDomains,
+    type TrustedDomainCreateResponse as TrustedDomainCreateResponse,
+    type TrustedDomainListResponse as TrustedDomainListResponse,
+    type TrustedDomainDeleteResponse as TrustedDomainDeleteResponse,
+    type TrustedDomainEditResponse as TrustedDomainEditResponse,
+    type TrustedDomainGetResponse as TrustedDomainGetResponse,
+    TrustedDomainListResponsesV4PagePaginationArray as TrustedDomainListResponsesV4PagePaginationArray,
+    type TrustedDomainCreateParams as TrustedDomainCreateParams,
+    type TrustedDomainListParams as TrustedDomainListParams,
+    type TrustedDomainDeleteParams as TrustedDomainDeleteParams,
+    type TrustedDomainEditParams as TrustedDomainEditParams,
+    type TrustedDomainGetParams as TrustedDomainGetParams,
+  };
+}
diff --git a/src/resources/email-security/settings/trusted-domains.ts b/src/resources/email-security/settings/trusted-domains.ts
new file mode 100644
index 0000000000..44eb965593
--- /dev/null
+++ b/src/resources/email-security/settings/trusted-domains.ts
@@ -0,0 +1,426 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
+
+export class TrustedDomains extends APIResource {
+  /**
+   * Create a trusted email domain
+   */
+  create(
+    params: TrustedDomainCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TrustedDomainCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/email-security/settings/trusted_domains`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: TrustedDomainCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists, searches, and sorts an account’s trusted email domains.
+   */
+  list(
+    params: TrustedDomainListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<TrustedDomainListResponsesV4PagePaginationArray, TrustedDomainListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/email-security/settings/trusted_domains`,
+      TrustedDomainListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Delete a trusted email domain
+   */
+  delete(
+    trustedDomainId: number,
+    params: TrustedDomainDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TrustedDomainDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/email-security/settings/trusted_domains/${trustedDomainId}`,
+        options,
+      ) as Core.APIPromise<{ result: TrustedDomainDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update a trusted email domain
+   */
+  edit(
+    trustedDomainId: number,
+    params: TrustedDomainEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TrustedDomainEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(
+        `/accounts/${account_id}/email-security/settings/trusted_domains/${trustedDomainId}`,
+        { body, ...options },
+      ) as Core.APIPromise<{ result: TrustedDomainEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get a trusted email domain
+   */
+  get(
+    trustedDomainId: number,
+    params: TrustedDomainGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TrustedDomainGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/email-security/settings/trusted_domains/${trustedDomainId}`,
+        options,
+      ) as Core.APIPromise<{ result: TrustedDomainGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class TrustedDomainListResponsesV4PagePaginationArray extends V4PagePaginationArray<TrustedDomainListResponse> {}
+
+export type TrustedDomainCreateResponse =
+  | TrustedDomainCreateResponse.EmailSecurityTrustedDomain
+  | Array<TrustedDomainCreateResponse.UnionMember1>;
+
+export namespace TrustedDomainCreateResponse {
+  export interface EmailSecurityTrustedDomain {
+    /**
+     * The unique identifier for the trusted domain.
+     */
+    id: number;
+
+    created_at: string;
+
+    /**
+     * Select to prevent recently registered domains from triggering a Suspicious or
+     * Malicious disposition.
+     */
+    is_recent: boolean;
+
+    is_regex: boolean;
+
+    /**
+     * Select for partner or other approved domains that have similar spelling to your
+     * connected domains. Prevents listed domains from triggering a Spoof disposition.
+     */
+    is_similarity: boolean;
+
+    last_modified: string;
+
+    pattern: string;
+
+    comments?: string | null;
+  }
+
+  export interface UnionMember1 {
+    /**
+     * The unique identifier for the trusted domain.
+     */
+    id: number;
+
+    created_at: string;
+
+    /**
+     * Select to prevent recently registered domains from triggering a Suspicious or
+     * Malicious disposition.
+     */
+    is_recent: boolean;
+
+    is_regex: boolean;
+
+    /**
+     * Select for partner or other approved domains that have similar spelling to your
+     * connected domains. Prevents listed domains from triggering a Spoof disposition.
+     */
+    is_similarity: boolean;
+
+    last_modified: string;
+
+    pattern: string;
+
+    comments?: string | null;
+  }
+}
+
+export interface TrustedDomainListResponse {
+  /**
+   * The unique identifier for the trusted domain.
+   */
+  id: number;
+
+  created_at: string;
+
+  /**
+   * Select to prevent recently registered domains from triggering a Suspicious or
+   * Malicious disposition.
+   */
+  is_recent: boolean;
+
+  is_regex: boolean;
+
+  /**
+   * Select for partner or other approved domains that have similar spelling to your
+   * connected domains. Prevents listed domains from triggering a Spoof disposition.
+   */
+  is_similarity: boolean;
+
+  last_modified: string;
+
+  pattern: string;
+
+  comments?: string | null;
+}
+
+export interface TrustedDomainDeleteResponse {
+  /**
+   * The unique identifier for the trusted domain.
+   */
+  id: number;
+}
+
+export interface TrustedDomainEditResponse {
+  /**
+   * The unique identifier for the trusted domain.
+   */
+  id: number;
+
+  created_at: string;
+
+  /**
+   * Select to prevent recently registered domains from triggering a Suspicious or
+   * Malicious disposition.
+   */
+  is_recent: boolean;
+
+  is_regex: boolean;
+
+  /**
+   * Select for partner or other approved domains that have similar spelling to your
+   * connected domains. Prevents listed domains from triggering a Spoof disposition.
+   */
+  is_similarity: boolean;
+
+  last_modified: string;
+
+  pattern: string;
+
+  comments?: string | null;
+}
+
+export interface TrustedDomainGetResponse {
+  /**
+   * The unique identifier for the trusted domain.
+   */
+  id: number;
+
+  created_at: string;
+
+  /**
+   * Select to prevent recently registered domains from triggering a Suspicious or
+   * Malicious disposition.
+   */
+  is_recent: boolean;
+
+  is_regex: boolean;
+
+  /**
+   * Select for partner or other approved domains that have similar spelling to your
+   * connected domains. Prevents listed domains from triggering a Spoof disposition.
+   */
+  is_similarity: boolean;
+
+  last_modified: string;
+
+  pattern: string;
+
+  comments?: string | null;
+}
+
+export type TrustedDomainCreateParams =
+  | TrustedDomainCreateParams.EmailSecurityCreateTrustedDomain
+  | TrustedDomainCreateParams.Variant1;
+
+export declare namespace TrustedDomainCreateParams {
+  export interface EmailSecurityCreateTrustedDomain {
+    /**
+     * Path param: Account Identifier
+     */
+    account_id: string;
+
+    /**
+     * Body param: Select to prevent recently registered domains from triggering a
+     * Suspicious or Malicious disposition.
+     */
+    is_recent: boolean;
+
+    /**
+     * Body param:
+     */
+    is_regex: boolean;
+
+    /**
+     * Body param: Select for partner or other approved domains that have similar
+     * spelling to your connected domains. Prevents listed domains from triggering a
+     * Spoof disposition.
+     */
+    is_similarity: boolean;
+
+    /**
+     * Body param:
+     */
+    pattern: string;
+
+    /**
+     * Body param:
+     */
+    comments?: string | null;
+  }
+
+  export interface Variant1 {
+    /**
+     * Path param: Account Identifier
+     */
+    account_id: string;
+
+    /**
+     * Body param:
+     */
+    body: Array<TrustedDomainCreateParams.Variant1.Body>;
+  }
+
+  export namespace Variant1 {
+    export interface Body {
+      /**
+       * Select to prevent recently registered domains from triggering a Suspicious or
+       * Malicious disposition.
+       */
+      is_recent: boolean;
+
+      is_regex: boolean;
+
+      /**
+       * Select for partner or other approved domains that have similar spelling to your
+       * connected domains. Prevents listed domains from triggering a Spoof disposition.
+       */
+      is_similarity: boolean;
+
+      pattern: string;
+
+      comments?: string | null;
+    }
+  }
+}
+
+export interface TrustedDomainListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param: The sorting direction.
+   */
+  direction?: 'asc' | 'desc';
+
+  /**
+   * Query param:
+   */
+  is_recent?: boolean;
+
+  /**
+   * Query param:
+   */
+  is_similarity?: boolean;
+
+  /**
+   * Query param: The field to sort by.
+   */
+  order?: 'pattern' | 'created_at';
+
+  /**
+   * Query param: Allows searching in multiple properties of a record simultaneously.
+   * This parameter is intended for human users, not automation. Its exact behavior
+   * is intentionally left unspecified and is subject to change in the future.
+   */
+  search?: string;
+}
+
+export interface TrustedDomainDeleteParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+export interface TrustedDomainEditParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  comments?: string | null;
+
+  /**
+   * Body param: Select to prevent recently registered domains from triggering a
+   * Suspicious or Malicious disposition.
+   */
+  is_recent?: boolean | null;
+
+  /**
+   * Body param:
+   */
+  is_regex?: boolean | null;
+
+  /**
+   * Body param: Select for partner or other approved domains that have similar
+   * spelling to your connected domains. Prevents listed domains from triggering a
+   * Spoof disposition.
+   */
+  is_similarity?: boolean | null;
+
+  /**
+   * Body param:
+   */
+  pattern?: string | null;
+}
+
+export interface TrustedDomainGetParams {
+  /**
+   * Account Identifier
+   */
+  account_id: string;
+}
+
+TrustedDomains.TrustedDomainListResponsesV4PagePaginationArray =
+  TrustedDomainListResponsesV4PagePaginationArray;
+
+export declare namespace TrustedDomains {
+  export {
+    type TrustedDomainCreateResponse as TrustedDomainCreateResponse,
+    type TrustedDomainListResponse as TrustedDomainListResponse,
+    type TrustedDomainDeleteResponse as TrustedDomainDeleteResponse,
+    type TrustedDomainEditResponse as TrustedDomainEditResponse,
+    type TrustedDomainGetResponse as TrustedDomainGetResponse,
+    TrustedDomainListResponsesV4PagePaginationArray as TrustedDomainListResponsesV4PagePaginationArray,
+    type TrustedDomainCreateParams as TrustedDomainCreateParams,
+    type TrustedDomainListParams as TrustedDomainListParams,
+    type TrustedDomainDeleteParams as TrustedDomainDeleteParams,
+    type TrustedDomainEditParams as TrustedDomainEditParams,
+    type TrustedDomainGetParams as TrustedDomainGetParams,
+  };
+}
diff --git a/src/resources/email-security/submissions.ts b/src/resources/email-security/submissions.ts
new file mode 100644
index 0000000000..5637256c03
--- /dev/null
+++ b/src/resources/email-security/submissions.ts
@@ -0,0 +1,117 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
+
+export class Submissions extends APIResource {
+  /**
+   * This endpoint returns information for submissions to made to reclassify emails.
+   */
+  list(
+    params: SubmissionListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<SubmissionListResponsesV4PagePaginationArray, SubmissionListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/email-security/submissions`,
+      SubmissionListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+}
+
+export class SubmissionListResponsesV4PagePaginationArray extends V4PagePaginationArray<SubmissionListResponse> {}
+
+export interface SubmissionListResponse {
+  requested_ts: string;
+
+  submission_id: string;
+
+  original_disposition?:
+    | 'MALICIOUS'
+    | 'MALICIOUS-BEC'
+    | 'SUSPICIOUS'
+    | 'SPOOF'
+    | 'SPAM'
+    | 'BULK'
+    | 'ENCRYPTED'
+    | 'EXTERNAL'
+    | 'UNKNOWN'
+    | 'NONE'
+    | null;
+
+  outcome?: string | null;
+
+  outcome_disposition?:
+    | 'MALICIOUS'
+    | 'MALICIOUS-BEC'
+    | 'SUSPICIOUS'
+    | 'SPOOF'
+    | 'SPAM'
+    | 'BULK'
+    | 'ENCRYPTED'
+    | 'EXTERNAL'
+    | 'UNKNOWN'
+    | 'NONE'
+    | null;
+
+  requested_by?: string | null;
+
+  requested_disposition?:
+    | 'MALICIOUS'
+    | 'MALICIOUS-BEC'
+    | 'SUSPICIOUS'
+    | 'SPOOF'
+    | 'SPAM'
+    | 'BULK'
+    | 'ENCRYPTED'
+    | 'EXTERNAL'
+    | 'UNKNOWN'
+    | 'NONE'
+    | null;
+
+  status?: string | null;
+
+  subject?: string | null;
+
+  type?: string | null;
+}
+
+export interface SubmissionListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account Identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param: The end of the search date range. Defaults to `now`.
+   */
+  end?: string;
+
+  /**
+   * Query param: The beginning of the search date range. Defaults to
+   * `now - 30 days`.
+   */
+  start?: string;
+
+  /**
+   * Query param:
+   */
+  submission_id?: string;
+
+  /**
+   * Query param:
+   */
+  type?: 'TEAM' | 'USER';
+}
+
+Submissions.SubmissionListResponsesV4PagePaginationArray = SubmissionListResponsesV4PagePaginationArray;
+
+export declare namespace Submissions {
+  export {
+    type SubmissionListResponse as SubmissionListResponse,
+    SubmissionListResponsesV4PagePaginationArray as SubmissionListResponsesV4PagePaginationArray,
+    type SubmissionListParams as SubmissionListParams,
+  };
+}
diff --git a/src/resources/event-notifications/event-notifications.ts b/src/resources/event-notifications/event-notifications.ts
deleted file mode 100644
index f428122919..0000000000
--- a/src/resources/event-notifications/event-notifications.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../resource';
-import * as R2API from './r2/r2';
-
-export class EventNotifications extends APIResource {
-  r2: R2API.R2 = new R2API.R2(this._client);
-}
-
-export namespace EventNotifications {
-  export import R2 = R2API.R2;
-}
diff --git a/src/resources/event-notifications/r2/configuration/configuration.ts b/src/resources/event-notifications/r2/configuration/configuration.ts
deleted file mode 100644
index c682458c88..0000000000
--- a/src/resources/event-notifications/r2/configuration/configuration.ts
+++ /dev/null
@@ -1,82 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../../resource';
-import * as Core from '../../../../core';
-import * as ConfigurationAPI from './configuration';
-import * as QueuesAPI from './queues';
-
-export class Configuration extends APIResource {
-  queues: QueuesAPI.Queues = new QueuesAPI.Queues(this._client);
-
-  /**
-   * Returns all notification rules for each queue for which bucket notifications are
-   * produced.
-   */
-  get(
-    bucketName: string,
-    params: ConfigurationGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<ConfigurationGetResponse> {
-    const { account_id } = params;
-    return (
-      this._client.get(
-        `/accounts/${account_id}/event_notifications/r2/${bucketName}/configuration`,
-        options,
-      ) as Core.APIPromise<{ result: ConfigurationGetResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export type ConfigurationGetResponse = Record<string, Record<string, ConfigurationGetResponse.mq_detail>>;
-
-export namespace ConfigurationGetResponse {
-  export interface mq_detail {
-    /**
-     * Queue ID that will receive notifications based on the configured rules
-     */
-    queue: string;
-
-    /**
-     * Array of rules to drive notifications
-     */
-    rules: Array<mq_detail.Rule>;
-  }
-
-  export namespace mq_detail {
-    export interface Rule {
-      /**
-       * Array of R2 object actions that will trigger notifications
-       */
-      actions: Array<
-        'PutObject' | 'CopyObject' | 'DeleteObject' | 'CompleteMultipartUpload' | 'AbortMultipartUpload'
-      >;
-
-      /**
-       * Notifications will be sent only for objects with this prefix
-       */
-      prefix?: string;
-
-      /**
-       * Notifications will be sent only for objects with this suffix
-       */
-      suffix?: string;
-    }
-  }
-}
-
-export interface ConfigurationGetParams {
-  /**
-   * Identifier
-   */
-  account_id: string;
-}
-
-export namespace Configuration {
-  export import ConfigurationGetResponse = ConfigurationAPI.ConfigurationGetResponse;
-  export import ConfigurationGetParams = ConfigurationAPI.ConfigurationGetParams;
-  export import Queues = QueuesAPI.Queues;
-  export import QueueUpdateResponse = QueuesAPI.QueueUpdateResponse;
-  export import QueueDeleteResponse = QueuesAPI.QueueDeleteResponse;
-  export import QueueUpdateParams = QueuesAPI.QueueUpdateParams;
-  export import QueueDeleteParams = QueuesAPI.QueueDeleteParams;
-}
diff --git a/src/resources/event-notifications/r2/configuration/index.ts b/src/resources/event-notifications/r2/configuration/index.ts
deleted file mode 100644
index b81a9f8da9..0000000000
--- a/src/resources/event-notifications/r2/configuration/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { ConfigurationGetResponse, ConfigurationGetParams, Configuration } from './configuration';
-export {
-  QueueUpdateResponse,
-  QueueDeleteResponse,
-  QueueUpdateParams,
-  QueueDeleteParams,
-  Queues,
-} from './queues';
diff --git a/src/resources/event-notifications/r2/index.ts b/src/resources/event-notifications/r2/index.ts
deleted file mode 100644
index 601572c2dd..0000000000
--- a/src/resources/event-notifications/r2/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { ConfigurationGetResponse, ConfigurationGetParams, Configuration } from './configuration/index';
-export { R2 } from './r2';
diff --git a/src/resources/event-notifications/r2/r2.ts b/src/resources/event-notifications/r2/r2.ts
deleted file mode 100644
index ace8e1f627..0000000000
--- a/src/resources/event-notifications/r2/r2.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../resource';
-import * as ConfigurationAPI from './configuration/configuration';
-
-export class R2 extends APIResource {
-  configuration: ConfigurationAPI.Configuration = new ConfigurationAPI.Configuration(this._client);
-}
-
-export namespace R2 {
-  export import Configuration = ConfigurationAPI.Configuration;
-  export import ConfigurationGetResponse = ConfigurationAPI.ConfigurationGetResponse;
-  export import ConfigurationGetParams = ConfigurationAPI.ConfigurationGetParams;
-}
diff --git a/src/resources/filters.ts b/src/resources/filters.ts
index ac743a2f67..7ffbb7d7a2 100644
--- a/src/resources/filters.ts
+++ b/src/resources/filters.ts
@@ -1,7 +1,6 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../resource';
-import { isRequestOptions } from '../core';
 import * as Core from '../core';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../pagination';
 
@@ -12,12 +11,12 @@ export class Filters extends APIResource {
    * @deprecated The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
    */
   create(
-    zoneIdentifier: string,
-    body: FilterCreateParams,
+    params: FilterCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<FilterCreateResponse | null> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.post(`/zones/${zoneIdentifier}/filters`, { body, ...options }) as Core.APIPromise<{
+      this._client.post(`/zones/${zone_id}/filters`, { body, ...options }) as Core.APIPromise<{
         result: FilterCreateResponse | null;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -29,15 +28,16 @@ export class Filters extends APIResource {
    * @deprecated The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
    */
   update(
-    zoneIdentifier: string,
-    id: string,
-    body: FilterUpdateParams,
+    filterId: string,
+    params: FilterUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<FirewallFilter> {
+    const { zone_id, body } = params;
     return (
-      this._client.put(`/zones/${zoneIdentifier}/filters/${id}`, { body, ...options }) as Core.APIPromise<{
-        result: FirewallFilter;
-      }>
+      this._client.put(`/zones/${zone_id}/filters/${filterId}`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: FirewallFilter }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -48,23 +48,11 @@ export class Filters extends APIResource {
    * @deprecated The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
    */
   list(
-    zoneIdentifier: string,
-    query?: FilterListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<FirewallFiltersV4PagePaginationArray, FirewallFilter>;
-  list(
-    zoneIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<FirewallFiltersV4PagePaginationArray, FirewallFilter>;
-  list(
-    zoneIdentifier: string,
-    query: FilterListParams | Core.RequestOptions = {},
+    params: FilterListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<FirewallFiltersV4PagePaginationArray, FirewallFilter> {
-    if (isRequestOptions(query)) {
-      return this.list(zoneIdentifier, {}, query);
-    }
-    return this._client.getAPIList(`/zones/${zoneIdentifier}/filters`, FirewallFiltersV4PagePaginationArray, {
+    const { zone_id, ...query } = params;
+    return this._client.getAPIList(`/zones/${zone_id}/filters`, FirewallFiltersV4PagePaginationArray, {
       query,
       ...options,
     });
@@ -75,22 +63,66 @@ export class Filters extends APIResource {
    *
    * @deprecated The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
    */
-  delete(zoneIdentifier: string, id: string, options?: Core.RequestOptions): Core.APIPromise<FirewallFilter> {
+  delete(
+    filterId: string,
+    params: FilterDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FirewallFilter> {
+    const { zone_id } = params;
     return (
-      this._client.delete(`/zones/${zoneIdentifier}/filters/${id}`, options) as Core.APIPromise<{
+      this._client.delete(`/zones/${zone_id}/filters/${filterId}`, options) as Core.APIPromise<{
         result: FirewallFilter;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 
+  /**
+   * Deletes one or more existing filters.
+   *
+   * @deprecated The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
+   */
+  bulkDelete(
+    params: FilterBulkDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FilterBulkDeleteResponse | null> {
+    const { zone_id } = params;
+    return (
+      this._client.delete(`/zones/${zone_id}/filters`, options) as Core.APIPromise<{
+        result: FilterBulkDeleteResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Updates one or more existing filters.
+   *
+   * @deprecated The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
+   */
+  bulkUpdate(
+    params: FilterBulkUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FilterBulkUpdateResponse | null> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.put(`/zones/${zone_id}/filters`, { body, ...options }) as Core.APIPromise<{
+        result: FilterBulkUpdateResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Fetches the details of a filter.
    *
    * @deprecated The Filters API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
    */
-  get(zoneIdentifier: string, id: string, options?: Core.RequestOptions): Core.APIPromise<FirewallFilter> {
+  get(
+    filterId: string,
+    params: FilterGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FirewallFilter> {
+    const { zone_id } = params;
     return (
-      this._client.get(`/zones/${zoneIdentifier}/filters/${id}`, options) as Core.APIPromise<{
+      this._client.get(`/zones/${zone_id}/filters/${filterId}`, options) as Core.APIPromise<{
         result: FirewallFilter;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -127,35 +159,117 @@ export interface FirewallFilter {
   ref?: string;
 }
 
+export interface FirewallFilterParam {
+  /**
+   * An informative summary of the filter.
+   */
+  description?: string;
+
+  /**
+   * The filter expression. For more information, refer to
+   * [Expressions](https://developers.cloudflare.com/ruleset-engine/rules-language/expressions/).
+   */
+  expression?: string;
+
+  /**
+   * When true, indicates that the filter is currently paused.
+   */
+  paused?: boolean;
+
+  /**
+   * A short reference tag. Allows you to select related filters.
+   */
+  ref?: string;
+}
+
 export type FilterCreateResponse = Array<FirewallFilter>;
 
-export type FilterCreateParams = unknown;
+export type FilterBulkDeleteResponse = Array<FirewallFilter>;
+
+export type FilterBulkUpdateResponse = Array<FirewallFilter>;
+
+export interface FilterCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The filter expression. For more information, refer to
+   * [Expressions](https://developers.cloudflare.com/ruleset-engine/rules-language/expressions/).
+   */
+  expression: string;
+}
 
-export type FilterUpdateParams = unknown;
+export interface FilterUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+}
 
 export interface FilterListParams extends V4PagePaginationArrayParams {
   /**
-   * The unique identifier of the filter.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: The unique identifier of the filter.
    */
   id?: string;
 
   /**
-   * A case-insensitive string to find in the description.
+   * Query param: A case-insensitive string to find in the description.
    */
   description?: string;
 
   /**
-   * A case-insensitive string to find in the expression.
+   * Query param: A case-insensitive string to find in the expression.
    */
   expression?: string;
 
   /**
-   * When true, indicates that the filter is currently paused.
+   * Query param: When true, indicates that the filter is currently paused.
    */
   paused?: boolean;
 
   /**
-   * The filter ref (a short reference tag) to search for. Must be an exact match.
+   * Query param: The filter ref (a short reference tag) to search for. Must be an
+   * exact match.
    */
   ref?: string;
 }
+
+export interface FilterDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface FilterBulkDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface FilterBulkUpdateParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface FilterGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
diff --git a/src/resources/firewall/access-rules.ts b/src/resources/firewall/access-rules.ts
index 9fea9a359d..edc662dd9c 100644
--- a/src/resources/firewall/access-rules.ts
+++ b/src/resources/firewall/access-rules.ts
@@ -3,8 +3,7 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import { CloudflareError } from '../../error';
-import * as AccessRulesAPI from './access-rules';
+import { CloudflareError } from 'cloudflare/error';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class AccessRules extends APIResource {
@@ -93,21 +92,18 @@ export class AccessRules extends APIResource {
    * Note: This operation will affect all zones in the account or zone.
    */
   delete(
-    identifier: unknown,
+    ruleId: string,
     params?: AccessRuleDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<AccessRuleDeleteResponse | null>;
+  delete(ruleId: string, options?: Core.RequestOptions): Core.APIPromise<AccessRuleDeleteResponse | null>;
   delete(
-    identifier: unknown,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<AccessRuleDeleteResponse | null>;
-  delete(
-    identifier: unknown,
+    ruleId: string,
     params: AccessRuleDeleteParams | Core.RequestOptions = {},
     options?: Core.RequestOptions,
   ): Core.APIPromise<AccessRuleDeleteResponse | null> {
     if (isRequestOptions(params)) {
-      return this.delete(identifier, {}, params);
+      return this.delete(ruleId, {}, params);
     }
     const { account_id, zone_id } = params;
     if (!account_id && !zone_id) {
@@ -128,7 +124,7 @@ export class AccessRules extends APIResource {
         };
     return (
       this._client.delete(
-        `/${accountOrZone}/${accountOrZoneId}/firewall/access_rules/rules/${identifier}`,
+        `/${accountOrZone}/${accountOrZoneId}/firewall/access_rules/rules/${ruleId}`,
         options,
       ) as Core.APIPromise<{ result: AccessRuleDeleteResponse | null }>
     )._thenUnwrap((obj) => obj.result);
@@ -140,7 +136,7 @@ export class AccessRules extends APIResource {
    * Note: This operation will affect all zones in the account or zone.
    */
   edit(
-    identifier: unknown,
+    ruleId: string,
     params: AccessRuleEditParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<AccessRuleEditResponse> {
@@ -162,7 +158,7 @@ export class AccessRules extends APIResource {
           accountOrZoneId: zone_id,
         };
     return (
-      this._client.patch(`/${accountOrZone}/${accountOrZoneId}/firewall/access_rules/rules/${identifier}`, {
+      this._client.patch(`/${accountOrZone}/${accountOrZoneId}/firewall/access_rules/rules/${ruleId}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: AccessRuleEditResponse }>
@@ -173,18 +169,18 @@ export class AccessRules extends APIResource {
    * Fetches the details of an IP Access rule defined.
    */
   get(
-    identifier: unknown,
+    ruleId: string,
     params?: AccessRuleGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<AccessRuleGetResponse>;
-  get(identifier: unknown, options?: Core.RequestOptions): Core.APIPromise<AccessRuleGetResponse>;
+  get(ruleId: string, options?: Core.RequestOptions): Core.APIPromise<AccessRuleGetResponse>;
   get(
-    identifier: unknown,
+    ruleId: string,
     params: AccessRuleGetParams | Core.RequestOptions = {},
     options?: Core.RequestOptions,
   ): Core.APIPromise<AccessRuleGetResponse> {
     if (isRequestOptions(params)) {
-      return this.get(identifier, {}, params);
+      return this.get(ruleId, {}, params);
     }
     const { account_id, zone_id } = params;
     if (!account_id && !zone_id) {
@@ -205,7 +201,7 @@ export class AccessRules extends APIResource {
         };
     return (
       this._client.get(
-        `/${accountOrZone}/${accountOrZoneId}/firewall/access_rules/rules/${identifier}`,
+        `/${accountOrZone}/${accountOrZoneId}/firewall/access_rules/rules/${ruleId}`,
         options,
       ) as Core.APIPromise<{ result: AccessRuleGetResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -350,9 +346,143 @@ export interface IPV6ConfigurationParam {
   value?: string;
 }
 
-export type AccessRuleCreateResponse = unknown | string | null;
+export interface AccessRuleCreateResponse {
+  /**
+   * The unique identifier of the IP Access rule.
+   */
+  id: string;
+
+  /**
+   * The available actions that a rule can apply to a matched request.
+   */
+  allowed_modes: Array<'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge'>;
+
+  /**
+   * The rule configuration.
+   */
+  configuration:
+    | AccessRuleIPConfiguration
+    | IPV6Configuration
+    | AccessRuleCIDRConfiguration
+    | ASNConfiguration
+    | CountryConfiguration;
+
+  /**
+   * The action to apply to a matched request.
+   */
+  mode: 'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge';
+
+  /**
+   * The timestamp of when the rule was created.
+   */
+  created_on?: string;
+
+  /**
+   * The timestamp of when the rule was last modified.
+   */
+  modified_on?: string;
+
+  /**
+   * An informative summary of the rule, typically used as a reminder or explanation.
+   */
+  notes?: string;
+
+  /**
+   * All zones owned by the user will have the rule applied.
+   */
+  scope?: AccessRuleCreateResponse.Scope;
+}
+
+export namespace AccessRuleCreateResponse {
+  /**
+   * All zones owned by the user will have the rule applied.
+   */
+  export interface Scope {
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * The contact email address of the user.
+     */
+    email?: string;
+
+    /**
+     * The scope of the rule.
+     */
+    type?: 'user' | 'organization';
+  }
+}
+
+export interface AccessRuleListResponse {
+  /**
+   * The unique identifier of the IP Access rule.
+   */
+  id: string;
+
+  /**
+   * The available actions that a rule can apply to a matched request.
+   */
+  allowed_modes: Array<'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge'>;
+
+  /**
+   * The rule configuration.
+   */
+  configuration:
+    | AccessRuleIPConfiguration
+    | IPV6Configuration
+    | AccessRuleCIDRConfiguration
+    | ASNConfiguration
+    | CountryConfiguration;
+
+  /**
+   * The action to apply to a matched request.
+   */
+  mode: 'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge';
+
+  /**
+   * The timestamp of when the rule was created.
+   */
+  created_on?: string;
+
+  /**
+   * The timestamp of when the rule was last modified.
+   */
+  modified_on?: string;
+
+  /**
+   * An informative summary of the rule, typically used as a reminder or explanation.
+   */
+  notes?: string;
+
+  /**
+   * All zones owned by the user will have the rule applied.
+   */
+  scope?: AccessRuleListResponse.Scope;
+}
+
+export namespace AccessRuleListResponse {
+  /**
+   * All zones owned by the user will have the rule applied.
+   */
+  export interface Scope {
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * The contact email address of the user.
+     */
+    email?: string;
 
-export type AccessRuleListResponse = unknown;
+    /**
+     * The scope of the rule.
+     */
+    type?: 'user' | 'organization';
+  }
+}
 
 export interface AccessRuleDeleteResponse {
   /**
@@ -361,9 +491,143 @@ export interface AccessRuleDeleteResponse {
   id: string;
 }
 
-export type AccessRuleEditResponse = unknown | string | null;
+export interface AccessRuleEditResponse {
+  /**
+   * The unique identifier of the IP Access rule.
+   */
+  id: string;
+
+  /**
+   * The available actions that a rule can apply to a matched request.
+   */
+  allowed_modes: Array<'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge'>;
 
-export type AccessRuleGetResponse = unknown | string | null;
+  /**
+   * The rule configuration.
+   */
+  configuration:
+    | AccessRuleIPConfiguration
+    | IPV6Configuration
+    | AccessRuleCIDRConfiguration
+    | ASNConfiguration
+    | CountryConfiguration;
+
+  /**
+   * The action to apply to a matched request.
+   */
+  mode: 'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge';
+
+  /**
+   * The timestamp of when the rule was created.
+   */
+  created_on?: string;
+
+  /**
+   * The timestamp of when the rule was last modified.
+   */
+  modified_on?: string;
+
+  /**
+   * An informative summary of the rule, typically used as a reminder or explanation.
+   */
+  notes?: string;
+
+  /**
+   * All zones owned by the user will have the rule applied.
+   */
+  scope?: AccessRuleEditResponse.Scope;
+}
+
+export namespace AccessRuleEditResponse {
+  /**
+   * All zones owned by the user will have the rule applied.
+   */
+  export interface Scope {
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * The contact email address of the user.
+     */
+    email?: string;
+
+    /**
+     * The scope of the rule.
+     */
+    type?: 'user' | 'organization';
+  }
+}
+
+export interface AccessRuleGetResponse {
+  /**
+   * The unique identifier of the IP Access rule.
+   */
+  id: string;
+
+  /**
+   * The available actions that a rule can apply to a matched request.
+   */
+  allowed_modes: Array<'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge'>;
+
+  /**
+   * The rule configuration.
+   */
+  configuration:
+    | AccessRuleIPConfiguration
+    | IPV6Configuration
+    | AccessRuleCIDRConfiguration
+    | ASNConfiguration
+    | CountryConfiguration;
+
+  /**
+   * The action to apply to a matched request.
+   */
+  mode: 'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge';
+
+  /**
+   * The timestamp of when the rule was created.
+   */
+  created_on?: string;
+
+  /**
+   * The timestamp of when the rule was last modified.
+   */
+  modified_on?: string;
+
+  /**
+   * An informative summary of the rule, typically used as a reminder or explanation.
+   */
+  notes?: string;
+
+  /**
+   * All zones owned by the user will have the rule applied.
+   */
+  scope?: AccessRuleGetResponse.Scope;
+}
+
+export namespace AccessRuleGetResponse {
+  /**
+   * All zones owned by the user will have the rule applied.
+   */
+  export interface Scope {
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * The contact email address of the user.
+     */
+    email?: string;
+
+    /**
+     * The scope of the rule.
+     */
+    type?: 'user' | 'organization';
+  }
+}
 
 export interface AccessRuleCreateParams {
   /**
@@ -413,20 +677,33 @@ export interface AccessRuleListParams extends V4PagePaginationArrayParams {
    */
   zone_id?: string;
 
+  /**
+   * Query param:
+   */
+  configuration?: AccessRuleListParams.Configuration;
+
   /**
    * Query param: The direction used to sort returned rules.
    */
   direction?: 'asc' | 'desc';
 
   /**
-   * Query param:
+   * Query param: When set to `all`, all the search requirements must match. When set
+   * to `any`, only one of the search requirements has to match.
    */
-  'egs-pagination'?: AccessRuleListParams.EgsPagination;
+  match?: 'any' | 'all';
 
   /**
-   * Query param:
+   * Query param: The action to apply to a matched request.
+   */
+  mode?: 'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge';
+
+  /**
+   * Query param: The string to search for in the notes of existing IP Access rules.
+   * Notes: For example, the string 'attack' would match IP Access rules with notes
+   * 'Attack 26/02' and 'Attack 27/02'. The search is case insensitive.
    */
-  filters?: AccessRuleListParams.Filters;
+  notes?: string;
 
   /**
    * Query param: The field used to sort returned rules.
@@ -435,30 +712,11 @@ export interface AccessRuleListParams extends V4PagePaginationArrayParams {
 }
 
 export namespace AccessRuleListParams {
-  export interface EgsPagination {
-    json?: EgsPagination.Json;
-  }
-
-  export namespace EgsPagination {
-    export interface Json {
-      /**
-       * The page number of paginated results.
-       */
-      page?: number;
-
-      /**
-       * The maximum number of results per page. You can only set the value to `1` or to
-       * a multiple of 5 such as `5`, `10`, `15`, or `20`.
-       */
-      per_page?: number;
-    }
-  }
-
-  export interface Filters {
+  export interface Configuration {
     /**
      * The target to search in existing rules.
      */
-    'configuration.target'?: 'ip' | 'ip_range' | 'asn' | 'country';
+    target?: 'ip' | 'ip_range' | 'asn' | 'country';
 
     /**
      * The target value to search for in existing rules: an IP address, an IP address
@@ -466,25 +724,7 @@ export namespace AccessRuleListParams {
      * Notes: You can search for a single IPv4 address, an IP address range with a
      * subnet of '/16' or '/24', or a two-letter ISO-3166-1 alpha-2 country code.
      */
-    'configuration.value'?: string;
-
-    /**
-     * When set to `all`, all the search requirements must match. When set to `any`,
-     * only one of the search requirements has to match.
-     */
-    match?: 'any' | 'all';
-
-    /**
-     * The action to apply to a matched request.
-     */
-    mode?: 'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge';
-
-    /**
-     * The string to search for in the notes of existing IP Access rules. Notes: For
-     * example, the string 'attack' would match IP Access rules with notes 'Attack
-     * 26/02' and 'Attack 27/02'. The search is case insensitive.
-     */
-    notes?: string;
+    value?: string;
   }
 }
 
@@ -547,21 +787,25 @@ export interface AccessRuleGetParams {
   zone_id?: string;
 }
 
-export namespace AccessRules {
-  export import AccessRuleCIDRConfiguration = AccessRulesAPI.AccessRuleCIDRConfiguration;
-  export import AccessRuleIPConfiguration = AccessRulesAPI.AccessRuleIPConfiguration;
-  export import ASNConfiguration = AccessRulesAPI.ASNConfiguration;
-  export import CountryConfiguration = AccessRulesAPI.CountryConfiguration;
-  export import IPV6Configuration = AccessRulesAPI.IPV6Configuration;
-  export import AccessRuleCreateResponse = AccessRulesAPI.AccessRuleCreateResponse;
-  export import AccessRuleListResponse = AccessRulesAPI.AccessRuleListResponse;
-  export import AccessRuleDeleteResponse = AccessRulesAPI.AccessRuleDeleteResponse;
-  export import AccessRuleEditResponse = AccessRulesAPI.AccessRuleEditResponse;
-  export import AccessRuleGetResponse = AccessRulesAPI.AccessRuleGetResponse;
-  export import AccessRuleListResponsesV4PagePaginationArray = AccessRulesAPI.AccessRuleListResponsesV4PagePaginationArray;
-  export import AccessRuleCreateParams = AccessRulesAPI.AccessRuleCreateParams;
-  export import AccessRuleListParams = AccessRulesAPI.AccessRuleListParams;
-  export import AccessRuleDeleteParams = AccessRulesAPI.AccessRuleDeleteParams;
-  export import AccessRuleEditParams = AccessRulesAPI.AccessRuleEditParams;
-  export import AccessRuleGetParams = AccessRulesAPI.AccessRuleGetParams;
+AccessRules.AccessRuleListResponsesV4PagePaginationArray = AccessRuleListResponsesV4PagePaginationArray;
+
+export declare namespace AccessRules {
+  export {
+    type AccessRuleCIDRConfiguration as AccessRuleCIDRConfiguration,
+    type AccessRuleIPConfiguration as AccessRuleIPConfiguration,
+    type ASNConfiguration as ASNConfiguration,
+    type CountryConfiguration as CountryConfiguration,
+    type IPV6Configuration as IPV6Configuration,
+    type AccessRuleCreateResponse as AccessRuleCreateResponse,
+    type AccessRuleListResponse as AccessRuleListResponse,
+    type AccessRuleDeleteResponse as AccessRuleDeleteResponse,
+    type AccessRuleEditResponse as AccessRuleEditResponse,
+    type AccessRuleGetResponse as AccessRuleGetResponse,
+    AccessRuleListResponsesV4PagePaginationArray as AccessRuleListResponsesV4PagePaginationArray,
+    type AccessRuleCreateParams as AccessRuleCreateParams,
+    type AccessRuleListParams as AccessRuleListParams,
+    type AccessRuleDeleteParams as AccessRuleDeleteParams,
+    type AccessRuleEditParams as AccessRuleEditParams,
+    type AccessRuleGetParams as AccessRuleGetParams,
+  };
 }
diff --git a/src/resources/firewall/firewall.ts b/src/resources/firewall/firewall.ts
index fa985578dd..fc8b19685f 100644
--- a/src/resources/firewall/firewall.ts
+++ b/src/resources/firewall/firewall.ts
@@ -2,10 +2,80 @@
 
 import { APIResource } from '../../resource';
 import * as AccessRulesAPI from './access-rules';
+import {
+  ASNConfiguration,
+  AccessRuleCIDRConfiguration,
+  AccessRuleCreateParams,
+  AccessRuleCreateResponse,
+  AccessRuleDeleteParams,
+  AccessRuleDeleteResponse,
+  AccessRuleEditParams,
+  AccessRuleEditResponse,
+  AccessRuleGetParams,
+  AccessRuleGetResponse,
+  AccessRuleIPConfiguration,
+  AccessRuleListParams,
+  AccessRuleListResponse,
+  AccessRuleListResponsesV4PagePaginationArray,
+  AccessRules,
+  CountryConfiguration,
+  IPV6Configuration,
+} from './access-rules';
 import * as LockdownsAPI from './lockdowns';
+import {
+  Configuration,
+  Lockdown,
+  LockdownCIDRConfiguration,
+  LockdownCreateParams,
+  LockdownDeleteParams,
+  LockdownDeleteResponse,
+  LockdownGetParams,
+  LockdownIPConfiguration,
+  LockdownListParams,
+  LockdownURL,
+  LockdownUpdateParams,
+  Lockdowns,
+  LockdownsV4PagePaginationArray,
+} from './lockdowns';
 import * as RulesAPI from './rules';
+import {
+  DeletedFilter,
+  FirewallRule,
+  FirewallRulesV4PagePaginationArray,
+  Product,
+  RuleBulkDeleteParams,
+  RuleBulkDeleteResponse,
+  RuleBulkEditParams,
+  RuleBulkEditResponse,
+  RuleBulkUpdateParams,
+  RuleBulkUpdateResponse,
+  RuleCreateParams,
+  RuleCreateResponse,
+  RuleDeleteParams,
+  RuleEditParams,
+  RuleEditResponse,
+  RuleGetParams,
+  RuleListParams,
+  RuleUpdateParams,
+  Rules,
+} from './rules';
 import * as UARulesAPI from './ua-rules';
+import {
+  UARuleCreateParams,
+  UARuleCreateResponse,
+  UARuleDeleteParams,
+  UARuleDeleteResponse,
+  UARuleGetParams,
+  UARuleGetResponse,
+  UARuleListParams,
+  UARuleListResponse,
+  UARuleListResponsesV4PagePaginationArray,
+  UARuleUpdateParams,
+  UARuleUpdateResponse,
+  UARules,
+} from './ua-rules';
 import * as WAFAPI from './waf/waf';
+import { WAF } from './waf/waf';
 
 export class Firewall extends APIResource {
   lockdowns: LockdownsAPI.Lockdowns = new LockdownsAPI.Lockdowns(this._client);
@@ -15,56 +85,89 @@ export class Firewall extends APIResource {
   waf: WAFAPI.WAF = new WAFAPI.WAF(this._client);
 }
 
-export namespace Firewall {
-  export import Lockdowns = LockdownsAPI.Lockdowns;
-  export import Configuration = LockdownsAPI.Configuration;
-  export import Lockdown = LockdownsAPI.Lockdown;
-  export import LockdownCIDRConfiguration = LockdownsAPI.LockdownCIDRConfiguration;
-  export import LockdownIPConfiguration = LockdownsAPI.LockdownIPConfiguration;
-  export import LockdownURL = LockdownsAPI.LockdownURL;
-  export import LockdownDeleteResponse = LockdownsAPI.LockdownDeleteResponse;
-  export import LockdownsV4PagePaginationArray = LockdownsAPI.LockdownsV4PagePaginationArray;
-  export import LockdownCreateParams = LockdownsAPI.LockdownCreateParams;
-  export import LockdownUpdateParams = LockdownsAPI.LockdownUpdateParams;
-  export import LockdownListParams = LockdownsAPI.LockdownListParams;
-  export import Rules = RulesAPI.Rules;
-  export import FirewallRule = RulesAPI.FirewallRule;
-  export import Product = RulesAPI.Product;
-  export import DeletedFilter = RulesAPI.DeletedFilter;
-  export import RuleCreateResponse = RulesAPI.RuleCreateResponse;
-  export import RuleEditResponse = RulesAPI.RuleEditResponse;
-  export import FirewallRulesV4PagePaginationArray = RulesAPI.FirewallRulesV4PagePaginationArray;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleEditParams = RulesAPI.RuleEditParams;
-  export import RuleGetParams = RulesAPI.RuleGetParams;
-  export import AccessRules = AccessRulesAPI.AccessRules;
-  export import AccessRuleCIDRConfiguration = AccessRulesAPI.AccessRuleCIDRConfiguration;
-  export import AccessRuleIPConfiguration = AccessRulesAPI.AccessRuleIPConfiguration;
-  export import ASNConfiguration = AccessRulesAPI.ASNConfiguration;
-  export import CountryConfiguration = AccessRulesAPI.CountryConfiguration;
-  export import IPV6Configuration = AccessRulesAPI.IPV6Configuration;
-  export import AccessRuleCreateResponse = AccessRulesAPI.AccessRuleCreateResponse;
-  export import AccessRuleListResponse = AccessRulesAPI.AccessRuleListResponse;
-  export import AccessRuleDeleteResponse = AccessRulesAPI.AccessRuleDeleteResponse;
-  export import AccessRuleEditResponse = AccessRulesAPI.AccessRuleEditResponse;
-  export import AccessRuleGetResponse = AccessRulesAPI.AccessRuleGetResponse;
-  export import AccessRuleListResponsesV4PagePaginationArray = AccessRulesAPI.AccessRuleListResponsesV4PagePaginationArray;
-  export import AccessRuleCreateParams = AccessRulesAPI.AccessRuleCreateParams;
-  export import AccessRuleListParams = AccessRulesAPI.AccessRuleListParams;
-  export import AccessRuleDeleteParams = AccessRulesAPI.AccessRuleDeleteParams;
-  export import AccessRuleEditParams = AccessRulesAPI.AccessRuleEditParams;
-  export import AccessRuleGetParams = AccessRulesAPI.AccessRuleGetParams;
-  export import UARules = UARulesAPI.UARules;
-  export import UARuleCreateResponse = UARulesAPI.UARuleCreateResponse;
-  export import UARuleUpdateResponse = UARulesAPI.UARuleUpdateResponse;
-  export import UARuleListResponse = UARulesAPI.UARuleListResponse;
-  export import UARuleDeleteResponse = UARulesAPI.UARuleDeleteResponse;
-  export import UARuleGetResponse = UARulesAPI.UARuleGetResponse;
-  export import UARuleListResponsesV4PagePaginationArray = UARulesAPI.UARuleListResponsesV4PagePaginationArray;
-  export import UARuleCreateParams = UARulesAPI.UARuleCreateParams;
-  export import UARuleUpdateParams = UARulesAPI.UARuleUpdateParams;
-  export import UARuleListParams = UARulesAPI.UARuleListParams;
-  export import WAF = WAFAPI.WAF;
+Firewall.Lockdowns = Lockdowns;
+Firewall.LockdownsV4PagePaginationArray = LockdownsV4PagePaginationArray;
+Firewall.Rules = Rules;
+Firewall.FirewallRulesV4PagePaginationArray = FirewallRulesV4PagePaginationArray;
+Firewall.AccessRules = AccessRules;
+Firewall.AccessRuleListResponsesV4PagePaginationArray = AccessRuleListResponsesV4PagePaginationArray;
+Firewall.UARules = UARules;
+Firewall.UARuleListResponsesV4PagePaginationArray = UARuleListResponsesV4PagePaginationArray;
+Firewall.WAF = WAF;
+
+export declare namespace Firewall {
+  export {
+    Lockdowns as Lockdowns,
+    type Configuration as Configuration,
+    type Lockdown as Lockdown,
+    type LockdownCIDRConfiguration as LockdownCIDRConfiguration,
+    type LockdownIPConfiguration as LockdownIPConfiguration,
+    type LockdownURL as LockdownURL,
+    type LockdownDeleteResponse as LockdownDeleteResponse,
+    LockdownsV4PagePaginationArray as LockdownsV4PagePaginationArray,
+    type LockdownCreateParams as LockdownCreateParams,
+    type LockdownUpdateParams as LockdownUpdateParams,
+    type LockdownListParams as LockdownListParams,
+    type LockdownDeleteParams as LockdownDeleteParams,
+    type LockdownGetParams as LockdownGetParams,
+  };
+
+  export {
+    Rules as Rules,
+    type DeletedFilter as DeletedFilter,
+    type FirewallRule as FirewallRule,
+    type Product as Product,
+    type RuleCreateResponse as RuleCreateResponse,
+    type RuleBulkDeleteResponse as RuleBulkDeleteResponse,
+    type RuleBulkEditResponse as RuleBulkEditResponse,
+    type RuleBulkUpdateResponse as RuleBulkUpdateResponse,
+    type RuleEditResponse as RuleEditResponse,
+    FirewallRulesV4PagePaginationArray as FirewallRulesV4PagePaginationArray,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleBulkDeleteParams as RuleBulkDeleteParams,
+    type RuleBulkEditParams as RuleBulkEditParams,
+    type RuleBulkUpdateParams as RuleBulkUpdateParams,
+    type RuleEditParams as RuleEditParams,
+    type RuleGetParams as RuleGetParams,
+  };
+
+  export {
+    AccessRules as AccessRules,
+    type AccessRuleCIDRConfiguration as AccessRuleCIDRConfiguration,
+    type AccessRuleIPConfiguration as AccessRuleIPConfiguration,
+    type ASNConfiguration as ASNConfiguration,
+    type CountryConfiguration as CountryConfiguration,
+    type IPV6Configuration as IPV6Configuration,
+    type AccessRuleCreateResponse as AccessRuleCreateResponse,
+    type AccessRuleListResponse as AccessRuleListResponse,
+    type AccessRuleDeleteResponse as AccessRuleDeleteResponse,
+    type AccessRuleEditResponse as AccessRuleEditResponse,
+    type AccessRuleGetResponse as AccessRuleGetResponse,
+    AccessRuleListResponsesV4PagePaginationArray as AccessRuleListResponsesV4PagePaginationArray,
+    type AccessRuleCreateParams as AccessRuleCreateParams,
+    type AccessRuleListParams as AccessRuleListParams,
+    type AccessRuleDeleteParams as AccessRuleDeleteParams,
+    type AccessRuleEditParams as AccessRuleEditParams,
+    type AccessRuleGetParams as AccessRuleGetParams,
+  };
+
+  export {
+    UARules as UARules,
+    type UARuleCreateResponse as UARuleCreateResponse,
+    type UARuleUpdateResponse as UARuleUpdateResponse,
+    type UARuleListResponse as UARuleListResponse,
+    type UARuleDeleteResponse as UARuleDeleteResponse,
+    type UARuleGetResponse as UARuleGetResponse,
+    UARuleListResponsesV4PagePaginationArray as UARuleListResponsesV4PagePaginationArray,
+    type UARuleCreateParams as UARuleCreateParams,
+    type UARuleUpdateParams as UARuleUpdateParams,
+    type UARuleListParams as UARuleListParams,
+    type UARuleDeleteParams as UARuleDeleteParams,
+    type UARuleGetParams as UARuleGetParams,
+  };
+
+  export { WAF as WAF };
 }
diff --git a/src/resources/firewall/index.ts b/src/resources/firewall/index.ts
index 82bb6e88f4..f1522cc2e6 100644
--- a/src/resources/firewall/index.ts
+++ b/src/resources/firewall/index.ts
@@ -1,62 +1,73 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AccessRuleCIDRConfiguration,
-  AccessRuleIPConfiguration,
-  ASNConfiguration,
-  CountryConfiguration,
-  IPV6Configuration,
-  AccessRuleCreateResponse,
-  AccessRuleListResponse,
-  AccessRuleDeleteResponse,
-  AccessRuleEditResponse,
-  AccessRuleGetResponse,
-  AccessRuleCreateParams,
-  AccessRuleListParams,
-  AccessRuleDeleteParams,
-  AccessRuleEditParams,
-  AccessRuleGetParams,
   AccessRuleListResponsesV4PagePaginationArray,
   AccessRules,
+  type AccessRuleCIDRConfiguration,
+  type AccessRuleIPConfiguration,
+  type ASNConfiguration,
+  type CountryConfiguration,
+  type IPV6Configuration,
+  type AccessRuleCreateResponse,
+  type AccessRuleListResponse,
+  type AccessRuleDeleteResponse,
+  type AccessRuleEditResponse,
+  type AccessRuleGetResponse,
+  type AccessRuleCreateParams,
+  type AccessRuleListParams,
+  type AccessRuleDeleteParams,
+  type AccessRuleEditParams,
+  type AccessRuleGetParams,
 } from './access-rules';
-export {
-  Configuration,
-  Lockdown,
-  LockdownCIDRConfiguration,
-  LockdownIPConfiguration,
-  LockdownURL,
-  LockdownDeleteResponse,
-  LockdownCreateParams,
-  LockdownUpdateParams,
-  LockdownListParams,
-  LockdownsV4PagePaginationArray,
-  Lockdowns,
-} from './lockdowns';
 export { Firewall } from './firewall';
 export {
-  FirewallRule,
-  Product,
-  DeletedFilter,
-  RuleCreateResponse,
-  RuleEditResponse,
-  RuleCreateParams,
-  RuleUpdateParams,
-  RuleListParams,
-  RuleEditParams,
-  RuleGetParams,
   FirewallRulesV4PagePaginationArray,
   Rules,
+  type DeletedFilter,
+  type FirewallRule,
+  type Product,
+  type RuleCreateResponse,
+  type RuleBulkDeleteResponse,
+  type RuleBulkEditResponse,
+  type RuleBulkUpdateResponse,
+  type RuleEditResponse,
+  type RuleCreateParams,
+  type RuleUpdateParams,
+  type RuleListParams,
+  type RuleDeleteParams,
+  type RuleBulkDeleteParams,
+  type RuleBulkEditParams,
+  type RuleBulkUpdateParams,
+  type RuleEditParams,
+  type RuleGetParams,
 } from './rules';
 export {
-  UARuleCreateResponse,
-  UARuleUpdateResponse,
-  UARuleListResponse,
-  UARuleDeleteResponse,
-  UARuleGetResponse,
-  UARuleCreateParams,
-  UARuleUpdateParams,
-  UARuleListParams,
+  LockdownsV4PagePaginationArray,
+  Lockdowns,
+  type Configuration,
+  type Lockdown,
+  type LockdownCIDRConfiguration,
+  type LockdownIPConfiguration,
+  type LockdownURL,
+  type LockdownDeleteResponse,
+  type LockdownCreateParams,
+  type LockdownUpdateParams,
+  type LockdownListParams,
+  type LockdownDeleteParams,
+  type LockdownGetParams,
+} from './lockdowns';
+export {
   UARuleListResponsesV4PagePaginationArray,
   UARules,
+  type UARuleCreateResponse,
+  type UARuleUpdateResponse,
+  type UARuleListResponse,
+  type UARuleDeleteResponse,
+  type UARuleGetResponse,
+  type UARuleCreateParams,
+  type UARuleUpdateParams,
+  type UARuleListParams,
+  type UARuleDeleteParams,
+  type UARuleGetParams,
 } from './ua-rules';
 export { WAF } from './waf/index';
diff --git a/src/resources/firewall/lockdowns.ts b/src/resources/firewall/lockdowns.ts
index 583215924c..72b1cd8a95 100644
--- a/src/resources/firewall/lockdowns.ts
+++ b/src/resources/firewall/lockdowns.ts
@@ -1,25 +1,20 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
-import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as LockdownsAPI from './lockdowns';
+import * as OverridesAPI from './waf/overrides';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class Lockdowns extends APIResource {
   /**
    * Creates a new Zone Lockdown rule.
    */
-  create(
-    zoneIdentifier: string,
-    body: LockdownCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Lockdown> {
+  create(params: LockdownCreateParams, options?: Core.RequestOptions): Core.APIPromise<Lockdown> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.post(`/zones/${zoneIdentifier}/firewall/lockdowns`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: Lockdown }>
+      this._client.post(`/zones/${zone_id}/firewall/lockdowns`, { body, ...options }) as Core.APIPromise<{
+        result: Lockdown;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -27,13 +22,13 @@ export class Lockdowns extends APIResource {
    * Updates an existing Zone Lockdown rule.
    */
   update(
-    zoneIdentifier: string,
-    id: string,
-    body: LockdownUpdateParams,
+    lockDownsId: string,
+    params: LockdownUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<Lockdown> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.put(`/zones/${zoneIdentifier}/firewall/lockdowns/${id}`, {
+      this._client.put(`/zones/${zone_id}/firewall/lockdowns/${lockDownsId}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: Lockdown }>
@@ -45,39 +40,27 @@ export class Lockdowns extends APIResource {
    * parameters.
    */
   list(
-    zoneIdentifier: string,
-    query?: LockdownListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<LockdownsV4PagePaginationArray, Lockdown>;
-  list(
-    zoneIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<LockdownsV4PagePaginationArray, Lockdown>;
-  list(
-    zoneIdentifier: string,
-    query: LockdownListParams | Core.RequestOptions = {},
+    params: LockdownListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<LockdownsV4PagePaginationArray, Lockdown> {
-    if (isRequestOptions(query)) {
-      return this.list(zoneIdentifier, {}, query);
-    }
-    return this._client.getAPIList(
-      `/zones/${zoneIdentifier}/firewall/lockdowns`,
-      LockdownsV4PagePaginationArray,
-      { query, ...options },
-    );
+    const { zone_id, ...query } = params;
+    return this._client.getAPIList(`/zones/${zone_id}/firewall/lockdowns`, LockdownsV4PagePaginationArray, {
+      query,
+      ...options,
+    });
   }
 
   /**
    * Deletes an existing Zone Lockdown rule.
    */
   delete(
-    zoneIdentifier: string,
-    id: string,
+    lockDownsId: string,
+    params: LockdownDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<LockdownDeleteResponse> {
+    const { zone_id } = params;
     return (
-      this._client.delete(`/zones/${zoneIdentifier}/firewall/lockdowns/${id}`, options) as Core.APIPromise<{
+      this._client.delete(`/zones/${zone_id}/firewall/lockdowns/${lockDownsId}`, options) as Core.APIPromise<{
         result: LockdownDeleteResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -86,9 +69,14 @@ export class Lockdowns extends APIResource {
   /**
    * Fetches the details of a Zone Lockdown rule.
    */
-  get(zoneIdentifier: string, id: string, options?: Core.RequestOptions): Core.APIPromise<Lockdown> {
+  get(
+    lockDownsId: string,
+    params: LockdownGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<Lockdown> {
+    const { zone_id } = params;
     return (
-      this._client.get(`/zones/${zoneIdentifier}/firewall/lockdowns/${id}`, options) as Core.APIPromise<{
+      this._client.get(`/zones/${zone_id}/firewall/lockdowns/${lockDownsId}`, options) as Core.APIPromise<{
         result: Lockdown;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -102,7 +90,14 @@ export class LockdownsV4PagePaginationArray extends V4PagePaginationArray<Lockdo
  * specified in the Zone Lockdown rule. You can include any number of `ip` or
  * `ip_range` configurations.
  */
-export type Configuration = LockdownIPConfiguration | LockdownCIDRConfiguration;
+export type Configuration = Array<LockdownIPConfiguration | LockdownCIDRConfiguration>;
+
+/**
+ * A list of IP addresses or CIDR ranges that will be allowed to access the URLs
+ * specified in the Zone Lockdown rule. You can include any number of `ip` or
+ * `ip_range` configurations.
+ */
+export type ConfigurationParam = Array<LockdownIPConfigurationParam | LockdownCIDRConfigurationParam>;
 
 export interface Lockdown {
   /**
@@ -158,6 +153,19 @@ export interface LockdownCIDRConfiguration {
   value?: string;
 }
 
+export interface LockdownCIDRConfigurationParam {
+  /**
+   * The configuration target. You must set the target to `ip_range` when specifying
+   * an IP address range in the Zone Lockdown rule.
+   */
+  target?: 'ip_range';
+
+  /**
+   * The IP address range to match. You can only use prefix lengths `/16` and `/24`.
+   */
+  value?: string;
+}
+
 export interface LockdownIPConfiguration {
   /**
    * The configuration target. You must set the target to `ip` when specifying an IP
@@ -172,6 +180,20 @@ export interface LockdownIPConfiguration {
   value?: string;
 }
 
+export interface LockdownIPConfigurationParam {
+  /**
+   * The configuration target. You must set the target to `ip` when specifying an IP
+   * address in the Zone Lockdown rule.
+   */
+  target?: 'ip';
+
+  /**
+   * The IP address to match. This address will be compared to the IP address of
+   * incoming requests.
+   */
+  value?: string;
+}
+
 export type LockdownURL = string;
 
 export interface LockdownDeleteResponse {
@@ -181,68 +203,131 @@ export interface LockdownDeleteResponse {
   id?: string;
 }
 
-export type LockdownCreateParams = unknown;
+export interface LockdownCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
 
-export type LockdownUpdateParams = unknown;
+  /**
+   * Body param: A list of IP addresses or CIDR ranges that will be allowed to access
+   * the URLs specified in the Zone Lockdown rule. You can include any number of `ip`
+   * or `ip_range` configurations.
+   */
+  configurations: ConfigurationParam;
+
+  /**
+   * Body param: The URLs to include in the current WAF override. You can use
+   * wildcards. Each entered URL will be escaped before use, which means you can only
+   * use simple wildcard patterns.
+   */
+  urls: Array<OverridesAPI.OverrideURLParam>;
+}
+
+export interface LockdownUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: A list of IP addresses or CIDR ranges that will be allowed to access
+   * the URLs specified in the Zone Lockdown rule. You can include any number of `ip`
+   * or `ip_range` configurations.
+   */
+  configurations: ConfigurationParam;
+
+  /**
+   * Body param: The URLs to include in the current WAF override. You can use
+   * wildcards. Each entered URL will be escaped before use, which means you can only
+   * use simple wildcard patterns.
+   */
+  urls: Array<OverridesAPI.OverrideURLParam>;
+}
 
 export interface LockdownListParams extends V4PagePaginationArrayParams {
   /**
-   * The timestamp of when the rule was created.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: The timestamp of when the rule was created.
    */
   created_on?: string;
 
   /**
-   * A string to search for in the description of existing rules.
+   * Query param: A string to search for in the description of existing rules.
    */
   description?: string;
 
   /**
-   * A string to search for in the description of existing rules.
+   * Query param: A string to search for in the description of existing rules.
    */
   description_search?: string;
 
   /**
-   * A single IP address to search for in existing rules.
+   * Query param: A single IP address to search for in existing rules.
    */
   ip?: string;
 
   /**
-   * A single IP address range to search for in existing rules.
+   * Query param: A single IP address range to search for in existing rules.
    */
   ip_range_search?: string;
 
   /**
-   * A single IP address to search for in existing rules.
+   * Query param: A single IP address to search for in existing rules.
    */
   ip_search?: string;
 
   /**
-   * The timestamp of when the rule was last modified.
+   * Query param: The timestamp of when the rule was last modified.
    */
   modified_on?: string;
 
   /**
-   * The priority of the rule to control the processing order. A lower number
-   * indicates higher priority. If not provided, any rules with a configured priority
-   * will be processed before rules without a priority.
+   * Query param: The priority of the rule to control the processing order. A lower
+   * number indicates higher priority. If not provided, any rules with a configured
+   * priority will be processed before rules without a priority.
    */
   priority?: number;
 
   /**
-   * A single URI to search for in the list of URLs of existing rules.
+   * Query param: A single URI to search for in the list of URLs of existing rules.
    */
   uri_search?: string;
 }
 
-export namespace Lockdowns {
-  export import Configuration = LockdownsAPI.Configuration;
-  export import Lockdown = LockdownsAPI.Lockdown;
-  export import LockdownCIDRConfiguration = LockdownsAPI.LockdownCIDRConfiguration;
-  export import LockdownIPConfiguration = LockdownsAPI.LockdownIPConfiguration;
-  export import LockdownURL = LockdownsAPI.LockdownURL;
-  export import LockdownDeleteResponse = LockdownsAPI.LockdownDeleteResponse;
-  export import LockdownsV4PagePaginationArray = LockdownsAPI.LockdownsV4PagePaginationArray;
-  export import LockdownCreateParams = LockdownsAPI.LockdownCreateParams;
-  export import LockdownUpdateParams = LockdownsAPI.LockdownUpdateParams;
-  export import LockdownListParams = LockdownsAPI.LockdownListParams;
+export interface LockdownDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface LockdownGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+Lockdowns.LockdownsV4PagePaginationArray = LockdownsV4PagePaginationArray;
+
+export declare namespace Lockdowns {
+  export {
+    type Configuration as Configuration,
+    type Lockdown as Lockdown,
+    type LockdownCIDRConfiguration as LockdownCIDRConfiguration,
+    type LockdownIPConfiguration as LockdownIPConfiguration,
+    type LockdownURL as LockdownURL,
+    type LockdownDeleteResponse as LockdownDeleteResponse,
+    LockdownsV4PagePaginationArray as LockdownsV4PagePaginationArray,
+    type LockdownCreateParams as LockdownCreateParams,
+    type LockdownUpdateParams as LockdownUpdateParams,
+    type LockdownListParams as LockdownListParams,
+    type LockdownDeleteParams as LockdownDeleteParams,
+    type LockdownGetParams as LockdownGetParams,
+  };
 }
diff --git a/src/resources/firewall/rules.ts b/src/resources/firewall/rules.ts
index 3f6c8a44bf..4a75035a5c 100644
--- a/src/resources/firewall/rules.ts
+++ b/src/resources/firewall/rules.ts
@@ -1,9 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
-import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as RulesAPI from './rules';
 import * as FiltersAPI from '../filters';
 import * as RateLimitsAPI from '../rate-limits';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
@@ -15,12 +13,12 @@ export class Rules extends APIResource {
    * @deprecated The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
    */
   create(
-    zoneIdentifier: string,
-    body: RuleCreateParams,
+    params: RuleCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<RuleCreateResponse | null> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.post(`/zones/${zoneIdentifier}/firewall/rules`, { body, ...options }) as Core.APIPromise<{
+      this._client.post(`/zones/${zone_id}/firewall/rules`, { body, ...options }) as Core.APIPromise<{
         result: RuleCreateResponse | null;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -32,13 +30,13 @@ export class Rules extends APIResource {
    * @deprecated The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
    */
   update(
-    zoneIdentifier: string,
-    id: string,
-    body: RuleUpdateParams,
+    ruleId: string,
+    params: RuleUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<FirewallRule> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.put(`/zones/${zoneIdentifier}/firewall/rules/${id}`, {
+      this._client.put(`/zones/${zone_id}/firewall/rules/${ruleId}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: FirewallRule }>
@@ -52,27 +50,14 @@ export class Rules extends APIResource {
    * @deprecated The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
    */
   list(
-    zoneIdentifier: string,
-    query?: RuleListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<FirewallRulesV4PagePaginationArray, FirewallRule>;
-  list(
-    zoneIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<FirewallRulesV4PagePaginationArray, FirewallRule>;
-  list(
-    zoneIdentifier: string,
-    query: RuleListParams | Core.RequestOptions = {},
+    params: RuleListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<FirewallRulesV4PagePaginationArray, FirewallRule> {
-    if (isRequestOptions(query)) {
-      return this.list(zoneIdentifier, {}, query);
-    }
-    return this._client.getAPIList(
-      `/zones/${zoneIdentifier}/firewall/rules`,
-      FirewallRulesV4PagePaginationArray,
-      { query, ...options },
-    );
+    const { zone_id, ...query } = params;
+    return this._client.getAPIList(`/zones/${zone_id}/firewall/rules`, FirewallRulesV4PagePaginationArray, {
+      query,
+      ...options,
+    });
   }
 
   /**
@@ -80,27 +65,83 @@ export class Rules extends APIResource {
    *
    * @deprecated The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
    */
-  delete(zoneIdentifier: string, id: string, options?: Core.RequestOptions): Core.APIPromise<FirewallRule> {
+  delete(
+    ruleId: string,
+    params: RuleDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FirewallRule> {
+    const { zone_id } = params;
     return (
-      this._client.delete(`/zones/${zoneIdentifier}/firewall/rules/${id}`, options) as Core.APIPromise<{
+      this._client.delete(`/zones/${zone_id}/firewall/rules/${ruleId}`, options) as Core.APIPromise<{
         result: FirewallRule;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 
+  /**
+   * Deletes existing firewall rules.
+   *
+   * @deprecated The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
+   */
+  bulkDelete(
+    params: RuleBulkDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RuleBulkDeleteResponse | null> {
+    const { zone_id } = params;
+    return (
+      this._client.delete(`/zones/${zone_id}/firewall/rules`, options) as Core.APIPromise<{
+        result: RuleBulkDeleteResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Updates the priority of existing firewall rules.
+   *
+   * @deprecated The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
+   */
+  bulkEdit(
+    params: RuleBulkEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RuleBulkEditResponse | null> {
+    const { zone_id, body } = params;
+    return (
+      this._client.patch(`/zones/${zone_id}/firewall/rules`, { body: body, ...options }) as Core.APIPromise<{
+        result: RuleBulkEditResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Updates one or more existing firewall rules.
+   *
+   * @deprecated The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
+   */
+  bulkUpdate(
+    params: RuleBulkUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RuleBulkUpdateResponse | null> {
+    const { zone_id, body } = params;
+    return (
+      this._client.put(`/zones/${zone_id}/firewall/rules`, { body: body, ...options }) as Core.APIPromise<{
+        result: RuleBulkUpdateResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Updates the priority of an existing firewall rule.
    *
    * @deprecated The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
    */
   edit(
-    zoneIdentifier: string,
-    id: string,
-    body: RuleEditParams,
+    ruleId: string,
+    params: RuleEditParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<RuleEditResponse | null> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.patch(`/zones/${zoneIdentifier}/firewall/rules/${id}`, {
+      this._client.patch(`/zones/${zone_id}/firewall/rules/${ruleId}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: RuleEditResponse | null }>
@@ -112,15 +153,11 @@ export class Rules extends APIResource {
    *
    * @deprecated The Firewall Rules API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#firewall-rules-api-and-filters-api for full details.
    */
-  get(
-    zoneIdentifier: string,
-    params: RuleGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<FirewallRule> {
-    const { path_id, query_id, ...query } = params;
+  get(ruleId: string, params: RuleGetParams, options?: Core.RequestOptions): Core.APIPromise<FirewallRule> {
+    const { zone_id, ...query } = params;
     return (
-      this._client.get(`/zones/${zoneIdentifier}/firewall/rules/${path_id}`, {
-        query: { id: query_id, ...query },
+      this._client.get(`/zones/${zone_id}/firewall/rules/${ruleId}`, {
+        query,
         ...options,
       }) as Core.APIPromise<{ result: FirewallRule }>
     )._thenUnwrap((obj) => obj.result);
@@ -129,6 +166,18 @@ export class Rules extends APIResource {
 
 export class FirewallRulesV4PagePaginationArray extends V4PagePaginationArray<FirewallRule> {}
 
+export interface DeletedFilter {
+  /**
+   * The unique identifier of the filter.
+   */
+  id: string;
+
+  /**
+   * When true, indicates that the firewall rule was deleted.
+   */
+  deleted: boolean;
+}
+
 export interface FirewallRule {
   /**
    * The unique identifier of the firewall rule.
@@ -173,72 +222,267 @@ export interface FirewallRule {
  */
 export type Product = 'zoneLockdown' | 'uaBlock' | 'bic' | 'hot' | 'securityLevel' | 'rateLimit' | 'waf';
 
-export interface DeletedFilter {
+export type RuleCreateResponse = Array<FirewallRule>;
+
+export type RuleBulkDeleteResponse = Array<FirewallRule>;
+
+export type RuleBulkEditResponse = Array<FirewallRule>;
+
+export type RuleBulkUpdateResponse = Array<FirewallRule>;
+
+export type RuleEditResponse = Array<FirewallRule>;
+
+export interface RuleCreateParams {
   /**
-   * The unique identifier of the filter.
+   * Path param: Identifier
    */
-  id: string;
+  zone_id: string;
 
   /**
-   * When true, indicates that the firewall rule was deleted.
+   * Body param: The action to perform when the threshold of matched traffic within
+   * the configured period is exceeded.
    */
-  deleted: boolean;
+  action: RuleCreateParams.Action;
+
+  /**
+   * Body param:
+   */
+  filter: FiltersAPI.FirewallFilterParam;
 }
 
-export type RuleCreateResponse = Array<FirewallRule>;
+export namespace RuleCreateParams {
+  /**
+   * The action to perform when the threshold of matched traffic within the
+   * configured period is exceeded.
+   */
+  export interface Action {
+    /**
+     * The action to perform.
+     */
+    mode?: 'simulate' | 'ban' | 'challenge' | 'js_challenge' | 'managed_challenge';
 
-export type RuleEditResponse = Array<FirewallRule>;
+    /**
+     * A custom content type and reponse to return when the threshold is exceeded. The
+     * custom response configured in this object will override the custom error for the
+     * zone. This object is optional. Notes: If you omit this object, Cloudflare will
+     * use the default HTML error page. If "mode" is "challenge", "managed_challenge",
+     * or "js_challenge", Cloudflare will use the zone challenge pages and you should
+     * not provide the "response" object.
+     */
+    response?: Action.Response;
+
+    /**
+     * The time in seconds during which Cloudflare will perform the mitigation action.
+     * Must be an integer value greater than or equal to the period. Notes: If "mode"
+     * is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the
+     * zone's Challenge Passage time and you should not provide this value.
+     */
+    timeout?: number;
+  }
+
+  export namespace Action {
+    /**
+     * A custom content type and reponse to return when the threshold is exceeded. The
+     * custom response configured in this object will override the custom error for the
+     * zone. This object is optional. Notes: If you omit this object, Cloudflare will
+     * use the default HTML error page. If "mode" is "challenge", "managed_challenge",
+     * or "js_challenge", Cloudflare will use the zone challenge pages and you should
+     * not provide the "response" object.
+     */
+    export interface Response {
+      /**
+       * The response body to return. The value must conform to the configured content
+       * type.
+       */
+      body?: string;
+
+      /**
+       * The content type of the body. Must be one of the following: `text/plain`,
+       * `text/xml`, or `application/json`.
+       */
+      content_type?: string;
+    }
+  }
+}
+
+export interface RuleUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The action to perform when the threshold of matched traffic within
+   * the configured period is exceeded.
+   */
+  action: RuleUpdateParams.Action;
+
+  /**
+   * Body param:
+   */
+  filter: FiltersAPI.FirewallFilterParam;
+}
+
+export namespace RuleUpdateParams {
+  /**
+   * The action to perform when the threshold of matched traffic within the
+   * configured period is exceeded.
+   */
+  export interface Action {
+    /**
+     * The action to perform.
+     */
+    mode?: 'simulate' | 'ban' | 'challenge' | 'js_challenge' | 'managed_challenge';
+
+    /**
+     * A custom content type and reponse to return when the threshold is exceeded. The
+     * custom response configured in this object will override the custom error for the
+     * zone. This object is optional. Notes: If you omit this object, Cloudflare will
+     * use the default HTML error page. If "mode" is "challenge", "managed_challenge",
+     * or "js_challenge", Cloudflare will use the zone challenge pages and you should
+     * not provide the "response" object.
+     */
+    response?: Action.Response;
+
+    /**
+     * The time in seconds during which Cloudflare will perform the mitigation action.
+     * Must be an integer value greater than or equal to the period. Notes: If "mode"
+     * is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the
+     * zone's Challenge Passage time and you should not provide this value.
+     */
+    timeout?: number;
+  }
 
-export type RuleCreateParams = unknown;
+  export namespace Action {
+    /**
+     * A custom content type and reponse to return when the threshold is exceeded. The
+     * custom response configured in this object will override the custom error for the
+     * zone. This object is optional. Notes: If you omit this object, Cloudflare will
+     * use the default HTML error page. If "mode" is "challenge", "managed_challenge",
+     * or "js_challenge", Cloudflare will use the zone challenge pages and you should
+     * not provide the "response" object.
+     */
+    export interface Response {
+      /**
+       * The response body to return. The value must conform to the configured content
+       * type.
+       */
+      body?: string;
 
-export type RuleUpdateParams = unknown;
+      /**
+       * The content type of the body. Must be one of the following: `text/plain`,
+       * `text/xml`, or `application/json`.
+       */
+      content_type?: string;
+    }
+  }
+}
 
 export interface RuleListParams extends V4PagePaginationArrayParams {
   /**
-   * The unique identifier of the firewall rule.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: The unique identifier of the firewall rule.
    */
   id?: string;
 
   /**
-   * The action to search for. Must be an exact match.
+   * Query param: The action to search for. Must be an exact match.
    */
   action?: string;
 
   /**
-   * A case-insensitive string to find in the description.
+   * Query param: A case-insensitive string to find in the description.
    */
   description?: string;
 
   /**
-   * When true, indicates that the firewall rule is currently paused.
+   * Query param: When true, indicates that the firewall rule is currently paused.
    */
   paused?: boolean;
 }
 
-export type RuleEditParams = unknown;
+export interface RuleDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface RuleBulkDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface RuleBulkEditParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+}
+
+export interface RuleBulkUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+}
+
+export interface RuleEditParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
 
 export interface RuleGetParams {
   /**
-   * Path param: The unique identifier of the firewall rule.
+   * Path param: Identifier
    */
-  path_id: string;
+  zone_id: string;
 
   /**
    * Query param: The unique identifier of the firewall rule.
    */
-  query_id?: string;
+  id?: string;
 }
 
-export namespace Rules {
-  export import FirewallRule = RulesAPI.FirewallRule;
-  export import Product = RulesAPI.Product;
-  export import DeletedFilter = RulesAPI.DeletedFilter;
-  export import RuleCreateResponse = RulesAPI.RuleCreateResponse;
-  export import RuleEditResponse = RulesAPI.RuleEditResponse;
-  export import FirewallRulesV4PagePaginationArray = RulesAPI.FirewallRulesV4PagePaginationArray;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleEditParams = RulesAPI.RuleEditParams;
-  export import RuleGetParams = RulesAPI.RuleGetParams;
+Rules.FirewallRulesV4PagePaginationArray = FirewallRulesV4PagePaginationArray;
+
+export declare namespace Rules {
+  export {
+    type DeletedFilter as DeletedFilter,
+    type FirewallRule as FirewallRule,
+    type Product as Product,
+    type RuleCreateResponse as RuleCreateResponse,
+    type RuleBulkDeleteResponse as RuleBulkDeleteResponse,
+    type RuleBulkEditResponse as RuleBulkEditResponse,
+    type RuleBulkUpdateResponse as RuleBulkUpdateResponse,
+    type RuleEditResponse as RuleEditResponse,
+    FirewallRulesV4PagePaginationArray as FirewallRulesV4PagePaginationArray,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleBulkDeleteParams as RuleBulkDeleteParams,
+    type RuleBulkEditParams as RuleBulkEditParams,
+    type RuleBulkUpdateParams as RuleBulkUpdateParams,
+    type RuleEditParams as RuleEditParams,
+    type RuleGetParams as RuleGetParams,
+  };
 }
diff --git a/src/resources/firewall/ua-rules.ts b/src/resources/firewall/ua-rules.ts
index 3d3d79131d..8c8a3d70c3 100644
--- a/src/resources/firewall/ua-rules.ts
+++ b/src/resources/firewall/ua-rules.ts
@@ -1,25 +1,20 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
-import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as UARulesAPI from './ua-rules';
+import * as AccessRulesAPI from './access-rules';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class UARules extends APIResource {
   /**
    * Creates a new User Agent Blocking rule in a zone.
    */
-  create(
-    zoneIdentifier: string,
-    body: UARuleCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<UARuleCreateResponse> {
+  create(params: UARuleCreateParams, options?: Core.RequestOptions): Core.APIPromise<UARuleCreateResponse> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.post(`/zones/${zoneIdentifier}/firewall/ua_rules`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: UARuleCreateResponse }>
+      this._client.post(`/zones/${zone_id}/firewall/ua_rules`, { body, ...options }) as Core.APIPromise<{
+        result: UARuleCreateResponse;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -27,13 +22,13 @@ export class UARules extends APIResource {
    * Updates an existing User Agent Blocking rule.
    */
   update(
-    zoneIdentifier: string,
-    id: string,
-    body: UARuleUpdateParams,
+    uaRuleId: string,
+    params: UARuleUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<UARuleUpdateResponse> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.put(`/zones/${zoneIdentifier}/firewall/ua_rules/${id}`, {
+      this._client.put(`/zones/${zone_id}/firewall/ua_rules/${uaRuleId}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: UARuleUpdateResponse }>
@@ -45,24 +40,12 @@ export class UARules extends APIResource {
    * several optional parameters.
    */
   list(
-    zoneIdentifier: string,
-    query?: UARuleListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<UARuleListResponsesV4PagePaginationArray, UARuleListResponse>;
-  list(
-    zoneIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<UARuleListResponsesV4PagePaginationArray, UARuleListResponse>;
-  list(
-    zoneIdentifier: string,
-    query: UARuleListParams | Core.RequestOptions = {},
+    params: UARuleListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<UARuleListResponsesV4PagePaginationArray, UARuleListResponse> {
-    if (isRequestOptions(query)) {
-      return this.list(zoneIdentifier, {}, query);
-    }
+    const { zone_id, ...query } = params;
     return this._client.getAPIList(
-      `/zones/${zoneIdentifier}/firewall/ua_rules`,
+      `/zones/${zone_id}/firewall/ua_rules`,
       UARuleListResponsesV4PagePaginationArray,
       { query, ...options },
     );
@@ -72,12 +55,13 @@ export class UARules extends APIResource {
    * Deletes an existing User Agent Blocking rule.
    */
   delete(
-    zoneIdentifier: string,
-    id: string,
+    uaRuleId: string,
+    params: UARuleDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<UARuleDeleteResponse> {
+    const { zone_id } = params;
     return (
-      this._client.delete(`/zones/${zoneIdentifier}/firewall/ua_rules/${id}`, options) as Core.APIPromise<{
+      this._client.delete(`/zones/${zone_id}/firewall/ua_rules/${uaRuleId}`, options) as Core.APIPromise<{
         result: UARuleDeleteResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -86,9 +70,14 @@ export class UARules extends APIResource {
   /**
    * Fetches the details of a User Agent Blocking rule.
    */
-  get(zoneIdentifier: string, id: string, options?: Core.RequestOptions): Core.APIPromise<UARuleGetResponse> {
+  get(
+    uaRuleId: string,
+    params: UARuleGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<UARuleGetResponse> {
+    const { zone_id } = params;
     return (
-      this._client.get(`/zones/${zoneIdentifier}/firewall/ua_rules/${id}`, options) as Core.APIPromise<{
+      this._client.get(`/zones/${zone_id}/firewall/ua_rules/${uaRuleId}`, options) as Core.APIPromise<{
         result: UARuleGetResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -156,35 +145,100 @@ export interface UARuleDeleteResponse {
 
 export type UARuleGetResponse = unknown | string | null;
 
-export type UARuleCreateParams = unknown;
+export interface UARuleCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The rule configuration.
+   */
+  configuration:
+    | AccessRulesAPI.AccessRuleIPConfigurationParam
+    | AccessRulesAPI.IPV6ConfigurationParam
+    | AccessRulesAPI.AccessRuleCIDRConfigurationParam
+    | AccessRulesAPI.ASNConfigurationParam
+    | AccessRulesAPI.CountryConfigurationParam;
+
+  /**
+   * Body param: The action to apply to a matched request.
+   */
+  mode: 'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge';
+}
+
+export interface UARuleUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The rule configuration.
+   */
+  configuration:
+    | AccessRulesAPI.AccessRuleIPConfigurationParam
+    | AccessRulesAPI.IPV6ConfigurationParam
+    | AccessRulesAPI.AccessRuleCIDRConfigurationParam
+    | AccessRulesAPI.ASNConfigurationParam
+    | AccessRulesAPI.CountryConfigurationParam;
 
-export type UARuleUpdateParams = unknown;
+  /**
+   * Body param: The action to apply to a matched request.
+   */
+  mode: 'block' | 'challenge' | 'whitelist' | 'js_challenge' | 'managed_challenge';
+}
 
 export interface UARuleListParams extends V4PagePaginationArrayParams {
   /**
-   * A string to search for in the description of existing rules.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: A string to search for in the description of existing rules.
    */
   description?: string;
 
   /**
-   * A string to search for in the description of existing rules.
+   * Query param: A string to search for in the description of existing rules.
    */
   description_search?: string;
 
   /**
-   * A string to search for in the user agent values of existing rules.
+   * Query param: A string to search for in the user agent values of existing rules.
    */
   ua_search?: string;
 }
 
-export namespace UARules {
-  export import UARuleCreateResponse = UARulesAPI.UARuleCreateResponse;
-  export import UARuleUpdateResponse = UARulesAPI.UARuleUpdateResponse;
-  export import UARuleListResponse = UARulesAPI.UARuleListResponse;
-  export import UARuleDeleteResponse = UARulesAPI.UARuleDeleteResponse;
-  export import UARuleGetResponse = UARulesAPI.UARuleGetResponse;
-  export import UARuleListResponsesV4PagePaginationArray = UARulesAPI.UARuleListResponsesV4PagePaginationArray;
-  export import UARuleCreateParams = UARulesAPI.UARuleCreateParams;
-  export import UARuleUpdateParams = UARulesAPI.UARuleUpdateParams;
-  export import UARuleListParams = UARulesAPI.UARuleListParams;
+export interface UARuleDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface UARuleGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+UARules.UARuleListResponsesV4PagePaginationArray = UARuleListResponsesV4PagePaginationArray;
+
+export declare namespace UARules {
+  export {
+    type UARuleCreateResponse as UARuleCreateResponse,
+    type UARuleUpdateResponse as UARuleUpdateResponse,
+    type UARuleListResponse as UARuleListResponse,
+    type UARuleDeleteResponse as UARuleDeleteResponse,
+    type UARuleGetResponse as UARuleGetResponse,
+    UARuleListResponsesV4PagePaginationArray as UARuleListResponsesV4PagePaginationArray,
+    type UARuleCreateParams as UARuleCreateParams,
+    type UARuleUpdateParams as UARuleUpdateParams,
+    type UARuleListParams as UARuleListParams,
+    type UARuleDeleteParams as UARuleDeleteParams,
+    type UARuleGetParams as UARuleGetParams,
+  };
 }
diff --git a/src/resources/firewall/waf/index.ts b/src/resources/firewall/waf/index.ts
index 24c2a12290..7f47a8efe3 100644
--- a/src/resources/firewall/waf/index.ts
+++ b/src/resources/firewall/waf/index.ts
@@ -1,22 +1,25 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Override,
-  OverrideURL,
-  RewriteAction,
-  WAFRule,
-  OverrideDeleteResponse,
-  OverrideCreateParams,
-  OverrideUpdateParams,
-  OverrideListParams,
   OverridesV4PagePaginationArray,
   Overrides,
+  type Override,
+  type OverrideURL,
+  type RewriteAction,
+  type WAFRule,
+  type OverrideDeleteResponse,
+  type OverrideCreateParams,
+  type OverrideUpdateParams,
+  type OverrideListParams,
+  type OverrideDeleteParams,
+  type OverrideGetParams,
 } from './overrides';
 export {
-  PackageListResponse,
-  PackageGetResponse,
-  PackageListParams,
   PackageListResponsesV4PagePaginationArray,
   Packages,
+  type PackageListResponse,
+  type PackageGetResponse,
+  type PackageListParams,
+  type PackageGetParams,
 } from './packages/index';
 export { WAF } from './waf';
diff --git a/src/resources/firewall/waf/overrides.ts b/src/resources/firewall/waf/overrides.ts
index daeaae7093..f54c8195b5 100644
--- a/src/resources/firewall/waf/overrides.ts
+++ b/src/resources/firewall/waf/overrides.ts
@@ -1,9 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../resource';
-import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as OverridesAPI from './overrides';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class Overrides extends APIResource {
@@ -13,16 +11,12 @@ export class Overrides extends APIResource {
    * **Note:** Applies only to the
    * [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
    */
-  create(
-    zoneIdentifier: string,
-    body: OverrideCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Override> {
+  create(params: OverrideCreateParams, options?: Core.RequestOptions): Core.APIPromise<Override> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.post(`/zones/${zoneIdentifier}/firewall/waf/overrides`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: Override }>
+      this._client.post(`/zones/${zone_id}/firewall/waf/overrides`, { body, ...options }) as Core.APIPromise<{
+        result: Override;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -33,13 +27,13 @@ export class Overrides extends APIResource {
    * [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
    */
   update(
-    zoneIdentifier: string,
-    id: string,
-    body: OverrideUpdateParams,
+    overridesId: string,
+    params: OverrideUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<Override> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.put(`/zones/${zoneIdentifier}/firewall/waf/overrides/${id}`, {
+      this._client.put(`/zones/${zone_id}/firewall/waf/overrides/${overridesId}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: Override }>
@@ -53,24 +47,12 @@ export class Overrides extends APIResource {
    * [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
    */
   list(
-    zoneIdentifier: string,
-    query?: OverrideListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<OverridesV4PagePaginationArray, Override>;
-  list(
-    zoneIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<OverridesV4PagePaginationArray, Override>;
-  list(
-    zoneIdentifier: string,
-    query: OverrideListParams | Core.RequestOptions = {},
+    params: OverrideListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<OverridesV4PagePaginationArray, Override> {
-    if (isRequestOptions(query)) {
-      return this.list(zoneIdentifier, {}, query);
-    }
+    const { zone_id, ...query } = params;
     return this._client.getAPIList(
-      `/zones/${zoneIdentifier}/firewall/waf/overrides`,
+      `/zones/${zone_id}/firewall/waf/overrides`,
       OverridesV4PagePaginationArray,
       { query, ...options },
     );
@@ -83,13 +65,14 @@ export class Overrides extends APIResource {
    * [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
    */
   delete(
-    zoneIdentifier: string,
-    id: string,
+    overridesId: string,
+    params: OverrideDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<OverrideDeleteResponse> {
+    const { zone_id } = params;
     return (
       this._client.delete(
-        `/zones/${zoneIdentifier}/firewall/waf/overrides/${id}`,
+        `/zones/${zone_id}/firewall/waf/overrides/${overridesId}`,
         options,
       ) as Core.APIPromise<{ result: OverrideDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -101,11 +84,17 @@ export class Overrides extends APIResource {
    * **Note:** Applies only to the
    * [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
    */
-  get(zoneIdentifier: string, id: string, options?: Core.RequestOptions): Core.APIPromise<Override> {
+  get(
+    overridesId: string,
+    params: OverrideGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<Override> {
+    const { zone_id } = params;
     return (
-      this._client.get(`/zones/${zoneIdentifier}/firewall/waf/overrides/${id}`, options) as Core.APIPromise<{
-        result: Override;
-      }>
+      this._client.get(
+        `/zones/${zone_id}/firewall/waf/overrides/${overridesId}`,
+        options,
+      ) as Core.APIPromise<{ result: Override }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -169,6 +158,8 @@ export interface Override {
 
 export type OverrideURL = string;
 
+export type OverrideURLParam = string;
+
 /**
  * Specifies that, when a WAF rule matches, its configured action will be replaced
  * by the action configured in this object.
@@ -179,16 +170,56 @@ export interface RewriteAction {
    */
   block?: 'challenge' | 'block' | 'simulate' | 'disable' | 'default';
 
-  challenge?: string;
+  /**
+   * The WAF rule action to apply.
+   */
+  challenge?: 'challenge' | 'block' | 'simulate' | 'disable' | 'default';
+
+  /**
+   * The WAF rule action to apply.
+   */
+  default?: 'challenge' | 'block' | 'simulate' | 'disable' | 'default';
+
+  /**
+   * The WAF rule action to apply.
+   */
+  disable?: 'challenge' | 'block' | 'simulate' | 'disable' | 'default';
+
+  /**
+   * The WAF rule action to apply.
+   */
+  simulate?: 'challenge' | 'block' | 'simulate' | 'disable' | 'default';
+}
+
+/**
+ * Specifies that, when a WAF rule matches, its configured action will be replaced
+ * by the action configured in this object.
+ */
+export interface RewriteActionParam {
+  /**
+   * The WAF rule action to apply.
+   */
+  block?: 'challenge' | 'block' | 'simulate' | 'disable' | 'default';
+
+  /**
+   * The WAF rule action to apply.
+   */
+  challenge?: 'challenge' | 'block' | 'simulate' | 'disable' | 'default';
 
-  default?: string;
+  /**
+   * The WAF rule action to apply.
+   */
+  default?: 'challenge' | 'block' | 'simulate' | 'disable' | 'default';
 
   /**
    * The WAF rule action to apply.
    */
   disable?: 'challenge' | 'block' | 'simulate' | 'disable' | 'default';
 
-  simulate?: string;
+  /**
+   * The WAF rule action to apply.
+   */
+  simulate?: 'challenge' | 'block' | 'simulate' | 'disable' | 'default';
 }
 
 /**
@@ -200,6 +231,15 @@ export interface RewriteAction {
  */
 export type WAFRule = Record<string, 'challenge' | 'block' | 'simulate' | 'disable' | 'default'>;
 
+/**
+ * An object that allows you to override the action of specific WAF rules. Each key
+ * of this object must be the ID of a WAF rule, and each value must be a valid WAF
+ * action. Unless you are disabling a rule, ensure that you also enable the rule
+ * group that this WAF rule belongs to. When creating a new URI-based WAF override,
+ * you must provide a `groups` object or a `rules` object.
+ */
+export type WAFRuleParam = Record<string, 'challenge' | 'block' | 'simulate' | 'disable' | 'default'>;
+
 export interface OverrideDeleteResponse {
   /**
    * The unique identifier of the WAF override.
@@ -207,20 +247,89 @@ export interface OverrideDeleteResponse {
   id?: string;
 }
 
-export type OverrideCreateParams = unknown;
+export interface OverrideCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The URLs to include in the current WAF override. You can use
+   * wildcards. Each entered URL will be escaped before use, which means you can only
+   * use simple wildcard patterns.
+   */
+  urls: Array<OverrideURLParam>;
+}
+
+export interface OverrideUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
 
-export type OverrideUpdateParams = unknown;
+  /**
+   * Body param: Identifier
+   */
+  id: string;
+
+  /**
+   * Body param: Specifies that, when a WAF rule matches, its configured action will
+   * be replaced by the action configured in this object.
+   */
+  rewrite_action: RewriteActionParam;
+
+  /**
+   * Body param: An object that allows you to override the action of specific WAF
+   * rules. Each key of this object must be the ID of a WAF rule, and each value must
+   * be a valid WAF action. Unless you are disabling a rule, ensure that you also
+   * enable the rule group that this WAF rule belongs to. When creating a new
+   * URI-based WAF override, you must provide a `groups` object or a `rules` object.
+   */
+  rules: WAFRuleParam;
+
+  /**
+   * Body param: The URLs to include in the current WAF override. You can use
+   * wildcards. Each entered URL will be escaped before use, which means you can only
+   * use simple wildcard patterns.
+   */
+  urls: Array<OverrideURLParam>;
+}
+
+export interface OverrideListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+}
+
+export interface OverrideDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface OverrideGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
 
-export interface OverrideListParams extends V4PagePaginationArrayParams {}
+Overrides.OverridesV4PagePaginationArray = OverridesV4PagePaginationArray;
 
-export namespace Overrides {
-  export import Override = OverridesAPI.Override;
-  export import OverrideURL = OverridesAPI.OverrideURL;
-  export import RewriteAction = OverridesAPI.RewriteAction;
-  export import WAFRule = OverridesAPI.WAFRule;
-  export import OverrideDeleteResponse = OverridesAPI.OverrideDeleteResponse;
-  export import OverridesV4PagePaginationArray = OverridesAPI.OverridesV4PagePaginationArray;
-  export import OverrideCreateParams = OverridesAPI.OverrideCreateParams;
-  export import OverrideUpdateParams = OverridesAPI.OverrideUpdateParams;
-  export import OverrideListParams = OverridesAPI.OverrideListParams;
+export declare namespace Overrides {
+  export {
+    type Override as Override,
+    type OverrideURL as OverrideURL,
+    type RewriteAction as RewriteAction,
+    type WAFRule as WAFRule,
+    type OverrideDeleteResponse as OverrideDeleteResponse,
+    OverridesV4PagePaginationArray as OverridesV4PagePaginationArray,
+    type OverrideCreateParams as OverrideCreateParams,
+    type OverrideUpdateParams as OverrideUpdateParams,
+    type OverrideListParams as OverrideListParams,
+    type OverrideDeleteParams as OverrideDeleteParams,
+    type OverrideGetParams as OverrideGetParams,
+  };
 }
diff --git a/src/resources/firewall/waf/packages/groups.ts b/src/resources/firewall/waf/packages/groups.ts
index ec5011ee03..f9134cdfe0 100644
--- a/src/resources/firewall/waf/packages/groups.ts
+++ b/src/resources/firewall/waf/packages/groups.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as GroupsAPI from './groups';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../../pagination';
 
 export class Groups extends APIResource {
@@ -178,12 +177,16 @@ export interface GroupGetParams {
   zone_id: string;
 }
 
-export namespace Groups {
-  export import Group = GroupsAPI.Group;
-  export import GroupEditResponse = GroupsAPI.GroupEditResponse;
-  export import GroupGetResponse = GroupsAPI.GroupGetResponse;
-  export import GroupsV4PagePaginationArray = GroupsAPI.GroupsV4PagePaginationArray;
-  export import GroupListParams = GroupsAPI.GroupListParams;
-  export import GroupEditParams = GroupsAPI.GroupEditParams;
-  export import GroupGetParams = GroupsAPI.GroupGetParams;
+Groups.GroupsV4PagePaginationArray = GroupsV4PagePaginationArray;
+
+export declare namespace Groups {
+  export {
+    type Group as Group,
+    type GroupEditResponse as GroupEditResponse,
+    type GroupGetResponse as GroupGetResponse,
+    GroupsV4PagePaginationArray as GroupsV4PagePaginationArray,
+    type GroupListParams as GroupListParams,
+    type GroupEditParams as GroupEditParams,
+    type GroupGetParams as GroupGetParams,
+  };
 }
diff --git a/src/resources/firewall/waf/packages/index.ts b/src/resources/firewall/waf/packages/index.ts
index 34fac46e93..0e20a4f731 100644
--- a/src/resources/firewall/waf/packages/index.ts
+++ b/src/resources/firewall/waf/packages/index.ts
@@ -1,31 +1,32 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AllowedModesAnomaly,
-  WAFRuleGroup,
-  RuleListResponse,
-  RuleEditResponse,
-  RuleGetResponse,
-  RuleListParams,
-  RuleEditParams,
-  RuleGetParams,
-  RuleListResponsesV4PagePaginationArray,
-  Rules,
-} from './rules';
-export {
-  Group,
-  GroupEditResponse,
-  GroupGetResponse,
-  GroupListParams,
-  GroupEditParams,
-  GroupGetParams,
   GroupsV4PagePaginationArray,
   Groups,
+  type Group,
+  type GroupEditResponse,
+  type GroupGetResponse,
+  type GroupListParams,
+  type GroupEditParams,
+  type GroupGetParams,
 } from './groups';
 export {
-  PackageListResponse,
-  PackageGetResponse,
-  PackageListParams,
   PackageListResponsesV4PagePaginationArray,
   Packages,
+  type PackageListResponse,
+  type PackageGetResponse,
+  type PackageListParams,
+  type PackageGetParams,
 } from './packages';
+export {
+  RuleListResponsesV4PagePaginationArray,
+  Rules,
+  type AllowedModesAnomaly,
+  type WAFRuleGroup,
+  type RuleListResponse,
+  type RuleEditResponse,
+  type RuleGetResponse,
+  type RuleListParams,
+  type RuleEditParams,
+  type RuleGetParams,
+} from './rules';
diff --git a/src/resources/firewall/waf/packages/packages.ts b/src/resources/firewall/waf/packages/packages.ts
index 928ec16415..bab75abe14 100644
--- a/src/resources/firewall/waf/packages/packages.ts
+++ b/src/resources/firewall/waf/packages/packages.ts
@@ -1,12 +1,32 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../../resource';
-import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as PackagesAPI from './packages';
 import * as Shared from '../../../shared';
 import * as GroupsAPI from './groups';
+import {
+  Group,
+  GroupEditParams,
+  GroupEditResponse,
+  GroupGetParams,
+  GroupGetResponse,
+  GroupListParams,
+  Groups,
+  GroupsV4PagePaginationArray,
+} from './groups';
 import * as RulesAPI from './rules';
+import {
+  AllowedModesAnomaly,
+  RuleEditParams,
+  RuleEditResponse,
+  RuleGetParams,
+  RuleGetResponse,
+  RuleListParams,
+  RuleListResponse,
+  RuleListResponsesV4PagePaginationArray,
+  Rules,
+  WAFRuleGroup,
+} from './rules';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../../pagination';
 
 export class Packages extends APIResource {
@@ -20,24 +40,12 @@ export class Packages extends APIResource {
    * [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
    */
   list(
-    zoneIdentifier: string,
-    query?: PackageListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<PackageListResponsesV4PagePaginationArray, PackageListResponse>;
-  list(
-    zoneIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<PackageListResponsesV4PagePaginationArray, PackageListResponse>;
-  list(
-    zoneIdentifier: string,
-    query: PackageListParams | Core.RequestOptions = {},
+    params: PackageListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<PackageListResponsesV4PagePaginationArray, PackageListResponse> {
-    if (isRequestOptions(query)) {
-      return this.list(zoneIdentifier, {}, query);
-    }
+    const { zone_id, ...query } = params;
     return this._client.getAPIList(
-      `/zones/${zoneIdentifier}/firewall/waf/packages`,
+      `/zones/${zone_id}/firewall/waf/packages`,
       PackageListResponsesV4PagePaginationArray,
       { query, ...options },
     );
@@ -50,152 +58,18 @@ export class Packages extends APIResource {
    * [previous version of WAF managed rules](https://developers.cloudflare.com/support/firewall/managed-rules-web-application-firewall-waf/understanding-waf-managed-rules-web-application-firewall/).
    */
   get(
-    zoneIdentifier: string,
-    identifier: string,
+    packageId: string,
+    params: PackageGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<PackageGetResponse> {
-    return this._client.get(`/zones/${zoneIdentifier}/firewall/waf/packages/${identifier}`, options);
+    const { zone_id } = params;
+    return this._client.get(`/zones/${zone_id}/firewall/waf/packages/${packageId}`, options);
   }
 }
 
 export class PackageListResponsesV4PagePaginationArray extends V4PagePaginationArray<PackageListResponse> {}
 
-export type PackageListResponse =
-  | PackageListResponse.FirewallAPIResponseCollection
-  | PackageListResponse.Result;
-
-export namespace PackageListResponse {
-  export interface FirewallAPIResponseCollection {
-    errors: Array<Shared.ResponseInfo>;
-
-    messages: Array<Shared.ResponseInfo>;
-
-    result: unknown | Array<unknown> | string | null;
-
-    /**
-     * Whether the API call was successful
-     */
-    success: true;
-
-    result_info?: FirewallAPIResponseCollection.ResultInfo;
-  }
-
-  export namespace FirewallAPIResponseCollection {
-    export interface ResultInfo {
-      /**
-       * Total number of results for the requested service
-       */
-      count?: number;
-
-      /**
-       * Current page within paginated list of results
-       */
-      page?: number;
-
-      /**
-       * Number of results per page of results
-       */
-      per_page?: number;
-
-      /**
-       * Total results available without any search parameters
-       */
-      total_count?: number;
-    }
-  }
-
-  export interface Result {
-    result?: Array<Result.FirewallPackageDefinition | Result.FirewallAnomalyPackage>;
-  }
-
-  export namespace Result {
-    export interface FirewallPackageDefinition {
-      /**
-       * Identifier
-       */
-      id: string;
-
-      /**
-       * A summary of the purpose/function of the WAF package.
-       */
-      description: string;
-
-      /**
-       * The mode that defines how rules within the package are evaluated during the
-       * course of a request. When a package uses anomaly detection mode (`anomaly`
-       * value), each rule is given a score when triggered. If the total score of all
-       * triggered rules exceeds the sensitivity defined in the WAF package, the action
-       * configured in the package will be performed. Traditional detection mode
-       * (`traditional` value) will decide the action to take when it is triggered by the
-       * request. If multiple rules are triggered, the action providing the highest
-       * protection will be applied (for example, a 'block' action will win over a
-       * 'challenge' action).
-       */
-      detection_mode: 'anomaly' | 'traditional';
-
-      /**
-       * The name of the WAF package.
-       */
-      name: string;
-
-      /**
-       * Identifier
-       */
-      zone_id: string;
-
-      /**
-       * When set to `active`, indicates that the WAF package will be applied to the
-       * zone.
-       */
-      status?: 'active';
-    }
-
-    export interface FirewallAnomalyPackage {
-      /**
-       * Identifier
-       */
-      id: string;
-
-      /**
-       * A summary of the purpose/function of the WAF package.
-       */
-      description: string;
-
-      /**
-       * When a WAF package uses anomaly detection, each rule is given a score when
-       * triggered. If the total score of all triggered rules exceeds the sensitivity
-       * defined on the WAF package, the action defined on the package will be taken.
-       */
-      detection_mode: 'anomaly' | 'traditional';
-
-      /**
-       * The name of the WAF package.
-       */
-      name: string;
-
-      /**
-       * Identifier
-       */
-      zone_id: string;
-
-      /**
-       * The default action performed by the rules in the WAF package.
-       */
-      action_mode?: 'simulate' | 'block' | 'challenge';
-
-      /**
-       * The sensitivity of the WAF package.
-       */
-      sensitivity?: 'high' | 'medium' | 'low' | 'off';
-
-      /**
-       * When set to `active`, indicates that the WAF package will be applied to the
-       * zone.
-       */
-      status?: 'active';
-    }
-  }
-}
+export type PackageListResponse = unknown;
 
 export type PackageGetResponse = PackageGetResponse.FirewallAPIResponseSingle | PackageGetResponse.Result;
 
@@ -220,48 +94,75 @@ export namespace PackageGetResponse {
 
 export interface PackageListParams extends V4PagePaginationArrayParams {
   /**
-   * The direction used to sort returned packages.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: The direction used to sort returned packages.
    */
   direction?: 'asc' | 'desc';
 
   /**
-   * When set to `all`, all the search requirements must match. When set to `any`,
-   * only one of the search requirements has to match.
+   * Query param: When set to `all`, all the search requirements must match. When set
+   * to `any`, only one of the search requirements has to match.
    */
   match?: 'any' | 'all';
 
   /**
-   * The name of the WAF package.
+   * Query param: The name of the WAF package.
    */
   name?: string;
 
   /**
-   * The field used to sort returned packages.
+   * Query param: The field used to sort returned packages.
    */
   order?: 'name';
 }
 
-export namespace Packages {
-  export import PackageListResponse = PackagesAPI.PackageListResponse;
-  export import PackageGetResponse = PackagesAPI.PackageGetResponse;
-  export import PackageListResponsesV4PagePaginationArray = PackagesAPI.PackageListResponsesV4PagePaginationArray;
-  export import PackageListParams = PackagesAPI.PackageListParams;
-  export import Groups = GroupsAPI.Groups;
-  export import Group = GroupsAPI.Group;
-  export import GroupEditResponse = GroupsAPI.GroupEditResponse;
-  export import GroupGetResponse = GroupsAPI.GroupGetResponse;
-  export import GroupsV4PagePaginationArray = GroupsAPI.GroupsV4PagePaginationArray;
-  export import GroupListParams = GroupsAPI.GroupListParams;
-  export import GroupEditParams = GroupsAPI.GroupEditParams;
-  export import GroupGetParams = GroupsAPI.GroupGetParams;
-  export import Rules = RulesAPI.Rules;
-  export import AllowedModesAnomaly = RulesAPI.AllowedModesAnomaly;
-  export import WAFRuleGroup = RulesAPI.WAFRuleGroup;
-  export import RuleListResponse = RulesAPI.RuleListResponse;
-  export import RuleEditResponse = RulesAPI.RuleEditResponse;
-  export import RuleGetResponse = RulesAPI.RuleGetResponse;
-  export import RuleListResponsesV4PagePaginationArray = RulesAPI.RuleListResponsesV4PagePaginationArray;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleEditParams = RulesAPI.RuleEditParams;
-  export import RuleGetParams = RulesAPI.RuleGetParams;
+export interface PackageGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+Packages.PackageListResponsesV4PagePaginationArray = PackageListResponsesV4PagePaginationArray;
+Packages.Groups = Groups;
+Packages.GroupsV4PagePaginationArray = GroupsV4PagePaginationArray;
+Packages.Rules = Rules;
+Packages.RuleListResponsesV4PagePaginationArray = RuleListResponsesV4PagePaginationArray;
+
+export declare namespace Packages {
+  export {
+    type PackageListResponse as PackageListResponse,
+    type PackageGetResponse as PackageGetResponse,
+    PackageListResponsesV4PagePaginationArray as PackageListResponsesV4PagePaginationArray,
+    type PackageListParams as PackageListParams,
+    type PackageGetParams as PackageGetParams,
+  };
+
+  export {
+    Groups as Groups,
+    type Group as Group,
+    type GroupEditResponse as GroupEditResponse,
+    type GroupGetResponse as GroupGetResponse,
+    GroupsV4PagePaginationArray as GroupsV4PagePaginationArray,
+    type GroupListParams as GroupListParams,
+    type GroupEditParams as GroupEditParams,
+    type GroupGetParams as GroupGetParams,
+  };
+
+  export {
+    Rules as Rules,
+    type AllowedModesAnomaly as AllowedModesAnomaly,
+    type WAFRuleGroup as WAFRuleGroup,
+    type RuleListResponse as RuleListResponse,
+    type RuleEditResponse as RuleEditResponse,
+    type RuleGetResponse as RuleGetResponse,
+    RuleListResponsesV4PagePaginationArray as RuleListResponsesV4PagePaginationArray,
+    type RuleListParams as RuleListParams,
+    type RuleEditParams as RuleEditParams,
+    type RuleGetParams as RuleGetParams,
+  };
 }
diff --git a/src/resources/firewall/waf/packages/rules.ts b/src/resources/firewall/waf/packages/rules.ts
index cfca715134..4884478794 100644
--- a/src/resources/firewall/waf/packages/rules.ts
+++ b/src/resources/firewall/waf/packages/rules.ts
@@ -457,14 +457,18 @@ export interface RuleGetParams {
   zone_id: string;
 }
 
-export namespace Rules {
-  export import AllowedModesAnomaly = RulesAPI.AllowedModesAnomaly;
-  export import WAFRuleGroup = RulesAPI.WAFRuleGroup;
-  export import RuleListResponse = RulesAPI.RuleListResponse;
-  export import RuleEditResponse = RulesAPI.RuleEditResponse;
-  export import RuleGetResponse = RulesAPI.RuleGetResponse;
-  export import RuleListResponsesV4PagePaginationArray = RulesAPI.RuleListResponsesV4PagePaginationArray;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleEditParams = RulesAPI.RuleEditParams;
-  export import RuleGetParams = RulesAPI.RuleGetParams;
+Rules.RuleListResponsesV4PagePaginationArray = RuleListResponsesV4PagePaginationArray;
+
+export declare namespace Rules {
+  export {
+    type AllowedModesAnomaly as AllowedModesAnomaly,
+    type WAFRuleGroup as WAFRuleGroup,
+    type RuleListResponse as RuleListResponse,
+    type RuleEditResponse as RuleEditResponse,
+    type RuleGetResponse as RuleGetResponse,
+    RuleListResponsesV4PagePaginationArray as RuleListResponsesV4PagePaginationArray,
+    type RuleListParams as RuleListParams,
+    type RuleEditParams as RuleEditParams,
+    type RuleGetParams as RuleGetParams,
+  };
 }
diff --git a/src/resources/firewall/waf/waf.ts b/src/resources/firewall/waf/waf.ts
index 225565216a..f16358ba96 100644
--- a/src/resources/firewall/waf/waf.ts
+++ b/src/resources/firewall/waf/waf.ts
@@ -2,27 +2,62 @@
 
 import { APIResource } from '../../../resource';
 import * as OverridesAPI from './overrides';
+import {
+  Override,
+  OverrideCreateParams,
+  OverrideDeleteParams,
+  OverrideDeleteResponse,
+  OverrideGetParams,
+  OverrideListParams,
+  OverrideURL,
+  OverrideUpdateParams,
+  Overrides,
+  OverridesV4PagePaginationArray,
+  RewriteAction,
+  WAFRule,
+} from './overrides';
 import * as PackagesAPI from './packages/packages';
+import {
+  PackageGetParams,
+  PackageGetResponse,
+  PackageListParams,
+  PackageListResponse,
+  PackageListResponsesV4PagePaginationArray,
+  Packages,
+} from './packages/packages';
 
 export class WAF extends APIResource {
   overrides: OverridesAPI.Overrides = new OverridesAPI.Overrides(this._client);
   packages: PackagesAPI.Packages = new PackagesAPI.Packages(this._client);
 }
 
-export namespace WAF {
-  export import Overrides = OverridesAPI.Overrides;
-  export import Override = OverridesAPI.Override;
-  export import OverrideURL = OverridesAPI.OverrideURL;
-  export import RewriteAction = OverridesAPI.RewriteAction;
-  export import WAFRule = OverridesAPI.WAFRule;
-  export import OverrideDeleteResponse = OverridesAPI.OverrideDeleteResponse;
-  export import OverridesV4PagePaginationArray = OverridesAPI.OverridesV4PagePaginationArray;
-  export import OverrideCreateParams = OverridesAPI.OverrideCreateParams;
-  export import OverrideUpdateParams = OverridesAPI.OverrideUpdateParams;
-  export import OverrideListParams = OverridesAPI.OverrideListParams;
-  export import Packages = PackagesAPI.Packages;
-  export import PackageListResponse = PackagesAPI.PackageListResponse;
-  export import PackageGetResponse = PackagesAPI.PackageGetResponse;
-  export import PackageListResponsesV4PagePaginationArray = PackagesAPI.PackageListResponsesV4PagePaginationArray;
-  export import PackageListParams = PackagesAPI.PackageListParams;
+WAF.Overrides = Overrides;
+WAF.OverridesV4PagePaginationArray = OverridesV4PagePaginationArray;
+WAF.Packages = Packages;
+WAF.PackageListResponsesV4PagePaginationArray = PackageListResponsesV4PagePaginationArray;
+
+export declare namespace WAF {
+  export {
+    Overrides as Overrides,
+    type Override as Override,
+    type OverrideURL as OverrideURL,
+    type RewriteAction as RewriteAction,
+    type WAFRule as WAFRule,
+    type OverrideDeleteResponse as OverrideDeleteResponse,
+    OverridesV4PagePaginationArray as OverridesV4PagePaginationArray,
+    type OverrideCreateParams as OverrideCreateParams,
+    type OverrideUpdateParams as OverrideUpdateParams,
+    type OverrideListParams as OverrideListParams,
+    type OverrideDeleteParams as OverrideDeleteParams,
+    type OverrideGetParams as OverrideGetParams,
+  };
+
+  export {
+    Packages as Packages,
+    type PackageListResponse as PackageListResponse,
+    type PackageGetResponse as PackageGetResponse,
+    PackageListResponsesV4PagePaginationArray as PackageListResponsesV4PagePaginationArray,
+    type PackageListParams as PackageListParams,
+    type PackageGetParams as PackageGetParams,
+  };
 }
diff --git a/src/resources/healthchecks/healthchecks.ts b/src/resources/healthchecks/healthchecks.ts
index 3ba5bdd8b9..60c24fa6c6 100644
--- a/src/resources/healthchecks/healthchecks.ts
+++ b/src/resources/healthchecks/healthchecks.ts
@@ -3,7 +3,14 @@
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as PreviewsAPI from './previews';
-import { SinglePage } from '../../pagination';
+import {
+  PreviewCreateParams,
+  PreviewDeleteParams,
+  PreviewDeleteResponse,
+  PreviewGetParams,
+  Previews,
+} from './previews';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class Healthchecks extends APIResource {
   previews: PreviewsAPI.Previews = new PreviewsAPI.Previews(this._client);
@@ -43,9 +50,9 @@ export class Healthchecks extends APIResource {
   list(
     params: HealthcheckListParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<HealthchecksSinglePage, Healthcheck> {
+  ): Core.PagePromise<HealthchecksV4PagePaginationArray, Healthcheck> {
     const { zone_id, ...query } = params;
-    return this._client.getAPIList(`/zones/${zone_id}/healthchecks`, HealthchecksSinglePage, {
+    return this._client.getAPIList(`/zones/${zone_id}/healthchecks`, HealthchecksV4PagePaginationArray, {
       query,
       ...options,
     });
@@ -101,7 +108,7 @@ export class Healthchecks extends APIResource {
   }
 }
 
-export class HealthchecksSinglePage extends SinglePage<Healthcheck> {}
+export class HealthchecksV4PagePaginationArray extends V4PagePaginationArray<Healthcheck> {}
 
 /**
  * WNAM: Western North America, ENAM: Eastern North America, WEU: Western Europe,
@@ -615,21 +622,11 @@ export interface HealthcheckUpdateParams {
   type?: string;
 }
 
-export interface HealthcheckListParams {
+export interface HealthcheckListParams extends V4PagePaginationArrayParams {
   /**
    * Path param: Identifier
    */
   zone_id: string;
-
-  /**
-   * Query param: Page number of paginated results.
-   */
-  page?: unknown;
-
-  /**
-   * Query param: Maximum number of results per page. Must be a multiple of 5.
-   */
-  per_page?: unknown;
 }
 
 export interface HealthcheckDeleteParams {
@@ -727,10 +724,14 @@ export interface HealthcheckGetParams {
   zone_id: string;
 }
 
-export namespace Healthchecks {
-  export import Previews = PreviewsAPI.Previews;
-  export import PreviewDeleteResponse = PreviewsAPI.PreviewDeleteResponse;
-  export import PreviewCreateParams = PreviewsAPI.PreviewCreateParams;
-  export import PreviewDeleteParams = PreviewsAPI.PreviewDeleteParams;
-  export import PreviewGetParams = PreviewsAPI.PreviewGetParams;
+Healthchecks.Previews = Previews;
+
+export declare namespace Healthchecks {
+  export {
+    Previews as Previews,
+    type PreviewDeleteResponse as PreviewDeleteResponse,
+    type PreviewCreateParams as PreviewCreateParams,
+    type PreviewDeleteParams as PreviewDeleteParams,
+    type PreviewGetParams as PreviewGetParams,
+  };
 }
diff --git a/src/resources/healthchecks/index.ts b/src/resources/healthchecks/index.ts
index 91364b0b65..3d192827dd 100644
--- a/src/resources/healthchecks/index.ts
+++ b/src/resources/healthchecks/index.ts
@@ -2,9 +2,9 @@
 
 export { Healthchecks } from './healthchecks';
 export {
-  PreviewDeleteResponse,
-  PreviewCreateParams,
-  PreviewDeleteParams,
-  PreviewGetParams,
   Previews,
+  type PreviewDeleteResponse,
+  type PreviewCreateParams,
+  type PreviewDeleteParams,
+  type PreviewGetParams,
 } from './previews';
diff --git a/src/resources/healthchecks/previews.ts b/src/resources/healthchecks/previews.ts
index 7f31c4c2ec..bd72d02eb2 100644
--- a/src/resources/healthchecks/previews.ts
+++ b/src/resources/healthchecks/previews.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as PreviewsAPI from './previews';
 import * as HealthchecksAPI from './healthchecks';
 
 export class Previews extends APIResource {
@@ -158,9 +157,11 @@ export interface PreviewGetParams {
   zone_id: string;
 }
 
-export namespace Previews {
-  export import PreviewDeleteResponse = PreviewsAPI.PreviewDeleteResponse;
-  export import PreviewCreateParams = PreviewsAPI.PreviewCreateParams;
-  export import PreviewDeleteParams = PreviewsAPI.PreviewDeleteParams;
-  export import PreviewGetParams = PreviewsAPI.PreviewGetParams;
+export declare namespace Previews {
+  export {
+    type PreviewDeleteResponse as PreviewDeleteResponse,
+    type PreviewCreateParams as PreviewCreateParams,
+    type PreviewDeleteParams as PreviewDeleteParams,
+    type PreviewGetParams as PreviewGetParams,
+  };
 }
diff --git a/src/resources/hostnames/hostnames.ts b/src/resources/hostnames/hostnames.ts
index f957b44436..ba9be00c52 100644
--- a/src/resources/hostnames/hostnames.ts
+++ b/src/resources/hostnames/hostnames.ts
@@ -2,11 +2,14 @@
 
 import { APIResource } from '../../resource';
 import * as SettingsAPI from './settings/settings';
+import { Settings } from './settings/settings';
 
 export class Hostnames extends APIResource {
   settings: SettingsAPI.Settings = new SettingsAPI.Settings(this._client);
 }
 
-export namespace Hostnames {
-  export import Settings = SettingsAPI.Settings;
+Hostnames.Settings = Settings;
+
+export declare namespace Hostnames {
+  export { Settings as Settings };
 }
diff --git a/src/resources/hostnames/settings/index.ts b/src/resources/hostnames/settings/index.ts
index e10a07e2c8..89267d0021 100644
--- a/src/resources/hostnames/settings/index.ts
+++ b/src/resources/hostnames/settings/index.ts
@@ -1,13 +1,13 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export { Settings } from './settings';
 export {
-  Setting,
-  SettingValue,
-  TLSDeleteResponse,
-  TLSGetResponse,
-  TLSUpdateParams,
-  TLSDeleteParams,
-  TLSGetParams,
   TLS,
+  type Setting,
+  type SettingValue,
+  type TLSDeleteResponse,
+  type TLSGetResponse,
+  type TLSUpdateParams,
+  type TLSDeleteParams,
+  type TLSGetParams,
 } from './tls';
-export { Settings } from './settings';
diff --git a/src/resources/hostnames/settings/settings.ts b/src/resources/hostnames/settings/settings.ts
index 0f03b8db42..d2d64fe152 100644
--- a/src/resources/hostnames/settings/settings.ts
+++ b/src/resources/hostnames/settings/settings.ts
@@ -2,18 +2,32 @@
 
 import { APIResource } from '../../../resource';
 import * as TLSAPI from './tls';
+import {
+  Setting,
+  SettingValue,
+  TLS,
+  TLSDeleteParams,
+  TLSDeleteResponse,
+  TLSGetParams,
+  TLSGetResponse,
+  TLSUpdateParams,
+} from './tls';
 
 export class Settings extends APIResource {
   tls: TLSAPI.TLS = new TLSAPI.TLS(this._client);
 }
 
-export namespace Settings {
-  export import TLS = TLSAPI.TLS;
-  export import Setting = TLSAPI.Setting;
-  export import SettingValue = TLSAPI.SettingValue;
-  export import TLSDeleteResponse = TLSAPI.TLSDeleteResponse;
-  export import TLSGetResponse = TLSAPI.TLSGetResponse;
-  export import TLSUpdateParams = TLSAPI.TLSUpdateParams;
-  export import TLSDeleteParams = TLSAPI.TLSDeleteParams;
-  export import TLSGetParams = TLSAPI.TLSGetParams;
+Settings.TLS = TLS;
+
+export declare namespace Settings {
+  export {
+    TLS as TLS,
+    type Setting as Setting,
+    type SettingValue as SettingValue,
+    type TLSDeleteResponse as TLSDeleteResponse,
+    type TLSGetResponse as TLSGetResponse,
+    type TLSUpdateParams as TLSUpdateParams,
+    type TLSDeleteParams as TLSDeleteParams,
+    type TLSGetParams as TLSGetParams,
+  };
 }
diff --git a/src/resources/hostnames/settings/tls.ts b/src/resources/hostnames/settings/tls.ts
index 180f4b9bd0..297f3e8fcf 100644
--- a/src/resources/hostnames/settings/tls.ts
+++ b/src/resources/hostnames/settings/tls.ts
@@ -48,11 +48,11 @@ export class TLS extends APIResource {
     settingId: 'ciphers' | 'min_tls_version' | 'http2',
     params: TLSGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<TLSGetResponse | null> {
+  ): Core.APIPromise<TLSGetResponse> {
     const { zone_id } = params;
     return (
       this._client.get(`/zones/${zone_id}/hostnames/settings/${settingId}`, options) as Core.APIPromise<{
-        result: TLSGetResponse | null;
+        result: TLSGetResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -106,6 +106,9 @@ export interface TLSDeleteResponse {
    */
   hostname?: string;
 
+  /**
+   * Deployment status for the given tls setting.
+   */
   status?: string;
 
   /**
@@ -113,7 +116,10 @@ export interface TLSDeleteResponse {
    */
   updated_at?: string;
 
-  value?: string;
+  /**
+   * The tls setting value.
+   */
+  value?: SettingValue;
 }
 
 export type TLSGetResponse = Array<TLSGetResponse.TLSGetResponseItem>;
@@ -173,12 +179,14 @@ export interface TLSGetParams {
   zone_id: string;
 }
 
-export namespace TLS {
-  export import Setting = TLSAPI.Setting;
-  export import SettingValue = TLSAPI.SettingValue;
-  export import TLSDeleteResponse = TLSAPI.TLSDeleteResponse;
-  export import TLSGetResponse = TLSAPI.TLSGetResponse;
-  export import TLSUpdateParams = TLSAPI.TLSUpdateParams;
-  export import TLSDeleteParams = TLSAPI.TLSDeleteParams;
-  export import TLSGetParams = TLSAPI.TLSGetParams;
+export declare namespace TLS {
+  export {
+    type Setting as Setting,
+    type SettingValue as SettingValue,
+    type TLSDeleteResponse as TLSDeleteResponse,
+    type TLSGetResponse as TLSGetResponse,
+    type TLSUpdateParams as TLSUpdateParams,
+    type TLSDeleteParams as TLSDeleteParams,
+    type TLSGetParams as TLSGetParams,
+  };
 }
diff --git a/src/resources/hyperdrive/configs.ts b/src/resources/hyperdrive/configs.ts
index 66a42b6f68..b2184138cc 100644
--- a/src/resources/hyperdrive/configs.ts
+++ b/src/resources/hyperdrive/configs.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ConfigsAPI from './configs';
 import * as HyperdriveAPI from './hyperdrive';
 import { HyperdrivesSinglePage } from './hyperdrive';
 
@@ -13,13 +12,13 @@ export class Configs extends APIResource {
   create(
     params: ConfigCreateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<HyperdriveAPI.Hyperdrive | null> {
+  ): Core.APIPromise<HyperdriveAPI.Hyperdrive> {
     const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/hyperdrive/configs`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: HyperdriveAPI.Hyperdrive | null }>
+      }) as Core.APIPromise<{ result: HyperdriveAPI.Hyperdrive }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -30,13 +29,13 @@ export class Configs extends APIResource {
     hyperdriveId: string,
     params: ConfigUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<HyperdriveAPI.Hyperdrive | null> {
+  ): Core.APIPromise<HyperdriveAPI.Hyperdrive> {
     const { account_id, ...body } = params;
     return (
       this._client.put(`/accounts/${account_id}/hyperdrive/configs/${hyperdriveId}`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: HyperdriveAPI.Hyperdrive | null }>
+      }) as Core.APIPromise<{ result: HyperdriveAPI.Hyperdrive }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -62,31 +61,31 @@ export class Configs extends APIResource {
     hyperdriveId: string,
     params: ConfigDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ConfigDeleteResponse> {
+  ): Core.APIPromise<ConfigDeleteResponse | null> {
     const { account_id } = params;
     return (
       this._client.delete(
         `/accounts/${account_id}/hyperdrive/configs/${hyperdriveId}`,
         options,
-      ) as Core.APIPromise<{ result: ConfigDeleteResponse }>
+      ) as Core.APIPromise<{ result: ConfigDeleteResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Patches and returns the specified Hyperdrive configuration. Updates to the
-   * origin and caching settings are applied with an all-or-nothing approach.
+   * Patches and returns the specified Hyperdrive configuration. Custom caching
+   * settings are not kept if caching is disabled.
    */
   edit(
     hyperdriveId: string,
     params: ConfigEditParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<HyperdriveAPI.Hyperdrive | null> {
+  ): Core.APIPromise<HyperdriveAPI.Hyperdrive> {
     const { account_id, ...body } = params;
     return (
       this._client.patch(`/accounts/${account_id}/hyperdrive/configs/${hyperdriveId}`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: HyperdriveAPI.Hyperdrive | null }>
+      }) as Core.APIPromise<{ result: HyperdriveAPI.Hyperdrive }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -97,18 +96,18 @@ export class Configs extends APIResource {
     hyperdriveId: string,
     params: ConfigGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<HyperdriveAPI.Hyperdrive | null> {
+  ): Core.APIPromise<HyperdriveAPI.Hyperdrive> {
     const { account_id } = params;
     return (
       this._client.get(
         `/accounts/${account_id}/hyperdrive/configs/${hyperdriveId}`,
         options,
-      ) as Core.APIPromise<{ result: HyperdriveAPI.Hyperdrive | null }>
+      ) as Core.APIPromise<{ result: HyperdriveAPI.Hyperdrive }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export type ConfigDeleteResponse = unknown | string | null;
+export type ConfigDeleteResponse = unknown;
 
 export interface ConfigCreateParams {
   /**
@@ -124,16 +123,99 @@ export interface ConfigCreateParams {
   /**
    * Body param:
    */
-  origin: HyperdriveAPI.ConfigurationParam;
+  origin:
+    | ConfigCreateParams.PublicDatabase
+    | ConfigCreateParams.AccessProtectedDatabaseBehindCloudflareTunnel;
 
   /**
    * Body param:
    */
-  caching?: ConfigCreateParams.Caching;
+  caching?:
+    | ConfigCreateParams.HyperdriveHyperdriveCachingCommon
+    | ConfigCreateParams.HyperdriveHyperdriveCachingEnabled;
 }
 
 export namespace ConfigCreateParams {
-  export interface Caching {
+  export interface PublicDatabase {
+    /**
+     * The name of your origin database.
+     */
+    database: string;
+
+    /**
+     * The host (hostname or IP) of your origin database.
+     */
+    host: string;
+
+    /**
+     * The password required to access your origin database. This value is write-only
+     * and never returned by the API.
+     */
+    password: string;
+
+    /**
+     * The port (default: 5432 for Postgres) of your origin database.
+     */
+    port: number;
+
+    /**
+     * Specifies the URL scheme used to connect to your origin database.
+     */
+    scheme: 'postgres' | 'postgresql';
+
+    /**
+     * The user of your origin database.
+     */
+    user: string;
+  }
+
+  export interface AccessProtectedDatabaseBehindCloudflareTunnel {
+    /**
+     * The Client ID of the Access token to use when connecting to the origin database
+     */
+    access_client_id: string;
+
+    /**
+     * The Client Secret of the Access token to use when connecting to the origin
+     * database. This value is write-only and never returned by the API.
+     */
+    access_client_secret: string;
+
+    /**
+     * The name of your origin database.
+     */
+    database: string;
+
+    /**
+     * The host (hostname or IP) of your origin database.
+     */
+    host: string;
+
+    /**
+     * The password required to access your origin database. This value is write-only
+     * and never returned by the API.
+     */
+    password: string;
+
+    /**
+     * Specifies the URL scheme used to connect to your origin database.
+     */
+    scheme: 'postgres' | 'postgresql';
+
+    /**
+     * The user of your origin database.
+     */
+    user: string;
+  }
+
+  export interface HyperdriveHyperdriveCachingCommon {
+    /**
+     * When set to true, disables the caching of SQL responses. (Default: false)
+     */
+    disabled?: boolean;
+  }
+
+  export interface HyperdriveHyperdriveCachingEnabled {
     /**
      * When set to true, disables the caching of SQL responses. (Default: false)
      */
@@ -141,13 +223,13 @@ export namespace ConfigCreateParams {
 
     /**
      * When present, specifies max duration for which items should persist in the
-     * cache. (Default: 60)
+     * cache. Not returned if set to default. (Default: 60)
      */
     max_age?: number;
 
     /**
      * When present, indicates the number of seconds cache may serve the response after
-     * it becomes stale. (Default: 15)
+     * it becomes stale. Not returned if set to default. (Default: 15)
      */
     stale_while_revalidate?: number;
   }
@@ -167,16 +249,99 @@ export interface ConfigUpdateParams {
   /**
    * Body param:
    */
-  origin: HyperdriveAPI.ConfigurationParam;
+  origin:
+    | ConfigUpdateParams.PublicDatabase
+    | ConfigUpdateParams.AccessProtectedDatabaseBehindCloudflareTunnel;
 
   /**
    * Body param:
    */
-  caching?: ConfigUpdateParams.Caching;
+  caching?:
+    | ConfigUpdateParams.HyperdriveHyperdriveCachingCommon
+    | ConfigUpdateParams.HyperdriveHyperdriveCachingEnabled;
 }
 
 export namespace ConfigUpdateParams {
-  export interface Caching {
+  export interface PublicDatabase {
+    /**
+     * The name of your origin database.
+     */
+    database: string;
+
+    /**
+     * The host (hostname or IP) of your origin database.
+     */
+    host: string;
+
+    /**
+     * The password required to access your origin database. This value is write-only
+     * and never returned by the API.
+     */
+    password: string;
+
+    /**
+     * The port (default: 5432 for Postgres) of your origin database.
+     */
+    port: number;
+
+    /**
+     * Specifies the URL scheme used to connect to your origin database.
+     */
+    scheme: 'postgres' | 'postgresql';
+
+    /**
+     * The user of your origin database.
+     */
+    user: string;
+  }
+
+  export interface AccessProtectedDatabaseBehindCloudflareTunnel {
+    /**
+     * The Client ID of the Access token to use when connecting to the origin database
+     */
+    access_client_id: string;
+
+    /**
+     * The Client Secret of the Access token to use when connecting to the origin
+     * database. This value is write-only and never returned by the API.
+     */
+    access_client_secret: string;
+
+    /**
+     * The name of your origin database.
+     */
+    database: string;
+
+    /**
+     * The host (hostname or IP) of your origin database.
+     */
+    host: string;
+
+    /**
+     * The password required to access your origin database. This value is write-only
+     * and never returned by the API.
+     */
+    password: string;
+
+    /**
+     * Specifies the URL scheme used to connect to your origin database.
+     */
+    scheme: 'postgres' | 'postgresql';
+
+    /**
+     * The user of your origin database.
+     */
+    user: string;
+  }
+
+  export interface HyperdriveHyperdriveCachingCommon {
+    /**
+     * When set to true, disables the caching of SQL responses. (Default: false)
+     */
+    disabled?: boolean;
+  }
+
+  export interface HyperdriveHyperdriveCachingEnabled {
     /**
      * When set to true, disables the caching of SQL responses. (Default: false)
      */
@@ -184,13 +349,13 @@ export namespace ConfigUpdateParams {
 
     /**
      * When present, specifies max duration for which items should persist in the
-     * cache. (Default: 60)
+     * cache. Not returned if set to default. (Default: 60)
      */
     max_age?: number;
 
     /**
      * When present, indicates the number of seconds cache may serve the response after
-     * it becomes stale. (Default: 15)
+     * it becomes stale. Not returned if set to default. (Default: 15)
      */
     stale_while_revalidate?: number;
   }
@@ -219,7 +384,9 @@ export interface ConfigEditParams {
   /**
    * Body param:
    */
-  caching?: ConfigEditParams.Caching;
+  caching?:
+    | ConfigEditParams.HyperdriveHyperdriveCachingCommon
+    | ConfigEditParams.HyperdriveHyperdriveCachingEnabled;
 
   /**
    * Body param:
@@ -229,11 +396,21 @@ export interface ConfigEditParams {
   /**
    * Body param:
    */
-  origin?: HyperdriveAPI.ConfigurationParam;
+  origin?:
+    | ConfigEditParams.HyperdriveHyperdriveDatabase
+    | ConfigEditParams.HyperdriveHyperdriveInternetOrigin
+    | ConfigEditParams.HyperdriveHyperdriveOverAccessOrigin;
 }
 
 export namespace ConfigEditParams {
-  export interface Caching {
+  export interface HyperdriveHyperdriveCachingCommon {
+    /**
+     * When set to true, disables the caching of SQL responses. (Default: false)
+     */
+    disabled?: boolean;
+  }
+
+  export interface HyperdriveHyperdriveCachingEnabled {
     /**
      * When set to true, disables the caching of SQL responses. (Default: false)
      */
@@ -241,16 +418,69 @@ export namespace ConfigEditParams {
 
     /**
      * When present, specifies max duration for which items should persist in the
-     * cache. (Default: 60)
+     * cache. Not returned if set to default. (Default: 60)
      */
     max_age?: number;
 
     /**
      * When present, indicates the number of seconds cache may serve the response after
-     * it becomes stale. (Default: 15)
+     * it becomes stale. Not returned if set to default. (Default: 15)
      */
     stale_while_revalidate?: number;
   }
+
+  export interface HyperdriveHyperdriveDatabase {
+    /**
+     * The name of your origin database.
+     */
+    database?: string;
+
+    /**
+     * The password required to access your origin database. This value is write-only
+     * and never returned by the API.
+     */
+    password?: string;
+
+    /**
+     * Specifies the URL scheme used to connect to your origin database.
+     */
+    scheme?: 'postgres' | 'postgresql';
+
+    /**
+     * The user of your origin database.
+     */
+    user?: string;
+  }
+
+  export interface HyperdriveHyperdriveInternetOrigin {
+    /**
+     * The host (hostname or IP) of your origin database.
+     */
+    host: string;
+
+    /**
+     * The port (default: 5432 for Postgres) of your origin database.
+     */
+    port: number;
+  }
+
+  export interface HyperdriveHyperdriveOverAccessOrigin {
+    /**
+     * The Client ID of the Access token to use when connecting to the origin database
+     */
+    access_client_id: string;
+
+    /**
+     * The Client Secret of the Access token to use when connecting to the origin
+     * database. This value is write-only and never returned by the API.
+     */
+    access_client_secret: string;
+
+    /**
+     * The host (hostname or IP) of your origin database.
+     */
+    host: string;
+  }
 }
 
 export interface ConfigGetParams {
@@ -260,14 +490,16 @@ export interface ConfigGetParams {
   account_id: string;
 }
 
-export namespace Configs {
-  export import ConfigDeleteResponse = ConfigsAPI.ConfigDeleteResponse;
-  export import ConfigCreateParams = ConfigsAPI.ConfigCreateParams;
-  export import ConfigUpdateParams = ConfigsAPI.ConfigUpdateParams;
-  export import ConfigListParams = ConfigsAPI.ConfigListParams;
-  export import ConfigDeleteParams = ConfigsAPI.ConfigDeleteParams;
-  export import ConfigEditParams = ConfigsAPI.ConfigEditParams;
-  export import ConfigGetParams = ConfigsAPI.ConfigGetParams;
+export declare namespace Configs {
+  export {
+    type ConfigDeleteResponse as ConfigDeleteResponse,
+    type ConfigCreateParams as ConfigCreateParams,
+    type ConfigUpdateParams as ConfigUpdateParams,
+    type ConfigListParams as ConfigListParams,
+    type ConfigDeleteParams as ConfigDeleteParams,
+    type ConfigEditParams as ConfigEditParams,
+    type ConfigGetParams as ConfigGetParams,
+  };
 }
 
 export { HyperdrivesSinglePage };
diff --git a/src/resources/hyperdrive/hyperdrive.ts b/src/resources/hyperdrive/hyperdrive.ts
index ec828d094d..2077c1ada4 100644
--- a/src/resources/hyperdrive/hyperdrive.ts
+++ b/src/resources/hyperdrive/hyperdrive.ts
@@ -2,6 +2,16 @@
 
 import { APIResource } from '../../resource';
 import * as ConfigsAPI from './configs';
+import {
+  ConfigCreateParams,
+  ConfigDeleteParams,
+  ConfigDeleteResponse,
+  ConfigEditParams,
+  ConfigGetParams,
+  ConfigListParams,
+  ConfigUpdateParams,
+  Configs,
+} from './configs';
 import { SinglePage } from '../../pagination';
 
 export class HyperdriveResource extends APIResource {
@@ -10,80 +20,142 @@ export class HyperdriveResource extends APIResource {
 
 export class HyperdrivesSinglePage extends SinglePage<Hyperdrive> {}
 
-export interface Configuration {
-  /**
-   * The name of your origin database.
-   */
-  database: string;
+export type Configuration =
+  | Configuration.HyperdriveHyperdriveInternetOrigin
+  | Configuration.HyperdriveHyperdriveOverAccessOrigin;
 
-  /**
-   * The host (hostname or IP) of your origin database.
-   */
-  host: string;
+export namespace Configuration {
+  export interface HyperdriveHyperdriveInternetOrigin {
+    /**
+     * The host (hostname or IP) of your origin database.
+     */
+    host: string;
 
-  /**
-   * Specifies the URL scheme used to connect to your origin database.
-   */
-  scheme: 'postgres' | 'postgresql' | 'mysql';
+    /**
+     * The port (default: 5432 for Postgres) of your origin database.
+     */
+    port: number;
 
-  /**
-   * The user of your origin database.
-   */
-  user: string;
+    /**
+     * The name of your origin database.
+     */
+    database?: string;
 
-  /**
-   * The Client ID of the Access token to use when connecting to the origin database
-   */
-  access_client_id?: string;
+    /**
+     * Specifies the URL scheme used to connect to your origin database.
+     */
+    scheme?: 'postgres' | 'postgresql';
 
-  /**
-   * The port (default: 5432 for Postgres) of your origin database.
-   */
-  port?: number;
-}
+    /**
+     * The user of your origin database.
+     */
+    user?: string;
+  }
 
-export interface ConfigurationParam {
-  /**
-   * The name of your origin database.
-   */
-  database: string;
+  export interface HyperdriveHyperdriveOverAccessOrigin {
+    /**
+     * The Client ID of the Access token to use when connecting to the origin database
+     */
+    access_client_id: string;
 
-  /**
-   * The host (hostname or IP) of your origin database.
-   */
-  host: string;
+    /**
+     * The host (hostname or IP) of your origin database.
+     */
+    host: string;
 
-  /**
-   * Specifies the URL scheme used to connect to your origin database.
-   */
-  scheme: 'postgres' | 'postgresql' | 'mysql';
+    /**
+     * The name of your origin database.
+     */
+    database?: string;
 
-  /**
-   * The user of your origin database.
-   */
-  user: string;
+    /**
+     * Specifies the URL scheme used to connect to your origin database.
+     */
+    scheme?: 'postgres' | 'postgresql';
 
-  /**
-   * The Client ID of the Access token to use when connecting to the origin database
-   */
-  access_client_id?: string;
+    /**
+     * The user of your origin database.
+     */
+    user?: string;
+  }
+}
 
+export interface Hyperdrive {
   /**
-   * The port (default: 5432 for Postgres) of your origin database.
+   * Identifier
    */
-  port?: number;
-}
+  id: string;
 
-export interface Hyperdrive {
-  caching?: Hyperdrive.Caching;
+  name: string;
 
-  name?: string;
+  origin: Hyperdrive.PublicDatabase | Hyperdrive.AccessProtectedDatabaseBehindCloudflareTunnel;
 
-  origin?: Configuration;
+  caching?: Hyperdrive.HyperdriveHyperdriveCachingCommon | Hyperdrive.HyperdriveHyperdriveCachingEnabled;
 }
 
 export namespace Hyperdrive {
-  export interface Caching {
+  export interface PublicDatabase {
+    /**
+     * The name of your origin database.
+     */
+    database: string;
+
+    /**
+     * The host (hostname or IP) of your origin database.
+     */
+    host: string;
+
+    /**
+     * The port (default: 5432 for Postgres) of your origin database.
+     */
+    port: number;
+
+    /**
+     * Specifies the URL scheme used to connect to your origin database.
+     */
+    scheme: 'postgres' | 'postgresql';
+
+    /**
+     * The user of your origin database.
+     */
+    user: string;
+  }
+
+  export interface AccessProtectedDatabaseBehindCloudflareTunnel {
+    /**
+     * The Client ID of the Access token to use when connecting to the origin database
+     */
+    access_client_id: string;
+
+    /**
+     * The name of your origin database.
+     */
+    database: string;
+
+    /**
+     * The host (hostname or IP) of your origin database.
+     */
+    host: string;
+
+    /**
+     * Specifies the URL scheme used to connect to your origin database.
+     */
+    scheme: 'postgres' | 'postgresql';
+
+    /**
+     * The user of your origin database.
+     */
+    user: string;
+  }
+
+  export interface HyperdriveHyperdriveCachingCommon {
+    /**
+     * When set to true, disables the caching of SQL responses. (Default: false)
+     */
+    disabled?: boolean;
+  }
+
+  export interface HyperdriveHyperdriveCachingEnabled {
     /**
      * When set to true, disables the caching of SQL responses. (Default: false)
      */
@@ -91,25 +163,29 @@ export namespace Hyperdrive {
 
     /**
      * When present, specifies max duration for which items should persist in the
-     * cache. (Default: 60)
+     * cache. Not returned if set to default. (Default: 60)
      */
     max_age?: number;
 
     /**
      * When present, indicates the number of seconds cache may serve the response after
-     * it becomes stale. (Default: 15)
+     * it becomes stale. Not returned if set to default. (Default: 15)
      */
     stale_while_revalidate?: number;
   }
 }
 
-export namespace HyperdriveResource {
-  export import Configs = ConfigsAPI.Configs;
-  export import ConfigDeleteResponse = ConfigsAPI.ConfigDeleteResponse;
-  export import ConfigCreateParams = ConfigsAPI.ConfigCreateParams;
-  export import ConfigUpdateParams = ConfigsAPI.ConfigUpdateParams;
-  export import ConfigListParams = ConfigsAPI.ConfigListParams;
-  export import ConfigDeleteParams = ConfigsAPI.ConfigDeleteParams;
-  export import ConfigEditParams = ConfigsAPI.ConfigEditParams;
-  export import ConfigGetParams = ConfigsAPI.ConfigGetParams;
+HyperdriveResource.Configs = Configs;
+
+export declare namespace HyperdriveResource {
+  export {
+    Configs as Configs,
+    type ConfigDeleteResponse as ConfigDeleteResponse,
+    type ConfigCreateParams as ConfigCreateParams,
+    type ConfigUpdateParams as ConfigUpdateParams,
+    type ConfigListParams as ConfigListParams,
+    type ConfigDeleteParams as ConfigDeleteParams,
+    type ConfigEditParams as ConfigEditParams,
+    type ConfigGetParams as ConfigGetParams,
+  };
 }
diff --git a/src/resources/hyperdrive/index.ts b/src/resources/hyperdrive/index.ts
index 320a5f2e2b..638a077546 100644
--- a/src/resources/hyperdrive/index.ts
+++ b/src/resources/hyperdrive/index.ts
@@ -1,13 +1,13 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  ConfigDeleteResponse,
-  ConfigCreateParams,
-  ConfigUpdateParams,
-  ConfigListParams,
-  ConfigDeleteParams,
-  ConfigEditParams,
-  ConfigGetParams,
   Configs,
+  type ConfigDeleteResponse,
+  type ConfigCreateParams,
+  type ConfigUpdateParams,
+  type ConfigListParams,
+  type ConfigDeleteParams,
+  type ConfigEditParams,
+  type ConfigGetParams,
 } from './configs';
 export { HyperdriveResource } from './hyperdrive';
diff --git a/src/resources/iam/iam.ts b/src/resources/iam/iam.ts
index 58606c953d..7133ae36e2 100644
--- a/src/resources/iam/iam.ts
+++ b/src/resources/iam/iam.ts
@@ -2,7 +2,29 @@
 
 import { APIResource } from '../../resource';
 import * as PermissionGroupsAPI from './permission-groups';
+import {
+  PermissionGroupGetParams,
+  PermissionGroupGetResponse,
+  PermissionGroupListParams,
+  PermissionGroupListResponse,
+  PermissionGroupListResponsesV4PagePaginationArray,
+  PermissionGroups,
+} from './permission-groups';
 import * as ResourceGroupsAPI from './resource-groups';
+import {
+  ResourceGroupCreateParams,
+  ResourceGroupCreateResponse,
+  ResourceGroupDeleteParams,
+  ResourceGroupDeleteResponse,
+  ResourceGroupGetParams,
+  ResourceGroupGetResponse,
+  ResourceGroupListParams,
+  ResourceGroupListResponse,
+  ResourceGroupListResponsesV4PagePaginationArray,
+  ResourceGroupUpdateParams,
+  ResourceGroupUpdateResponse,
+  ResourceGroups,
+} from './resource-groups';
 
 export class IAM extends APIResource {
   permissionGroups: PermissionGroupsAPI.PermissionGroups = new PermissionGroupsAPI.PermissionGroups(
@@ -11,23 +33,33 @@ export class IAM extends APIResource {
   resourceGroups: ResourceGroupsAPI.ResourceGroups = new ResourceGroupsAPI.ResourceGroups(this._client);
 }
 
-export namespace IAM {
-  export import PermissionGroups = PermissionGroupsAPI.PermissionGroups;
-  export import PermissionGroupListResponse = PermissionGroupsAPI.PermissionGroupListResponse;
-  export import PermissionGroupGetResponse = PermissionGroupsAPI.PermissionGroupGetResponse;
-  export import PermissionGroupListResponsesV4PagePaginationArray = PermissionGroupsAPI.PermissionGroupListResponsesV4PagePaginationArray;
-  export import PermissionGroupListParams = PermissionGroupsAPI.PermissionGroupListParams;
-  export import PermissionGroupGetParams = PermissionGroupsAPI.PermissionGroupGetParams;
-  export import ResourceGroups = ResourceGroupsAPI.ResourceGroups;
-  export import ResourceGroupCreateResponse = ResourceGroupsAPI.ResourceGroupCreateResponse;
-  export import ResourceGroupUpdateResponse = ResourceGroupsAPI.ResourceGroupUpdateResponse;
-  export import ResourceGroupListResponse = ResourceGroupsAPI.ResourceGroupListResponse;
-  export import ResourceGroupDeleteResponse = ResourceGroupsAPI.ResourceGroupDeleteResponse;
-  export import ResourceGroupGetResponse = ResourceGroupsAPI.ResourceGroupGetResponse;
-  export import ResourceGroupListResponsesV4PagePaginationArray = ResourceGroupsAPI.ResourceGroupListResponsesV4PagePaginationArray;
-  export import ResourceGroupCreateParams = ResourceGroupsAPI.ResourceGroupCreateParams;
-  export import ResourceGroupUpdateParams = ResourceGroupsAPI.ResourceGroupUpdateParams;
-  export import ResourceGroupListParams = ResourceGroupsAPI.ResourceGroupListParams;
-  export import ResourceGroupDeleteParams = ResourceGroupsAPI.ResourceGroupDeleteParams;
-  export import ResourceGroupGetParams = ResourceGroupsAPI.ResourceGroupGetParams;
+IAM.PermissionGroups = PermissionGroups;
+IAM.PermissionGroupListResponsesV4PagePaginationArray = PermissionGroupListResponsesV4PagePaginationArray;
+IAM.ResourceGroups = ResourceGroups;
+IAM.ResourceGroupListResponsesV4PagePaginationArray = ResourceGroupListResponsesV4PagePaginationArray;
+
+export declare namespace IAM {
+  export {
+    PermissionGroups as PermissionGroups,
+    type PermissionGroupListResponse as PermissionGroupListResponse,
+    type PermissionGroupGetResponse as PermissionGroupGetResponse,
+    PermissionGroupListResponsesV4PagePaginationArray as PermissionGroupListResponsesV4PagePaginationArray,
+    type PermissionGroupListParams as PermissionGroupListParams,
+    type PermissionGroupGetParams as PermissionGroupGetParams,
+  };
+
+  export {
+    ResourceGroups as ResourceGroups,
+    type ResourceGroupCreateResponse as ResourceGroupCreateResponse,
+    type ResourceGroupUpdateResponse as ResourceGroupUpdateResponse,
+    type ResourceGroupListResponse as ResourceGroupListResponse,
+    type ResourceGroupDeleteResponse as ResourceGroupDeleteResponse,
+    type ResourceGroupGetResponse as ResourceGroupGetResponse,
+    ResourceGroupListResponsesV4PagePaginationArray as ResourceGroupListResponsesV4PagePaginationArray,
+    type ResourceGroupCreateParams as ResourceGroupCreateParams,
+    type ResourceGroupUpdateParams as ResourceGroupUpdateParams,
+    type ResourceGroupListParams as ResourceGroupListParams,
+    type ResourceGroupDeleteParams as ResourceGroupDeleteParams,
+    type ResourceGroupGetParams as ResourceGroupGetParams,
+  };
 }
diff --git a/src/resources/iam/index.ts b/src/resources/iam/index.ts
index 59a4d0d23a..233e440ab0 100644
--- a/src/resources/iam/index.ts
+++ b/src/resources/iam/index.ts
@@ -2,24 +2,24 @@
 
 export { IAM } from './iam';
 export {
-  PermissionGroupListResponse,
-  PermissionGroupGetResponse,
-  PermissionGroupListParams,
-  PermissionGroupGetParams,
   PermissionGroupListResponsesV4PagePaginationArray,
   PermissionGroups,
+  type PermissionGroupListResponse,
+  type PermissionGroupGetResponse,
+  type PermissionGroupListParams,
+  type PermissionGroupGetParams,
 } from './permission-groups';
 export {
-  ResourceGroupCreateResponse,
-  ResourceGroupUpdateResponse,
-  ResourceGroupListResponse,
-  ResourceGroupDeleteResponse,
-  ResourceGroupGetResponse,
-  ResourceGroupCreateParams,
-  ResourceGroupUpdateParams,
-  ResourceGroupListParams,
-  ResourceGroupDeleteParams,
-  ResourceGroupGetParams,
   ResourceGroupListResponsesV4PagePaginationArray,
   ResourceGroups,
+  type ResourceGroupCreateResponse,
+  type ResourceGroupUpdateResponse,
+  type ResourceGroupListResponse,
+  type ResourceGroupDeleteResponse,
+  type ResourceGroupGetResponse,
+  type ResourceGroupCreateParams,
+  type ResourceGroupUpdateParams,
+  type ResourceGroupListParams,
+  type ResourceGroupDeleteParams,
+  type ResourceGroupGetParams,
 } from './resource-groups';
diff --git a/src/resources/iam/permission-groups.ts b/src/resources/iam/permission-groups.ts
index 3e54f8b677..02837dc61f 100644
--- a/src/resources/iam/permission-groups.ts
+++ b/src/resources/iam/permission-groups.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as PermissionGroupsAPI from './permission-groups';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class PermissionGroups extends APIResource {
@@ -51,7 +50,7 @@ export interface PermissionGroupGetResponse {
   /**
    * Attributes associated to the permission group.
    */
-  meta?: unknown;
+  meta?: PermissionGroupGetResponse.Meta;
 
   /**
    * Name of the group.
@@ -59,6 +58,17 @@ export interface PermissionGroupGetResponse {
   name?: string;
 }
 
+export namespace PermissionGroupGetResponse {
+  /**
+   * Attributes associated to the permission group.
+   */
+  export interface Meta {
+    key?: string;
+
+    value?: string;
+  }
+}
+
 export interface PermissionGroupListParams extends V4PagePaginationArrayParams {
   /**
    * Path param: Account identifier tag.
@@ -88,10 +98,15 @@ export interface PermissionGroupGetParams {
   account_id: string;
 }
 
-export namespace PermissionGroups {
-  export import PermissionGroupListResponse = PermissionGroupsAPI.PermissionGroupListResponse;
-  export import PermissionGroupGetResponse = PermissionGroupsAPI.PermissionGroupGetResponse;
-  export import PermissionGroupListResponsesV4PagePaginationArray = PermissionGroupsAPI.PermissionGroupListResponsesV4PagePaginationArray;
-  export import PermissionGroupListParams = PermissionGroupsAPI.PermissionGroupListParams;
-  export import PermissionGroupGetParams = PermissionGroupsAPI.PermissionGroupGetParams;
+PermissionGroups.PermissionGroupListResponsesV4PagePaginationArray =
+  PermissionGroupListResponsesV4PagePaginationArray;
+
+export declare namespace PermissionGroups {
+  export {
+    type PermissionGroupListResponse as PermissionGroupListResponse,
+    type PermissionGroupGetResponse as PermissionGroupGetResponse,
+    PermissionGroupListResponsesV4PagePaginationArray as PermissionGroupListResponsesV4PagePaginationArray,
+    type PermissionGroupListParams as PermissionGroupListParams,
+    type PermissionGroupGetParams as PermissionGroupGetParams,
+  };
 }
diff --git a/src/resources/iam/resource-groups.ts b/src/resources/iam/resource-groups.ts
index 2dd5a2b4c6..677f2d9c62 100644
--- a/src/resources/iam/resource-groups.ts
+++ b/src/resources/iam/resource-groups.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ResourceGroupsAPI from './resource-groups';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class ResourceGroups extends APIResource {
@@ -149,7 +148,7 @@ export interface ResourceGroupUpdateResponse {
   /**
    * Attributes associated to the resource group.
    */
-  meta?: unknown;
+  meta?: ResourceGroupUpdateResponse.Meta;
 
   /**
    * Name of the resource group.
@@ -187,6 +186,15 @@ export namespace ResourceGroupUpdateResponse {
       key: string;
     }
   }
+
+  /**
+   * Attributes associated to the resource group.
+   */
+  export interface Meta {
+    key?: string;
+
+    value?: string;
+  }
 }
 
 export type ResourceGroupListResponse = unknown;
@@ -215,7 +223,7 @@ export interface ResourceGroupGetResponse {
   /**
    * Attributes associated to the resource group.
    */
-  meta?: unknown;
+  meta?: ResourceGroupGetResponse.Meta;
 
   /**
    * Name of the resource group.
@@ -253,6 +261,15 @@ export namespace ResourceGroupGetResponse {
       key: string;
     }
   }
+
+  /**
+   * Attributes associated to the resource group.
+   */
+  export interface Meta {
+    key?: string;
+
+    value?: string;
+  }
 }
 
 export interface ResourceGroupCreateParams {
@@ -388,16 +405,21 @@ export interface ResourceGroupGetParams {
   account_id: string;
 }
 
-export namespace ResourceGroups {
-  export import ResourceGroupCreateResponse = ResourceGroupsAPI.ResourceGroupCreateResponse;
-  export import ResourceGroupUpdateResponse = ResourceGroupsAPI.ResourceGroupUpdateResponse;
-  export import ResourceGroupListResponse = ResourceGroupsAPI.ResourceGroupListResponse;
-  export import ResourceGroupDeleteResponse = ResourceGroupsAPI.ResourceGroupDeleteResponse;
-  export import ResourceGroupGetResponse = ResourceGroupsAPI.ResourceGroupGetResponse;
-  export import ResourceGroupListResponsesV4PagePaginationArray = ResourceGroupsAPI.ResourceGroupListResponsesV4PagePaginationArray;
-  export import ResourceGroupCreateParams = ResourceGroupsAPI.ResourceGroupCreateParams;
-  export import ResourceGroupUpdateParams = ResourceGroupsAPI.ResourceGroupUpdateParams;
-  export import ResourceGroupListParams = ResourceGroupsAPI.ResourceGroupListParams;
-  export import ResourceGroupDeleteParams = ResourceGroupsAPI.ResourceGroupDeleteParams;
-  export import ResourceGroupGetParams = ResourceGroupsAPI.ResourceGroupGetParams;
+ResourceGroups.ResourceGroupListResponsesV4PagePaginationArray =
+  ResourceGroupListResponsesV4PagePaginationArray;
+
+export declare namespace ResourceGroups {
+  export {
+    type ResourceGroupCreateResponse as ResourceGroupCreateResponse,
+    type ResourceGroupUpdateResponse as ResourceGroupUpdateResponse,
+    type ResourceGroupListResponse as ResourceGroupListResponse,
+    type ResourceGroupDeleteResponse as ResourceGroupDeleteResponse,
+    type ResourceGroupGetResponse as ResourceGroupGetResponse,
+    ResourceGroupListResponsesV4PagePaginationArray as ResourceGroupListResponsesV4PagePaginationArray,
+    type ResourceGroupCreateParams as ResourceGroupCreateParams,
+    type ResourceGroupUpdateParams as ResourceGroupUpdateParams,
+    type ResourceGroupListParams as ResourceGroupListParams,
+    type ResourceGroupDeleteParams as ResourceGroupDeleteParams,
+    type ResourceGroupGetParams as ResourceGroupGetParams,
+  };
 }
diff --git a/src/resources/images/images.ts b/src/resources/images/images.ts
index 5162c81598..90f575c985 100644
--- a/src/resources/images/images.ts
+++ b/src/resources/images/images.ts
@@ -2,25 +2,43 @@
 
 import { APIResource } from '../../resource';
 import * as V1API from './v1/v1';
+import {
+  Image,
+  V1,
+  V1CreateParams,
+  V1DeleteParams,
+  V1DeleteResponse,
+  V1EditParams,
+  V1GetParams,
+  V1ListParams,
+  V1ListResponse,
+  V1ListResponsesV4PagePagination,
+} from './v1/v1';
 import * as V2API from './v2/v2';
+import { V2, V2ListParams, V2ListResponse } from './v2/v2';
 
 export class Images extends APIResource {
   v1: V1API.V1 = new V1API.V1(this._client);
   v2: V2API.V2 = new V2API.V2(this._client);
 }
 
-export namespace Images {
-  export import V1 = V1API.V1;
-  export import Image = V1API.Image;
-  export import V1ListResponse = V1API.V1ListResponse;
-  export import V1DeleteResponse = V1API.V1DeleteResponse;
-  export import V1ListResponsesV4PagePagination = V1API.V1ListResponsesV4PagePagination;
-  export import V1CreateParams = V1API.V1CreateParams;
-  export import V1ListParams = V1API.V1ListParams;
-  export import V1DeleteParams = V1API.V1DeleteParams;
-  export import V1EditParams = V1API.V1EditParams;
-  export import V1GetParams = V1API.V1GetParams;
-  export import V2 = V2API.V2;
-  export import V2ListResponse = V2API.V2ListResponse;
-  export import V2ListParams = V2API.V2ListParams;
+Images.V1 = V1;
+Images.V1ListResponsesV4PagePagination = V1ListResponsesV4PagePagination;
+Images.V2 = V2;
+
+export declare namespace Images {
+  export {
+    V1 as V1,
+    type Image as Image,
+    type V1ListResponse as V1ListResponse,
+    type V1DeleteResponse as V1DeleteResponse,
+    V1ListResponsesV4PagePagination as V1ListResponsesV4PagePagination,
+    type V1CreateParams as V1CreateParams,
+    type V1ListParams as V1ListParams,
+    type V1DeleteParams as V1DeleteParams,
+    type V1EditParams as V1EditParams,
+    type V1GetParams as V1GetParams,
+  };
+
+  export { V2 as V2, type V2ListResponse as V2ListResponse, type V2ListParams as V2ListParams };
 }
diff --git a/src/resources/images/index.ts b/src/resources/images/index.ts
index a4553e4a81..382d5480b3 100644
--- a/src/resources/images/index.ts
+++ b/src/resources/images/index.ts
@@ -1,16 +1,16 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export { Images } from './images';
 export {
-  Image,
-  V1ListResponse,
-  V1DeleteResponse,
-  V1CreateParams,
-  V1ListParams,
-  V1DeleteParams,
-  V1EditParams,
-  V1GetParams,
   V1ListResponsesV4PagePagination,
   V1,
+  type Image,
+  type V1ListResponse,
+  type V1DeleteResponse,
+  type V1CreateParams,
+  type V1ListParams,
+  type V1DeleteParams,
+  type V1EditParams,
+  type V1GetParams,
 } from './v1/index';
-export { Images } from './images';
-export { V2ListResponse, V2ListParams, V2 } from './v2/index';
+export { V2, type V2ListResponse, type V2ListParams } from './v2/index';
diff --git a/src/resources/images/v1/blobs.ts b/src/resources/images/v1/blobs.ts
index 1f84656905..061b78d8fa 100644
--- a/src/resources/images/v1/blobs.ts
+++ b/src/resources/images/v1/blobs.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as BlobsAPI from './blobs';
 import { type Response } from '../../../_shims/index';
 
 export class Blobs extends APIResource {
@@ -14,6 +13,7 @@ export class Blobs extends APIResource {
     const { account_id } = params;
     return this._client.get(`/accounts/${account_id}/images/v1/${imageId}/blob`, {
       ...options,
+      headers: { Accept: 'image/*', ...options?.headers },
       __binaryResponse: true,
     });
   }
@@ -26,6 +26,6 @@ export interface BlobGetParams {
   account_id: string;
 }
 
-export namespace Blobs {
-  export import BlobGetParams = BlobsAPI.BlobGetParams;
+export declare namespace Blobs {
+  export { type BlobGetParams as BlobGetParams };
 }
diff --git a/src/resources/images/v1/index.ts b/src/resources/images/v1/index.ts
index 9f46c98b8f..2c00f7a190 100644
--- a/src/resources/images/v1/index.ts
+++ b/src/resources/images/v1/index.ts
@@ -1,39 +1,39 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { BlobGetParams, Blobs } from './blobs';
+export { Blobs, type BlobGetParams } from './blobs';
+export {
+  Keys,
+  type Key,
+  type KeyUpdateResponse,
+  type KeyListResponse,
+  type KeyDeleteResponse,
+  type KeyUpdateParams,
+  type KeyListParams,
+  type KeyDeleteParams,
+} from './keys';
+export { Stats, type Stat, type StatGetParams } from './stats';
 export {
-  Image,
-  V1ListResponse,
-  V1DeleteResponse,
-  V1CreateParams,
-  V1ListParams,
-  V1DeleteParams,
-  V1EditParams,
-  V1GetParams,
   V1ListResponsesV4PagePagination,
   V1,
+  type Image,
+  type V1ListResponse,
+  type V1DeleteResponse,
+  type V1CreateParams,
+  type V1ListParams,
+  type V1DeleteParams,
+  type V1EditParams,
+  type V1GetParams,
 } from './v1';
 export {
-  Key,
-  KeyUpdateResponse,
-  KeyListResponse,
-  KeyDeleteResponse,
-  KeyUpdateParams,
-  KeyListParams,
-  KeyDeleteParams,
-  Keys,
-} from './keys';
-export { Stat, StatGetParams, Stats } from './stats';
-export {
-  Variant,
-  VariantCreateResponse,
-  VariantDeleteResponse,
-  VariantEditResponse,
-  VariantGetResponse,
-  VariantCreateParams,
-  VariantListParams,
-  VariantDeleteParams,
-  VariantEditParams,
-  VariantGetParams,
   Variants,
+  type Variant,
+  type VariantCreateResponse,
+  type VariantDeleteResponse,
+  type VariantEditResponse,
+  type VariantGetResponse,
+  type VariantCreateParams,
+  type VariantListParams,
+  type VariantDeleteParams,
+  type VariantEditParams,
+  type VariantGetParams,
 } from './variants';
diff --git a/src/resources/images/v1/keys.ts b/src/resources/images/v1/keys.ts
index f2f2bb61dd..9e531ee7ca 100644
--- a/src/resources/images/v1/keys.ts
+++ b/src/resources/images/v1/keys.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as KeysAPI from './keys';
 
 export class Keys extends APIResource {
   /**
@@ -98,12 +97,14 @@ export interface KeyDeleteParams {
   account_id: string;
 }
 
-export namespace Keys {
-  export import Key = KeysAPI.Key;
-  export import KeyUpdateResponse = KeysAPI.KeyUpdateResponse;
-  export import KeyListResponse = KeysAPI.KeyListResponse;
-  export import KeyDeleteResponse = KeysAPI.KeyDeleteResponse;
-  export import KeyUpdateParams = KeysAPI.KeyUpdateParams;
-  export import KeyListParams = KeysAPI.KeyListParams;
-  export import KeyDeleteParams = KeysAPI.KeyDeleteParams;
+export declare namespace Keys {
+  export {
+    type Key as Key,
+    type KeyUpdateResponse as KeyUpdateResponse,
+    type KeyListResponse as KeyListResponse,
+    type KeyDeleteResponse as KeyDeleteResponse,
+    type KeyUpdateParams as KeyUpdateParams,
+    type KeyListParams as KeyListParams,
+    type KeyDeleteParams as KeyDeleteParams,
+  };
 }
diff --git a/src/resources/images/v1/stats.ts b/src/resources/images/v1/stats.ts
index a1e2d3b38a..eb4fe9dd69 100644
--- a/src/resources/images/v1/stats.ts
+++ b/src/resources/images/v1/stats.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as StatsAPI from './stats';
 
 export class Stats extends APIResource {
   /**
@@ -43,7 +42,6 @@ export interface StatGetParams {
   account_id: string;
 }
 
-export namespace Stats {
-  export import Stat = StatsAPI.Stat;
-  export import StatGetParams = StatsAPI.StatGetParams;
+export declare namespace Stats {
+  export { type Stat as Stat, type StatGetParams as StatGetParams };
 }
diff --git a/src/resources/images/v1/v1.ts b/src/resources/images/v1/v1.ts
index 4aca25107c..01a8da0f32 100644
--- a/src/resources/images/v1/v1.ts
+++ b/src/resources/images/v1/v1.ts
@@ -2,12 +2,35 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as V1API from './v1';
-import * as Shared from '../../shared';
 import * as BlobsAPI from './blobs';
+import { BlobGetParams, Blobs } from './blobs';
 import * as KeysAPI from './keys';
+import {
+  Key,
+  KeyDeleteParams,
+  KeyDeleteResponse,
+  KeyListParams,
+  KeyListResponse,
+  KeyUpdateParams,
+  KeyUpdateResponse,
+  Keys,
+} from './keys';
 import * as StatsAPI from './stats';
+import { Stat, StatGetParams, Stats } from './stats';
 import * as VariantsAPI from './variants';
+import {
+  Variant,
+  VariantCreateParams,
+  VariantCreateResponse,
+  VariantDeleteParams,
+  VariantDeleteResponse,
+  VariantEditParams,
+  VariantEditResponse,
+  VariantGetParams,
+  VariantGetResponse,
+  VariantListParams,
+  Variants,
+} from './variants';
 import { V4PagePagination, type V4PagePaginationParams } from '../../../pagination';
 
 export class V1 extends APIResource {
@@ -123,29 +146,14 @@ export interface Image {
   /**
    * Object specifying available variants for an image.
    */
-  variants?: Array<string | string | string>;
+  variants?: Array<string>;
 }
 
 export interface V1ListResponse {
-  errors: Array<Shared.ResponseInfo>;
-
-  messages: Array<Shared.ResponseInfo>;
-
-  result: V1ListResponse.Result;
-
-  /**
-   * Whether the API call was successful
-   */
-  success: true;
-}
-
-export namespace V1ListResponse {
-  export interface Result {
-    images?: Array<V1API.Image>;
-  }
+  images?: Array<Image>;
 }
 
-export type V1DeleteResponse = unknown | string | null;
+export type V1DeleteResponse = unknown | string;
 
 export interface V1CreateParams {
   /**
@@ -218,38 +226,51 @@ export interface V1GetParams {
   account_id: string;
 }
 
-export namespace V1 {
-  export import Image = V1API.Image;
-  export import V1ListResponse = V1API.V1ListResponse;
-  export import V1DeleteResponse = V1API.V1DeleteResponse;
-  export import V1ListResponsesV4PagePagination = V1API.V1ListResponsesV4PagePagination;
-  export import V1CreateParams = V1API.V1CreateParams;
-  export import V1ListParams = V1API.V1ListParams;
-  export import V1DeleteParams = V1API.V1DeleteParams;
-  export import V1EditParams = V1API.V1EditParams;
-  export import V1GetParams = V1API.V1GetParams;
-  export import Keys = KeysAPI.Keys;
-  export import Key = KeysAPI.Key;
-  export import KeyUpdateResponse = KeysAPI.KeyUpdateResponse;
-  export import KeyListResponse = KeysAPI.KeyListResponse;
-  export import KeyDeleteResponse = KeysAPI.KeyDeleteResponse;
-  export import KeyUpdateParams = KeysAPI.KeyUpdateParams;
-  export import KeyListParams = KeysAPI.KeyListParams;
-  export import KeyDeleteParams = KeysAPI.KeyDeleteParams;
-  export import Stats = StatsAPI.Stats;
-  export import Stat = StatsAPI.Stat;
-  export import StatGetParams = StatsAPI.StatGetParams;
-  export import Variants = VariantsAPI.Variants;
-  export import Variant = VariantsAPI.Variant;
-  export import VariantCreateResponse = VariantsAPI.VariantCreateResponse;
-  export import VariantDeleteResponse = VariantsAPI.VariantDeleteResponse;
-  export import VariantEditResponse = VariantsAPI.VariantEditResponse;
-  export import VariantGetResponse = VariantsAPI.VariantGetResponse;
-  export import VariantCreateParams = VariantsAPI.VariantCreateParams;
-  export import VariantListParams = VariantsAPI.VariantListParams;
-  export import VariantDeleteParams = VariantsAPI.VariantDeleteParams;
-  export import VariantEditParams = VariantsAPI.VariantEditParams;
-  export import VariantGetParams = VariantsAPI.VariantGetParams;
-  export import Blobs = BlobsAPI.Blobs;
-  export import BlobGetParams = BlobsAPI.BlobGetParams;
+V1.V1ListResponsesV4PagePagination = V1ListResponsesV4PagePagination;
+V1.Keys = Keys;
+V1.Stats = Stats;
+V1.Variants = Variants;
+V1.Blobs = Blobs;
+
+export declare namespace V1 {
+  export {
+    type Image as Image,
+    type V1ListResponse as V1ListResponse,
+    type V1DeleteResponse as V1DeleteResponse,
+    V1ListResponsesV4PagePagination as V1ListResponsesV4PagePagination,
+    type V1CreateParams as V1CreateParams,
+    type V1ListParams as V1ListParams,
+    type V1DeleteParams as V1DeleteParams,
+    type V1EditParams as V1EditParams,
+    type V1GetParams as V1GetParams,
+  };
+
+  export {
+    Keys as Keys,
+    type Key as Key,
+    type KeyUpdateResponse as KeyUpdateResponse,
+    type KeyListResponse as KeyListResponse,
+    type KeyDeleteResponse as KeyDeleteResponse,
+    type KeyUpdateParams as KeyUpdateParams,
+    type KeyListParams as KeyListParams,
+    type KeyDeleteParams as KeyDeleteParams,
+  };
+
+  export { Stats as Stats, type Stat as Stat, type StatGetParams as StatGetParams };
+
+  export {
+    Variants as Variants,
+    type Variant as Variant,
+    type VariantCreateResponse as VariantCreateResponse,
+    type VariantDeleteResponse as VariantDeleteResponse,
+    type VariantEditResponse as VariantEditResponse,
+    type VariantGetResponse as VariantGetResponse,
+    type VariantCreateParams as VariantCreateParams,
+    type VariantListParams as VariantListParams,
+    type VariantDeleteParams as VariantDeleteParams,
+    type VariantEditParams as VariantEditParams,
+    type VariantGetParams as VariantGetParams,
+  };
+
+  export { Blobs as Blobs, type BlobGetParams as BlobGetParams };
 }
diff --git a/src/resources/images/v1/variants.ts b/src/resources/images/v1/variants.ts
index 341ade6c7d..844e0f7deb 100644
--- a/src/resources/images/v1/variants.ts
+++ b/src/resources/images/v1/variants.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as VariantsAPI from './variants';
 
 export class Variants extends APIResource {
   /**
@@ -186,7 +185,7 @@ export namespace VariantCreateResponse {
   }
 }
 
-export type VariantDeleteResponse = unknown | string | null;
+export type VariantDeleteResponse = unknown | string;
 
 export interface VariantEditResponse {
   variant?: VariantEditResponse.Variant;
@@ -404,15 +403,17 @@ export interface VariantGetParams {
   account_id: string;
 }
 
-export namespace Variants {
-  export import Variant = VariantsAPI.Variant;
-  export import VariantCreateResponse = VariantsAPI.VariantCreateResponse;
-  export import VariantDeleteResponse = VariantsAPI.VariantDeleteResponse;
-  export import VariantEditResponse = VariantsAPI.VariantEditResponse;
-  export import VariantGetResponse = VariantsAPI.VariantGetResponse;
-  export import VariantCreateParams = VariantsAPI.VariantCreateParams;
-  export import VariantListParams = VariantsAPI.VariantListParams;
-  export import VariantDeleteParams = VariantsAPI.VariantDeleteParams;
-  export import VariantEditParams = VariantsAPI.VariantEditParams;
-  export import VariantGetParams = VariantsAPI.VariantGetParams;
+export declare namespace Variants {
+  export {
+    type Variant as Variant,
+    type VariantCreateResponse as VariantCreateResponse,
+    type VariantDeleteResponse as VariantDeleteResponse,
+    type VariantEditResponse as VariantEditResponse,
+    type VariantGetResponse as VariantGetResponse,
+    type VariantCreateParams as VariantCreateParams,
+    type VariantListParams as VariantListParams,
+    type VariantDeleteParams as VariantDeleteParams,
+    type VariantEditParams as VariantEditParams,
+    type VariantGetParams as VariantGetParams,
+  };
 }
diff --git a/src/resources/images/v2/direct-uploads.ts b/src/resources/images/v2/direct-uploads.ts
index ee7a62928d..93d13ece16 100644
--- a/src/resources/images/v2/direct-uploads.ts
+++ b/src/resources/images/v2/direct-uploads.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as DirectUploadsAPI from './direct-uploads';
 
 export class DirectUploads extends APIResource {
   /**
@@ -73,7 +72,9 @@ export interface DirectUploadCreateParams {
   requireSignedURLs?: boolean;
 }
 
-export namespace DirectUploads {
-  export import DirectUploadCreateResponse = DirectUploadsAPI.DirectUploadCreateResponse;
-  export import DirectUploadCreateParams = DirectUploadsAPI.DirectUploadCreateParams;
+export declare namespace DirectUploads {
+  export {
+    type DirectUploadCreateResponse as DirectUploadCreateResponse,
+    type DirectUploadCreateParams as DirectUploadCreateParams,
+  };
 }
diff --git a/src/resources/images/v2/index.ts b/src/resources/images/v2/index.ts
index c0d98e2aa5..e53adac492 100644
--- a/src/resources/images/v2/index.ts
+++ b/src/resources/images/v2/index.ts
@@ -1,4 +1,8 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { DirectUploadCreateResponse, DirectUploadCreateParams, DirectUploads } from './direct-uploads';
-export { V2ListResponse, V2ListParams, V2 } from './v2';
+export {
+  DirectUploads,
+  type DirectUploadCreateResponse,
+  type DirectUploadCreateParams,
+} from './direct-uploads';
+export { V2, type V2ListResponse, type V2ListParams } from './v2';
diff --git a/src/resources/images/v2/v2.ts b/src/resources/images/v2/v2.ts
index a107c46fb7..8a3ec73525 100644
--- a/src/resources/images/v2/v2.ts
+++ b/src/resources/images/v2/v2.ts
@@ -2,9 +2,9 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as V2API from './v2';
 import * as V1API from '../v1/v1';
 import * as DirectUploadsAPI from './direct-uploads';
+import { DirectUploadCreateParams, DirectUploadCreateResponse, DirectUploads } from './direct-uploads';
 
 export class V2 extends APIResource {
   directUploads: DirectUploadsAPI.DirectUploads = new DirectUploadsAPI.DirectUploads(this._client);
@@ -57,10 +57,14 @@ export interface V2ListParams {
   sort_order?: 'asc' | 'desc';
 }
 
-export namespace V2 {
-  export import V2ListResponse = V2API.V2ListResponse;
-  export import V2ListParams = V2API.V2ListParams;
-  export import DirectUploads = DirectUploadsAPI.DirectUploads;
-  export import DirectUploadCreateResponse = DirectUploadsAPI.DirectUploadCreateResponse;
-  export import DirectUploadCreateParams = DirectUploadsAPI.DirectUploadCreateParams;
+V2.DirectUploads = DirectUploads;
+
+export declare namespace V2 {
+  export { type V2ListResponse as V2ListResponse, type V2ListParams as V2ListParams };
+
+  export {
+    DirectUploads as DirectUploads,
+    type DirectUploadCreateResponse as DirectUploadCreateResponse,
+    type DirectUploadCreateParams as DirectUploadCreateParams,
+  };
 }
diff --git a/src/resources/index.ts b/src/resources/index.ts
index a72a097310..aa3b916fc7 100644
--- a/src/resources/index.ts
+++ b/src/resources/index.ts
@@ -2,8 +2,10 @@
 
 export * from './shared';
 export { ACM } from './acm/acm';
+export { AI } from './ai/ai';
 export { AIGateway } from './ai-gateway/ai-gateway';
 export { APIGateway } from './api-gateway/api-gateway';
+export { AbuseReports } from './abuse-reports';
 export { Accounts } from './accounts/accounts';
 export { Addressing } from './addressing/addressing';
 export { Alerting } from './alerting/alerting';
@@ -11,25 +13,26 @@ export { Argo } from './argo/argo';
 export { AuditLogs } from './audit-logs';
 export { Billing } from './billing/billing';
 export { BotManagement } from './bot-management';
+export { BotnetFeed } from './botnet-feed/botnet-feed';
 export { BrandProtection } from './brand-protection';
 export { Cache } from './cache/cache';
 export { Calls } from './calls/calls';
 export { CertificateAuthorities } from './certificate-authorities/certificate-authorities';
-export { Challenges } from './challenges/challenges';
 export { ClientCertificates } from './client-certificates';
 export { CloudConnector } from './cloud-connector/cloud-connector';
 export { CloudforceOne } from './cloudforce-one/cloudforce-one';
+export { ContentScanning } from './content-scanning/content-scanning';
 export { CustomCertificates } from './custom-certificates/custom-certificates';
 export { CustomHostnames } from './custom-hostnames/custom-hostnames';
 export { CustomNameservers } from './custom-nameservers';
 export { D1Resource } from './d1/d1';
 export { DCVDelegation } from './dcv-delegation';
 export { DNS } from './dns/dns';
-export { DNSSECResource } from './dnssec';
+export { DNSFirewall } from './dns-firewall/dns-firewall';
 export { Diagnostics } from './diagnostics/diagnostics';
 export { DurableObjects } from './durable-objects/durable-objects';
 export { EmailRouting } from './email-routing/email-routing';
-export { EventNotifications } from './event-notifications/event-notifications';
+export { EmailSecurity } from './email-security/email-security';
 export { Filters } from './filters';
 export { Firewall } from './firewall/firewall';
 export { Healthchecks } from './healthchecks/healthchecks';
@@ -41,48 +44,46 @@ export { Images } from './images/images';
 export { Intel } from './intel/intel';
 export { KV } from './kv/kv';
 export { KeylessCertificates } from './keyless-certificates';
+export { LeakedCredentialChecks } from './leaked-credential-checks/leaked-credential-checks';
 export { LoadBalancers } from './load-balancers/load-balancers';
 export { Logpush } from './logpush/logpush';
 export { Logs } from './logs/logs';
 export { MTLSCertificates } from './mtls-certificates/mtls-certificates';
 export { MagicNetworkMonitoring } from './magic-network-monitoring/magic-network-monitoring';
 export { MagicTransit } from './magic-transit/magic-transit';
-export { ManagedHeaders } from './managed-headers';
+export { ManagedTransforms } from './managed-transforms';
 export { Memberships } from './memberships';
 export { OriginCACertificates } from './origin-ca-certificates';
 export { OriginPostQuantumEncryption } from './origin-post-quantum-encryption';
 export { OriginTLSClientAuth } from './origin-tls-client-auth/origin-tls-client-auth';
-export { PCAPs } from './pcaps/pcaps';
+export { PageRules } from './page-rules';
 export { PageShield } from './page-shield/page-shield';
-export { Pagerules } from './pagerules/pagerules';
 export { Pages } from './pages/pages';
-export { Plans } from './plans';
 export { Queues } from './queues/queues';
 export { R2 } from './r2/r2';
 export { RUM } from './rum/rum';
 export { Radar } from './radar/radar';
 export { RateLimits } from './rate-limits';
-export { RatePlans } from './rate-plans';
 export { Registrar } from './registrar/registrar';
 export { RequestTracers } from './request-tracers/request-tracers';
+export { ResourceSharing } from './resource-sharing/resource-sharing';
 export { Rules } from './rules/rules';
 export { Rulesets } from './rulesets/rulesets';
 export { SSL } from './ssl/ssl';
-export { SecondaryDNS } from './secondary-dns/secondary-dns';
+export { SecurityTXT } from './security-txt';
 export { Snippets } from './snippets/snippets';
 export { Spectrum } from './spectrum/spectrum';
 export { Speed } from './speed/speed';
-export { Storage } from './storage/storage';
 export { Stream } from './stream/stream';
-export { Subscriptions } from './subscriptions';
+export { Turnstile } from './turnstile/turnstile';
 export { URLNormalization } from './url-normalization';
 export { URLScanner } from './url-scanner/url-scanner';
 export { User } from './user/user';
 export { Vectorize } from './vectorize/vectorize';
-export { WARPConnector } from './warp-connector';
 export { WaitingRooms } from './waiting-rooms/waiting-rooms';
 export { Web3 } from './web3/web3';
 export { Workers } from './workers/workers';
 export { WorkersForPlatforms } from './workers-for-platforms/workers-for-platforms';
+export { Workflows } from './workflows/workflows';
 export { ZeroTrust } from './zero-trust/zero-trust';
 export { Zones } from './zones/zones';
diff --git a/src/resources/intel/asn/asn.ts b/src/resources/intel/asn/asn.ts
index b3d70ac9f2..530cb586ed 100644
--- a/src/resources/intel/asn/asn.ts
+++ b/src/resources/intel/asn/asn.ts
@@ -2,15 +2,16 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ASNAPI from './asn';
 import * as Shared from '../../shared';
 import * as SubnetsAPI from './subnets';
+import { SubnetGetParams, SubnetGetResponse, Subnets } from './subnets';
 
 export class ASN extends APIResource {
   subnets: SubnetsAPI.Subnets = new SubnetsAPI.Subnets(this._client);
 
   /**
-   * Get ASN Overview
+   * Gets an overview of the Autonomous System Number (ASN) and a list of subnets for
+   * it.
    */
   get(
     asn: Shared.ASNParam,
@@ -33,9 +34,14 @@ export interface ASNGetParams {
   account_id: string;
 }
 
-export namespace ASN {
-  export import ASNGetParams = ASNAPI.ASNGetParams;
-  export import Subnets = SubnetsAPI.Subnets;
-  export import SubnetGetResponse = SubnetsAPI.SubnetGetResponse;
-  export import SubnetGetParams = SubnetsAPI.SubnetGetParams;
+ASN.Subnets = Subnets;
+
+export declare namespace ASN {
+  export { type ASNGetParams as ASNGetParams };
+
+  export {
+    Subnets as Subnets,
+    type SubnetGetResponse as SubnetGetResponse,
+    type SubnetGetParams as SubnetGetParams,
+  };
 }
diff --git a/src/resources/intel/asn/index.ts b/src/resources/intel/asn/index.ts
index 93306f3866..1836c71269 100644
--- a/src/resources/intel/asn/index.ts
+++ b/src/resources/intel/asn/index.ts
@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { ASNGetParams, ASN } from './asn';
-export { SubnetGetResponse, SubnetGetParams, Subnets } from './subnets';
+export { ASN, type ASNGetParams } from './asn';
+export { Subnets, type SubnetGetResponse, type SubnetGetParams } from './subnets';
diff --git a/src/resources/intel/asn/subnets.ts b/src/resources/intel/asn/subnets.ts
index ccf67aced7..b0bbbb47ee 100644
--- a/src/resources/intel/asn/subnets.ts
+++ b/src/resources/intel/asn/subnets.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as SubnetsAPI from './subnets';
 import * as Shared from '../../shared';
 
 export class Subnets extends APIResource {
@@ -49,7 +48,6 @@ export interface SubnetGetParams {
   account_id: string;
 }
 
-export namespace Subnets {
-  export import SubnetGetResponse = SubnetsAPI.SubnetGetResponse;
-  export import SubnetGetParams = SubnetsAPI.SubnetGetParams;
+export declare namespace Subnets {
+  export { type SubnetGetResponse as SubnetGetResponse, type SubnetGetParams as SubnetGetParams };
 }
diff --git a/src/resources/intel/attack-surface-report/attack-surface-report.ts b/src/resources/intel/attack-surface-report/attack-surface-report.ts
index bc4865775c..ed340559ad 100644
--- a/src/resources/intel/attack-surface-report/attack-surface-report.ts
+++ b/src/resources/intel/attack-surface-report/attack-surface-report.ts
@@ -2,29 +2,55 @@
 
 import { APIResource } from '../../../resource';
 import * as IssueTypesAPI from './issue-types';
+import { IssueTypeGetParams, IssueTypeGetResponse, IssueTypes } from './issue-types';
 import * as IssuesAPI from './issues';
+import {
+  IssueClassParams,
+  IssueClassResponse,
+  IssueDismissParams,
+  IssueDismissResponse,
+  IssueListParams,
+  IssueListResponse,
+  IssueListResponsesV4PagePagination,
+  IssueSeverityParams,
+  IssueSeverityResponse,
+  IssueType,
+  IssueTypeParams,
+  IssueTypeResponse,
+  Issues,
+  SeverityQueryParam,
+} from './issues';
 
 export class AttackSurfaceReport extends APIResource {
   issueTypes: IssueTypesAPI.IssueTypes = new IssueTypesAPI.IssueTypes(this._client);
   issues: IssuesAPI.Issues = new IssuesAPI.Issues(this._client);
 }
 
-export namespace AttackSurfaceReport {
-  export import IssueTypes = IssueTypesAPI.IssueTypes;
-  export import IssueTypeGetResponse = IssueTypesAPI.IssueTypeGetResponse;
-  export import IssueTypeGetParams = IssueTypesAPI.IssueTypeGetParams;
-  export import Issues = IssuesAPI.Issues;
-  export import IssueType = IssuesAPI.IssueType;
-  export import SeverityQueryParam = IssuesAPI.SeverityQueryParam;
-  export import IssueListResponse = IssuesAPI.IssueListResponse;
-  export import IssueClassResponse = IssuesAPI.IssueClassResponse;
-  export import IssueDismissResponse = IssuesAPI.IssueDismissResponse;
-  export import IssueSeverityResponse = IssuesAPI.IssueSeverityResponse;
-  export import IssueTypeResponse = IssuesAPI.IssueTypeResponse;
-  export import IssueListResponsesV4PagePagination = IssuesAPI.IssueListResponsesV4PagePagination;
-  export import IssueListParams = IssuesAPI.IssueListParams;
-  export import IssueClassParams = IssuesAPI.IssueClassParams;
-  export import IssueDismissParams = IssuesAPI.IssueDismissParams;
-  export import IssueSeverityParams = IssuesAPI.IssueSeverityParams;
-  export import IssueTypeParams = IssuesAPI.IssueTypeParams;
+AttackSurfaceReport.IssueTypes = IssueTypes;
+AttackSurfaceReport.Issues = Issues;
+AttackSurfaceReport.IssueListResponsesV4PagePagination = IssueListResponsesV4PagePagination;
+
+export declare namespace AttackSurfaceReport {
+  export {
+    IssueTypes as IssueTypes,
+    type IssueTypeGetResponse as IssueTypeGetResponse,
+    type IssueTypeGetParams as IssueTypeGetParams,
+  };
+
+  export {
+    Issues as Issues,
+    type IssueType as IssueType,
+    type SeverityQueryParam as SeverityQueryParam,
+    type IssueListResponse as IssueListResponse,
+    type IssueClassResponse as IssueClassResponse,
+    type IssueDismissResponse as IssueDismissResponse,
+    type IssueSeverityResponse as IssueSeverityResponse,
+    type IssueTypeResponse as IssueTypeResponse,
+    IssueListResponsesV4PagePagination as IssueListResponsesV4PagePagination,
+    type IssueListParams as IssueListParams,
+    type IssueClassParams as IssueClassParams,
+    type IssueDismissParams as IssueDismissParams,
+    type IssueSeverityParams as IssueSeverityParams,
+    type IssueTypeParams as IssueTypeParams,
+  };
 }
diff --git a/src/resources/intel/attack-surface-report/index.ts b/src/resources/intel/attack-surface-report/index.ts
index da490f9ca2..d820411e8b 100644
--- a/src/resources/intel/attack-surface-report/index.ts
+++ b/src/resources/intel/attack-surface-report/index.ts
@@ -2,19 +2,19 @@
 
 export { AttackSurfaceReport } from './attack-surface-report';
 export {
-  IssueType,
-  SeverityQueryParam,
-  IssueListResponse,
-  IssueClassResponse,
-  IssueDismissResponse,
-  IssueSeverityResponse,
-  IssueTypeResponse,
-  IssueListParams,
-  IssueClassParams,
-  IssueDismissParams,
-  IssueSeverityParams,
-  IssueTypeParams,
   IssueListResponsesV4PagePagination,
   Issues,
+  type IssueType,
+  type SeverityQueryParam,
+  type IssueListResponse,
+  type IssueClassResponse,
+  type IssueDismissResponse,
+  type IssueSeverityResponse,
+  type IssueTypeResponse,
+  type IssueListParams,
+  type IssueClassParams,
+  type IssueDismissParams,
+  type IssueSeverityParams,
+  type IssueTypeParams,
 } from './issues';
-export { IssueTypeGetResponse, IssueTypeGetParams, IssueTypes } from './issue-types';
+export { IssueTypes, type IssueTypeGetResponse, type IssueTypeGetParams } from './issue-types';
diff --git a/src/resources/intel/attack-surface-report/issue-types.ts b/src/resources/intel/attack-surface-report/issue-types.ts
index 941e7530da..169b3c5e81 100644
--- a/src/resources/intel/attack-surface-report/issue-types.ts
+++ b/src/resources/intel/attack-surface-report/issue-types.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as IssueTypesAPI from './issue-types';
 
 export class IssueTypes extends APIResource {
   /**
@@ -28,7 +27,6 @@ export interface IssueTypeGetParams {
   account_id: string;
 }
 
-export namespace IssueTypes {
-  export import IssueTypeGetResponse = IssueTypesAPI.IssueTypeGetResponse;
-  export import IssueTypeGetParams = IssueTypesAPI.IssueTypeGetParams;
+export declare namespace IssueTypes {
+  export { type IssueTypeGetResponse as IssueTypeGetResponse, type IssueTypeGetParams as IssueTypeGetParams };
 }
diff --git a/src/resources/intel/attack-surface-report/issues.ts b/src/resources/intel/attack-surface-report/issues.ts
index 2f5d4067b1..5e8e241f83 100644
--- a/src/resources/intel/attack-surface-report/issues.ts
+++ b/src/resources/intel/attack-surface-report/issues.ts
@@ -44,12 +44,10 @@ export class Issues extends APIResource {
     options?: Core.RequestOptions,
   ): Core.APIPromise<IssueDismissResponse> {
     const { account_id, ...body } = params;
-    return (
-      this._client.put(`/accounts/${account_id}/intel/attack-surface-report/${issueId}/dismiss`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: IssueDismissResponse }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.put(`/accounts/${account_id}/intel/attack-surface-report/${issueId}/dismiss`, {
+      body,
+      ...options,
+    });
   }
 
   /**
@@ -103,62 +101,47 @@ export type SeverityQueryParam = 'low' | 'moderate' | 'critical';
 export type SeverityQueryParamParam = 'low' | 'moderate' | 'critical';
 
 export interface IssueListResponse {
-  errors: Array<Shared.ResponseInfo>;
+  /**
+   * Total number of results
+   */
+  count?: number;
 
-  messages: Array<Shared.ResponseInfo>;
+  issues?: Array<IssueListResponse.Issue>;
 
   /**
-   * Whether the API call was successful
+   * Current page within paginated list of results
    */
-  success: true;
+  page?: number;
 
-  result?: IssueListResponse.Result;
+  /**
+   * Number of results per page of results
+   */
+  per_page?: number;
 }
 
 export namespace IssueListResponse {
-  export interface Result {
-    /**
-     * Total number of results
-     */
-    count?: number;
-
-    issues?: Array<Result.Issue>;
+  export interface Issue {
+    id?: string;
 
-    /**
-     * Current page within paginated list of results
-     */
-    page?: number;
+    dismissed?: boolean;
 
-    /**
-     * Number of results per page of results
-     */
-    per_page?: number;
-  }
-
-  export namespace Result {
-    export interface Issue {
-      id?: string;
-
-      dismissed?: boolean;
-
-      issue_class?: string;
+    issue_class?: string;
 
-      issue_type?: IssuesAPI.IssueType;
+    issue_type?: IssuesAPI.IssueType;
 
-      payload?: unknown;
+    payload?: unknown;
 
-      resolve_link?: string;
+    resolve_link?: string;
 
-      resolve_text?: string;
+    resolve_text?: string;
 
-      severity?: 'Low' | 'Moderate' | 'Critical';
+    severity?: 'Low' | 'Moderate' | 'Critical';
 
-      since?: string;
+    since?: string;
 
-      subject?: string;
+    subject?: string;
 
-      timestamp?: string;
-    }
+    timestamp?: string;
   }
 }
 
@@ -172,7 +155,16 @@ export namespace IssueClassResponse {
   }
 }
 
-export type IssueDismissResponse = unknown | string;
+export interface IssueDismissResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+}
 
 export type IssueSeverityResponse = Array<IssueSeverityResponse.IssueSeverityResponseItem>;
 
@@ -454,18 +446,22 @@ export interface IssueTypeParams {
   'subject~neq'?: Array<string>;
 }
 
-export namespace Issues {
-  export import IssueType = IssuesAPI.IssueType;
-  export import SeverityQueryParam = IssuesAPI.SeverityQueryParam;
-  export import IssueListResponse = IssuesAPI.IssueListResponse;
-  export import IssueClassResponse = IssuesAPI.IssueClassResponse;
-  export import IssueDismissResponse = IssuesAPI.IssueDismissResponse;
-  export import IssueSeverityResponse = IssuesAPI.IssueSeverityResponse;
-  export import IssueTypeResponse = IssuesAPI.IssueTypeResponse;
-  export import IssueListResponsesV4PagePagination = IssuesAPI.IssueListResponsesV4PagePagination;
-  export import IssueListParams = IssuesAPI.IssueListParams;
-  export import IssueClassParams = IssuesAPI.IssueClassParams;
-  export import IssueDismissParams = IssuesAPI.IssueDismissParams;
-  export import IssueSeverityParams = IssuesAPI.IssueSeverityParams;
-  export import IssueTypeParams = IssuesAPI.IssueTypeParams;
+Issues.IssueListResponsesV4PagePagination = IssueListResponsesV4PagePagination;
+
+export declare namespace Issues {
+  export {
+    type IssueType as IssueType,
+    type SeverityQueryParam as SeverityQueryParam,
+    type IssueListResponse as IssueListResponse,
+    type IssueClassResponse as IssueClassResponse,
+    type IssueDismissResponse as IssueDismissResponse,
+    type IssueSeverityResponse as IssueSeverityResponse,
+    type IssueTypeResponse as IssueTypeResponse,
+    IssueListResponsesV4PagePagination as IssueListResponsesV4PagePagination,
+    type IssueListParams as IssueListParams,
+    type IssueClassParams as IssueClassParams,
+    type IssueDismissParams as IssueDismissParams,
+    type IssueSeverityParams as IssueSeverityParams,
+    type IssueTypeParams as IssueTypeParams,
+  };
 }
diff --git a/src/resources/intel/dns.ts b/src/resources/intel/dns.ts
index 79260d4852..d5d834e8a8 100644
--- a/src/resources/intel/dns.ts
+++ b/src/resources/intel/dns.ts
@@ -2,27 +2,22 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as DNSAPI from './dns';
-import * as Shared from '../shared';
 import { V4PagePagination, type V4PagePaginationParams } from '../../pagination';
 
 export class DNS extends APIResource {
   /**
-   * Get Passive DNS by IP
+   * Gets a list of all the domains that have resolved to a specific IP address.
    */
-  list(
-    params: DNSListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<DNSListResponsesV4PagePagination, DNSListResponse> {
+  list(params: DNSListParams, options?: Core.RequestOptions): Core.PagePromise<DNSV4PagePagination, DNS> {
     const { account_id, ...query } = params;
-    return this._client.getAPIList(`/accounts/${account_id}/intel/dns`, DNSListResponsesV4PagePagination, {
+    return this._client.getAPIList(`/accounts/${account_id}/intel/dns`, DNSV4PagePagination, {
       query,
       ...options,
     });
   }
 }
 
-export class DNSListResponsesV4PagePagination extends V4PagePagination<DNSListResponse> {}
+export class DNSV4PagePagination extends V4PagePagination<DNS> {}
 
 export interface DNS {
   /**
@@ -56,7 +51,7 @@ export namespace DNS {
     /**
      * Hostname that the IP was observed resolving to.
      */
-    hostname?: unknown;
+    hostname?: string;
 
     /**
      * Last seen date of the DNS record during the time period.
@@ -65,19 +60,6 @@ export namespace DNS {
   }
 }
 
-export interface DNSListResponse {
-  errors: Array<Shared.ResponseInfo>;
-
-  messages: Array<Shared.ResponseInfo>;
-
-  /**
-   * Whether the API call was successful
-   */
-  success: true;
-
-  result?: DNS;
-}
-
 export interface DNSListParams extends V4PagePaginationParams {
   /**
    * Path param: Identifier
@@ -109,9 +91,8 @@ export namespace DNSListParams {
   }
 }
 
-export namespace DNS {
-  export import DNS = DNSAPI.DNS;
-  export import DNSListResponse = DNSAPI.DNSListResponse;
-  export import DNSListResponsesV4PagePagination = DNSAPI.DNSListResponsesV4PagePagination;
-  export import DNSListParams = DNSAPI.DNSListParams;
+DNS.DNSV4PagePagination = DNSV4PagePagination;
+
+export declare namespace DNS {
+  export { type DNS as DNS, DNSV4PagePagination as DNSV4PagePagination, type DNSListParams as DNSListParams };
 }
diff --git a/src/resources/intel/domain-history.ts b/src/resources/intel/domain-history.ts
index 7321170e22..57dffd0790 100644
--- a/src/resources/intel/domain-history.ts
+++ b/src/resources/intel/domain-history.ts
@@ -2,11 +2,11 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as DomainHistoryAPI from './domain-history';
 
 export class DomainHistoryResource extends APIResource {
   /**
-   * Get Domain History
+   * Gets historical security threat and content categories currently and previously
+   * assigned to a domain.
    */
   get(
     params: DomainHistoryGetParams,
@@ -52,8 +52,10 @@ export interface DomainHistoryGetParams {
   domain?: string;
 }
 
-export namespace DomainHistoryResource {
-  export import DomainHistory = DomainHistoryAPI.DomainHistory;
-  export import DomainHistoryGetResponse = DomainHistoryAPI.DomainHistoryGetResponse;
-  export import DomainHistoryGetParams = DomainHistoryAPI.DomainHistoryGetParams;
+export declare namespace DomainHistoryResource {
+  export {
+    type DomainHistory as DomainHistory,
+    type DomainHistoryGetResponse as DomainHistoryGetResponse,
+    type DomainHistoryGetParams as DomainHistoryGetParams,
+  };
 }
diff --git a/src/resources/intel/domains/bulks.ts b/src/resources/intel/domains/bulks.ts
index 78a72bccdf..46e535cb83 100644
--- a/src/resources/intel/domains/bulks.ts
+++ b/src/resources/intel/domains/bulks.ts
@@ -2,11 +2,10 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as BulksAPI from './bulks';
 
 export class Bulks extends APIResource {
   /**
-   * Get Multiple Domain Details
+   * Same as summary
    */
   get(params: BulkGetParams, options?: Core.RequestOptions): Core.APIPromise<BulkGetResponse | null> {
     const { account_id, ...query } = params;
@@ -33,10 +32,7 @@ export namespace BulkGetResponse {
      */
     application?: BulkGetResponseItem.Application;
 
-    /**
-     * Current content categories.
-     */
-    content_categories?: Array<unknown>;
+    content_categories?: Array<BulkGetResponseItem.ContentCategory>;
 
     domain?: string;
 
@@ -62,7 +58,7 @@ export namespace BulkGetResponse {
      */
     risk_score?: number;
 
-    risk_types?: Array<unknown>;
+    risk_types?: Array<BulkGetResponseItem.RiskType>;
   }
 
   export namespace BulkGetResponseItem {
@@ -85,6 +81,17 @@ export namespace BulkGetResponse {
       name?: string;
     }
 
+    /**
+     * Current content categories.
+     */
+    export interface ContentCategory {
+      id?: number;
+
+      name?: string;
+
+      super_category_id?: number;
+    }
+
     export interface InheritedContentCategory {
       id?: number;
 
@@ -100,6 +107,14 @@ export namespace BulkGetResponse {
 
       super_category_id?: number;
     }
+
+    export interface RiskType {
+      id?: number;
+
+      name?: string;
+
+      super_category_id?: number;
+    }
   }
 }
 
@@ -116,7 +131,6 @@ export interface BulkGetParams {
   domain?: unknown;
 }
 
-export namespace Bulks {
-  export import BulkGetResponse = BulksAPI.BulkGetResponse;
-  export import BulkGetParams = BulksAPI.BulkGetParams;
+export declare namespace Bulks {
+  export { type BulkGetResponse as BulkGetResponse, type BulkGetParams as BulkGetParams };
 }
diff --git a/src/resources/intel/domains/domains.ts b/src/resources/intel/domains/domains.ts
index 5053152dda..9f3b988cc1 100644
--- a/src/resources/intel/domains/domains.ts
+++ b/src/resources/intel/domains/domains.ts
@@ -2,14 +2,14 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as DomainsAPI from './domains';
 import * as BulksAPI from './bulks';
+import { BulkGetParams, BulkGetResponse, Bulks } from './bulks';
 
 export class Domains extends APIResource {
   bulks: BulksAPI.Bulks = new BulksAPI.Bulks(this._client);
 
   /**
-   * Get Domain Details
+   * Gets security details and statistics about a domain.
    */
   get(params: DomainGetParams, options?: Core.RequestOptions): Core.APIPromise<Domain> {
     const { account_id, ...query } = params;
@@ -32,10 +32,7 @@ export interface Domain {
    */
   application?: Domain.Application;
 
-  /**
-   * Current content categories.
-   */
-  content_categories?: Array<unknown>;
+  content_categories?: Array<Domain.ContentCategory>;
 
   domain?: string;
 
@@ -67,7 +64,7 @@ export interface Domain {
    */
   risk_score?: number;
 
-  risk_types?: Array<unknown>;
+  risk_types?: Array<Domain.RiskType>;
 }
 
 export namespace Domain {
@@ -90,6 +87,17 @@ export namespace Domain {
     name?: string;
   }
 
+  /**
+   * Current content categories.
+   */
+  export interface ContentCategory {
+    id?: number;
+
+    name?: string;
+
+    super_category_id?: number;
+  }
+
   export interface InheritedContentCategory {
     id?: number;
 
@@ -118,6 +126,14 @@ export namespace Domain {
      */
     value?: string;
   }
+
+  export interface RiskType {
+    id?: number;
+
+    name?: string;
+
+    super_category_id?: number;
+  }
 }
 
 export interface DomainGetParams {
@@ -132,10 +148,10 @@ export interface DomainGetParams {
   domain?: string;
 }
 
-export namespace Domains {
-  export import Domain = DomainsAPI.Domain;
-  export import DomainGetParams = DomainsAPI.DomainGetParams;
-  export import Bulks = BulksAPI.Bulks;
-  export import BulkGetResponse = BulksAPI.BulkGetResponse;
-  export import BulkGetParams = BulksAPI.BulkGetParams;
+Domains.Bulks = Bulks;
+
+export declare namespace Domains {
+  export { type Domain as Domain, type DomainGetParams as DomainGetParams };
+
+  export { Bulks as Bulks, type BulkGetResponse as BulkGetResponse, type BulkGetParams as BulkGetParams };
 }
diff --git a/src/resources/intel/domains/index.ts b/src/resources/intel/domains/index.ts
index 01ad658f8f..c1e77ab87e 100644
--- a/src/resources/intel/domains/index.ts
+++ b/src/resources/intel/domains/index.ts
@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { BulkGetResponse, BulkGetParams, Bulks } from './bulks';
-export { Domain, DomainGetParams, Domains } from './domains';
+export { Bulks, type BulkGetResponse, type BulkGetParams } from './bulks';
+export { Domains, type Domain, type DomainGetParams } from './domains';
diff --git a/src/resources/intel/index.ts b/src/resources/intel/index.ts
index 8c8dadddaa..aaf903a157 100644
--- a/src/resources/intel/index.ts
+++ b/src/resources/intel/index.ts
@@ -1,36 +1,36 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { ASNGetParams, ASN } from './asn/index';
+export { ASN, type ASNGetParams } from './asn/index';
 export { AttackSurfaceReport } from './attack-surface-report/index';
-export { DNS, DNSListResponse, DNSListParams, DNSListResponsesV4PagePagination } from './dns';
-export { Domain, DomainGetParams, Domains } from './domains/index';
+export { DNSV4PagePagination, DNS, type DNSListParams } from './dns';
 export {
-  DomainHistory,
-  DomainHistoryGetResponse,
-  DomainHistoryGetParams,
   DomainHistoryResource,
+  type DomainHistory,
+  type DomainHistoryGetResponse,
+  type DomainHistoryGetParams,
 } from './domain-history';
-export { IP, IPGetResponse, IPGetParams, IPs } from './ips';
-export { IPList, IPListGetResponse, IPListGetParams, IPLists } from './ip-lists';
+export { Domains, type Domain, type DomainGetParams } from './domains/index';
+export { IPLists, type IPList, type IPListGetResponse, type IPListGetParams } from './ip-lists';
+export { IPs, type IP, type IPGetResponse, type IPGetParams } from './ips';
 export {
-  IndicatorFeedCreateResponse,
-  IndicatorFeedUpdateResponse,
-  IndicatorFeedListResponse,
-  IndicatorFeedDataResponse,
-  IndicatorFeedGetResponse,
-  IndicatorFeedCreateParams,
-  IndicatorFeedUpdateParams,
-  IndicatorFeedListParams,
-  IndicatorFeedDataParams,
-  IndicatorFeedGetParams,
   IndicatorFeedListResponsesSinglePage,
   IndicatorFeeds,
+  type IndicatorFeedCreateResponse,
+  type IndicatorFeedUpdateResponse,
+  type IndicatorFeedListResponse,
+  type IndicatorFeedDataResponse,
+  type IndicatorFeedGetResponse,
+  type IndicatorFeedCreateParams,
+  type IndicatorFeedUpdateParams,
+  type IndicatorFeedListParams,
+  type IndicatorFeedDataParams,
+  type IndicatorFeedGetParams,
 } from './indicator-feeds/index';
 export { Intel } from './intel';
 export {
-  MiscategorizationCreateResponse,
-  MiscategorizationCreateParams,
   Miscategorizations,
+  type MiscategorizationCreateResponse,
+  type MiscategorizationCreateParams,
 } from './miscategorizations';
-export { Sinkhole, SinkholeListParams, SinkholesSinglePage, Sinkholes } from './sinkholes';
-export { Whois, WhoisGetResponse, WhoisGetParams } from './whois';
+export { SinkholesSinglePage, Sinkholes, type Sinkhole, type SinkholeListParams } from './sinkholes';
+export { Whois, type WhoisGetResponse, type WhoisGetParams } from './whois';
diff --git a/src/resources/intel/indicator-feeds/downloads.ts b/src/resources/intel/indicator-feeds/downloads.ts
new file mode 100644
index 0000000000..376e506a1b
--- /dev/null
+++ b/src/resources/intel/indicator-feeds/downloads.ts
@@ -0,0 +1,51 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Downloads extends APIResource {
+  /**
+   * Download indicator feed data
+   */
+  get(
+    feedId: number,
+    params: DownloadGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DownloadGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/intel/indicator_feeds/${feedId}/download`,
+        options,
+      ) as Core.APIPromise<{ result: DownloadGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface DownloadGetResponse {
+  /**
+   * Feed id
+   */
+  file_id?: number;
+
+  /**
+   * Name of the file unified in our system
+   */
+  filename?: string;
+
+  /**
+   * Current status of upload, should be unified
+   */
+  status?: string;
+}
+
+export interface DownloadGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace Downloads {
+  export { type DownloadGetResponse as DownloadGetResponse, type DownloadGetParams as DownloadGetParams };
+}
diff --git a/src/resources/intel/indicator-feeds/index.ts b/src/resources/intel/indicator-feeds/index.ts
index 8efda88792..c9f2ee64de 100644
--- a/src/resources/intel/indicator-feeds/index.ts
+++ b/src/resources/intel/indicator-feeds/index.ts
@@ -1,26 +1,27 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export { Downloads, type DownloadGetResponse, type DownloadGetParams } from './downloads';
 export {
-  IndicatorFeedCreateResponse,
-  IndicatorFeedUpdateResponse,
-  IndicatorFeedListResponse,
-  IndicatorFeedDataResponse,
-  IndicatorFeedGetResponse,
-  IndicatorFeedCreateParams,
-  IndicatorFeedUpdateParams,
-  IndicatorFeedListParams,
-  IndicatorFeedDataParams,
-  IndicatorFeedGetParams,
   IndicatorFeedListResponsesSinglePage,
   IndicatorFeeds,
+  type IndicatorFeedCreateResponse,
+  type IndicatorFeedUpdateResponse,
+  type IndicatorFeedListResponse,
+  type IndicatorFeedDataResponse,
+  type IndicatorFeedGetResponse,
+  type IndicatorFeedCreateParams,
+  type IndicatorFeedUpdateParams,
+  type IndicatorFeedListParams,
+  type IndicatorFeedDataParams,
+  type IndicatorFeedGetParams,
 } from './indicator-feeds';
 export {
-  PermissionCreateResponse,
-  PermissionListResponse,
-  PermissionDeleteResponse,
-  PermissionCreateParams,
-  PermissionListParams,
-  PermissionDeleteParams,
   Permissions,
+  type PermissionCreateResponse,
+  type PermissionListResponse,
+  type PermissionDeleteResponse,
+  type PermissionCreateParams,
+  type PermissionListParams,
+  type PermissionDeleteParams,
 } from './permissions';
-export { SnapshotUpdateResponse, SnapshotUpdateParams, Snapshots } from './snapshots';
+export { Snapshots, type SnapshotUpdateResponse, type SnapshotUpdateParams } from './snapshots';
diff --git a/src/resources/intel/indicator-feeds/indicator-feeds.ts b/src/resources/intel/indicator-feeds/indicator-feeds.ts
index d1dea08ec8..acaa129b7a 100644
--- a/src/resources/intel/indicator-feeds/indicator-feeds.ts
+++ b/src/resources/intel/indicator-feeds/indicator-feeds.ts
@@ -2,14 +2,26 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as IndicatorFeedsAPI from './indicator-feeds';
+import * as DownloadsAPI from './downloads';
+import { DownloadGetParams, DownloadGetResponse, Downloads } from './downloads';
 import * as PermissionsAPI from './permissions';
+import {
+  PermissionCreateParams,
+  PermissionCreateResponse,
+  PermissionDeleteParams,
+  PermissionDeleteResponse,
+  PermissionListParams,
+  PermissionListResponse,
+  Permissions,
+} from './permissions';
 import * as SnapshotsAPI from './snapshots';
+import { SnapshotUpdateParams, SnapshotUpdateResponse, Snapshots } from './snapshots';
 import { SinglePage } from '../../../pagination';
 
 export class IndicatorFeeds extends APIResource {
   snapshots: SnapshotsAPI.Snapshots = new SnapshotsAPI.Snapshots(this._client);
   permissions: PermissionsAPI.Permissions = new PermissionsAPI.Permissions(this._client);
+  downloads: DownloadsAPI.Downloads = new DownloadsAPI.Downloads(this._client);
 
   /**
    * Create new indicator feed
@@ -115,6 +127,11 @@ export interface IndicatorFeedCreateResponse {
    */
   is_attributable?: boolean;
 
+  /**
+   * Whether the indicator feed can be downloaded
+   */
+  is_downloadable?: boolean;
+
   /**
    * Whether the indicator feed is exposed to customers
    */
@@ -152,6 +169,11 @@ export interface IndicatorFeedUpdateResponse {
    */
   is_attributable?: boolean;
 
+  /**
+   * Whether the indicator feed can be downloaded
+   */
+  is_downloadable?: boolean;
+
   /**
    * Whether the indicator feed is exposed to customers
    */
@@ -189,6 +211,11 @@ export interface IndicatorFeedListResponse {
    */
   is_attributable?: boolean;
 
+  /**
+   * Whether the indicator feed can be downloaded
+   */
+  is_downloadable?: boolean;
+
   /**
    * Whether the indicator feed is exposed to customers
    */
@@ -228,6 +255,11 @@ export interface IndicatorFeedGetResponse {
    */
   is_attributable?: boolean;
 
+  /**
+   * Whether the indicator feed can be downloaded
+   */
+  is_downloadable?: boolean;
+
   /**
    * Whether the indicator feed is exposed to customers
    */
@@ -292,6 +324,11 @@ export interface IndicatorFeedUpdateParams {
    */
   is_attributable?: boolean;
 
+  /**
+   * Body param: The new is_downloadable value of the feed
+   */
+  is_downloadable?: boolean;
+
   /**
    * Body param: The new is_public value of the feed
    */
@@ -324,26 +361,45 @@ export interface IndicatorFeedGetParams {
   account_id: string;
 }
 
-export namespace IndicatorFeeds {
-  export import IndicatorFeedCreateResponse = IndicatorFeedsAPI.IndicatorFeedCreateResponse;
-  export import IndicatorFeedUpdateResponse = IndicatorFeedsAPI.IndicatorFeedUpdateResponse;
-  export import IndicatorFeedListResponse = IndicatorFeedsAPI.IndicatorFeedListResponse;
-  export import IndicatorFeedDataResponse = IndicatorFeedsAPI.IndicatorFeedDataResponse;
-  export import IndicatorFeedGetResponse = IndicatorFeedsAPI.IndicatorFeedGetResponse;
-  export import IndicatorFeedListResponsesSinglePage = IndicatorFeedsAPI.IndicatorFeedListResponsesSinglePage;
-  export import IndicatorFeedCreateParams = IndicatorFeedsAPI.IndicatorFeedCreateParams;
-  export import IndicatorFeedUpdateParams = IndicatorFeedsAPI.IndicatorFeedUpdateParams;
-  export import IndicatorFeedListParams = IndicatorFeedsAPI.IndicatorFeedListParams;
-  export import IndicatorFeedDataParams = IndicatorFeedsAPI.IndicatorFeedDataParams;
-  export import IndicatorFeedGetParams = IndicatorFeedsAPI.IndicatorFeedGetParams;
-  export import Snapshots = SnapshotsAPI.Snapshots;
-  export import SnapshotUpdateResponse = SnapshotsAPI.SnapshotUpdateResponse;
-  export import SnapshotUpdateParams = SnapshotsAPI.SnapshotUpdateParams;
-  export import Permissions = PermissionsAPI.Permissions;
-  export import PermissionCreateResponse = PermissionsAPI.PermissionCreateResponse;
-  export import PermissionListResponse = PermissionsAPI.PermissionListResponse;
-  export import PermissionDeleteResponse = PermissionsAPI.PermissionDeleteResponse;
-  export import PermissionCreateParams = PermissionsAPI.PermissionCreateParams;
-  export import PermissionListParams = PermissionsAPI.PermissionListParams;
-  export import PermissionDeleteParams = PermissionsAPI.PermissionDeleteParams;
+IndicatorFeeds.IndicatorFeedListResponsesSinglePage = IndicatorFeedListResponsesSinglePage;
+IndicatorFeeds.Snapshots = Snapshots;
+IndicatorFeeds.Permissions = Permissions;
+IndicatorFeeds.Downloads = Downloads;
+
+export declare namespace IndicatorFeeds {
+  export {
+    type IndicatorFeedCreateResponse as IndicatorFeedCreateResponse,
+    type IndicatorFeedUpdateResponse as IndicatorFeedUpdateResponse,
+    type IndicatorFeedListResponse as IndicatorFeedListResponse,
+    type IndicatorFeedDataResponse as IndicatorFeedDataResponse,
+    type IndicatorFeedGetResponse as IndicatorFeedGetResponse,
+    IndicatorFeedListResponsesSinglePage as IndicatorFeedListResponsesSinglePage,
+    type IndicatorFeedCreateParams as IndicatorFeedCreateParams,
+    type IndicatorFeedUpdateParams as IndicatorFeedUpdateParams,
+    type IndicatorFeedListParams as IndicatorFeedListParams,
+    type IndicatorFeedDataParams as IndicatorFeedDataParams,
+    type IndicatorFeedGetParams as IndicatorFeedGetParams,
+  };
+
+  export {
+    Snapshots as Snapshots,
+    type SnapshotUpdateResponse as SnapshotUpdateResponse,
+    type SnapshotUpdateParams as SnapshotUpdateParams,
+  };
+
+  export {
+    Permissions as Permissions,
+    type PermissionCreateResponse as PermissionCreateResponse,
+    type PermissionListResponse as PermissionListResponse,
+    type PermissionDeleteResponse as PermissionDeleteResponse,
+    type PermissionCreateParams as PermissionCreateParams,
+    type PermissionListParams as PermissionListParams,
+    type PermissionDeleteParams as PermissionDeleteParams,
+  };
+
+  export {
+    Downloads as Downloads,
+    type DownloadGetResponse as DownloadGetResponse,
+    type DownloadGetParams as DownloadGetParams,
+  };
 }
diff --git a/src/resources/intel/indicator-feeds/permissions.ts b/src/resources/intel/indicator-feeds/permissions.ts
index d501b9885c..8625ee3ae1 100644
--- a/src/resources/intel/indicator-feeds/permissions.ts
+++ b/src/resources/intel/indicator-feeds/permissions.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as PermissionsAPI from './permissions';
 
 export class Permissions extends APIResource {
   /**
@@ -77,6 +76,11 @@ export namespace PermissionListResponse {
      */
     is_attributable?: boolean;
 
+    /**
+     * Whether the indicator feed can be downloaded
+     */
+    is_downloadable?: boolean;
+
     /**
      * Whether the indicator feed is exposed to customers
      */
@@ -137,11 +141,13 @@ export interface PermissionDeleteParams {
   feed_id?: number;
 }
 
-export namespace Permissions {
-  export import PermissionCreateResponse = PermissionsAPI.PermissionCreateResponse;
-  export import PermissionListResponse = PermissionsAPI.PermissionListResponse;
-  export import PermissionDeleteResponse = PermissionsAPI.PermissionDeleteResponse;
-  export import PermissionCreateParams = PermissionsAPI.PermissionCreateParams;
-  export import PermissionListParams = PermissionsAPI.PermissionListParams;
-  export import PermissionDeleteParams = PermissionsAPI.PermissionDeleteParams;
+export declare namespace Permissions {
+  export {
+    type PermissionCreateResponse as PermissionCreateResponse,
+    type PermissionListResponse as PermissionListResponse,
+    type PermissionDeleteResponse as PermissionDeleteResponse,
+    type PermissionCreateParams as PermissionCreateParams,
+    type PermissionListParams as PermissionListParams,
+    type PermissionDeleteParams as PermissionDeleteParams,
+  };
 }
diff --git a/src/resources/intel/indicator-feeds/snapshots.ts b/src/resources/intel/indicator-feeds/snapshots.ts
index 11e57f0322..cd7b91d0e0 100644
--- a/src/resources/intel/indicator-feeds/snapshots.ts
+++ b/src/resources/intel/indicator-feeds/snapshots.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as SnapshotsAPI from './snapshots';
 
 export class Snapshots extends APIResource {
   /**
@@ -52,7 +51,9 @@ export interface SnapshotUpdateParams {
   source?: string;
 }
 
-export namespace Snapshots {
-  export import SnapshotUpdateResponse = SnapshotsAPI.SnapshotUpdateResponse;
-  export import SnapshotUpdateParams = SnapshotsAPI.SnapshotUpdateParams;
+export declare namespace Snapshots {
+  export {
+    type SnapshotUpdateResponse as SnapshotUpdateResponse,
+    type SnapshotUpdateParams as SnapshotUpdateParams,
+  };
 }
diff --git a/src/resources/intel/intel.ts b/src/resources/intel/intel.ts
index 0e079b060e..d2279d8198 100644
--- a/src/resources/intel/intel.ts
+++ b/src/resources/intel/intel.ts
@@ -2,16 +2,49 @@
 
 import { APIResource } from '../../resource';
 import * as DNSAPI from './dns';
+import { DNS, DNSListParams, DNSV4PagePagination } from './dns';
 import * as DomainHistoryAPI from './domain-history';
+import {
+  DomainHistory,
+  DomainHistoryGetParams,
+  DomainHistoryGetResponse,
+  DomainHistoryResource,
+} from './domain-history';
 import * as IPListsAPI from './ip-lists';
+import { IPList, IPListGetParams, IPListGetResponse, IPLists } from './ip-lists';
 import * as IPsAPI from './ips';
+import { IP, IPGetParams, IPGetResponse, IPs } from './ips';
 import * as MiscategorizationsAPI from './miscategorizations';
+import {
+  MiscategorizationCreateParams,
+  MiscategorizationCreateResponse,
+  Miscategorizations,
+} from './miscategorizations';
 import * as SinkholesAPI from './sinkholes';
+import { Sinkhole, SinkholeListParams, Sinkholes, SinkholesSinglePage } from './sinkholes';
 import * as WhoisAPI from './whois';
+import { Whois, WhoisGetParams, WhoisGetResponse } from './whois';
 import * as ASNAPI from './asn/asn';
+import { ASN, ASNGetParams } from './asn/asn';
 import * as AttackSurfaceReportAPI from './attack-surface-report/attack-surface-report';
+import { AttackSurfaceReport } from './attack-surface-report/attack-surface-report';
 import * as DomainsAPI from './domains/domains';
+import { Domain, DomainGetParams, Domains } from './domains/domains';
 import * as IndicatorFeedsAPI from './indicator-feeds/indicator-feeds';
+import {
+  IndicatorFeedCreateParams,
+  IndicatorFeedCreateResponse,
+  IndicatorFeedDataParams,
+  IndicatorFeedDataResponse,
+  IndicatorFeedGetParams,
+  IndicatorFeedGetResponse,
+  IndicatorFeedListParams,
+  IndicatorFeedListResponse,
+  IndicatorFeedListResponsesSinglePage,
+  IndicatorFeedUpdateParams,
+  IndicatorFeedUpdateResponse,
+  IndicatorFeeds,
+} from './indicator-feeds/indicator-feeds';
 
 export class Intel extends APIResource {
   asn: ASNAPI.ASN = new ASNAPI.ASN(this._client);
@@ -32,49 +65,75 @@ export class Intel extends APIResource {
     new AttackSurfaceReportAPI.AttackSurfaceReport(this._client);
 }
 
-export namespace Intel {
-  export import ASN = ASNAPI.ASN;
-  export import ASNGetParams = ASNAPI.ASNGetParams;
-  export import DNS = DNSAPI.DNS;
-  export import DNSListResponse = DNSAPI.DNSListResponse;
-  export import DNSListResponsesV4PagePagination = DNSAPI.DNSListResponsesV4PagePagination;
-  export import DNSListParams = DNSAPI.DNSListParams;
-  export import Domains = DomainsAPI.Domains;
-  export import Domain = DomainsAPI.Domain;
-  export import DomainGetParams = DomainsAPI.DomainGetParams;
-  export import DomainHistoryResource = DomainHistoryAPI.DomainHistoryResource;
-  export import DomainHistory = DomainHistoryAPI.DomainHistory;
-  export import DomainHistoryGetResponse = DomainHistoryAPI.DomainHistoryGetResponse;
-  export import DomainHistoryGetParams = DomainHistoryAPI.DomainHistoryGetParams;
-  export import IPs = IPsAPI.IPs;
-  export import IP = IPsAPI.IP;
-  export import IPGetResponse = IPsAPI.IPGetResponse;
-  export import IPGetParams = IPsAPI.IPGetParams;
-  export import IPLists = IPListsAPI.IPLists;
-  export import IPList = IPListsAPI.IPList;
-  export import IPListGetResponse = IPListsAPI.IPListGetResponse;
-  export import IPListGetParams = IPListsAPI.IPListGetParams;
-  export import Miscategorizations = MiscategorizationsAPI.Miscategorizations;
-  export import MiscategorizationCreateResponse = MiscategorizationsAPI.MiscategorizationCreateResponse;
-  export import MiscategorizationCreateParams = MiscategorizationsAPI.MiscategorizationCreateParams;
-  export import Whois = WhoisAPI.Whois;
-  export import WhoisGetResponse = WhoisAPI.WhoisGetResponse;
-  export import WhoisGetParams = WhoisAPI.WhoisGetParams;
-  export import IndicatorFeeds = IndicatorFeedsAPI.IndicatorFeeds;
-  export import IndicatorFeedCreateResponse = IndicatorFeedsAPI.IndicatorFeedCreateResponse;
-  export import IndicatorFeedUpdateResponse = IndicatorFeedsAPI.IndicatorFeedUpdateResponse;
-  export import IndicatorFeedListResponse = IndicatorFeedsAPI.IndicatorFeedListResponse;
-  export import IndicatorFeedDataResponse = IndicatorFeedsAPI.IndicatorFeedDataResponse;
-  export import IndicatorFeedGetResponse = IndicatorFeedsAPI.IndicatorFeedGetResponse;
-  export import IndicatorFeedListResponsesSinglePage = IndicatorFeedsAPI.IndicatorFeedListResponsesSinglePage;
-  export import IndicatorFeedCreateParams = IndicatorFeedsAPI.IndicatorFeedCreateParams;
-  export import IndicatorFeedUpdateParams = IndicatorFeedsAPI.IndicatorFeedUpdateParams;
-  export import IndicatorFeedListParams = IndicatorFeedsAPI.IndicatorFeedListParams;
-  export import IndicatorFeedDataParams = IndicatorFeedsAPI.IndicatorFeedDataParams;
-  export import IndicatorFeedGetParams = IndicatorFeedsAPI.IndicatorFeedGetParams;
-  export import Sinkholes = SinkholesAPI.Sinkholes;
-  export import Sinkhole = SinkholesAPI.Sinkhole;
-  export import SinkholesSinglePage = SinkholesAPI.SinkholesSinglePage;
-  export import SinkholeListParams = SinkholesAPI.SinkholeListParams;
-  export import AttackSurfaceReport = AttackSurfaceReportAPI.AttackSurfaceReport;
+Intel.ASN = ASN;
+Intel.DNSV4PagePagination = DNSV4PagePagination;
+Intel.Domains = Domains;
+Intel.DomainHistoryResource = DomainHistoryResource;
+Intel.IPs = IPs;
+Intel.IPLists = IPLists;
+Intel.Miscategorizations = Miscategorizations;
+Intel.IndicatorFeeds = IndicatorFeeds;
+Intel.IndicatorFeedListResponsesSinglePage = IndicatorFeedListResponsesSinglePage;
+Intel.Sinkholes = Sinkholes;
+Intel.SinkholesSinglePage = SinkholesSinglePage;
+Intel.AttackSurfaceReport = AttackSurfaceReport;
+
+export declare namespace Intel {
+  export { ASN as ASN, type ASNGetParams as ASNGetParams };
+
+  export { type DNS as DNS, DNSV4PagePagination as DNSV4PagePagination, type DNSListParams as DNSListParams };
+
+  export { Domains as Domains, type Domain as Domain, type DomainGetParams as DomainGetParams };
+
+  export {
+    DomainHistoryResource as DomainHistoryResource,
+    type DomainHistory as DomainHistory,
+    type DomainHistoryGetResponse as DomainHistoryGetResponse,
+    type DomainHistoryGetParams as DomainHistoryGetParams,
+  };
+
+  export { IPs as IPs, type IP as IP, type IPGetResponse as IPGetResponse, type IPGetParams as IPGetParams };
+
+  export {
+    IPLists as IPLists,
+    type IPList as IPList,
+    type IPListGetResponse as IPListGetResponse,
+    type IPListGetParams as IPListGetParams,
+  };
+
+  export {
+    Miscategorizations as Miscategorizations,
+    type MiscategorizationCreateResponse as MiscategorizationCreateResponse,
+    type MiscategorizationCreateParams as MiscategorizationCreateParams,
+  };
+
+  export {
+    type Whois as Whois,
+    type WhoisGetResponse as WhoisGetResponse,
+    type WhoisGetParams as WhoisGetParams,
+  };
+
+  export {
+    IndicatorFeeds as IndicatorFeeds,
+    type IndicatorFeedCreateResponse as IndicatorFeedCreateResponse,
+    type IndicatorFeedUpdateResponse as IndicatorFeedUpdateResponse,
+    type IndicatorFeedListResponse as IndicatorFeedListResponse,
+    type IndicatorFeedDataResponse as IndicatorFeedDataResponse,
+    type IndicatorFeedGetResponse as IndicatorFeedGetResponse,
+    IndicatorFeedListResponsesSinglePage as IndicatorFeedListResponsesSinglePage,
+    type IndicatorFeedCreateParams as IndicatorFeedCreateParams,
+    type IndicatorFeedUpdateParams as IndicatorFeedUpdateParams,
+    type IndicatorFeedListParams as IndicatorFeedListParams,
+    type IndicatorFeedDataParams as IndicatorFeedDataParams,
+    type IndicatorFeedGetParams as IndicatorFeedGetParams,
+  };
+
+  export {
+    Sinkholes as Sinkholes,
+    type Sinkhole as Sinkhole,
+    SinkholesSinglePage as SinkholesSinglePage,
+    type SinkholeListParams as SinkholeListParams,
+  };
+
+  export { AttackSurfaceReport as AttackSurfaceReport };
 }
diff --git a/src/resources/intel/ip-lists.ts b/src/resources/intel/ip-lists.ts
index bb2d323170..633a6716c0 100644
--- a/src/resources/intel/ip-lists.ts
+++ b/src/resources/intel/ip-lists.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as IPListsAPI from './ip-lists';
 
 export class IPLists extends APIResource {
   /**
@@ -35,8 +34,10 @@ export interface IPListGetParams {
   account_id: string;
 }
 
-export namespace IPLists {
-  export import IPList = IPListsAPI.IPList;
-  export import IPListGetResponse = IPListsAPI.IPListGetResponse;
-  export import IPListGetParams = IPListsAPI.IPListGetParams;
+export declare namespace IPLists {
+  export {
+    type IPList as IPList,
+    type IPListGetResponse as IPListGetResponse,
+    type IPListGetParams as IPListGetParams,
+  };
 }
diff --git a/src/resources/intel/ips.ts b/src/resources/intel/ips.ts
index 79bcf0d8c0..0e86d2270a 100644
--- a/src/resources/intel/ips.ts
+++ b/src/resources/intel/ips.ts
@@ -2,11 +2,11 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as IPsAPI from './ips';
 
 export class IPs extends APIResource {
   /**
-   * Get IP Overview
+   * Gets the geolocation, ASN, infrastructure type of the ASN, and any security
+   * threat categories of an IP address.
    */
   get(params: IPGetParams, options?: Core.RequestOptions): Core.APIPromise<IPGetResponse | null> {
     const { account_id, ...query } = params;
@@ -25,9 +25,9 @@ export interface IP {
    */
   belongs_to_ref?: IP.BelongsToRef;
 
-  ip?: string | string;
+  ip?: string;
 
-  risk_types?: Array<unknown>;
+  risk_types?: Array<IP.RiskType>;
 }
 
 export namespace IP {
@@ -49,6 +49,14 @@ export namespace IP {
 
     value?: string;
   }
+
+  export interface RiskType {
+    id?: number;
+
+    name?: string;
+
+    super_category_id?: number;
+  }
 }
 
 export type IPGetResponse = Array<IP>;
@@ -70,8 +78,6 @@ export interface IPGetParams {
   ipv6?: string;
 }
 
-export namespace IPs {
-  export import IP = IPsAPI.IP;
-  export import IPGetResponse = IPsAPI.IPGetResponse;
-  export import IPGetParams = IPsAPI.IPGetParams;
+export declare namespace IPs {
+  export { type IP as IP, type IPGetResponse as IPGetResponse, type IPGetParams as IPGetParams };
 }
diff --git a/src/resources/intel/miscategorizations.ts b/src/resources/intel/miscategorizations.ts
index 2bec93ec3b..077bfb7a0e 100644
--- a/src/resources/intel/miscategorizations.ts
+++ b/src/resources/intel/miscategorizations.ts
@@ -2,27 +2,31 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as MiscategorizationsAPI from './miscategorizations';
+import * as Shared from '../shared';
 
 export class Miscategorizations extends APIResource {
   /**
-   * Create Miscategorization
+   * Allows you to submit requests to change a domain’s category.
    */
   create(
     params: MiscategorizationCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<MiscategorizationCreateResponse> {
     const { account_id, ...body } = params;
-    return (
-      this._client.post(`/accounts/${account_id}/intel/miscategorization`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: MiscategorizationCreateResponse }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.post(`/accounts/${account_id}/intel/miscategorization`, { body, ...options });
   }
 }
 
-export type MiscategorizationCreateResponse = unknown | string;
+export interface MiscategorizationCreateResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+}
 
 export interface MiscategorizationCreateParams {
   /**
@@ -48,7 +52,7 @@ export interface MiscategorizationCreateParams {
   /**
    * Body param: Provide only if indicator_type is `ipv4` or `ipv6`.
    */
-  ip?: unknown;
+  ip?: string | null;
 
   /**
    * Body param: Security category IDs to add.
@@ -68,7 +72,9 @@ export interface MiscategorizationCreateParams {
   url?: string;
 }
 
-export namespace Miscategorizations {
-  export import MiscategorizationCreateResponse = MiscategorizationsAPI.MiscategorizationCreateResponse;
-  export import MiscategorizationCreateParams = MiscategorizationsAPI.MiscategorizationCreateParams;
+export declare namespace Miscategorizations {
+  export {
+    type MiscategorizationCreateResponse as MiscategorizationCreateResponse,
+    type MiscategorizationCreateParams as MiscategorizationCreateParams,
+  };
 }
diff --git a/src/resources/intel/sinkholes.ts b/src/resources/intel/sinkholes.ts
index 4f2e3f86bb..d28caf0fbb 100644
--- a/src/resources/intel/sinkholes.ts
+++ b/src/resources/intel/sinkholes.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SinkholesAPI from './sinkholes';
 import { SinglePage } from '../../pagination';
 
 export class Sinkholes extends APIResource {
@@ -64,8 +63,12 @@ export interface SinkholeListParams {
   account_id: string;
 }
 
-export namespace Sinkholes {
-  export import Sinkhole = SinkholesAPI.Sinkhole;
-  export import SinkholesSinglePage = SinkholesAPI.SinkholesSinglePage;
-  export import SinkholeListParams = SinkholesAPI.SinkholeListParams;
+Sinkholes.SinkholesSinglePage = SinkholesSinglePage;
+
+export declare namespace Sinkholes {
+  export {
+    type Sinkhole as Sinkhole,
+    SinkholesSinglePage as SinkholesSinglePage,
+    type SinkholeListParams as SinkholeListParams,
+  };
 }
diff --git a/src/resources/intel/whois.ts b/src/resources/intel/whois.ts
index 2bdcd10760..bf94dab574 100644
--- a/src/resources/intel/whois.ts
+++ b/src/resources/intel/whois.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as WhoisAPI from './whois';
 
 export class Whois extends APIResource {
   /**
@@ -226,8 +225,10 @@ export interface WhoisGetParams {
   domain?: string;
 }
 
-export namespace Whois {
-  export import Whois = WhoisAPI.Whois;
-  export import WhoisGetResponse = WhoisAPI.WhoisGetResponse;
-  export import WhoisGetParams = WhoisAPI.WhoisGetParams;
+export declare namespace Whois {
+  export {
+    type Whois as Whois,
+    type WhoisGetResponse as WhoisGetResponse,
+    type WhoisGetParams as WhoisGetParams,
+  };
 }
diff --git a/src/resources/keyless-certificates.ts b/src/resources/keyless-certificates.ts
index c629a8f0f9..11fca9e12a 100644
--- a/src/resources/keyless-certificates.ts
+++ b/src/resources/keyless-certificates.ts
@@ -126,7 +126,7 @@ export interface KeylessCertificate {
    * Available permissions for the Keyless SSL for the current user requesting the
    * item.
    */
-  permissions: Array<unknown>;
+  permissions: Array<string>;
 
   /**
    * The keyless SSL port used to communicate between Cloudflare and the client's
diff --git a/src/resources/kv/index.ts b/src/resources/kv/index.ts
index ecc5cc36fe..a8c5f15acb 100644
--- a/src/resources/kv/index.ts
+++ b/src/resources/kv/index.ts
@@ -2,14 +2,18 @@
 
 export { KV } from './kv';
 export {
-  Namespace,
-  NamespaceUpdateResponse,
-  NamespaceDeleteResponse,
-  NamespaceCreateParams,
-  NamespaceUpdateParams,
-  NamespaceListParams,
-  NamespaceDeleteParams,
-  NamespaceGetParams,
   NamespacesV4PagePaginationArray,
   Namespaces,
+  type Namespace,
+  type NamespaceUpdateResponse,
+  type NamespaceDeleteResponse,
+  type NamespaceBulkDeleteResponse,
+  type NamespaceBulkUpdateResponse,
+  type NamespaceCreateParams,
+  type NamespaceUpdateParams,
+  type NamespaceListParams,
+  type NamespaceDeleteParams,
+  type NamespaceBulkDeleteParams,
+  type NamespaceBulkUpdateParams,
+  type NamespaceGetParams,
 } from './namespaces/index';
diff --git a/src/resources/kv/kv.ts b/src/resources/kv/kv.ts
index d68cc9a01c..15034b22f4 100644
--- a/src/resources/kv/kv.ts
+++ b/src/resources/kv/kv.ts
@@ -2,20 +2,45 @@
 
 import { APIResource } from '../../resource';
 import * as NamespacesAPI from './namespaces/namespaces';
+import {
+  Namespace,
+  NamespaceBulkDeleteParams,
+  NamespaceBulkDeleteResponse,
+  NamespaceBulkUpdateParams,
+  NamespaceBulkUpdateResponse,
+  NamespaceCreateParams,
+  NamespaceDeleteParams,
+  NamespaceDeleteResponse,
+  NamespaceGetParams,
+  NamespaceListParams,
+  NamespaceUpdateParams,
+  NamespaceUpdateResponse,
+  Namespaces,
+  NamespacesV4PagePaginationArray,
+} from './namespaces/namespaces';
 
 export class KV extends APIResource {
   namespaces: NamespacesAPI.Namespaces = new NamespacesAPI.Namespaces(this._client);
 }
 
-export namespace KV {
-  export import Namespaces = NamespacesAPI.Namespaces;
-  export import Namespace = NamespacesAPI.Namespace;
-  export import NamespaceUpdateResponse = NamespacesAPI.NamespaceUpdateResponse;
-  export import NamespaceDeleteResponse = NamespacesAPI.NamespaceDeleteResponse;
-  export import NamespacesV4PagePaginationArray = NamespacesAPI.NamespacesV4PagePaginationArray;
-  export import NamespaceCreateParams = NamespacesAPI.NamespaceCreateParams;
-  export import NamespaceUpdateParams = NamespacesAPI.NamespaceUpdateParams;
-  export import NamespaceListParams = NamespacesAPI.NamespaceListParams;
-  export import NamespaceDeleteParams = NamespacesAPI.NamespaceDeleteParams;
-  export import NamespaceGetParams = NamespacesAPI.NamespaceGetParams;
+KV.Namespaces = Namespaces;
+KV.NamespacesV4PagePaginationArray = NamespacesV4PagePaginationArray;
+
+export declare namespace KV {
+  export {
+    Namespaces as Namespaces,
+    type Namespace as Namespace,
+    type NamespaceUpdateResponse as NamespaceUpdateResponse,
+    type NamespaceDeleteResponse as NamespaceDeleteResponse,
+    type NamespaceBulkDeleteResponse as NamespaceBulkDeleteResponse,
+    type NamespaceBulkUpdateResponse as NamespaceBulkUpdateResponse,
+    NamespacesV4PagePaginationArray as NamespacesV4PagePaginationArray,
+    type NamespaceCreateParams as NamespaceCreateParams,
+    type NamespaceUpdateParams as NamespaceUpdateParams,
+    type NamespaceListParams as NamespaceListParams,
+    type NamespaceDeleteParams as NamespaceDeleteParams,
+    type NamespaceBulkDeleteParams as NamespaceBulkDeleteParams,
+    type NamespaceBulkUpdateParams as NamespaceBulkUpdateParams,
+    type NamespaceGetParams as NamespaceGetParams,
+  };
 }
diff --git a/src/resources/storage/analytics.ts b/src/resources/kv/namespaces/analytics.ts
similarity index 91%
rename from src/resources/storage/analytics.ts
rename to src/resources/kv/namespaces/analytics.ts
index 65ec67714b..d996fc4ccb 100644
--- a/src/resources/storage/analytics.ts
+++ b/src/resources/kv/namespaces/analytics.ts
@@ -1,8 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as AnalyticsAPI from './analytics';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
 
 export class Analytics extends APIResource {
   /**
@@ -47,12 +46,12 @@ export interface Components {
   /**
    * Maximum results for each metric.
    */
-  max: unknown;
+  max: Record<string, number>;
 
   /**
    * Minimum results for each metric.
    */
-  min: unknown;
+  min: Record<string, number>;
 
   /**
    * For specifying result metrics.
@@ -67,7 +66,12 @@ export interface Components {
   /**
    * Total results for metrics across all data.
    */
-  totals: unknown;
+  totals: Record<string, number>;
+
+  /**
+   * Time interval buckets by beginning and ending
+   */
+  time_intervals?: Array<Array<string>>;
 }
 
 export namespace Components {
@@ -75,7 +79,9 @@ export namespace Components {
     /**
      * List of metrics returned by the query.
      */
-    metrics: Array<unknown>;
+    metrics: Array<Array<number>>;
+
+    dimensions?: Array<string>;
   }
 
   /**
@@ -125,7 +131,7 @@ export namespace Components {
      * Array of dimensions or metrics to sort by, each dimension/metric may be prefixed
      * by - (descending) or + (ascending).
      */
-    sort?: Array<unknown>;
+    sort?: Array<string>;
 
     /**
      * End of time interval to query, defaults to current time.
@@ -149,12 +155,12 @@ export interface Schema {
   /**
    * Maximum results for each metric.
    */
-  max: unknown;
+  max: Record<string, number>;
 
   /**
    * Minimum results for each metric.
    */
-  min: unknown;
+  min: Record<string, number>;
 
   /**
    * For specifying result metrics.
@@ -169,7 +175,12 @@ export interface Schema {
   /**
    * Total results for metrics across all data.
    */
-  totals: unknown;
+  totals: Record<string, number>;
+
+  /**
+   * Time interval buckets by beginning and ending
+   */
+  time_intervals?: Array<Array<string>>;
 }
 
 export namespace Schema {
@@ -177,7 +188,9 @@ export namespace Schema {
     /**
      * List of metrics returned by the query.
      */
-    metrics: Array<unknown>;
+    metrics: Array<Array<number>>;
+
+    dimensions?: Array<string>;
   }
 
   /**
@@ -227,7 +240,7 @@ export namespace Schema {
      * Array of dimensions or metrics to sort by, each dimension/metric may be prefixed
      * by - (descending) or + (ascending).
      */
-    sort?: Array<unknown>;
+    sort?: Array<string>;
 
     /**
      * End of time interval to query, defaults to current time.
@@ -296,7 +309,7 @@ export namespace AnalyticsListParams {
      * Array of dimensions or metrics to sort by, each dimension/metric may be prefixed
      * by - (descending) or + (ascending).
      */
-    sort?: Array<unknown>;
+    sort?: Array<string>;
 
     /**
      * End of time interval to query, defaults to current time.
@@ -365,7 +378,7 @@ export namespace AnalyticsStoredParams {
      * Array of dimensions or metrics to sort by, each dimension/metric may be prefixed
      * by - (descending) or + (ascending).
      */
-    sort?: Array<unknown>;
+    sort?: Array<string>;
 
     /**
      * End of time interval to query, defaults to current time.
@@ -374,9 +387,11 @@ export namespace AnalyticsStoredParams {
   }
 }
 
-export namespace Analytics {
-  export import Components = AnalyticsAPI.Components;
-  export import Schema = AnalyticsAPI.Schema;
-  export import AnalyticsListParams = AnalyticsAPI.AnalyticsListParams;
-  export import AnalyticsStoredParams = AnalyticsAPI.AnalyticsStoredParams;
+export declare namespace Analytics {
+  export {
+    type Components as Components,
+    type Schema as Schema,
+    type AnalyticsListParams as AnalyticsListParams,
+    type AnalyticsStoredParams as AnalyticsStoredParams,
+  };
 }
diff --git a/src/resources/kv/namespaces/bulk.ts b/src/resources/kv/namespaces/bulk.ts
deleted file mode 100644
index ed8f88a230..0000000000
--- a/src/resources/kv/namespaces/bulk.ts
+++ /dev/null
@@ -1,116 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../resource';
-import * as Core from '../../../core';
-import * as BulkAPI from './bulk';
-
-export class Bulk extends APIResource {
-  /**
-   * Write multiple keys and values at once. Body should be an array of up to 10,000
-   * key-value pairs to be stored, along with optional expiration information.
-   * Existing values and expirations will be overwritten. If neither `expiration` nor
-   * `expiration_ttl` is specified, the key-value pair will never expire. If both are
-   * set, `expiration_ttl` is used and `expiration` is ignored. The entire request
-   * size must be 100 megabytes or less.
-   */
-  update(
-    namespaceId: string,
-    params: BulkUpdateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<BulkUpdateResponse | null> {
-    const { account_id, body } = params;
-    return (
-      this._client.put(`/accounts/${account_id}/storage/kv/namespaces/${namespaceId}/bulk`, {
-        body: body,
-        ...options,
-      }) as Core.APIPromise<{ result: BulkUpdateResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Remove multiple KV pairs from the namespace. Body should be an array of up to
-   * 10,000 keys to be removed.
-   */
-  delete(
-    namespaceId: string,
-    params: BulkDeleteParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<BulkDeleteResponse | null> {
-    const { account_id } = params;
-    return (
-      this._client.delete(
-        `/accounts/${account_id}/storage/kv/namespaces/${namespaceId}/bulk`,
-        options,
-      ) as Core.APIPromise<{ result: BulkDeleteResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export interface BulkUpdateResponse {}
-
-export interface BulkDeleteResponse {}
-
-export interface BulkUpdateParams {
-  /**
-   * Path param: Identifier
-   */
-  account_id: string;
-
-  /**
-   * Body param:
-   */
-  body: Array<BulkUpdateParams.Body>;
-}
-
-export namespace BulkUpdateParams {
-  export interface Body {
-    /**
-     * Whether or not the server should base64 decode the value before storing it.
-     * Useful for writing values that wouldn't otherwise be valid JSON strings, such as
-     * images.
-     */
-    base64?: boolean;
-
-    /**
-     * The time, measured in number of seconds since the UNIX epoch, at which the key
-     * should expire.
-     */
-    expiration?: number;
-
-    /**
-     * The number of seconds for which the key should be visible before it expires. At
-     * least 60.
-     */
-    expiration_ttl?: number;
-
-    /**
-     * A key's name. The name may be at most 512 bytes. All printable, non-whitespace
-     * characters are valid.
-     */
-    key?: string;
-
-    /**
-     * Arbitrary JSON that is associated with a key.
-     */
-    metadata?: Record<string, unknown>;
-
-    /**
-     * A UTF-8 encoded string to be stored, up to 25 MiB in length.
-     */
-    value?: string;
-  }
-}
-
-export interface BulkDeleteParams {
-  /**
-   * Identifier
-   */
-  account_id: string;
-}
-
-export namespace Bulk {
-  export import BulkUpdateResponse = BulkAPI.BulkUpdateResponse;
-  export import BulkDeleteResponse = BulkAPI.BulkDeleteResponse;
-  export import BulkUpdateParams = BulkAPI.BulkUpdateParams;
-  export import BulkDeleteParams = BulkAPI.BulkDeleteParams;
-}
diff --git a/src/resources/kv/namespaces/index.ts b/src/resources/kv/namespaces/index.ts
index 1fa99eaa8b..1dc1c6409a 100644
--- a/src/resources/kv/namespaces/index.ts
+++ b/src/resources/kv/namespaces/index.ts
@@ -1,25 +1,35 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { BulkUpdateResponse, BulkDeleteResponse, BulkUpdateParams, BulkDeleteParams, Bulk } from './bulk';
-export { Key, KeyListParams, KeysCursorLimitPagination, Keys } from './keys';
-export { MetadataGetResponse, MetadataGetParams, Metadata } from './metadata';
 export {
-  Namespace,
-  NamespaceUpdateResponse,
-  NamespaceDeleteResponse,
-  NamespaceCreateParams,
-  NamespaceUpdateParams,
-  NamespaceListParams,
-  NamespaceDeleteParams,
-  NamespaceGetParams,
+  Analytics,
+  type Components,
+  type Schema,
+  type AnalyticsListParams,
+  type AnalyticsStoredParams,
+} from './analytics';
+export { KeysCursorLimitPagination, Keys, type Key, type KeyListParams } from './keys';
+export { Metadata, type MetadataGetResponse, type MetadataGetParams } from './metadata';
+export {
   NamespacesV4PagePaginationArray,
   Namespaces,
+  type Namespace,
+  type NamespaceUpdateResponse,
+  type NamespaceDeleteResponse,
+  type NamespaceBulkDeleteResponse,
+  type NamespaceBulkUpdateResponse,
+  type NamespaceCreateParams,
+  type NamespaceUpdateParams,
+  type NamespaceListParams,
+  type NamespaceDeleteParams,
+  type NamespaceBulkDeleteParams,
+  type NamespaceBulkUpdateParams,
+  type NamespaceGetParams,
 } from './namespaces';
 export {
-  ValueUpdateResponse,
-  ValueDeleteResponse,
-  ValueUpdateParams,
-  ValueDeleteParams,
-  ValueGetParams,
   Values,
+  type ValueUpdateResponse,
+  type ValueDeleteResponse,
+  type ValueUpdateParams,
+  type ValueDeleteParams,
+  type ValueGetParams,
 } from './values';
diff --git a/src/resources/kv/namespaces/keys.ts b/src/resources/kv/namespaces/keys.ts
index b938d01c1e..befb8ba794 100644
--- a/src/resources/kv/namespaces/keys.ts
+++ b/src/resources/kv/namespaces/keys.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as KeysAPI from './keys';
 import { CursorLimitPagination, type CursorLimitPaginationParams } from '../../../pagination';
 
 export class Keys extends APIResource {
@@ -61,8 +60,12 @@ export interface KeyListParams extends CursorLimitPaginationParams {
   prefix?: string;
 }
 
-export namespace Keys {
-  export import Key = KeysAPI.Key;
-  export import KeysCursorLimitPagination = KeysAPI.KeysCursorLimitPagination;
-  export import KeyListParams = KeysAPI.KeyListParams;
+Keys.KeysCursorLimitPagination = KeysCursorLimitPagination;
+
+export declare namespace Keys {
+  export {
+    type Key as Key,
+    KeysCursorLimitPagination as KeysCursorLimitPagination,
+    type KeyListParams as KeyListParams,
+  };
 }
diff --git a/src/resources/kv/namespaces/metadata.ts b/src/resources/kv/namespaces/metadata.ts
index d9ba02cebd..3111527816 100644
--- a/src/resources/kv/namespaces/metadata.ts
+++ b/src/resources/kv/namespaces/metadata.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as MetadataAPI from './metadata';
 
 export class Metadata extends APIResource {
   /**
@@ -38,7 +37,6 @@ export interface MetadataGetParams {
   account_id: string;
 }
 
-export namespace Metadata {
-  export import MetadataGetResponse = MetadataAPI.MetadataGetResponse;
-  export import MetadataGetParams = MetadataAPI.MetadataGetParams;
+export declare namespace Metadata {
+  export { type MetadataGetResponse as MetadataGetResponse, type MetadataGetParams as MetadataGetParams };
 }
diff --git a/src/resources/kv/namespaces/namespaces.ts b/src/resources/kv/namespaces/namespaces.ts
index 4a240ebc3c..0f4eb36444 100644
--- a/src/resources/kv/namespaces/namespaces.ts
+++ b/src/resources/kv/namespaces/namespaces.ts
@@ -2,15 +2,25 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as NamespacesAPI from './namespaces';
-import * as BulkAPI from './bulk';
+import * as AnalyticsAPI from './analytics';
+import { Analytics, AnalyticsListParams, AnalyticsStoredParams, Components, Schema } from './analytics';
 import * as KeysAPI from './keys';
+import { Key, KeyListParams, Keys, KeysCursorLimitPagination } from './keys';
 import * as MetadataAPI from './metadata';
+import { Metadata, MetadataGetParams, MetadataGetResponse } from './metadata';
 import * as ValuesAPI from './values';
+import {
+  ValueDeleteParams,
+  ValueDeleteResponse,
+  ValueGetParams,
+  ValueUpdateParams,
+  ValueUpdateResponse,
+  Values,
+} from './values';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class Namespaces extends APIResource {
-  bulk: BulkAPI.Bulk = new BulkAPI.Bulk(this._client);
+  analytics: AnalyticsAPI.Analytics = new AnalyticsAPI.Analytics(this._client);
   keys: KeysAPI.Keys = new KeysAPI.Keys(this._client);
   metadata: MetadataAPI.Metadata = new MetadataAPI.Metadata(this._client);
   values: ValuesAPI.Values = new ValuesAPI.Values(this._client);
@@ -79,6 +89,46 @@ export class Namespaces extends APIResource {
     )._thenUnwrap((obj) => obj.result);
   }
 
+  /**
+   * Remove multiple KV pairs from the namespace. Body should be an array of up to
+   * 10,000 keys to be removed.
+   */
+  bulkDelete(
+    namespaceId: string,
+    params: NamespaceBulkDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<NamespaceBulkDeleteResponse | null> {
+    const { account_id, body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/storage/kv/namespaces/${namespaceId}/bulk/delete`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: NamespaceBulkDeleteResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Write multiple keys and values at once. Body should be an array of up to 10,000
+   * key-value pairs to be stored, along with optional expiration information.
+   * Existing values and expirations will be overwritten. If neither `expiration` nor
+   * `expiration_ttl` is specified, the key-value pair will never expire. If both are
+   * set, `expiration_ttl` is used and `expiration` is ignored. The entire request
+   * size must be 100 megabytes or less.
+   */
+  bulkUpdate(
+    namespaceId: string,
+    params: NamespaceBulkUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<NamespaceBulkUpdateResponse | null> {
+    const { account_id, body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/storage/kv/namespaces/${namespaceId}/bulk`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: NamespaceBulkUpdateResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Get the namespace corresponding to the given ID.
    */
@@ -121,6 +171,30 @@ export interface NamespaceUpdateResponse {}
 
 export interface NamespaceDeleteResponse {}
 
+export interface NamespaceBulkDeleteResponse {
+  /**
+   * Number of keys successfully updated
+   */
+  successful_key_count?: number;
+
+  /**
+   * Name of the keys that failed to be fully updated. They should be retried.
+   */
+  unsuccessful_keys?: Array<string>;
+}
+
+export interface NamespaceBulkUpdateResponse {
+  /**
+   * Number of keys successfully updated
+   */
+  successful_key_count?: number;
+
+  /**
+   * Name of the keys that failed to be fully updated. They should be retried.
+   */
+  unsuccessful_keys?: Array<string>;
+}
+
 export interface NamespaceCreateParams {
   /**
    * Path param: Identifier
@@ -169,6 +243,69 @@ export interface NamespaceDeleteParams {
   account_id: string;
 }
 
+export interface NamespaceBulkDeleteParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: Array<string>;
+}
+
+export interface NamespaceBulkUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: Array<NamespaceBulkUpdateParams.Body>;
+}
+
+export namespace NamespaceBulkUpdateParams {
+  export interface Body {
+    /**
+     * Whether or not the server should base64 decode the value before storing it.
+     * Useful for writing values that wouldn't otherwise be valid JSON strings, such as
+     * images.
+     */
+    base64?: boolean;
+
+    /**
+     * The time, measured in number of seconds since the UNIX epoch, at which the key
+     * should expire.
+     */
+    expiration?: number;
+
+    /**
+     * The number of seconds for which the key should be visible before it expires. At
+     * least 60.
+     */
+    expiration_ttl?: number;
+
+    /**
+     * A key's name. The name may be at most 512 bytes. All printable, non-whitespace
+     * characters are valid.
+     */
+    key?: string;
+
+    /**
+     * Arbitrary JSON that is associated with a key.
+     */
+    metadata?: Record<string, unknown>;
+
+    /**
+     * A UTF-8 encoded string to be stored, up to 25 MiB in length.
+     */
+    value?: string;
+  }
+}
+
 export interface NamespaceGetParams {
   /**
    * Identifier
@@ -176,32 +313,57 @@ export interface NamespaceGetParams {
   account_id: string;
 }
 
-export namespace Namespaces {
-  export import Namespace = NamespacesAPI.Namespace;
-  export import NamespaceUpdateResponse = NamespacesAPI.NamespaceUpdateResponse;
-  export import NamespaceDeleteResponse = NamespacesAPI.NamespaceDeleteResponse;
-  export import NamespacesV4PagePaginationArray = NamespacesAPI.NamespacesV4PagePaginationArray;
-  export import NamespaceCreateParams = NamespacesAPI.NamespaceCreateParams;
-  export import NamespaceUpdateParams = NamespacesAPI.NamespaceUpdateParams;
-  export import NamespaceListParams = NamespacesAPI.NamespaceListParams;
-  export import NamespaceDeleteParams = NamespacesAPI.NamespaceDeleteParams;
-  export import NamespaceGetParams = NamespacesAPI.NamespaceGetParams;
-  export import Bulk = BulkAPI.Bulk;
-  export import BulkUpdateResponse = BulkAPI.BulkUpdateResponse;
-  export import BulkDeleteResponse = BulkAPI.BulkDeleteResponse;
-  export import BulkUpdateParams = BulkAPI.BulkUpdateParams;
-  export import BulkDeleteParams = BulkAPI.BulkDeleteParams;
-  export import Keys = KeysAPI.Keys;
-  export import Key = KeysAPI.Key;
-  export import KeysCursorLimitPagination = KeysAPI.KeysCursorLimitPagination;
-  export import KeyListParams = KeysAPI.KeyListParams;
-  export import Metadata = MetadataAPI.Metadata;
-  export import MetadataGetResponse = MetadataAPI.MetadataGetResponse;
-  export import MetadataGetParams = MetadataAPI.MetadataGetParams;
-  export import Values = ValuesAPI.Values;
-  export import ValueUpdateResponse = ValuesAPI.ValueUpdateResponse;
-  export import ValueDeleteResponse = ValuesAPI.ValueDeleteResponse;
-  export import ValueUpdateParams = ValuesAPI.ValueUpdateParams;
-  export import ValueDeleteParams = ValuesAPI.ValueDeleteParams;
-  export import ValueGetParams = ValuesAPI.ValueGetParams;
+Namespaces.NamespacesV4PagePaginationArray = NamespacesV4PagePaginationArray;
+Namespaces.Analytics = Analytics;
+Namespaces.Keys = Keys;
+Namespaces.KeysCursorLimitPagination = KeysCursorLimitPagination;
+Namespaces.Metadata = Metadata;
+Namespaces.Values = Values;
+
+export declare namespace Namespaces {
+  export {
+    type Namespace as Namespace,
+    type NamespaceUpdateResponse as NamespaceUpdateResponse,
+    type NamespaceDeleteResponse as NamespaceDeleteResponse,
+    type NamespaceBulkDeleteResponse as NamespaceBulkDeleteResponse,
+    type NamespaceBulkUpdateResponse as NamespaceBulkUpdateResponse,
+    NamespacesV4PagePaginationArray as NamespacesV4PagePaginationArray,
+    type NamespaceCreateParams as NamespaceCreateParams,
+    type NamespaceUpdateParams as NamespaceUpdateParams,
+    type NamespaceListParams as NamespaceListParams,
+    type NamespaceDeleteParams as NamespaceDeleteParams,
+    type NamespaceBulkDeleteParams as NamespaceBulkDeleteParams,
+    type NamespaceBulkUpdateParams as NamespaceBulkUpdateParams,
+    type NamespaceGetParams as NamespaceGetParams,
+  };
+
+  export {
+    Analytics as Analytics,
+    type Components as Components,
+    type Schema as Schema,
+    type AnalyticsListParams as AnalyticsListParams,
+    type AnalyticsStoredParams as AnalyticsStoredParams,
+  };
+
+  export {
+    Keys as Keys,
+    type Key as Key,
+    KeysCursorLimitPagination as KeysCursorLimitPagination,
+    type KeyListParams as KeyListParams,
+  };
+
+  export {
+    Metadata as Metadata,
+    type MetadataGetResponse as MetadataGetResponse,
+    type MetadataGetParams as MetadataGetParams,
+  };
+
+  export {
+    Values as Values,
+    type ValueUpdateResponse as ValueUpdateResponse,
+    type ValueDeleteResponse as ValueDeleteResponse,
+    type ValueUpdateParams as ValueUpdateParams,
+    type ValueDeleteParams as ValueDeleteParams,
+    type ValueGetParams as ValueGetParams,
+  };
 }
diff --git a/src/resources/kv/namespaces/values.ts b/src/resources/kv/namespaces/values.ts
index 98a07df9da..502e8c34e5 100644
--- a/src/resources/kv/namespaces/values.ts
+++ b/src/resources/kv/namespaces/values.ts
@@ -2,17 +2,18 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ValuesAPI from './values';
 import { type Response } from '../../../_shims/index';
 
 export class Values extends APIResource {
   /**
    * Write a value identified by a key. Use URL-encoding to use special characters
    * (for example, `:`, `!`, `%`) in the key name. Body should be the value to be
-   * stored along with JSON metadata to be associated with the key/value pair.
-   * Existing values, expirations, and metadata will be overwritten. If neither
-   * `expiration` nor `expiration_ttl` is specified, the key-value pair will never
-   * expire. If both are set, `expiration_ttl` is used and `expiration` is ignored.
+   * stored. If JSON metadata to be associated with the key/value pair is needed, use
+   * `multipart/form-data` content type for your PUT request (see dropdown below in
+   * `REQUEST BODY SCHEMA`). Existing values, expirations, and metadata will be
+   * overwritten. If neither `expiration` nor `expiration_ttl` is specified, the
+   * key-value pair will never expire. If both are set, `expiration_ttl` is used and
+   * `expiration` is ignored.
    */
   update(
     namespaceId: string,
@@ -20,11 +21,16 @@ export class Values extends APIResource {
     params: ValueUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<ValueUpdateResponse | null> {
-    const { account_id, ...body } = params;
+    const { account_id, expiration, expiration_ttl, ...body } = params;
     return (
       this._client.put(
         `/accounts/${account_id}/storage/kv/namespaces/${namespaceId}/values/${keyName}`,
-        Core.multipartFormRequestOptions({ body, ...options }),
+        Core.maybeMultipartFormRequestOptions({
+          query: { expiration, expiration_ttl },
+          body,
+          ...options,
+          headers: { 'Content-Type': '*/*', ...options?.headers },
+        }),
       ) as Core.APIPromise<{ result: ValueUpdateResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -64,7 +70,11 @@ export class Values extends APIResource {
     const { account_id } = params;
     return this._client.get(
       `/accounts/${account_id}/storage/kv/namespaces/${namespaceId}/values/${keyName}`,
-      { ...options, __binaryResponse: true },
+      {
+        ...options,
+        headers: { Accept: 'application/octet-stream', ...options?.headers },
+        __binaryResponse: true,
+      },
     );
   }
 }
@@ -88,6 +98,18 @@ export interface ValueUpdateParams {
    * Body param: A byte sequence to be stored, up to 25 MiB in length.
    */
   value: string;
+
+  /**
+   * Query param: The time, measured in number of seconds since the UNIX epoch, at
+   * which the key should expire.
+   */
+  expiration?: number;
+
+  /**
+   * Query param: The number of seconds for which the key should be visible before it
+   * expires. At least 60.
+   */
+  expiration_ttl?: number;
 }
 
 export interface ValueDeleteParams {
@@ -104,10 +126,12 @@ export interface ValueGetParams {
   account_id: string;
 }
 
-export namespace Values {
-  export import ValueUpdateResponse = ValuesAPI.ValueUpdateResponse;
-  export import ValueDeleteResponse = ValuesAPI.ValueDeleteResponse;
-  export import ValueUpdateParams = ValuesAPI.ValueUpdateParams;
-  export import ValueDeleteParams = ValuesAPI.ValueDeleteParams;
-  export import ValueGetParams = ValuesAPI.ValueGetParams;
+export declare namespace Values {
+  export {
+    type ValueUpdateResponse as ValueUpdateResponse,
+    type ValueDeleteResponse as ValueDeleteResponse,
+    type ValueUpdateParams as ValueUpdateParams,
+    type ValueDeleteParams as ValueDeleteParams,
+    type ValueGetParams as ValueGetParams,
+  };
 }
diff --git a/src/resources/leaked-credential-checks/detections.ts b/src/resources/leaked-credential-checks/detections.ts
new file mode 100644
index 0000000000..353a0cecd5
--- /dev/null
+++ b/src/resources/leaked-credential-checks/detections.ts
@@ -0,0 +1,203 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { SinglePage } from '../../pagination';
+
+export class Detections extends APIResource {
+  /**
+   * Create user-defined detection pattern for Leaked Credential Checks
+   */
+  create(
+    params: DetectionCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DetectionCreateResponse> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.post(`/zones/${zone_id}/leaked-credential-checks/detections`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: DetectionCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update user-defined detection pattern for Leaked Credential Checks
+   */
+  update(
+    detectionId: string,
+    params: DetectionUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DetectionUpdateResponse> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.put(`/zones/${zone_id}/leaked-credential-checks/detections/${detectionId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: DetectionUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List user-defined detection patterns for Leaked Credential Checks
+   */
+  list(
+    params: DetectionListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<DetectionListResponsesSinglePage, DetectionListResponse> {
+    const { zone_id } = params;
+    return this._client.getAPIList(
+      `/zones/${zone_id}/leaked-credential-checks/detections`,
+      DetectionListResponsesSinglePage,
+      options,
+    );
+  }
+
+  /**
+   * Remove user-defined detection pattern for Leaked Credential Checks
+   */
+  delete(
+    detectionId: string,
+    params: DetectionDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DetectionDeleteResponse> {
+    const { zone_id } = params;
+    return (
+      this._client.delete(
+        `/zones/${zone_id}/leaked-credential-checks/detections/${detectionId}`,
+        options,
+      ) as Core.APIPromise<{ result: DetectionDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class DetectionListResponsesSinglePage extends SinglePage<DetectionListResponse> {}
+
+/**
+ * A custom set of username/password expressions to match Leaked Credential Checks
+ * on
+ */
+export interface DetectionCreateResponse {
+  /**
+   * The unique ID for this custom detection
+   */
+  id?: string;
+
+  /**
+   * The ruleset expression to use in matching the password in a request
+   */
+  password?: string;
+
+  /**
+   * The ruleset expression to use in matching the username in a request
+   */
+  username?: string;
+}
+
+/**
+ * A custom set of username/password expressions to match Leaked Credential Checks
+ * on
+ */
+export interface DetectionUpdateResponse {
+  /**
+   * The unique ID for this custom detection
+   */
+  id?: string;
+
+  /**
+   * The ruleset expression to use in matching the password in a request
+   */
+  password?: string;
+
+  /**
+   * The ruleset expression to use in matching the username in a request
+   */
+  username?: string;
+}
+
+/**
+ * A custom set of username/password expressions to match Leaked Credential Checks
+ * on
+ */
+export interface DetectionListResponse {
+  /**
+   * The unique ID for this custom detection
+   */
+  id?: string;
+
+  /**
+   * The ruleset expression to use in matching the password in a request
+   */
+  password?: string;
+
+  /**
+   * The ruleset expression to use in matching the username in a request
+   */
+  username?: string;
+}
+
+export type DetectionDeleteResponse = unknown;
+
+export interface DetectionCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The ruleset expression to use in matching the password in a request
+   */
+  password?: string;
+
+  /**
+   * Body param: The ruleset expression to use in matching the username in a request
+   */
+  username?: string;
+}
+
+export interface DetectionUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The ruleset expression to use in matching the password in a request
+   */
+  password?: string;
+
+  /**
+   * Body param: The ruleset expression to use in matching the username in a request
+   */
+  username?: string;
+}
+
+export interface DetectionListParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface DetectionDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+Detections.DetectionListResponsesSinglePage = DetectionListResponsesSinglePage;
+
+export declare namespace Detections {
+  export {
+    type DetectionCreateResponse as DetectionCreateResponse,
+    type DetectionUpdateResponse as DetectionUpdateResponse,
+    type DetectionListResponse as DetectionListResponse,
+    type DetectionDeleteResponse as DetectionDeleteResponse,
+    DetectionListResponsesSinglePage as DetectionListResponsesSinglePage,
+    type DetectionCreateParams as DetectionCreateParams,
+    type DetectionUpdateParams as DetectionUpdateParams,
+    type DetectionListParams as DetectionListParams,
+    type DetectionDeleteParams as DetectionDeleteParams,
+  };
+}
diff --git a/src/resources/leaked-credential-checks/index.ts b/src/resources/leaked-credential-checks/index.ts
new file mode 100644
index 0000000000..1844848bf2
--- /dev/null
+++ b/src/resources/leaked-credential-checks/index.ts
@@ -0,0 +1,15 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  DetectionListResponsesSinglePage,
+  Detections,
+  type DetectionCreateResponse,
+  type DetectionUpdateResponse,
+  type DetectionListResponse,
+  type DetectionDeleteResponse,
+  type DetectionCreateParams,
+  type DetectionUpdateParams,
+  type DetectionListParams,
+  type DetectionDeleteParams,
+} from './detections';
+export { LeakedCredentialChecks } from './leaked-credential-checks';
diff --git a/src/resources/leaked-credential-checks/leaked-credential-checks.ts b/src/resources/leaked-credential-checks/leaked-credential-checks.ts
new file mode 100644
index 0000000000..a94753581e
--- /dev/null
+++ b/src/resources/leaked-credential-checks/leaked-credential-checks.ts
@@ -0,0 +1,109 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import * as DetectionsAPI from './detections';
+import {
+  DetectionCreateParams,
+  DetectionCreateResponse,
+  DetectionDeleteParams,
+  DetectionDeleteResponse,
+  DetectionListParams,
+  DetectionListResponse,
+  DetectionListResponsesSinglePage,
+  DetectionUpdateParams,
+  DetectionUpdateResponse,
+  Detections,
+} from './detections';
+
+export class LeakedCredentialChecks extends APIResource {
+  detections: DetectionsAPI.Detections = new DetectionsAPI.Detections(this._client);
+
+  /**
+   * Updates the current status of Leaked Credential Checks
+   */
+  create(
+    params: LeakedCredentialCheckCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<LeakedCredentialCheckCreateResponse> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.post(`/zones/${zone_id}/leaked-credential-checks`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: LeakedCredentialCheckCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Retrieves the current status of Leaked Credential Checks
+   */
+  get(
+    params: LeakedCredentialCheckGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<LeakedCredentialCheckGetResponse> {
+    const { zone_id } = params;
+    return (
+      this._client.get(`/zones/${zone_id}/leaked-credential-checks`, options) as Core.APIPromise<{
+        result: LeakedCredentialCheckGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+/**
+ * The overall status for Leaked Credential Checks
+ */
+export interface LeakedCredentialCheckCreateResponse {
+  /**
+   * Whether or not Leaked Credential Checks are enabled
+   */
+  enabled?: boolean;
+}
+
+/**
+ * The overall status for Leaked Credential Checks
+ */
+export interface LeakedCredentialCheckGetResponse {
+  /**
+   * Whether or not Leaked Credential Checks are enabled
+   */
+  enabled?: boolean;
+}
+
+export interface LeakedCredentialCheckCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: Whether or not Leaked Credential Checks are enabled
+   */
+  enabled?: boolean;
+}
+
+export interface LeakedCredentialCheckGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+LeakedCredentialChecks.Detections = Detections;
+LeakedCredentialChecks.DetectionListResponsesSinglePage = DetectionListResponsesSinglePage;
+
+export declare namespace LeakedCredentialChecks {
+  export {
+    Detections as Detections,
+    type DetectionCreateResponse as DetectionCreateResponse,
+    type DetectionUpdateResponse as DetectionUpdateResponse,
+    type DetectionListResponse as DetectionListResponse,
+    type DetectionDeleteResponse as DetectionDeleteResponse,
+    DetectionListResponsesSinglePage as DetectionListResponsesSinglePage,
+    type DetectionCreateParams as DetectionCreateParams,
+    type DetectionUpdateParams as DetectionUpdateParams,
+    type DetectionListParams as DetectionListParams,
+    type DetectionDeleteParams as DetectionDeleteParams,
+  };
+}
diff --git a/src/resources/load-balancers/index.ts b/src/resources/load-balancers/index.ts
index d137d0197f..f4353364b1 100644
--- a/src/resources/load-balancers/index.ts
+++ b/src/resources/load-balancers/index.ts
@@ -2,29 +2,37 @@
 
 export { LoadBalancers } from './load-balancers';
 export {
-  Monitor,
-  MonitorDeleteResponse,
-  MonitorCreateParams,
-  MonitorUpdateParams,
-  MonitorListParams,
-  MonitorDeleteParams,
-  MonitorEditParams,
-  MonitorGetParams,
   MonitorsSinglePage,
   Monitors,
+  type Monitor,
+  type MonitorDeleteResponse,
+  type MonitorCreateParams,
+  type MonitorUpdateParams,
+  type MonitorListParams,
+  type MonitorDeleteParams,
+  type MonitorEditParams,
+  type MonitorGetParams,
 } from './monitors/index';
 export {
-  Pool,
-  PoolDeleteResponse,
-  PoolCreateParams,
-  PoolUpdateParams,
-  PoolListParams,
-  PoolDeleteParams,
-  PoolEditParams,
-  PoolGetParams,
   PoolsSinglePage,
   Pools,
+  type Pool,
+  type PoolDeleteResponse,
+  type PoolBulkEditResponse,
+  type PoolCreateParams,
+  type PoolUpdateParams,
+  type PoolListParams,
+  type PoolDeleteParams,
+  type PoolBulkEditParams,
+  type PoolEditParams,
+  type PoolGetParams,
 } from './pools/index';
-export { PreviewGetResponse, PreviewGetParams, Previews } from './previews';
-export { RegionListResponse, RegionGetResponse, RegionListParams, RegionGetParams, Regions } from './regions';
-export { SearchGetResponse, SearchGetParams, Searches } from './searches';
+export { Previews, type PreviewGetResponse, type PreviewGetParams } from './previews';
+export {
+  Regions,
+  type RegionListResponse,
+  type RegionGetResponse,
+  type RegionListParams,
+  type RegionGetParams,
+} from './regions';
+export { Searches, type SearchGetResponse, type SearchGetParams } from './searches';
diff --git a/src/resources/load-balancers/load-balancers.ts b/src/resources/load-balancers/load-balancers.ts
index aeef387a7d..a654590327 100644
--- a/src/resources/load-balancers/load-balancers.ts
+++ b/src/resources/load-balancers/load-balancers.ts
@@ -4,10 +4,39 @@ import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as LoadBalancersAPI from './load-balancers';
 import * as PreviewsAPI from './previews';
+import { PreviewGetParams, PreviewGetResponse, Previews } from './previews';
 import * as RegionsAPI from './regions';
+import { RegionGetParams, RegionGetResponse, RegionListParams, RegionListResponse, Regions } from './regions';
 import * as SearchesAPI from './searches';
+import { SearchGetParams, SearchGetResponse, Searches } from './searches';
 import * as MonitorsAPI from './monitors/monitors';
+import {
+  Monitor,
+  MonitorCreateParams,
+  MonitorDeleteParams,
+  MonitorDeleteResponse,
+  MonitorEditParams,
+  MonitorGetParams,
+  MonitorListParams,
+  MonitorUpdateParams,
+  Monitors,
+  MonitorsSinglePage,
+} from './monitors/monitors';
 import * as PoolsAPI from './pools/pools';
+import {
+  Pool,
+  PoolBulkEditParams,
+  PoolBulkEditResponse,
+  PoolCreateParams,
+  PoolDeleteParams,
+  PoolDeleteResponse,
+  PoolEditParams,
+  PoolGetParams,
+  PoolListParams,
+  PoolUpdateParams,
+  Pools,
+  PoolsSinglePage,
+} from './pools/pools';
 import { SinglePage } from '../../pagination';
 
 export class LoadBalancers extends APIResource {
@@ -286,7 +315,7 @@ export interface LoadBalancer {
    * back to using the corresponding region_pool mapping if it exists else to
    * default_pools.
    */
-  country_pools?: unknown;
+  country_pools?: Record<string, Array<string>>;
 
   created_on?: string;
 
@@ -309,7 +338,7 @@ export interface LoadBalancer {
   /**
    * The pool ID to use when all other pools are detected as unhealthy.
    */
-  fallback_pool?: unknown;
+  fallback_pool?: string;
 
   /**
    * Controls location-based steering for non-proxied requests. See `steering_policy`
@@ -326,13 +355,18 @@ export interface LoadBalancer {
    */
   name?: string;
 
+  /**
+   * List of networks where Load Balancer or Pool is enabled.
+   */
+  networks?: Array<string>;
+
   /**
    * (Enterprise only): A mapping of Cloudflare PoP identifiers to a list of pool IDs
    * (ordered by their failover priority) for the PoP (datacenter). Any PoPs not
    * explicitly defined will fall back to using the corresponding country_pool, then
    * region_pool mapping if it exists else to default_pools.
    */
-  pop_pools?: unknown;
+  pop_pools?: Record<string, Array<string>>;
 
   /**
    * Whether the hostname should be gray clouded (false) or orange clouded (true).
@@ -356,7 +390,7 @@ export interface LoadBalancer {
    * priority) for the given region. Any regions not explicitly defined will fall
    * back to using default_pools.
    */
-  region_pools?: unknown;
+  region_pools?: Record<string, Array<string>>;
 
   /**
    * BETA Field Not General Access: A list of rules for this load balancer to
@@ -366,7 +400,7 @@ export interface LoadBalancer {
 
   /**
    * Specifies the type of session affinity the load balancer should use unless
-   * specified as `"none"` or "" (default). The supported types are:
+   * specified as `"none"`. The supported types are:
    *
    * - `"cookie"`: On the first request to a proxied load balancer, a cookie is
    *   generated, encoding information of which origin the request will be forwarded
@@ -760,7 +794,7 @@ export interface RandomSteering {
    * A mapping of pool IDs to custom weights. The weight is relative to other pools
    * in the load balancer.
    */
-  pool_weights?: unknown;
+  pool_weights?: Record<string, number>;
 }
 
 /**
@@ -784,7 +818,7 @@ export interface RandomSteeringParam {
    * A mapping of pool IDs to custom weights. The weight is relative to other pools
    * in the load balancer.
    */
-  pool_weights?: unknown;
+  pool_weights?: Record<string, number>;
 }
 
 /**
@@ -888,7 +922,7 @@ export namespace Rules {
      * back to using the corresponding region_pool mapping if it exists else to
      * default_pools.
      */
-    country_pools?: unknown;
+    country_pools?: Record<string, Array<string>>;
 
     /**
      * A list of pool IDs ordered by their failover priority. Pools defined here are
@@ -899,7 +933,7 @@ export namespace Rules {
     /**
      * The pool ID to use when all other pools are detected as unhealthy.
      */
-    fallback_pool?: unknown;
+    fallback_pool?: string;
 
     /**
      * Controls location-based steering for non-proxied requests. See `steering_policy`
@@ -913,7 +947,7 @@ export namespace Rules {
      * explicitly defined will fall back to using the corresponding country_pool, then
      * region_pool mapping if it exists else to default_pools.
      */
-    pop_pools?: unknown;
+    pop_pools?: Record<string, Array<string>>;
 
     /**
      * Configures pool weights.
@@ -932,11 +966,11 @@ export namespace Rules {
      * priority) for the given region. Any regions not explicitly defined will fall
      * back to using default_pools.
      */
-    region_pools?: unknown;
+    region_pools?: Record<string, Array<string>>;
 
     /**
      * Specifies the type of session affinity the load balancer should use unless
-     * specified as `"none"` or "" (default). The supported types are:
+     * specified as `"none"`. The supported types are:
      *
      * - `"cookie"`: On the first request to a proxied load balancer, a cookie is
      *   generated, encoding information of which origin the request will be forwarded
@@ -1115,7 +1149,7 @@ export namespace RulesParam {
      * back to using the corresponding region_pool mapping if it exists else to
      * default_pools.
      */
-    country_pools?: unknown;
+    country_pools?: Record<string, Array<string>>;
 
     /**
      * A list of pool IDs ordered by their failover priority. Pools defined here are
@@ -1126,7 +1160,7 @@ export namespace RulesParam {
     /**
      * The pool ID to use when all other pools are detected as unhealthy.
      */
-    fallback_pool?: unknown;
+    fallback_pool?: string;
 
     /**
      * Controls location-based steering for non-proxied requests. See `steering_policy`
@@ -1140,7 +1174,7 @@ export namespace RulesParam {
      * explicitly defined will fall back to using the corresponding country_pool, then
      * region_pool mapping if it exists else to default_pools.
      */
-    pop_pools?: unknown;
+    pop_pools?: Record<string, Array<string>>;
 
     /**
      * Configures pool weights.
@@ -1159,11 +1193,11 @@ export namespace RulesParam {
      * priority) for the given region. Any regions not explicitly defined will fall
      * back to using default_pools.
      */
-    region_pools?: unknown;
+    region_pools?: Record<string, Array<string>>;
 
     /**
      * Specifies the type of session affinity the load balancer should use unless
-     * specified as `"none"` or "" (default). The supported types are:
+     * specified as `"none"`. The supported types are:
      *
      * - `"cookie"`: On the first request to a proxied load balancer, a cookie is
      *   generated, encoding information of which origin the request will be forwarded
@@ -1243,7 +1277,7 @@ export namespace RulesParam {
 
 /**
  * Specifies the type of session affinity the load balancer should use unless
- * specified as `"none"` or "" (default). The supported types are:
+ * specified as `"none"`. The supported types are:
  *
  * - `"cookie"`: On the first request to a proxied load balancer, a cookie is
  *   generated, encoding information of which origin the request will be forwarded
@@ -1266,11 +1300,11 @@ export namespace RulesParam {
  *   `headers` in `session_affinity_attributes` for additional required
  *   configuration.
  */
-export type SessionAffinity = 'none' | 'cookie' | 'ip_cookie' | 'header' | '""';
+export type SessionAffinity = 'none' | 'cookie' | 'ip_cookie' | 'header';
 
 /**
  * Specifies the type of session affinity the load balancer should use unless
- * specified as `"none"` or "" (default). The supported types are:
+ * specified as `"none"`. The supported types are:
  *
  * - `"cookie"`: On the first request to a proxied load balancer, a cookie is
  *   generated, encoding information of which origin the request will be forwarded
@@ -1293,7 +1327,7 @@ export type SessionAffinity = 'none' | 'cookie' | 'ip_cookie' | 'header' | '""';
  *   `headers` in `session_affinity_attributes` for additional required
  *   configuration.
  */
-export type SessionAffinityParam = 'none' | 'cookie' | 'ip_cookie' | 'header' | '""';
+export type SessionAffinityParam = 'none' | 'cookie' | 'ip_cookie' | 'header';
 
 /**
  * Configures attributes for session affinity.
@@ -1461,7 +1495,7 @@ export type SteeringPolicy =
   | 'proximity'
   | 'least_outstanding_requests'
   | 'least_connections'
-  | '""';
+  | '';
 
 /**
  * Steering Policy for this load balancer.
@@ -1495,7 +1529,7 @@ export type SteeringPolicyParam =
   | 'proximity'
   | 'least_outstanding_requests'
   | 'least_connections'
-  | '""';
+  | '';
 
 export interface LoadBalancerDeleteResponse {
   id?: string;
@@ -1517,7 +1551,7 @@ export interface LoadBalancerCreateParams {
   /**
    * Body param: The pool ID to use when all other pools are detected as unhealthy.
    */
-  fallback_pool: unknown;
+  fallback_pool: string;
 
   /**
    * Body param: The DNS hostname to associate with your Load Balancer. If this
@@ -1542,7 +1576,7 @@ export interface LoadBalancerCreateParams {
    * will fall back to using the corresponding region_pool mapping if it exists else
    * to default_pools.
    */
-  country_pools?: unknown;
+  country_pools?: Record<string, Array<string>>;
 
   /**
    * Body param: Object description.
@@ -1555,13 +1589,18 @@ export interface LoadBalancerCreateParams {
    */
   location_strategy?: LocationStrategyParam;
 
+  /**
+   * Body param: List of networks where Load Balancer or Pool is enabled.
+   */
+  networks?: Array<string>;
+
   /**
    * Body param: (Enterprise only): A mapping of Cloudflare PoP identifiers to a list
    * of pool IDs (ordered by their failover priority) for the PoP (datacenter). Any
    * PoPs not explicitly defined will fall back to using the corresponding
    * country_pool, then region_pool mapping if it exists else to default_pools.
    */
-  pop_pools?: unknown;
+  pop_pools?: Record<string, Array<string>>;
 
   /**
    * Body param: Whether the hostname should be gray clouded (false) or orange
@@ -1586,7 +1625,7 @@ export interface LoadBalancerCreateParams {
    * failover priority) for the given region. Any regions not explicitly defined will
    * fall back to using default_pools.
    */
-  region_pools?: unknown;
+  region_pools?: Record<string, Array<string>>;
 
   /**
    * Body param: BETA Field Not General Access: A list of rules for this load
@@ -1596,7 +1635,7 @@ export interface LoadBalancerCreateParams {
 
   /**
    * Body param: Specifies the type of session affinity the load balancer should use
-   * unless specified as `"none"` or "" (default). The supported types are:
+   * unless specified as `"none"`. The supported types are:
    *
    * - `"cookie"`: On the first request to a proxied load balancer, a cookie is
    *   generated, encoding information of which origin the request will be forwarded
@@ -1691,7 +1730,7 @@ export interface LoadBalancerUpdateParams {
   /**
    * Body param: The pool ID to use when all other pools are detected as unhealthy.
    */
-  fallback_pool: unknown;
+  fallback_pool: string;
 
   /**
    * Body param: The DNS hostname to associate with your Load Balancer. If this
@@ -1716,7 +1755,7 @@ export interface LoadBalancerUpdateParams {
    * will fall back to using the corresponding region_pool mapping if it exists else
    * to default_pools.
    */
-  country_pools?: unknown;
+  country_pools?: Record<string, Array<string>>;
 
   /**
    * Body param: Object description.
@@ -1734,13 +1773,18 @@ export interface LoadBalancerUpdateParams {
    */
   location_strategy?: LocationStrategyParam;
 
+  /**
+   * Body param: List of networks where Load Balancer or Pool is enabled.
+   */
+  networks?: Array<string>;
+
   /**
    * Body param: (Enterprise only): A mapping of Cloudflare PoP identifiers to a list
    * of pool IDs (ordered by their failover priority) for the PoP (datacenter). Any
    * PoPs not explicitly defined will fall back to using the corresponding
    * country_pool, then region_pool mapping if it exists else to default_pools.
    */
-  pop_pools?: unknown;
+  pop_pools?: Record<string, Array<string>>;
 
   /**
    * Body param: Whether the hostname should be gray clouded (false) or orange
@@ -1765,7 +1809,7 @@ export interface LoadBalancerUpdateParams {
    * failover priority) for the given region. Any regions not explicitly defined will
    * fall back to using default_pools.
    */
-  region_pools?: unknown;
+  region_pools?: Record<string, Array<string>>;
 
   /**
    * Body param: BETA Field Not General Access: A list of rules for this load
@@ -1775,7 +1819,7 @@ export interface LoadBalancerUpdateParams {
 
   /**
    * Body param: Specifies the type of session affinity the load balancer should use
-   * unless specified as `"none"` or "" (default). The supported types are:
+   * unless specified as `"none"`. The supported types are:
    *
    * - `"cookie"`: On the first request to a proxied load balancer, a cookie is
    *   generated, encoding information of which origin the request will be forwarded
@@ -1884,7 +1928,7 @@ export interface LoadBalancerEditParams {
    * will fall back to using the corresponding region_pool mapping if it exists else
    * to default_pools.
    */
-  country_pools?: unknown;
+  country_pools?: Record<string, Array<string>>;
 
   /**
    * Body param: A list of pool IDs ordered by their failover priority. Pools defined
@@ -1906,7 +1950,7 @@ export interface LoadBalancerEditParams {
   /**
    * Body param: The pool ID to use when all other pools are detected as unhealthy.
    */
-  fallback_pool?: unknown;
+  fallback_pool?: string;
 
   /**
    * Body param: Controls location-based steering for non-proxied requests. See
@@ -1927,7 +1971,7 @@ export interface LoadBalancerEditParams {
    * PoPs not explicitly defined will fall back to using the corresponding
    * country_pool, then region_pool mapping if it exists else to default_pools.
    */
-  pop_pools?: unknown;
+  pop_pools?: Record<string, Array<string>>;
 
   /**
    * Body param: Whether the hostname should be gray clouded (false) or orange
@@ -1952,7 +1996,7 @@ export interface LoadBalancerEditParams {
    * failover priority) for the given region. Any regions not explicitly defined will
    * fall back to using default_pools.
    */
-  region_pools?: unknown;
+  region_pools?: Record<string, Array<string>>;
 
   /**
    * Body param: BETA Field Not General Access: A list of rules for this load
@@ -1962,7 +2006,7 @@ export interface LoadBalancerEditParams {
 
   /**
    * Body param: Specifies the type of session affinity the load balancer should use
-   * unless specified as `"none"` or "" (default). The supported types are:
+   * unless specified as `"none"`. The supported types are:
    *
    * - `"cookie"`: On the first request to a proxied load balancer, a cookie is
    *   generated, encoding information of which origin the request will be forwarded
@@ -2045,36 +2089,60 @@ export interface LoadBalancerGetParams {
   zone_id: string;
 }
 
-export namespace LoadBalancers {
-  export import Monitors = MonitorsAPI.Monitors;
-  export import Monitor = MonitorsAPI.Monitor;
-  export import MonitorDeleteResponse = MonitorsAPI.MonitorDeleteResponse;
-  export import MonitorsSinglePage = MonitorsAPI.MonitorsSinglePage;
-  export import MonitorCreateParams = MonitorsAPI.MonitorCreateParams;
-  export import MonitorUpdateParams = MonitorsAPI.MonitorUpdateParams;
-  export import MonitorListParams = MonitorsAPI.MonitorListParams;
-  export import MonitorDeleteParams = MonitorsAPI.MonitorDeleteParams;
-  export import MonitorEditParams = MonitorsAPI.MonitorEditParams;
-  export import MonitorGetParams = MonitorsAPI.MonitorGetParams;
-  export import Pools = PoolsAPI.Pools;
-  export import Pool = PoolsAPI.Pool;
-  export import PoolDeleteResponse = PoolsAPI.PoolDeleteResponse;
-  export import PoolsSinglePage = PoolsAPI.PoolsSinglePage;
-  export import PoolCreateParams = PoolsAPI.PoolCreateParams;
-  export import PoolUpdateParams = PoolsAPI.PoolUpdateParams;
-  export import PoolListParams = PoolsAPI.PoolListParams;
-  export import PoolDeleteParams = PoolsAPI.PoolDeleteParams;
-  export import PoolEditParams = PoolsAPI.PoolEditParams;
-  export import PoolGetParams = PoolsAPI.PoolGetParams;
-  export import Previews = PreviewsAPI.Previews;
-  export import PreviewGetResponse = PreviewsAPI.PreviewGetResponse;
-  export import PreviewGetParams = PreviewsAPI.PreviewGetParams;
-  export import Regions = RegionsAPI.Regions;
-  export import RegionListResponse = RegionsAPI.RegionListResponse;
-  export import RegionGetResponse = RegionsAPI.RegionGetResponse;
-  export import RegionListParams = RegionsAPI.RegionListParams;
-  export import RegionGetParams = RegionsAPI.RegionGetParams;
-  export import Searches = SearchesAPI.Searches;
-  export import SearchGetResponse = SearchesAPI.SearchGetResponse;
-  export import SearchGetParams = SearchesAPI.SearchGetParams;
+LoadBalancers.Monitors = Monitors;
+LoadBalancers.MonitorsSinglePage = MonitorsSinglePage;
+LoadBalancers.Pools = Pools;
+LoadBalancers.PoolsSinglePage = PoolsSinglePage;
+LoadBalancers.Previews = Previews;
+LoadBalancers.Regions = Regions;
+LoadBalancers.Searches = Searches;
+
+export declare namespace LoadBalancers {
+  export {
+    Monitors as Monitors,
+    type Monitor as Monitor,
+    type MonitorDeleteResponse as MonitorDeleteResponse,
+    MonitorsSinglePage as MonitorsSinglePage,
+    type MonitorCreateParams as MonitorCreateParams,
+    type MonitorUpdateParams as MonitorUpdateParams,
+    type MonitorListParams as MonitorListParams,
+    type MonitorDeleteParams as MonitorDeleteParams,
+    type MonitorEditParams as MonitorEditParams,
+    type MonitorGetParams as MonitorGetParams,
+  };
+
+  export {
+    Pools as Pools,
+    type Pool as Pool,
+    type PoolDeleteResponse as PoolDeleteResponse,
+    type PoolBulkEditResponse as PoolBulkEditResponse,
+    PoolsSinglePage as PoolsSinglePage,
+    type PoolCreateParams as PoolCreateParams,
+    type PoolUpdateParams as PoolUpdateParams,
+    type PoolListParams as PoolListParams,
+    type PoolDeleteParams as PoolDeleteParams,
+    type PoolBulkEditParams as PoolBulkEditParams,
+    type PoolEditParams as PoolEditParams,
+    type PoolGetParams as PoolGetParams,
+  };
+
+  export {
+    Previews as Previews,
+    type PreviewGetResponse as PreviewGetResponse,
+    type PreviewGetParams as PreviewGetParams,
+  };
+
+  export {
+    Regions as Regions,
+    type RegionListResponse as RegionListResponse,
+    type RegionGetResponse as RegionGetResponse,
+    type RegionListParams as RegionListParams,
+    type RegionGetParams as RegionGetParams,
+  };
+
+  export {
+    Searches as Searches,
+    type SearchGetResponse as SearchGetResponse,
+    type SearchGetParams as SearchGetParams,
+  };
 }
diff --git a/src/resources/load-balancers/monitors/index.ts b/src/resources/load-balancers/monitors/index.ts
index c19e5d704c..656856b3d1 100644
--- a/src/resources/load-balancers/monitors/index.ts
+++ b/src/resources/load-balancers/monitors/index.ts
@@ -1,16 +1,16 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Monitor,
-  MonitorDeleteResponse,
-  MonitorCreateParams,
-  MonitorUpdateParams,
-  MonitorListParams,
-  MonitorDeleteParams,
-  MonitorEditParams,
-  MonitorGetParams,
   MonitorsSinglePage,
   Monitors,
+  type Monitor,
+  type MonitorDeleteResponse,
+  type MonitorCreateParams,
+  type MonitorUpdateParams,
+  type MonitorListParams,
+  type MonitorDeleteParams,
+  type MonitorEditParams,
+  type MonitorGetParams,
 } from './monitors';
-export { PreviewCreateResponse, PreviewCreateParams, Previews } from './previews';
-export { ReferenceGetResponse, ReferenceGetParams, References } from './references';
+export { Previews, type PreviewCreateResponse, type PreviewCreateParams } from './previews';
+export { References, type ReferenceGetResponse, type ReferenceGetParams } from './references';
diff --git a/src/resources/load-balancers/monitors/monitors.ts b/src/resources/load-balancers/monitors/monitors.ts
index d26b8ff423..62eb846319 100644
--- a/src/resources/load-balancers/monitors/monitors.ts
+++ b/src/resources/load-balancers/monitors/monitors.ts
@@ -2,9 +2,10 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as MonitorsAPI from './monitors';
 import * as PreviewsAPI from './previews';
+import { PreviewCreateParams, PreviewCreateResponse, Previews } from './previews';
 import * as ReferencesAPI from './references';
+import { ReferenceGetParams, ReferenceGetResponse, References } from './references';
 import { SinglePage } from '../../../pagination';
 
 export class Monitors extends APIResource {
@@ -158,7 +159,7 @@ export interface Monitor {
    * a Host header by default. The User-Agent header cannot be overridden. This
    * parameter is only valid for HTTP and HTTPS monitors.
    */
-  header?: unknown;
+  header?: Record<string, Array<string>>;
 
   /**
    * The interval between each health check. Shorter intervals may improve failover
@@ -221,12 +222,6 @@ export interface MonitorCreateParams {
    */
   account_id: string;
 
-  /**
-   * Body param: The expected HTTP response code or code range of the health check.
-   * This parameter is only valid for HTTP and HTTPS monitors.
-   */
-  expected_codes: string;
-
   /**
    * Body param: Do not validate the certificate when monitor use HTTPS. This
    * parameter is currently only valid for HTTP and HTTPS monitors.
@@ -257,6 +252,12 @@ export interface MonitorCreateParams {
    */
   expected_body?: string;
 
+  /**
+   * Body param: The expected HTTP response code or code range of the health check.
+   * This parameter is only valid for HTTP and HTTPS monitors.
+   */
+  expected_codes?: string;
+
   /**
    * Body param: Follow redirects if returned by the origin. This parameter is only
    * valid for HTTP and HTTPS monitors.
@@ -268,7 +269,7 @@ export interface MonitorCreateParams {
    * recommended you set a Host header by default. The User-Agent header cannot be
    * overridden. This parameter is only valid for HTTP and HTTPS monitors.
    */
-  header?: unknown;
+  header?: Record<string, Array<string>>;
 
   /**
    * Body param: The interval between each health check. Shorter intervals may
@@ -327,12 +328,6 @@ export interface MonitorUpdateParams {
    */
   account_id: string;
 
-  /**
-   * Body param: The expected HTTP response code or code range of the health check.
-   * This parameter is only valid for HTTP and HTTPS monitors.
-   */
-  expected_codes: string;
-
   /**
    * Body param: Do not validate the certificate when monitor use HTTPS. This
    * parameter is currently only valid for HTTP and HTTPS monitors.
@@ -363,6 +358,12 @@ export interface MonitorUpdateParams {
    */
   expected_body?: string;
 
+  /**
+   * Body param: The expected HTTP response code or code range of the health check.
+   * This parameter is only valid for HTTP and HTTPS monitors.
+   */
+  expected_codes?: string;
+
   /**
    * Body param: Follow redirects if returned by the origin. This parameter is only
    * valid for HTTP and HTTPS monitors.
@@ -374,7 +375,7 @@ export interface MonitorUpdateParams {
    * recommended you set a Host header by default. The User-Agent header cannot be
    * overridden. This parameter is only valid for HTTP and HTTPS monitors.
    */
-  header?: unknown;
+  header?: Record<string, Array<string>>;
 
   /**
    * Body param: The interval between each health check. Shorter intervals may
@@ -447,12 +448,6 @@ export interface MonitorEditParams {
    */
   account_id: string;
 
-  /**
-   * Body param: The expected HTTP response code or code range of the health check.
-   * This parameter is only valid for HTTP and HTTPS monitors.
-   */
-  expected_codes: string;
-
   /**
    * Body param: Do not validate the certificate when monitor use HTTPS. This
    * parameter is currently only valid for HTTP and HTTPS monitors.
@@ -483,6 +478,12 @@ export interface MonitorEditParams {
    */
   expected_body?: string;
 
+  /**
+   * Body param: The expected HTTP response code or code range of the health check.
+   * This parameter is only valid for HTTP and HTTPS monitors.
+   */
+  expected_codes?: string;
+
   /**
    * Body param: Follow redirects if returned by the origin. This parameter is only
    * valid for HTTP and HTTPS monitors.
@@ -494,7 +495,7 @@ export interface MonitorEditParams {
    * recommended you set a Host header by default. The User-Agent header cannot be
    * overridden. This parameter is only valid for HTTP and HTTPS monitors.
    */
-  header?: unknown;
+  header?: Record<string, Array<string>>;
 
   /**
    * Body param: The interval between each health check. Shorter intervals may
@@ -554,20 +555,32 @@ export interface MonitorGetParams {
   account_id: string;
 }
 
-export namespace Monitors {
-  export import Monitor = MonitorsAPI.Monitor;
-  export import MonitorDeleteResponse = MonitorsAPI.MonitorDeleteResponse;
-  export import MonitorsSinglePage = MonitorsAPI.MonitorsSinglePage;
-  export import MonitorCreateParams = MonitorsAPI.MonitorCreateParams;
-  export import MonitorUpdateParams = MonitorsAPI.MonitorUpdateParams;
-  export import MonitorListParams = MonitorsAPI.MonitorListParams;
-  export import MonitorDeleteParams = MonitorsAPI.MonitorDeleteParams;
-  export import MonitorEditParams = MonitorsAPI.MonitorEditParams;
-  export import MonitorGetParams = MonitorsAPI.MonitorGetParams;
-  export import Previews = PreviewsAPI.Previews;
-  export import PreviewCreateResponse = PreviewsAPI.PreviewCreateResponse;
-  export import PreviewCreateParams = PreviewsAPI.PreviewCreateParams;
-  export import References = ReferencesAPI.References;
-  export import ReferenceGetResponse = ReferencesAPI.ReferenceGetResponse;
-  export import ReferenceGetParams = ReferencesAPI.ReferenceGetParams;
+Monitors.MonitorsSinglePage = MonitorsSinglePage;
+Monitors.Previews = Previews;
+Monitors.References = References;
+
+export declare namespace Monitors {
+  export {
+    type Monitor as Monitor,
+    type MonitorDeleteResponse as MonitorDeleteResponse,
+    MonitorsSinglePage as MonitorsSinglePage,
+    type MonitorCreateParams as MonitorCreateParams,
+    type MonitorUpdateParams as MonitorUpdateParams,
+    type MonitorListParams as MonitorListParams,
+    type MonitorDeleteParams as MonitorDeleteParams,
+    type MonitorEditParams as MonitorEditParams,
+    type MonitorGetParams as MonitorGetParams,
+  };
+
+  export {
+    Previews as Previews,
+    type PreviewCreateResponse as PreviewCreateResponse,
+    type PreviewCreateParams as PreviewCreateParams,
+  };
+
+  export {
+    References as References,
+    type ReferenceGetResponse as ReferenceGetResponse,
+    type ReferenceGetParams as ReferenceGetParams,
+  };
 }
diff --git a/src/resources/load-balancers/monitors/previews.ts b/src/resources/load-balancers/monitors/previews.ts
index 3a409074c3..1322c46f35 100644
--- a/src/resources/load-balancers/monitors/previews.ts
+++ b/src/resources/load-balancers/monitors/previews.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as PreviewsAPI from './previews';
 
 export class Previews extends APIResource {
   /**
@@ -39,12 +38,6 @@ export interface PreviewCreateParams {
    */
   account_id: string;
 
-  /**
-   * Body param: The expected HTTP response code or code range of the health check.
-   * This parameter is only valid for HTTP and HTTPS monitors.
-   */
-  expected_codes: string;
-
   /**
    * Body param: Do not validate the certificate when monitor use HTTPS. This
    * parameter is currently only valid for HTTP and HTTPS monitors.
@@ -75,6 +68,12 @@ export interface PreviewCreateParams {
    */
   expected_body?: string;
 
+  /**
+   * Body param: The expected HTTP response code or code range of the health check.
+   * This parameter is only valid for HTTP and HTTPS monitors.
+   */
+  expected_codes?: string;
+
   /**
    * Body param: Follow redirects if returned by the origin. This parameter is only
    * valid for HTTP and HTTPS monitors.
@@ -86,7 +85,7 @@ export interface PreviewCreateParams {
    * recommended you set a Host header by default. The User-Agent header cannot be
    * overridden. This parameter is only valid for HTTP and HTTPS monitors.
    */
-  header?: unknown;
+  header?: Record<string, Array<string>>;
 
   /**
    * Body param: The interval between each health check. Shorter intervals may
@@ -139,7 +138,9 @@ export interface PreviewCreateParams {
   type?: 'http' | 'https' | 'tcp' | 'udp_icmp' | 'icmp_ping' | 'smtp';
 }
 
-export namespace Previews {
-  export import PreviewCreateResponse = PreviewsAPI.PreviewCreateResponse;
-  export import PreviewCreateParams = PreviewsAPI.PreviewCreateParams;
+export declare namespace Previews {
+  export {
+    type PreviewCreateResponse as PreviewCreateResponse,
+    type PreviewCreateParams as PreviewCreateParams,
+  };
 }
diff --git a/src/resources/load-balancers/monitors/references.ts b/src/resources/load-balancers/monitors/references.ts
index 6b733eb4c1..9934f7f32b 100644
--- a/src/resources/load-balancers/monitors/references.ts
+++ b/src/resources/load-balancers/monitors/references.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ReferencesAPI from './references';
 
 export class References extends APIResource {
   /**
@@ -12,13 +11,13 @@ export class References extends APIResource {
     monitorId: string,
     params: ReferenceGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ReferenceGetResponse | null> {
+  ): Core.APIPromise<ReferenceGetResponse> {
     const { account_id } = params;
     return (
       this._client.get(
         `/accounts/${account_id}/load_balancers/monitors/${monitorId}/references`,
         options,
-      ) as Core.APIPromise<{ result: ReferenceGetResponse | null }>
+      ) as Core.APIPromise<{ result: ReferenceGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -47,7 +46,6 @@ export interface ReferenceGetParams {
   account_id: string;
 }
 
-export namespace References {
-  export import ReferenceGetResponse = ReferencesAPI.ReferenceGetResponse;
-  export import ReferenceGetParams = ReferencesAPI.ReferenceGetParams;
+export declare namespace References {
+  export { type ReferenceGetResponse as ReferenceGetResponse, type ReferenceGetParams as ReferenceGetParams };
 }
diff --git a/src/resources/load-balancers/pools/health.ts b/src/resources/load-balancers/pools/health.ts
index cfc9c5b784..4d1dac6ae9 100644
--- a/src/resources/load-balancers/pools/health.ts
+++ b/src/resources/load-balancers/pools/health.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as HealthAPI from './health';
 
 export class Health extends APIResource {
   /**
@@ -54,19 +53,67 @@ export interface HealthCreateResponse {
  * A list of regions from which to run health checks. Null means every Cloudflare
  * data center.
  */
-export type HealthGetResponse = unknown | string | null;
+export interface HealthGetResponse {
+  /**
+   * Pool ID
+   */
+  pool_id?: string;
 
-export interface HealthCreateParams {
   /**
-   * Path param: Identifier
+   * List of regions and associated health status.
    */
-  account_id: string;
+  pop_health?: HealthGetResponse.POPHealth;
+}
 
+export namespace HealthGetResponse {
   /**
-   * Body param: The expected HTTP response code or code range of the health check.
-   * This parameter is only valid for HTTP and HTTPS monitors.
+   * List of regions and associated health status.
+   */
+  export interface POPHealth {
+    /**
+     * Whether health check in region is healthy.
+     */
+    healthy?: boolean;
+
+    origins?: Array<POPHealth.Origin>;
+  }
+
+  export namespace POPHealth {
+    export interface Origin {
+      ip?: Origin.IP;
+    }
+
+    export namespace Origin {
+      export interface IP {
+        /**
+         * Failure reason.
+         */
+        failure_reason?: string;
+
+        /**
+         * Origin health status.
+         */
+        healthy?: boolean;
+
+        /**
+         * Response code from origin health check.
+         */
+        response_code?: number;
+
+        /**
+         * Origin RTT (Round Trip Time) response.
+         */
+        rtt?: string;
+      }
+    }
+  }
+}
+
+export interface HealthCreateParams {
+  /**
+   * Path param: Identifier
    */
-  expected_codes: string;
+  account_id: string;
 
   /**
    * Body param: Do not validate the certificate when monitor use HTTPS. This
@@ -98,6 +145,12 @@ export interface HealthCreateParams {
    */
   expected_body?: string;
 
+  /**
+   * Body param: The expected HTTP response code or code range of the health check.
+   * This parameter is only valid for HTTP and HTTPS monitors.
+   */
+  expected_codes?: string;
+
   /**
    * Body param: Follow redirects if returned by the origin. This parameter is only
    * valid for HTTP and HTTPS monitors.
@@ -109,7 +162,7 @@ export interface HealthCreateParams {
    * recommended you set a Host header by default. The User-Agent header cannot be
    * overridden. This parameter is only valid for HTTP and HTTPS monitors.
    */
-  header?: unknown;
+  header?: Record<string, Array<string>>;
 
   /**
    * Body param: The interval between each health check. Shorter intervals may
@@ -169,9 +222,11 @@ export interface HealthGetParams {
   account_id: string;
 }
 
-export namespace Health {
-  export import HealthCreateResponse = HealthAPI.HealthCreateResponse;
-  export import HealthGetResponse = HealthAPI.HealthGetResponse;
-  export import HealthCreateParams = HealthAPI.HealthCreateParams;
-  export import HealthGetParams = HealthAPI.HealthGetParams;
+export declare namespace Health {
+  export {
+    type HealthCreateResponse as HealthCreateResponse,
+    type HealthGetResponse as HealthGetResponse,
+    type HealthCreateParams as HealthCreateParams,
+    type HealthGetParams as HealthGetParams,
+  };
 }
diff --git a/src/resources/load-balancers/pools/index.ts b/src/resources/load-balancers/pools/index.ts
index 095568cc74..058ae51510 100644
--- a/src/resources/load-balancers/pools/index.ts
+++ b/src/resources/load-balancers/pools/index.ts
@@ -1,22 +1,24 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  HealthCreateResponse,
-  HealthGetResponse,
-  HealthCreateParams,
-  HealthGetParams,
   Health,
+  type HealthCreateResponse,
+  type HealthGetResponse,
+  type HealthCreateParams,
+  type HealthGetParams,
 } from './health';
 export {
-  Pool,
-  PoolDeleteResponse,
-  PoolCreateParams,
-  PoolUpdateParams,
-  PoolListParams,
-  PoolDeleteParams,
-  PoolEditParams,
-  PoolGetParams,
   PoolsSinglePage,
   Pools,
+  type Pool,
+  type PoolDeleteResponse,
+  type PoolBulkEditResponse,
+  type PoolCreateParams,
+  type PoolUpdateParams,
+  type PoolListParams,
+  type PoolDeleteParams,
+  type PoolBulkEditParams,
+  type PoolEditParams,
+  type PoolGetParams,
 } from './pools';
-export { ReferenceGetResponse, ReferenceGetParams, References } from './references';
+export { References, type ReferenceGetResponse, type ReferenceGetParams } from './references';
diff --git a/src/resources/load-balancers/pools/pools.ts b/src/resources/load-balancers/pools/pools.ts
index cfe0eb0a52..77f042448c 100644
--- a/src/resources/load-balancers/pools/pools.ts
+++ b/src/resources/load-balancers/pools/pools.ts
@@ -2,10 +2,17 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as PoolsAPI from './pools';
 import * as LoadBalancersAPI from '../load-balancers';
 import * as HealthAPI from './health';
+import {
+  Health,
+  HealthCreateParams,
+  HealthCreateResponse,
+  HealthGetParams,
+  HealthGetResponse,
+} from './health';
 import * as ReferencesAPI from './references';
+import { ReferenceGetParams, ReferenceGetResponse, References } from './references';
 import { SinglePage } from '../../../pagination';
 
 export class Pools extends APIResource {
@@ -66,6 +73,22 @@ export class Pools extends APIResource {
     )._thenUnwrap((obj) => obj.result);
   }
 
+  /**
+   * Apply changes to a number of existing pools, overwriting the supplied
+   * properties. Pools are ordered by ascending `name`. Returns the list of affected
+   * pools. Supports the standard pagination query parameters, either
+   * `limit`/`offset` or `per_page`/`page`.
+   */
+  bulkEdit(params: PoolBulkEditParams, options?: Core.RequestOptions): Core.APIPromise<PoolBulkEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/load_balancers/pools`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: PoolBulkEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Apply changes to an existing pool, overwriting the supplied properties.
    */
@@ -153,7 +176,7 @@ export interface Pool {
    * The ID of the Monitor to use for checking the health of origins within this
    * pool.
    */
-  monitor?: unknown;
+  monitor?: string;
 
   /**
    * A short name (tag) for the pool. Only alphanumeric characters, hyphens, and
@@ -161,6 +184,11 @@ export interface Pool {
    */
   name?: string;
 
+  /**
+   * List of networks where Load Balancer or Pool is enabled.
+   */
+  networks?: Array<string>;
+
   /**
    * This field is now deprecated. It has been moved to Cloudflare's Centralized
    * Notification service
@@ -193,6 +221,8 @@ export interface PoolDeleteResponse {
   id?: string;
 }
 
+export type PoolBulkEditResponse = Array<Pool>;
+
 export interface PoolCreateParams {
   /**
    * Path param: Identifier
@@ -252,7 +282,7 @@ export interface PoolCreateParams {
    * Body param: The ID of the Monitor to use for checking the health of origins
    * within this pool.
    */
-  monitor?: unknown;
+  monitor?: string;
 
   /**
    * Body param: This field is now deprecated. It has been moved to Cloudflare's
@@ -341,7 +371,7 @@ export interface PoolUpdateParams {
    * Body param: The ID of the Monitor to use for checking the health of origins
    * within this pool.
    */
-  monitor?: unknown;
+  monitor?: string;
 
   /**
    * Body param: This field is now deprecated. It has been moved to Cloudflare's
@@ -375,7 +405,7 @@ export interface PoolListParams {
    * Query param: The ID of the Monitor to use for checking the health of origins
    * within this pool.
    */
-  monitor?: unknown;
+  monitor?: string;
 }
 
 export interface PoolDeleteParams {
@@ -385,6 +415,20 @@ export interface PoolDeleteParams {
   account_id: string;
 }
 
+export interface PoolBulkEditParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: The email address to send health status notifications to. This field
+   * is now deprecated in favor of Cloudflare Notifications for Load Balancing, so
+   * only resetting this field with an empty string `""` is accepted.
+   */
+  notification_email?: '';
+}
+
 export interface PoolEditParams {
   /**
    * Path param: Identifier
@@ -437,7 +481,7 @@ export interface PoolEditParams {
    * Body param: The ID of the Monitor to use for checking the health of origins
    * within this pool.
    */
-  monitor?: unknown;
+  monitor?: string;
 
   /**
    * Body param: A short name (tag) for the pool. Only alphanumeric characters,
@@ -481,22 +525,36 @@ export interface PoolGetParams {
   account_id: string;
 }
 
-export namespace Pools {
-  export import Pool = PoolsAPI.Pool;
-  export import PoolDeleteResponse = PoolsAPI.PoolDeleteResponse;
-  export import PoolsSinglePage = PoolsAPI.PoolsSinglePage;
-  export import PoolCreateParams = PoolsAPI.PoolCreateParams;
-  export import PoolUpdateParams = PoolsAPI.PoolUpdateParams;
-  export import PoolListParams = PoolsAPI.PoolListParams;
-  export import PoolDeleteParams = PoolsAPI.PoolDeleteParams;
-  export import PoolEditParams = PoolsAPI.PoolEditParams;
-  export import PoolGetParams = PoolsAPI.PoolGetParams;
-  export import Health = HealthAPI.Health;
-  export import HealthCreateResponse = HealthAPI.HealthCreateResponse;
-  export import HealthGetResponse = HealthAPI.HealthGetResponse;
-  export import HealthCreateParams = HealthAPI.HealthCreateParams;
-  export import HealthGetParams = HealthAPI.HealthGetParams;
-  export import References = ReferencesAPI.References;
-  export import ReferenceGetResponse = ReferencesAPI.ReferenceGetResponse;
-  export import ReferenceGetParams = ReferencesAPI.ReferenceGetParams;
+Pools.PoolsSinglePage = PoolsSinglePage;
+Pools.Health = Health;
+Pools.References = References;
+
+export declare namespace Pools {
+  export {
+    type Pool as Pool,
+    type PoolDeleteResponse as PoolDeleteResponse,
+    type PoolBulkEditResponse as PoolBulkEditResponse,
+    PoolsSinglePage as PoolsSinglePage,
+    type PoolCreateParams as PoolCreateParams,
+    type PoolUpdateParams as PoolUpdateParams,
+    type PoolListParams as PoolListParams,
+    type PoolDeleteParams as PoolDeleteParams,
+    type PoolBulkEditParams as PoolBulkEditParams,
+    type PoolEditParams as PoolEditParams,
+    type PoolGetParams as PoolGetParams,
+  };
+
+  export {
+    Health as Health,
+    type HealthCreateResponse as HealthCreateResponse,
+    type HealthGetResponse as HealthGetResponse,
+    type HealthCreateParams as HealthCreateParams,
+    type HealthGetParams as HealthGetParams,
+  };
+
+  export {
+    References as References,
+    type ReferenceGetResponse as ReferenceGetResponse,
+    type ReferenceGetParams as ReferenceGetParams,
+  };
 }
diff --git a/src/resources/load-balancers/pools/references.ts b/src/resources/load-balancers/pools/references.ts
index 0ac756d9cd..7d467af8d4 100644
--- a/src/resources/load-balancers/pools/references.ts
+++ b/src/resources/load-balancers/pools/references.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ReferencesAPI from './references';
 
 export class References extends APIResource {
   /**
@@ -12,13 +11,13 @@ export class References extends APIResource {
     poolId: string,
     params: ReferenceGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ReferenceGetResponse | null> {
+  ): Core.APIPromise<ReferenceGetResponse> {
     const { account_id } = params;
     return (
       this._client.get(
         `/accounts/${account_id}/load_balancers/pools/${poolId}/references`,
         options,
-      ) as Core.APIPromise<{ result: ReferenceGetResponse | null }>
+      ) as Core.APIPromise<{ result: ReferenceGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -47,7 +46,6 @@ export interface ReferenceGetParams {
   account_id: string;
 }
 
-export namespace References {
-  export import ReferenceGetResponse = ReferencesAPI.ReferenceGetResponse;
-  export import ReferenceGetParams = ReferencesAPI.ReferenceGetParams;
+export declare namespace References {
+  export { type ReferenceGetResponse as ReferenceGetResponse, type ReferenceGetParams as ReferenceGetParams };
 }
diff --git a/src/resources/load-balancers/previews.ts b/src/resources/load-balancers/previews.ts
index ceb822cc14..afe3657ab5 100644
--- a/src/resources/load-balancers/previews.ts
+++ b/src/resources/load-balancers/previews.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as PreviewsAPI from './previews';
 
 export class Previews extends APIResource {
   /**
@@ -26,16 +25,16 @@ export class Previews extends APIResource {
 /**
  * Resulting health data from a preview operation.
  */
-export type PreviewGetResponse = Record<string, PreviewGetResponse.unnamed_schema_with_map_parent_0>;
+export type PreviewGetResponse = Record<string, PreviewGetResponse.item>;
 
 export namespace PreviewGetResponse {
-  export interface unnamed_schema_with_map_parent_0 {
+  export interface item {
     healthy?: boolean;
 
-    origins?: Array<Record<string, unnamed_schema_with_map_parent_0.load_balancing_origin_health_data>>;
+    origins?: Array<Record<string, item.load_balancing_origin_health_data>>;
   }
 
-  export namespace unnamed_schema_with_map_parent_0 {
+  export namespace item {
     /**
      * The origin ipv4/ipv6 address or domain name mapped to it's health data.
      */
@@ -58,7 +57,6 @@ export interface PreviewGetParams {
   account_id: string;
 }
 
-export namespace Previews {
-  export import PreviewGetResponse = PreviewsAPI.PreviewGetResponse;
-  export import PreviewGetParams = PreviewsAPI.PreviewGetParams;
+export declare namespace Previews {
+  export { type PreviewGetResponse as PreviewGetResponse, type PreviewGetParams as PreviewGetParams };
 }
diff --git a/src/resources/load-balancers/regions.ts b/src/resources/load-balancers/regions.ts
index ac16610868..b9bf06d4f9 100644
--- a/src/resources/load-balancers/regions.ts
+++ b/src/resources/load-balancers/regions.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as RegionsAPI from './regions';
 
 export class Regions extends APIResource {
   /**
@@ -85,9 +84,11 @@ export interface RegionGetParams {
   account_id: string;
 }
 
-export namespace Regions {
-  export import RegionListResponse = RegionsAPI.RegionListResponse;
-  export import RegionGetResponse = RegionsAPI.RegionGetResponse;
-  export import RegionListParams = RegionsAPI.RegionListParams;
-  export import RegionGetParams = RegionsAPI.RegionGetParams;
+export declare namespace Regions {
+  export {
+    type RegionListResponse as RegionListResponse,
+    type RegionGetResponse as RegionGetResponse,
+    type RegionListParams as RegionListParams,
+    type RegionGetParams as RegionGetParams,
+  };
 }
diff --git a/src/resources/load-balancers/searches.ts b/src/resources/load-balancers/searches.ts
index 7f4f538190..4a24c3f977 100644
--- a/src/resources/load-balancers/searches.ts
+++ b/src/resources/load-balancers/searches.ts
@@ -2,24 +2,57 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SearchesAPI from './searches';
 
 export class Searches extends APIResource {
   /**
    * Search for Load Balancing resources.
    */
-  get(params: SearchGetParams, options?: Core.RequestOptions): Core.APIPromise<SearchGetResponse | null> {
+  get(params: SearchGetParams, options?: Core.RequestOptions): Core.APIPromise<SearchGetResponse> {
     const { account_id, ...query } = params;
     return (
       this._client.get(`/accounts/${account_id}/load_balancers/search`, {
         query,
         ...options,
-      }) as Core.APIPromise<{ result: SearchGetResponse | null }>
+      }) as Core.APIPromise<{ result: SearchGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export type SearchGetResponse = Array<unknown>;
+export interface SearchGetResponse {
+  /**
+   * A list of resources matching the search query.
+   */
+  resources?: Array<SearchGetResponse.Resource>;
+}
+
+export namespace SearchGetResponse {
+  /**
+   * A reference to a load balancer resource.
+   */
+  export interface Resource {
+    /**
+     * When listed as a reference, the type (direction) of the reference.
+     */
+    reference_type?: 'referral' | 'referrer';
+
+    /**
+     * A list of references to (referrer) or from (referral) this resource.
+     */
+    references?: Array<unknown>;
+
+    resource_id?: string;
+
+    /**
+     * The human-identifiable name of the resource.
+     */
+    resource_name?: string;
+
+    /**
+     * The type of the resource.
+     */
+    resource_type?: 'load_balancer' | 'monitor' | 'pool';
+  }
+}
 
 export interface SearchGetParams {
   /**
@@ -30,12 +63,12 @@ export interface SearchGetParams {
   /**
    * Query param:
    */
-  page?: unknown;
+  page?: number;
 
   /**
    * Query param:
    */
-  per_page?: unknown;
+  per_page?: number;
 
   /**
    * Query param:
@@ -57,7 +90,6 @@ export namespace SearchGetParams {
   }
 }
 
-export namespace Searches {
-  export import SearchGetResponse = SearchesAPI.SearchGetResponse;
-  export import SearchGetParams = SearchesAPI.SearchGetParams;
+export declare namespace Searches {
+  export { type SearchGetResponse as SearchGetResponse, type SearchGetParams as SearchGetParams };
 }
diff --git a/src/resources/logpush/datasets/datasets.ts b/src/resources/logpush/datasets/datasets.ts
index 901686e865..54b4932816 100644
--- a/src/resources/logpush/datasets/datasets.ts
+++ b/src/resources/logpush/datasets/datasets.ts
@@ -2,18 +2,24 @@
 
 import { APIResource } from '../../../resource';
 import * as FieldsAPI from './fields';
+import { FieldGetParams, FieldGetResponse, Fields } from './fields';
 import * as JobsAPI from './jobs';
+import { JobGetParams, JobGetResponse, Jobs } from './jobs';
 
 export class Datasets extends APIResource {
   fields: FieldsAPI.Fields = new FieldsAPI.Fields(this._client);
   jobs: JobsAPI.Jobs = new JobsAPI.Jobs(this._client);
 }
 
-export namespace Datasets {
-  export import Fields = FieldsAPI.Fields;
-  export import FieldGetResponse = FieldsAPI.FieldGetResponse;
-  export import FieldGetParams = FieldsAPI.FieldGetParams;
-  export import Jobs = JobsAPI.Jobs;
-  export import JobGetResponse = JobsAPI.JobGetResponse;
-  export import JobGetParams = JobsAPI.JobGetParams;
+Datasets.Fields = Fields;
+Datasets.Jobs = Jobs;
+
+export declare namespace Datasets {
+  export {
+    Fields as Fields,
+    type FieldGetResponse as FieldGetResponse,
+    type FieldGetParams as FieldGetParams,
+  };
+
+  export { Jobs as Jobs, type JobGetResponse as JobGetResponse, type JobGetParams as JobGetParams };
 }
diff --git a/src/resources/logpush/datasets/fields.ts b/src/resources/logpush/datasets/fields.ts
index 313198df44..f32d303ce8 100644
--- a/src/resources/logpush/datasets/fields.ts
+++ b/src/resources/logpush/datasets/fields.ts
@@ -3,8 +3,7 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import { CloudflareError } from '../../../error';
-import * as FieldsAPI from './fields';
+import { CloudflareError } from 'cloudflare/error';
 
 export class Fields extends APIResource {
   /**
@@ -65,7 +64,6 @@ export interface FieldGetParams {
   zone_id?: string;
 }
 
-export namespace Fields {
-  export import FieldGetResponse = FieldsAPI.FieldGetResponse;
-  export import FieldGetParams = FieldsAPI.FieldGetParams;
+export declare namespace Fields {
+  export { type FieldGetResponse as FieldGetResponse, type FieldGetParams as FieldGetParams };
 }
diff --git a/src/resources/logpush/datasets/index.ts b/src/resources/logpush/datasets/index.ts
index b80889fd4d..377e750207 100644
--- a/src/resources/logpush/datasets/index.ts
+++ b/src/resources/logpush/datasets/index.ts
@@ -1,5 +1,5 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Datasets } from './datasets';
-export { FieldGetResponse, FieldGetParams, Fields } from './fields';
-export { JobGetResponse, JobGetParams, Jobs } from './jobs';
+export { Fields, type FieldGetResponse, type FieldGetParams } from './fields';
+export { Jobs, type JobGetResponse, type JobGetParams } from './jobs';
diff --git a/src/resources/logpush/datasets/jobs.ts b/src/resources/logpush/datasets/jobs.ts
index c6e67c727c..b016bc109a 100644
--- a/src/resources/logpush/datasets/jobs.ts
+++ b/src/resources/logpush/datasets/jobs.ts
@@ -3,8 +3,7 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import { CloudflareError } from '../../../error';
-import * as DatasetsJobsAPI from './jobs';
+import { CloudflareError } from 'cloudflare/error';
 import * as JobsAPI from '../jobs';
 
 export class Jobs extends APIResource {
@@ -65,7 +64,6 @@ export interface JobGetParams {
   zone_id?: string;
 }
 
-export namespace Jobs {
-  export import JobGetResponse = DatasetsJobsAPI.JobGetResponse;
-  export import JobGetParams = DatasetsJobsAPI.JobGetParams;
+export declare namespace Jobs {
+  export { type JobGetResponse as JobGetResponse, type JobGetParams as JobGetParams };
 }
diff --git a/src/resources/logpush/edge.ts b/src/resources/logpush/edge.ts
index 70e1bc7259..3539a1d364 100644
--- a/src/resources/logpush/edge.ts
+++ b/src/resources/logpush/edge.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as EdgeAPI from './edge';
 
 export class Edge extends APIResource {
   /**
@@ -90,9 +89,11 @@ export interface EdgeGetParams {
   zone_id: string;
 }
 
-export namespace Edge {
-  export import InstantLogpushJob = EdgeAPI.InstantLogpushJob;
-  export import EdgeGetResponse = EdgeAPI.EdgeGetResponse;
-  export import EdgeCreateParams = EdgeAPI.EdgeCreateParams;
-  export import EdgeGetParams = EdgeAPI.EdgeGetParams;
+export declare namespace Edge {
+  export {
+    type InstantLogpushJob as InstantLogpushJob,
+    type EdgeGetResponse as EdgeGetResponse,
+    type EdgeCreateParams as EdgeCreateParams,
+    type EdgeGetParams as EdgeGetParams,
+  };
 }
diff --git a/src/resources/logpush/index.ts b/src/resources/logpush/index.ts
index 9a75e9e651..adc3f3a65d 100644
--- a/src/resources/logpush/index.ts
+++ b/src/resources/logpush/index.ts
@@ -1,31 +1,37 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Datasets } from './datasets/index';
-export { InstantLogpushJob, EdgeGetResponse, EdgeCreateParams, EdgeGetParams, Edge } from './edge';
+export {
+  Edge,
+  type InstantLogpushJob,
+  type EdgeGetResponse,
+  type EdgeCreateParams,
+  type EdgeGetParams,
+} from './edge';
 export { Logpush } from './logpush';
 export {
-  LogpushJob,
-  OutputOptions,
-  JobDeleteResponse,
-  JobCreateParams,
-  JobUpdateParams,
-  JobListParams,
-  JobDeleteParams,
-  JobGetParams,
   LogpushJobsSinglePage,
   Jobs,
+  type LogpushJob,
+  type OutputOptions,
+  type JobDeleteResponse,
+  type JobCreateParams,
+  type JobUpdateParams,
+  type JobListParams,
+  type JobDeleteParams,
+  type JobGetParams,
 } from './jobs';
 export {
-  OwnershipValidation,
-  OwnershipCreateResponse,
-  OwnershipCreateParams,
-  OwnershipValidateParams,
   Ownership,
+  type OwnershipValidation,
+  type OwnershipCreateResponse,
+  type OwnershipCreateParams,
+  type OwnershipValidateParams,
 } from './ownership';
 export {
-  ValidateDestinationResponse,
-  ValidateOriginResponse,
-  ValidateDestinationParams,
-  ValidateOriginParams,
   Validate,
+  type ValidateDestinationResponse,
+  type ValidateOriginResponse,
+  type ValidateDestinationParams,
+  type ValidateOriginParams,
 } from './validate';
diff --git a/src/resources/logpush/jobs.ts b/src/resources/logpush/jobs.ts
index ec5e715ac8..f90b659490 100644
--- a/src/resources/logpush/jobs.ts
+++ b/src/resources/logpush/jobs.ts
@@ -3,8 +3,7 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import { CloudflareError } from '../../error';
-import * as JobsAPI from './jobs';
+import { CloudflareError } from 'cloudflare/error';
 import { SinglePage } from '../../pagination';
 
 export class Jobs extends APIResource {
@@ -116,13 +115,13 @@ export class Jobs extends APIResource {
     jobId: number,
     params?: JobDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<JobDeleteResponse | null>;
-  delete(jobId: number, options?: Core.RequestOptions): Core.APIPromise<JobDeleteResponse | null>;
+  ): Core.APIPromise<JobDeleteResponse>;
+  delete(jobId: number, options?: Core.RequestOptions): Core.APIPromise<JobDeleteResponse>;
   delete(
     jobId: number,
     params: JobDeleteParams | Core.RequestOptions = {},
     options?: Core.RequestOptions,
-  ): Core.APIPromise<JobDeleteResponse | null> {
+  ): Core.APIPromise<JobDeleteResponse> {
     if (isRequestOptions(params)) {
       return this.delete(jobId, {}, params);
     }
@@ -147,7 +146,7 @@ export class Jobs extends APIResource {
       this._client.delete(
         `/${accountOrZone}/${accountOrZoneId}/logpush/jobs/${jobId}`,
         options,
-      ) as Core.APIPromise<{ result: JobDeleteResponse | null }>
+      ) as Core.APIPromise<{ result: JobDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -460,7 +459,12 @@ export interface OutputOptionsParam {
   timestamp_format?: 'unixnano' | 'unix' | 'rfc3339';
 }
 
-export type JobDeleteResponse = unknown;
+export interface JobDeleteResponse {
+  /**
+   * Unique id of the job.
+   */
+  id?: number;
+}
 
 export interface JobCreateParams {
   /**
@@ -642,6 +646,13 @@ export interface JobUpdateParams {
    */
   max_upload_records?: number | null;
 
+  /**
+   * Body param: Optional human readable job name. Not unique. Cloudflare suggests
+   * that you set this to a meaningful string, like the domain name, to make it
+   * easier to identify your job.
+   */
+  name?: string | null;
+
   /**
    * Body param: The structured replacement for `logpull_options`. When including
    * this field, the `logpull_option` field will be ignored.
@@ -690,14 +701,18 @@ export interface JobGetParams {
   zone_id?: string;
 }
 
-export namespace Jobs {
-  export import LogpushJob = JobsAPI.LogpushJob;
-  export import OutputOptions = JobsAPI.OutputOptions;
-  export import JobDeleteResponse = JobsAPI.JobDeleteResponse;
-  export import LogpushJobsSinglePage = JobsAPI.LogpushJobsSinglePage;
-  export import JobCreateParams = JobsAPI.JobCreateParams;
-  export import JobUpdateParams = JobsAPI.JobUpdateParams;
-  export import JobListParams = JobsAPI.JobListParams;
-  export import JobDeleteParams = JobsAPI.JobDeleteParams;
-  export import JobGetParams = JobsAPI.JobGetParams;
+Jobs.LogpushJobsSinglePage = LogpushJobsSinglePage;
+
+export declare namespace Jobs {
+  export {
+    type LogpushJob as LogpushJob,
+    type OutputOptions as OutputOptions,
+    type JobDeleteResponse as JobDeleteResponse,
+    LogpushJobsSinglePage as LogpushJobsSinglePage,
+    type JobCreateParams as JobCreateParams,
+    type JobUpdateParams as JobUpdateParams,
+    type JobListParams as JobListParams,
+    type JobDeleteParams as JobDeleteParams,
+    type JobGetParams as JobGetParams,
+  };
 }
diff --git a/src/resources/logpush/logpush.ts b/src/resources/logpush/logpush.ts
index 97fa183fdd..1c0bc8a0e2 100644
--- a/src/resources/logpush/logpush.ts
+++ b/src/resources/logpush/logpush.ts
@@ -2,10 +2,38 @@
 
 import { APIResource } from '../../resource';
 import * as EdgeAPI from './edge';
+import { Edge, EdgeCreateParams, EdgeGetParams, EdgeGetResponse, InstantLogpushJob } from './edge';
 import * as JobsAPI from './jobs';
+import {
+  JobCreateParams,
+  JobDeleteParams,
+  JobDeleteResponse,
+  JobGetParams,
+  JobListParams,
+  JobUpdateParams,
+  Jobs,
+  LogpushJob,
+  LogpushJobsSinglePage,
+  OutputOptions,
+} from './jobs';
 import * as OwnershipAPI from './ownership';
+import {
+  Ownership,
+  OwnershipCreateParams,
+  OwnershipCreateResponse,
+  OwnershipValidateParams,
+  OwnershipValidation,
+} from './ownership';
 import * as ValidateAPI from './validate';
+import {
+  Validate,
+  ValidateDestinationParams,
+  ValidateDestinationResponse,
+  ValidateOriginParams,
+  ValidateOriginResponse,
+} from './validate';
 import * as DatasetsAPI from './datasets/datasets';
+import { Datasets } from './datasets/datasets';
 
 export class Logpush extends APIResource {
   datasets: DatasetsAPI.Datasets = new DatasetsAPI.Datasets(this._client);
@@ -15,31 +43,50 @@ export class Logpush extends APIResource {
   validate: ValidateAPI.Validate = new ValidateAPI.Validate(this._client);
 }
 
-export namespace Logpush {
-  export import Datasets = DatasetsAPI.Datasets;
-  export import Edge = EdgeAPI.Edge;
-  export import InstantLogpushJob = EdgeAPI.InstantLogpushJob;
-  export import EdgeGetResponse = EdgeAPI.EdgeGetResponse;
-  export import EdgeCreateParams = EdgeAPI.EdgeCreateParams;
-  export import EdgeGetParams = EdgeAPI.EdgeGetParams;
-  export import Jobs = JobsAPI.Jobs;
-  export import LogpushJob = JobsAPI.LogpushJob;
-  export import OutputOptions = JobsAPI.OutputOptions;
-  export import JobDeleteResponse = JobsAPI.JobDeleteResponse;
-  export import LogpushJobsSinglePage = JobsAPI.LogpushJobsSinglePage;
-  export import JobCreateParams = JobsAPI.JobCreateParams;
-  export import JobUpdateParams = JobsAPI.JobUpdateParams;
-  export import JobListParams = JobsAPI.JobListParams;
-  export import JobDeleteParams = JobsAPI.JobDeleteParams;
-  export import JobGetParams = JobsAPI.JobGetParams;
-  export import Ownership = OwnershipAPI.Ownership;
-  export import OwnershipValidation = OwnershipAPI.OwnershipValidation;
-  export import OwnershipCreateResponse = OwnershipAPI.OwnershipCreateResponse;
-  export import OwnershipCreateParams = OwnershipAPI.OwnershipCreateParams;
-  export import OwnershipValidateParams = OwnershipAPI.OwnershipValidateParams;
-  export import Validate = ValidateAPI.Validate;
-  export import ValidateDestinationResponse = ValidateAPI.ValidateDestinationResponse;
-  export import ValidateOriginResponse = ValidateAPI.ValidateOriginResponse;
-  export import ValidateDestinationParams = ValidateAPI.ValidateDestinationParams;
-  export import ValidateOriginParams = ValidateAPI.ValidateOriginParams;
+Logpush.Datasets = Datasets;
+Logpush.Edge = Edge;
+Logpush.Jobs = Jobs;
+Logpush.LogpushJobsSinglePage = LogpushJobsSinglePage;
+Logpush.Ownership = Ownership;
+Logpush.Validate = Validate;
+
+export declare namespace Logpush {
+  export { Datasets as Datasets };
+
+  export {
+    Edge as Edge,
+    type InstantLogpushJob as InstantLogpushJob,
+    type EdgeGetResponse as EdgeGetResponse,
+    type EdgeCreateParams as EdgeCreateParams,
+    type EdgeGetParams as EdgeGetParams,
+  };
+
+  export {
+    Jobs as Jobs,
+    type LogpushJob as LogpushJob,
+    type OutputOptions as OutputOptions,
+    type JobDeleteResponse as JobDeleteResponse,
+    LogpushJobsSinglePage as LogpushJobsSinglePage,
+    type JobCreateParams as JobCreateParams,
+    type JobUpdateParams as JobUpdateParams,
+    type JobListParams as JobListParams,
+    type JobDeleteParams as JobDeleteParams,
+    type JobGetParams as JobGetParams,
+  };
+
+  export {
+    Ownership as Ownership,
+    type OwnershipValidation as OwnershipValidation,
+    type OwnershipCreateResponse as OwnershipCreateResponse,
+    type OwnershipCreateParams as OwnershipCreateParams,
+    type OwnershipValidateParams as OwnershipValidateParams,
+  };
+
+  export {
+    Validate as Validate,
+    type ValidateDestinationResponse as ValidateDestinationResponse,
+    type ValidateOriginResponse as ValidateOriginResponse,
+    type ValidateDestinationParams as ValidateDestinationParams,
+    type ValidateOriginParams as ValidateOriginParams,
+  };
 }
diff --git a/src/resources/logpush/ownership.ts b/src/resources/logpush/ownership.ts
index 8bb768dd6c..67770ebcfa 100644
--- a/src/resources/logpush/ownership.ts
+++ b/src/resources/logpush/ownership.ts
@@ -2,8 +2,7 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import { CloudflareError } from '../../error';
-import * as OwnershipAPI from './ownership';
+import { CloudflareError } from 'cloudflare/error';
 
 export class Ownership extends APIResource {
   /**
@@ -130,9 +129,11 @@ export interface OwnershipValidateParams {
   zone_id?: string;
 }
 
-export namespace Ownership {
-  export import OwnershipValidation = OwnershipAPI.OwnershipValidation;
-  export import OwnershipCreateResponse = OwnershipAPI.OwnershipCreateResponse;
-  export import OwnershipCreateParams = OwnershipAPI.OwnershipCreateParams;
-  export import OwnershipValidateParams = OwnershipAPI.OwnershipValidateParams;
+export declare namespace Ownership {
+  export {
+    type OwnershipValidation as OwnershipValidation,
+    type OwnershipCreateResponse as OwnershipCreateResponse,
+    type OwnershipCreateParams as OwnershipCreateParams,
+    type OwnershipValidateParams as OwnershipValidateParams,
+  };
 }
diff --git a/src/resources/logpush/validate.ts b/src/resources/logpush/validate.ts
index 649ad805f0..5e2779e288 100644
--- a/src/resources/logpush/validate.ts
+++ b/src/resources/logpush/validate.ts
@@ -2,8 +2,7 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import { CloudflareError } from '../../error';
-import * as ValidateAPI from './validate';
+import { CloudflareError } from 'cloudflare/error';
 
 export class Validate extends APIResource {
   /**
@@ -125,9 +124,11 @@ export interface ValidateOriginParams {
   zone_id?: string;
 }
 
-export namespace Validate {
-  export import ValidateDestinationResponse = ValidateAPI.ValidateDestinationResponse;
-  export import ValidateOriginResponse = ValidateAPI.ValidateOriginResponse;
-  export import ValidateDestinationParams = ValidateAPI.ValidateDestinationParams;
-  export import ValidateOriginParams = ValidateAPI.ValidateOriginParams;
+export declare namespace Validate {
+  export {
+    type ValidateDestinationResponse as ValidateDestinationResponse,
+    type ValidateOriginResponse as ValidateOriginResponse,
+    type ValidateDestinationParams as ValidateDestinationParams,
+    type ValidateOriginParams as ValidateOriginParams,
+  };
 }
diff --git a/src/resources/logs/control/cmb/cmb.ts b/src/resources/logs/control/cmb/cmb.ts
index 8009e1085e..281cbbf509 100644
--- a/src/resources/logs/control/cmb/cmb.ts
+++ b/src/resources/logs/control/cmb/cmb.ts
@@ -2,16 +2,28 @@
 
 import { APIResource } from '../../../../resource';
 import * as ConfigAPI from './config';
+import {
+  CmbConfig,
+  Config,
+  ConfigCreateParams,
+  ConfigDeleteParams,
+  ConfigDeleteResponse,
+  ConfigGetParams,
+} from './config';
 
 export class Cmb extends APIResource {
   config: ConfigAPI.Config = new ConfigAPI.Config(this._client);
 }
 
-export namespace Cmb {
-  export import Config = ConfigAPI.Config;
-  export import CmbConfig = ConfigAPI.CmbConfig;
-  export import ConfigDeleteResponse = ConfigAPI.ConfigDeleteResponse;
-  export import ConfigCreateParams = ConfigAPI.ConfigCreateParams;
-  export import ConfigDeleteParams = ConfigAPI.ConfigDeleteParams;
-  export import ConfigGetParams = ConfigAPI.ConfigGetParams;
+Cmb.Config = Config;
+
+export declare namespace Cmb {
+  export {
+    Config as Config,
+    type CmbConfig as CmbConfig,
+    type ConfigDeleteResponse as ConfigDeleteResponse,
+    type ConfigCreateParams as ConfigCreateParams,
+    type ConfigDeleteParams as ConfigDeleteParams,
+    type ConfigGetParams as ConfigGetParams,
+  };
 }
diff --git a/src/resources/logs/control/cmb/config.ts b/src/resources/logs/control/cmb/config.ts
index 2ea50010ce..15e887feb0 100644
--- a/src/resources/logs/control/cmb/config.ts
+++ b/src/resources/logs/control/cmb/config.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as ConfigAPI from './config';
 
 export class Config extends APIResource {
   /**
@@ -81,10 +80,12 @@ export interface ConfigGetParams {
   account_id: string;
 }
 
-export namespace Config {
-  export import CmbConfig = ConfigAPI.CmbConfig;
-  export import ConfigDeleteResponse = ConfigAPI.ConfigDeleteResponse;
-  export import ConfigCreateParams = ConfigAPI.ConfigCreateParams;
-  export import ConfigDeleteParams = ConfigAPI.ConfigDeleteParams;
-  export import ConfigGetParams = ConfigAPI.ConfigGetParams;
+export declare namespace Config {
+  export {
+    type CmbConfig as CmbConfig,
+    type ConfigDeleteResponse as ConfigDeleteResponse,
+    type ConfigCreateParams as ConfigCreateParams,
+    type ConfigDeleteParams as ConfigDeleteParams,
+    type ConfigGetParams as ConfigGetParams,
+  };
 }
diff --git a/src/resources/logs/control/cmb/index.ts b/src/resources/logs/control/cmb/index.ts
index cbf88f9561..0d9ca574cc 100644
--- a/src/resources/logs/control/cmb/index.ts
+++ b/src/resources/logs/control/cmb/index.ts
@@ -2,10 +2,10 @@
 
 export { Cmb } from './cmb';
 export {
-  CmbConfig,
-  ConfigDeleteResponse,
-  ConfigCreateParams,
-  ConfigDeleteParams,
-  ConfigGetParams,
   Config,
+  type CmbConfig,
+  type ConfigDeleteResponse,
+  type ConfigCreateParams,
+  type ConfigDeleteParams,
+  type ConfigGetParams,
 } from './config';
diff --git a/src/resources/logs/control/control.ts b/src/resources/logs/control/control.ts
index 5f5c1e3c0e..8c4fdeea5c 100644
--- a/src/resources/logs/control/control.ts
+++ b/src/resources/logs/control/control.ts
@@ -2,17 +2,32 @@
 
 import { APIResource } from '../../../resource';
 import * as RetentionAPI from './retention';
+import {
+  Retention,
+  RetentionCreateParams,
+  RetentionCreateResponse,
+  RetentionGetParams,
+  RetentionGetResponse,
+} from './retention';
 import * as CmbAPI from './cmb/cmb';
+import { Cmb } from './cmb/cmb';
 
 export class Control extends APIResource {
   retention: RetentionAPI.Retention = new RetentionAPI.Retention(this._client);
   cmb: CmbAPI.Cmb = new CmbAPI.Cmb(this._client);
 }
 
-export namespace Control {
-  export import Retention = RetentionAPI.Retention;
-  export import RetentionCreateResponse = RetentionAPI.RetentionCreateResponse;
-  export import RetentionGetResponse = RetentionAPI.RetentionGetResponse;
-  export import RetentionCreateParams = RetentionAPI.RetentionCreateParams;
-  export import Cmb = CmbAPI.Cmb;
+Control.Retention = Retention;
+Control.Cmb = Cmb;
+
+export declare namespace Control {
+  export {
+    Retention as Retention,
+    type RetentionCreateResponse as RetentionCreateResponse,
+    type RetentionGetResponse as RetentionGetResponse,
+    type RetentionCreateParams as RetentionCreateParams,
+    type RetentionGetParams as RetentionGetParams,
+  };
+
+  export { Cmb as Cmb };
 }
diff --git a/src/resources/logs/control/index.ts b/src/resources/logs/control/index.ts
index e431d52a6a..700f3ebeda 100644
--- a/src/resources/logs/control/index.ts
+++ b/src/resources/logs/control/index.ts
@@ -2,4 +2,10 @@
 
 export { Cmb } from './cmb/index';
 export { Control } from './control';
-export { RetentionCreateResponse, RetentionGetResponse, RetentionCreateParams, Retention } from './retention';
+export {
+  Retention,
+  type RetentionCreateResponse,
+  type RetentionGetResponse,
+  type RetentionCreateParams,
+  type RetentionGetParams,
+} from './retention';
diff --git a/src/resources/logs/control/retention.ts b/src/resources/logs/control/retention.ts
index 383c8714c3..d4e19f4f28 100644
--- a/src/resources/logs/control/retention.ts
+++ b/src/resources/logs/control/retention.ts
@@ -2,54 +2,78 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as RetentionAPI from './retention';
 
 export class Retention extends APIResource {
   /**
    * Updates log retention flag for Logpull API.
    */
   create(
-    zoneIdentifier: string,
-    body: RetentionCreateParams,
+    params: RetentionCreateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<RetentionCreateResponse> {
+  ): Core.APIPromise<RetentionCreateResponse | null> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.post(`/zones/${zoneIdentifier}/logs/control/retention/flag`, {
+      this._client.post(`/zones/${zone_id}/logs/control/retention/flag`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: RetentionCreateResponse }>
+      }) as Core.APIPromise<{ result: RetentionCreateResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
    * Gets log retention flag for Logpull API.
    */
-  get(zoneIdentifier: string, options?: Core.RequestOptions): Core.APIPromise<RetentionGetResponse> {
+  get(
+    params: RetentionGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RetentionGetResponse | null> {
+    const { zone_id } = params;
     return (
-      this._client.get(`/zones/${zoneIdentifier}/logs/control/retention/flag`, options) as Core.APIPromise<{
-        result: RetentionGetResponse;
+      this._client.get(`/zones/${zone_id}/logs/control/retention/flag`, options) as Core.APIPromise<{
+        result: RetentionGetResponse | null;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
 export interface RetentionCreateResponse {
+  /**
+   * The log retention flag for Logpull API.
+   */
   flag?: boolean;
 }
 
 export interface RetentionGetResponse {
+  /**
+   * The log retention flag for Logpull API.
+   */
   flag?: boolean;
 }
 
 export interface RetentionCreateParams {
   /**
-   * The log retention flag for Logpull API.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The log retention flag for Logpull API.
+   */
+  flag?: boolean;
+}
+
+export interface RetentionGetParams {
+  /**
+   * Identifier
    */
-  flag: boolean;
+  zone_id: string;
 }
 
-export namespace Retention {
-  export import RetentionCreateResponse = RetentionAPI.RetentionCreateResponse;
-  export import RetentionGetResponse = RetentionAPI.RetentionGetResponse;
-  export import RetentionCreateParams = RetentionAPI.RetentionCreateParams;
+export declare namespace Retention {
+  export {
+    type RetentionCreateResponse as RetentionCreateResponse,
+    type RetentionGetResponse as RetentionGetResponse,
+    type RetentionCreateParams as RetentionCreateParams,
+    type RetentionGetParams as RetentionGetParams,
+  };
 }
diff --git a/src/resources/logs/index.ts b/src/resources/logs/index.ts
index c8b3d7afa4..edef47a1eb 100644
--- a/src/resources/logs/index.ts
+++ b/src/resources/logs/index.ts
@@ -2,5 +2,5 @@
 
 export { Control } from './control/index';
 export { Logs } from './logs';
-export { RayIDGetResponse, RayIDGetParams, RayID } from './rayid';
-export { ReceivedGetResponse, ReceivedGetParams, Received } from './received/index';
+export { RayID, type RayIDGetResponse, type RayIDGetParams } from './rayid';
+export { Received, type ReceivedGetResponse, type ReceivedGetParams } from './received/index';
diff --git a/src/resources/logs/logs.ts b/src/resources/logs/logs.ts
index 97d33bfd3d..8bc3fd5875 100644
--- a/src/resources/logs/logs.ts
+++ b/src/resources/logs/logs.ts
@@ -2,8 +2,11 @@
 
 import { APIResource } from '../../resource';
 import * as RayIDAPI from './rayid';
+import { RayID, RayIDGetParams, RayIDGetResponse } from './rayid';
 import * as ControlAPI from './control/control';
+import { Control } from './control/control';
 import * as ReceivedAPI from './received/received';
+import { Received, ReceivedGetParams, ReceivedGetResponse } from './received/received';
 
 export class Logs extends APIResource {
   control: ControlAPI.Control = new ControlAPI.Control(this._client);
@@ -11,12 +14,18 @@ export class Logs extends APIResource {
   received: ReceivedAPI.Received = new ReceivedAPI.Received(this._client);
 }
 
-export namespace Logs {
-  export import Control = ControlAPI.Control;
-  export import RayID = RayIDAPI.RayID;
-  export import RayIDGetResponse = RayIDAPI.RayIDGetResponse;
-  export import RayIDGetParams = RayIDAPI.RayIDGetParams;
-  export import Received = ReceivedAPI.Received;
-  export import ReceivedGetResponse = ReceivedAPI.ReceivedGetResponse;
-  export import ReceivedGetParams = ReceivedAPI.ReceivedGetParams;
+Logs.Control = Control;
+Logs.RayID = RayID;
+Logs.Received = Received;
+
+export declare namespace Logs {
+  export { Control as Control };
+
+  export { RayID as RayID, type RayIDGetResponse as RayIDGetResponse, type RayIDGetParams as RayIDGetParams };
+
+  export {
+    Received as Received,
+    type ReceivedGetResponse as ReceivedGetResponse,
+    type ReceivedGetParams as ReceivedGetParams,
+  };
 }
diff --git a/src/resources/logs/rayid.ts b/src/resources/logs/rayid.ts
index d3dc7b72da..0704ee5c26 100644
--- a/src/resources/logs/rayid.ts
+++ b/src/resources/logs/rayid.ts
@@ -1,9 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
-import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as RayIDAPI from './rayid';
 
 export class RayID extends APIResource {
   /**
@@ -11,26 +9,12 @@ export class RayID extends APIResource {
    * return zero, one, or more records (ray ids are not unique).
    */
   get(
-    zoneIdentifier: string,
-    rayIdentifier: string,
-    query?: RayIDGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<RayIDGetResponse>;
-  get(
-    zoneIdentifier: string,
-    rayIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<RayIDGetResponse>;
-  get(
-    zoneIdentifier: string,
-    rayIdentifier: string,
-    query: RayIDGetParams | Core.RequestOptions = {},
+    RayID: string,
+    params: RayIDGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<RayIDGetResponse> {
-    if (isRequestOptions(query)) {
-      return this.get(zoneIdentifier, rayIdentifier, {}, query);
-    }
-    return this._client.get(`/zones/${zoneIdentifier}/logs/rayids/${rayIdentifier}`, { query, ...options });
+    const { zone_id, ...query } = params;
+    return this._client.get(`/zones/${zone_id}/logs/rayids/${RayID}`, { query, ...options });
   }
 }
 
@@ -38,31 +22,35 @@ export type RayIDGetResponse = string | unknown;
 
 export interface RayIDGetParams {
   /**
-   * The `/received` route by default returns a limited set of fields, and allows
-   * customers to override the default field set by specifying individual fields. The
-   * reasons for this are: 1. Most customers require only a small subset of fields,
-   * but that subset varies from customer to customer; 2. Flat schema is much easier
-   * to work with downstream (importing into BigTable etc); 3. Performance (time to
-   * process, file size). If `?fields=` is not specified, default field set is
-   * returned. This default field set may change at any time. When `?fields=` is
-   * provided, each record is returned with the specified fields. `fields` must be
-   * specified as a comma separated list without any whitespaces, and all fields must
-   * exist. The order in which fields are specified does not matter, and the order of
-   * fields in the response is not specified.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: The `/received` route by default returns a limited set of fields,
+   * and allows customers to override the default field set by specifying individual
+   * fields. The reasons for this are: 1. Most customers require only a small subset
+   * of fields, but that subset varies from customer to customer; 2. Flat schema is
+   * much easier to work with downstream (importing into BigTable etc); 3.
+   * Performance (time to process, file size). If `?fields=` is not specified,
+   * default field set is returned. This default field set may change at any time.
+   * When `?fields=` is provided, each record is returned with the specified fields.
+   * `fields` must be specified as a comma separated list without any whitespaces,
+   * and all fields must exist. The order in which fields are specified does not
+   * matter, and the order of fields in the response is not specified.
    */
   fields?: string;
 
   /**
-   * By default, timestamps in responses are returned as Unix nanosecond integers.
-   * The `?timestamps=` argument can be set to change the format in which response
-   * timestamps are returned. Possible values are: `unix`, `unixnano`, `rfc3339`.
-   * Note that `unix` and `unixnano` return timestamps as integers; `rfc3339` returns
-   * timestamps as strings.
+   * Query param: By default, timestamps in responses are returned as Unix nanosecond
+   * integers. The `?timestamps=` argument can be set to change the format in which
+   * response timestamps are returned. Possible values are: `unix`, `unixnano`,
+   * `rfc3339`. Note that `unix` and `unixnano` return timestamps as integers;
+   * `rfc3339` returns timestamps as strings.
    */
   timestamps?: 'unix' | 'unixnano' | 'rfc3339';
 }
 
-export namespace RayID {
-  export import RayIDGetResponse = RayIDAPI.RayIDGetResponse;
-  export import RayIDGetParams = RayIDAPI.RayIDGetParams;
+export declare namespace RayID {
+  export { type RayIDGetResponse as RayIDGetResponse, type RayIDGetParams as RayIDGetParams };
 }
diff --git a/src/resources/logs/received/fields.ts b/src/resources/logs/received/fields.ts
index 48ee4d3d7b..811f223ca0 100644
--- a/src/resources/logs/received/fields.ts
+++ b/src/resources/logs/received/fields.ts
@@ -2,15 +2,15 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as FieldsAPI from './fields';
 
 export class Fields extends APIResource {
   /**
    * Lists all fields available. The response is json object with key-value pairs,
    * where keys are field names, and values are descriptions.
    */
-  get(zoneIdentifier: string, options?: Core.RequestOptions): Core.APIPromise<FieldGetResponse> {
-    return this._client.get(`/zones/${zoneIdentifier}/logs/received/fields`, options);
+  get(params: FieldGetParams, options?: Core.RequestOptions): Core.APIPromise<FieldGetResponse> {
+    const { zone_id } = params;
+    return this._client.get(`/zones/${zone_id}/logs/received/fields`, options);
   }
 }
 
@@ -18,6 +18,13 @@ export interface FieldGetResponse {
   key?: string;
 }
 
-export namespace Fields {
-  export import FieldGetResponse = FieldsAPI.FieldGetResponse;
+export interface FieldGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export declare namespace Fields {
+  export { type FieldGetResponse as FieldGetResponse, type FieldGetParams as FieldGetParams };
 }
diff --git a/src/resources/logs/received/index.ts b/src/resources/logs/received/index.ts
index adc2f62489..872f107c23 100644
--- a/src/resources/logs/received/index.ts
+++ b/src/resources/logs/received/index.ts
@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { FieldGetResponse, Fields } from './fields';
-export { ReceivedGetResponse, ReceivedGetParams, Received } from './received';
+export { Fields, type FieldGetResponse, type FieldGetParams } from './fields';
+export { Received, type ReceivedGetResponse, type ReceivedGetParams } from './received';
diff --git a/src/resources/logs/received/received.ts b/src/resources/logs/received/received.ts
index 1d612838fa..f6697d739e 100644
--- a/src/resources/logs/received/received.ts
+++ b/src/resources/logs/received/received.ts
@@ -2,8 +2,8 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ReceivedAPI from './received';
 import * as FieldsAPI from './fields';
+import { FieldGetParams, FieldGetResponse, Fields } from './fields';
 
 export class Received extends APIResource {
   fields: FieldsAPI.Fields = new FieldsAPI.Fields(this._client);
@@ -18,12 +18,9 @@ export class Received extends APIResource {
    * `start=2018-05-20T10:01:00Z&end=2018-05-20T10:02:00Z` and so on; the overlap
    * will be handled properly.
    */
-  get(
-    zoneIdentifier: string,
-    query: ReceivedGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<ReceivedGetResponse> {
-    return this._client.get(`/zones/${zoneIdentifier}/logs/received`, { query, ...options });
+  get(params: ReceivedGetParams, options?: Core.RequestOptions): Core.APIPromise<ReceivedGetResponse> {
+    const { zone_id, ...query } = params;
+    return this._client.get(`/zones/${zone_id}/logs/received`, { query, ...options });
   }
 }
 
@@ -31,69 +28,80 @@ export type ReceivedGetResponse = string | unknown;
 
 export interface ReceivedGetParams {
   /**
-   * Sets the (exclusive) end of the requested time frame. This can be a unix
-   * timestamp (in seconds or nanoseconds), or an absolute timestamp that conforms to
-   * RFC 3339. `end` must be at least five minutes earlier than now and must be later
-   * than `start`. Difference between `start` and `end` must be not greater than one
-   * hour.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: Sets the (exclusive) end of the requested time frame. This can be a
+   * unix timestamp (in seconds or nanoseconds), or an absolute timestamp that
+   * conforms to RFC 3339. `end` must be at least five minutes earlier than now and
+   * must be later than `start`. Difference between `start` and `end` must be not
+   * greater than one hour.
    */
   end: string | number;
 
   /**
-   * When `?count=` is provided, the response will contain up to `count` results.
-   * Since results are not sorted, you are likely to get different data for repeated
-   * requests. `count` must be an integer > 0.
+   * Query param: When `?count=` is provided, the response will contain up to `count`
+   * results. Since results are not sorted, you are likely to get different data for
+   * repeated requests. `count` must be an integer > 0.
    */
   count?: number;
 
   /**
-   * The `/received` route by default returns a limited set of fields, and allows
-   * customers to override the default field set by specifying individual fields. The
-   * reasons for this are: 1. Most customers require only a small subset of fields,
-   * but that subset varies from customer to customer; 2. Flat schema is much easier
-   * to work with downstream (importing into BigTable etc); 3. Performance (time to
-   * process, file size). If `?fields=` is not specified, default field set is
-   * returned. This default field set may change at any time. When `?fields=` is
-   * provided, each record is returned with the specified fields. `fields` must be
-   * specified as a comma separated list without any whitespaces, and all fields must
-   * exist. The order in which fields are specified does not matter, and the order of
-   * fields in the response is not specified.
+   * Query param: The `/received` route by default returns a limited set of fields,
+   * and allows customers to override the default field set by specifying individual
+   * fields. The reasons for this are: 1. Most customers require only a small subset
+   * of fields, but that subset varies from customer to customer; 2. Flat schema is
+   * much easier to work with downstream (importing into BigTable etc); 3.
+   * Performance (time to process, file size). If `?fields=` is not specified,
+   * default field set is returned. This default field set may change at any time.
+   * When `?fields=` is provided, each record is returned with the specified fields.
+   * `fields` must be specified as a comma separated list without any whitespaces,
+   * and all fields must exist. The order in which fields are specified does not
+   * matter, and the order of fields in the response is not specified.
    */
   fields?: string;
 
   /**
-   * When `?sample=` is provided, a sample of matching records is returned. If
-   * `sample=0.1` then 10% of records will be returned. Sampling is random: repeated
-   * calls will not only return different records, but likely will also vary slightly
-   * in number of returned records. When `?count=` is also specified, `count` is
-   * applied to the number of returned records, not the sampled records. So, with
-   * `sample=0.05` and `count=7`, when there is a total of 100 records available,
-   * approximately five will be returned. When there are 1000 records, seven will be
-   * returned. When there are 10,000 records, seven will be returned.
+   * Query param: When `?sample=` is provided, a sample of matching records is
+   * returned. If `sample=0.1` then 10% of records will be returned. Sampling is
+   * random: repeated calls will not only return different records, but likely will
+   * also vary slightly in number of returned records. When `?count=` is also
+   * specified, `count` is applied to the number of returned records, not the sampled
+   * records. So, with `sample=0.05` and `count=7`, when there is a total of 100
+   * records available, approximately five will be returned. When there are 1000
+   * records, seven will be returned. When there are 10,000 records, seven will be
+   * returned.
    */
   sample?: number;
 
   /**
-   * Sets the (inclusive) beginning of the requested time frame. This can be a unix
-   * timestamp (in seconds or nanoseconds), or an absolute timestamp that conforms to
-   * RFC 3339. At this point in time, it cannot exceed a time in the past greater
-   * than seven days.
+   * Query param: Sets the (inclusive) beginning of the requested time frame. This
+   * can be a unix timestamp (in seconds or nanoseconds), or an absolute timestamp
+   * that conforms to RFC 3339. At this point in time, it cannot exceed a time in the
+   * past greater than seven days.
    */
   start?: string | number;
 
   /**
-   * By default, timestamps in responses are returned as Unix nanosecond integers.
-   * The `?timestamps=` argument can be set to change the format in which response
-   * timestamps are returned. Possible values are: `unix`, `unixnano`, `rfc3339`.
-   * Note that `unix` and `unixnano` return timestamps as integers; `rfc3339` returns
-   * timestamps as strings.
+   * Query param: By default, timestamps in responses are returned as Unix nanosecond
+   * integers. The `?timestamps=` argument can be set to change the format in which
+   * response timestamps are returned. Possible values are: `unix`, `unixnano`,
+   * `rfc3339`. Note that `unix` and `unixnano` return timestamps as integers;
+   * `rfc3339` returns timestamps as strings.
    */
   timestamps?: 'unix' | 'unixnano' | 'rfc3339';
 }
 
-export namespace Received {
-  export import ReceivedGetResponse = ReceivedAPI.ReceivedGetResponse;
-  export import ReceivedGetParams = ReceivedAPI.ReceivedGetParams;
-  export import Fields = FieldsAPI.Fields;
-  export import FieldGetResponse = FieldsAPI.FieldGetResponse;
+Received.Fields = Fields;
+
+export declare namespace Received {
+  export { type ReceivedGetResponse as ReceivedGetResponse, type ReceivedGetParams as ReceivedGetParams };
+
+  export {
+    Fields as Fields,
+    type FieldGetResponse as FieldGetResponse,
+    type FieldGetParams as FieldGetParams,
+  };
 }
diff --git a/src/resources/magic-network-monitoring/configs/configs.ts b/src/resources/magic-network-monitoring/configs/configs.ts
index 21fe9972d0..6ca54734fd 100644
--- a/src/resources/magic-network-monitoring/configs/configs.ts
+++ b/src/resources/magic-network-monitoring/configs/configs.ts
@@ -2,8 +2,8 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ConfigsAPI from './configs';
 import * as FullAPI from './full';
+import { Full, FullGetParams } from './full';
 
 export class Configs extends APIResource {
   full: FullAPI.Full = new FullAPI.Full(this._client);
@@ -12,9 +12,9 @@ export class Configs extends APIResource {
    * Create a new network monitoring configuration.
    */
   create(params: ConfigCreateParams, options?: Core.RequestOptions): Core.APIPromise<Configuration> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${account_id}/mnm/config`, { body: body, ...options }) as Core.APIPromise<{
+      this._client.post(`/accounts/${account_id}/mnm/config`, { body, ...options }) as Core.APIPromise<{
         result: Configuration;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -25,9 +25,9 @@ export class Configs extends APIResource {
    * configuration to be updated at once.
    */
   update(params: ConfigUpdateParams, options?: Core.RequestOptions): Core.APIPromise<Configuration> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
-      this._client.put(`/accounts/${account_id}/mnm/config`, { body: body, ...options }) as Core.APIPromise<{
+      this._client.put(`/accounts/${account_id}/mnm/config`, { body, ...options }) as Core.APIPromise<{
         result: Configuration;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -49,17 +49,16 @@ export class Configs extends APIResource {
    * Update fields in an existing network monitoring configuration.
    */
   edit(params: ConfigEditParams, options?: Core.RequestOptions): Core.APIPromise<Configuration> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
-      this._client.patch(`/accounts/${account_id}/mnm/config`, {
-        body: body,
-        ...options,
-      }) as Core.APIPromise<{ result: Configuration }>
+      this._client.patch(`/accounts/${account_id}/mnm/config`, { body, ...options }) as Core.APIPromise<{
+        result: Configuration;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Lists default sampling and router IPs for account.
+   * Lists default sampling, router IPs and warp devices for account.
    */
   get(params: ConfigGetParams, options?: Core.RequestOptions): Core.APIPromise<Configuration> {
     const { account_id } = params;
@@ -84,6 +83,31 @@ export interface Configuration {
   name: string;
 
   router_ips: Array<string>;
+
+  warp_devices: Array<Configuration.WARPDevice>;
+}
+
+export namespace Configuration {
+  /**
+   * Object representing a warp device with an ID and name.
+   */
+  export interface WARPDevice {
+    /**
+     * Unique identifier for the warp device.
+     */
+    id: string;
+
+    /**
+     * Name of the warp device.
+     */
+    name: string;
+
+    /**
+     * IPv4 CIDR of the router sourcing flow data associated with this warp device.
+     * Only /32 addresses are currently supported.
+     */
+    router_ip: string;
+  }
 }
 
 export interface ConfigCreateParams {
@@ -92,10 +116,49 @@ export interface ConfigCreateParams {
    */
   account_id: string;
 
+  /**
+   * Body param: Fallback sampling rate of flow messages being sent in packets per
+   * second. This should match the packet sampling rate configured on the router.
+   */
+  default_sampling: number;
+
+  /**
+   * Body param: The account name.
+   */
+  name: string;
+
+  /**
+   * Body param:
+   */
+  router_ips?: Array<string>;
+
   /**
    * Body param:
    */
-  body: unknown;
+  warp_devices?: Array<ConfigCreateParams.WARPDevice>;
+}
+
+export namespace ConfigCreateParams {
+  /**
+   * Object representing a warp device with an ID and name.
+   */
+  export interface WARPDevice {
+    /**
+     * Unique identifier for the warp device.
+     */
+    id: string;
+
+    /**
+     * Name of the warp device.
+     */
+    name: string;
+
+    /**
+     * IPv4 CIDR of the router sourcing flow data associated with this warp device.
+     * Only /32 addresses are currently supported.
+     */
+    router_ip: string;
+  }
 }
 
 export interface ConfigUpdateParams {
@@ -104,10 +167,49 @@ export interface ConfigUpdateParams {
    */
   account_id: string;
 
+  /**
+   * Body param: Fallback sampling rate of flow messages being sent in packets per
+   * second. This should match the packet sampling rate configured on the router.
+   */
+  default_sampling: number;
+
+  /**
+   * Body param: The account name.
+   */
+  name: string;
+
   /**
    * Body param:
    */
-  body: unknown;
+  router_ips?: Array<string>;
+
+  /**
+   * Body param:
+   */
+  warp_devices?: Array<ConfigUpdateParams.WARPDevice>;
+}
+
+export namespace ConfigUpdateParams {
+  /**
+   * Object representing a warp device with an ID and name.
+   */
+  export interface WARPDevice {
+    /**
+     * Unique identifier for the warp device.
+     */
+    id: string;
+
+    /**
+     * Name of the warp device.
+     */
+    name: string;
+
+    /**
+     * IPv4 CIDR of the router sourcing flow data associated with this warp device.
+     * Only /32 addresses are currently supported.
+     */
+    router_ip: string;
+  }
 }
 
 export interface ConfigDeleteParams {
@@ -120,23 +222,66 @@ export interface ConfigEditParams {
    */
   account_id: string;
 
+  /**
+   * Body param: Fallback sampling rate of flow messages being sent in packets per
+   * second. This should match the packet sampling rate configured on the router.
+   */
+  default_sampling?: number;
+
+  /**
+   * Body param: The account name.
+   */
+  name?: string;
+
+  /**
+   * Body param:
+   */
+  router_ips?: Array<string>;
+
   /**
    * Body param:
    */
-  body: unknown;
+  warp_devices?: Array<ConfigEditParams.WARPDevice>;
+}
+
+export namespace ConfigEditParams {
+  /**
+   * Object representing a warp device with an ID and name.
+   */
+  export interface WARPDevice {
+    /**
+     * Unique identifier for the warp device.
+     */
+    id: string;
+
+    /**
+     * Name of the warp device.
+     */
+    name: string;
+
+    /**
+     * IPv4 CIDR of the router sourcing flow data associated with this warp device.
+     * Only /32 addresses are currently supported.
+     */
+    router_ip: string;
+  }
 }
 
 export interface ConfigGetParams {
   account_id: string;
 }
 
-export namespace Configs {
-  export import Configuration = ConfigsAPI.Configuration;
-  export import ConfigCreateParams = ConfigsAPI.ConfigCreateParams;
-  export import ConfigUpdateParams = ConfigsAPI.ConfigUpdateParams;
-  export import ConfigDeleteParams = ConfigsAPI.ConfigDeleteParams;
-  export import ConfigEditParams = ConfigsAPI.ConfigEditParams;
-  export import ConfigGetParams = ConfigsAPI.ConfigGetParams;
-  export import Full = FullAPI.Full;
-  export import FullGetParams = FullAPI.FullGetParams;
+Configs.Full = Full;
+
+export declare namespace Configs {
+  export {
+    type Configuration as Configuration,
+    type ConfigCreateParams as ConfigCreateParams,
+    type ConfigUpdateParams as ConfigUpdateParams,
+    type ConfigDeleteParams as ConfigDeleteParams,
+    type ConfigEditParams as ConfigEditParams,
+    type ConfigGetParams as ConfigGetParams,
+  };
+
+  export { Full as Full, type FullGetParams as FullGetParams };
 }
diff --git a/src/resources/magic-network-monitoring/configs/full.ts b/src/resources/magic-network-monitoring/configs/full.ts
index 50e3d2d88b..be3abef480 100644
--- a/src/resources/magic-network-monitoring/configs/full.ts
+++ b/src/resources/magic-network-monitoring/configs/full.ts
@@ -2,12 +2,11 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as FullAPI from './full';
 import * as ConfigsAPI from './configs';
 
 export class Full extends APIResource {
   /**
-   * Lists default sampling, router IPs, and rules for account.
+   * Lists default sampling, router IPs, warp devices, and rules for account.
    */
   get(params: FullGetParams, options?: Core.RequestOptions): Core.APIPromise<ConfigsAPI.Configuration> {
     const { account_id } = params;
@@ -23,6 +22,6 @@ export interface FullGetParams {
   account_id: string;
 }
 
-export namespace Full {
-  export import FullGetParams = FullAPI.FullGetParams;
+export declare namespace Full {
+  export { type FullGetParams as FullGetParams };
 }
diff --git a/src/resources/magic-network-monitoring/configs/index.ts b/src/resources/magic-network-monitoring/configs/index.ts
index 84ea79ba6f..da6b24e588 100644
--- a/src/resources/magic-network-monitoring/configs/index.ts
+++ b/src/resources/magic-network-monitoring/configs/index.ts
@@ -1,12 +1,12 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Configuration,
-  ConfigCreateParams,
-  ConfigUpdateParams,
-  ConfigDeleteParams,
-  ConfigEditParams,
-  ConfigGetParams,
   Configs,
+  type Configuration,
+  type ConfigCreateParams,
+  type ConfigUpdateParams,
+  type ConfigDeleteParams,
+  type ConfigEditParams,
+  type ConfigGetParams,
 } from './configs';
-export { FullGetParams, Full } from './full';
+export { Full, type FullGetParams } from './full';
diff --git a/src/resources/magic-network-monitoring/index.ts b/src/resources/magic-network-monitoring/index.ts
index 4659508ad0..3b7a83bab7 100644
--- a/src/resources/magic-network-monitoring/index.ts
+++ b/src/resources/magic-network-monitoring/index.ts
@@ -1,23 +1,23 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Configuration,
-  ConfigCreateParams,
-  ConfigUpdateParams,
-  ConfigDeleteParams,
-  ConfigEditParams,
-  ConfigGetParams,
   Configs,
+  type Configuration,
+  type ConfigCreateParams,
+  type ConfigUpdateParams,
+  type ConfigDeleteParams,
+  type ConfigEditParams,
+  type ConfigGetParams,
 } from './configs/index';
 export { MagicNetworkMonitoring } from './magic-network-monitoring';
 export {
-  MagicNetworkMonitoringRule,
-  RuleCreateParams,
-  RuleUpdateParams,
-  RuleListParams,
-  RuleDeleteParams,
-  RuleEditParams,
-  RuleGetParams,
   MagicNetworkMonitoringRulesSinglePage,
   Rules,
+  type MagicNetworkMonitoringRule,
+  type RuleCreateParams,
+  type RuleUpdateParams,
+  type RuleListParams,
+  type RuleDeleteParams,
+  type RuleEditParams,
+  type RuleGetParams,
 } from './rules/index';
diff --git a/src/resources/magic-network-monitoring/magic-network-monitoring.ts b/src/resources/magic-network-monitoring/magic-network-monitoring.ts
index f717cb98ba..4025a732d4 100644
--- a/src/resources/magic-network-monitoring/magic-network-monitoring.ts
+++ b/src/resources/magic-network-monitoring/magic-network-monitoring.ts
@@ -2,28 +2,57 @@
 
 import { APIResource } from '../../resource';
 import * as ConfigsAPI from './configs/configs';
+import {
+  ConfigCreateParams,
+  ConfigDeleteParams,
+  ConfigEditParams,
+  ConfigGetParams,
+  ConfigUpdateParams,
+  Configs,
+  Configuration,
+} from './configs/configs';
 import * as RulesAPI from './rules/rules';
+import {
+  MagicNetworkMonitoringRule,
+  MagicNetworkMonitoringRulesSinglePage,
+  RuleCreateParams,
+  RuleDeleteParams,
+  RuleEditParams,
+  RuleGetParams,
+  RuleListParams,
+  RuleUpdateParams,
+  Rules,
+} from './rules/rules';
 
 export class MagicNetworkMonitoring extends APIResource {
   configs: ConfigsAPI.Configs = new ConfigsAPI.Configs(this._client);
   rules: RulesAPI.Rules = new RulesAPI.Rules(this._client);
 }
 
-export namespace MagicNetworkMonitoring {
-  export import Configs = ConfigsAPI.Configs;
-  export import Configuration = ConfigsAPI.Configuration;
-  export import ConfigCreateParams = ConfigsAPI.ConfigCreateParams;
-  export import ConfigUpdateParams = ConfigsAPI.ConfigUpdateParams;
-  export import ConfigDeleteParams = ConfigsAPI.ConfigDeleteParams;
-  export import ConfigEditParams = ConfigsAPI.ConfigEditParams;
-  export import ConfigGetParams = ConfigsAPI.ConfigGetParams;
-  export import Rules = RulesAPI.Rules;
-  export import MagicNetworkMonitoringRule = RulesAPI.MagicNetworkMonitoringRule;
-  export import MagicNetworkMonitoringRulesSinglePage = RulesAPI.MagicNetworkMonitoringRulesSinglePage;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleDeleteParams = RulesAPI.RuleDeleteParams;
-  export import RuleEditParams = RulesAPI.RuleEditParams;
-  export import RuleGetParams = RulesAPI.RuleGetParams;
+MagicNetworkMonitoring.Configs = Configs;
+MagicNetworkMonitoring.Rules = Rules;
+MagicNetworkMonitoring.MagicNetworkMonitoringRulesSinglePage = MagicNetworkMonitoringRulesSinglePage;
+
+export declare namespace MagicNetworkMonitoring {
+  export {
+    Configs as Configs,
+    type Configuration as Configuration,
+    type ConfigCreateParams as ConfigCreateParams,
+    type ConfigUpdateParams as ConfigUpdateParams,
+    type ConfigDeleteParams as ConfigDeleteParams,
+    type ConfigEditParams as ConfigEditParams,
+    type ConfigGetParams as ConfigGetParams,
+  };
+
+  export {
+    Rules as Rules,
+    type MagicNetworkMonitoringRule as MagicNetworkMonitoringRule,
+    MagicNetworkMonitoringRulesSinglePage as MagicNetworkMonitoringRulesSinglePage,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleEditParams as RuleEditParams,
+    type RuleGetParams as RuleGetParams,
+  };
 }
diff --git a/src/resources/magic-network-monitoring/rules/advertisements.ts b/src/resources/magic-network-monitoring/rules/advertisements.ts
index 6dcc856384..d36e5b7a16 100644
--- a/src/resources/magic-network-monitoring/rules/advertisements.ts
+++ b/src/resources/magic-network-monitoring/rules/advertisements.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as AdvertisementsAPI from './advertisements';
 
 export class Advertisements extends APIResource {
   /**
@@ -44,7 +43,6 @@ export interface AdvertisementEditParams {
   body: unknown;
 }
 
-export namespace Advertisements {
-  export import Advertisement = AdvertisementsAPI.Advertisement;
-  export import AdvertisementEditParams = AdvertisementsAPI.AdvertisementEditParams;
+export declare namespace Advertisements {
+  export { type Advertisement as Advertisement, type AdvertisementEditParams as AdvertisementEditParams };
 }
diff --git a/src/resources/magic-network-monitoring/rules/index.ts b/src/resources/magic-network-monitoring/rules/index.ts
index 6f14e418e6..a2f52aaa4b 100644
--- a/src/resources/magic-network-monitoring/rules/index.ts
+++ b/src/resources/magic-network-monitoring/rules/index.ts
@@ -1,14 +1,14 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { Advertisement, AdvertisementEditParams, Advertisements } from './advertisements';
+export { Advertisements, type Advertisement, type AdvertisementEditParams } from './advertisements';
 export {
-  MagicNetworkMonitoringRule,
-  RuleCreateParams,
-  RuleUpdateParams,
-  RuleListParams,
-  RuleDeleteParams,
-  RuleEditParams,
-  RuleGetParams,
   MagicNetworkMonitoringRulesSinglePage,
   Rules,
+  type MagicNetworkMonitoringRule,
+  type RuleCreateParams,
+  type RuleUpdateParams,
+  type RuleListParams,
+  type RuleDeleteParams,
+  type RuleEditParams,
+  type RuleGetParams,
 } from './rules';
diff --git a/src/resources/magic-network-monitoring/rules/rules.ts b/src/resources/magic-network-monitoring/rules/rules.ts
index 417f83d8ee..247d5279fd 100644
--- a/src/resources/magic-network-monitoring/rules/rules.ts
+++ b/src/resources/magic-network-monitoring/rules/rules.ts
@@ -2,8 +2,8 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as RulesAPI from './rules';
 import * as AdvertisementsAPI from './advertisements';
+import { Advertisement, AdvertisementEditParams, Advertisements } from './advertisements';
 import { SinglePage } from '../../../pagination';
 
 export class Rules extends APIResource {
@@ -17,9 +17,9 @@ export class Rules extends APIResource {
     params: RuleCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<MagicNetworkMonitoringRule | null> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${account_id}/mnm/rules`, { body: body, ...options }) as Core.APIPromise<{
+      this._client.post(`/accounts/${account_id}/mnm/rules`, { body, ...options }) as Core.APIPromise<{
         result: MagicNetworkMonitoringRule | null;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -32,9 +32,9 @@ export class Rules extends APIResource {
     params: RuleUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<MagicNetworkMonitoringRule | null> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
-      this._client.put(`/accounts/${account_id}/mnm/rules`, { body: body, ...options }) as Core.APIPromise<{
+      this._client.put(`/accounts/${account_id}/mnm/rules`, { body, ...options }) as Core.APIPromise<{
         result: MagicNetworkMonitoringRule | null;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -79,10 +79,10 @@ export class Rules extends APIResource {
     params: RuleEditParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<MagicNetworkMonitoringRule | null> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
       this._client.patch(`/accounts/${account_id}/mnm/rules/${ruleId}`, {
-        body: body,
+        body,
         ...options,
       }) as Core.APIPromise<{ result: MagicNetworkMonitoringRule | null }>
     )._thenUnwrap((obj) => obj.result);
@@ -157,10 +157,47 @@ export interface RuleCreateParams {
    */
   account_id: string;
 
+  /**
+   * Body param: The amount of time that the rule threshold must be exceeded to send
+   * an alert notification. The final value must be equivalent to one of the
+   * following 8 values ["1m","5m","10m","15m","20m","30m","45m","60m"]. The format
+   * is AhBmCsDmsEusFns where A, B, C, D, E and F durations are optional; however at
+   * least one unit must be provided.
+   */
+  duration: string;
+
+  /**
+   * Body param: The name of the rule. Must be unique. Supports characters A-Z, a-z,
+   * 0-9, underscore (\_), dash (-), period (.), and tilde (~). You can’t have a
+   * space in the rule name. Max 256 characters.
+   */
+  name: string;
+
+  /**
+   * Body param: Toggle on if you would like Cloudflare to automatically advertise
+   * the IP Prefixes within the rule via Magic Transit when the rule is triggered.
+   * Only available for users of Magic Transit.
+   */
+  automatic_advertisement?: boolean | null;
+
+  /**
+   * Body param: The number of bits per second for the rule. When this value is
+   * exceeded for the set duration, an alert notification is sent. Minimum of 1 and
+   * no maximum.
+   */
+  bandwidth?: number;
+
+  /**
+   * Body param: The number of packets per second for the rule. When this value is
+   * exceeded for the set duration, an alert notification is sent. Minimum of 1 and
+   * no maximum.
+   */
+  packet_threshold?: number;
+
   /**
    * Body param:
    */
-  body: unknown;
+  prefixes?: Array<string>;
 }
 
 export interface RuleUpdateParams {
@@ -169,10 +206,52 @@ export interface RuleUpdateParams {
    */
   account_id: string;
 
+  /**
+   * Body param: The amount of time that the rule threshold must be exceeded to send
+   * an alert notification. The final value must be equivalent to one of the
+   * following 8 values ["1m","5m","10m","15m","20m","30m","45m","60m"]. The format
+   * is AhBmCsDmsEusFns where A, B, C, D, E and F durations are optional; however at
+   * least one unit must be provided.
+   */
+  duration: string;
+
+  /**
+   * Body param: The name of the rule. Must be unique. Supports characters A-Z, a-z,
+   * 0-9, underscore (\_), dash (-), period (.), and tilde (~). You can’t have a
+   * space in the rule name. Max 256 characters.
+   */
+  name: string;
+
+  /**
+   * Body param: The id of the rule. Must be unique.
+   */
+  id?: string;
+
+  /**
+   * Body param: Toggle on if you would like Cloudflare to automatically advertise
+   * the IP Prefixes within the rule via Magic Transit when the rule is triggered.
+   * Only available for users of Magic Transit.
+   */
+  automatic_advertisement?: boolean | null;
+
+  /**
+   * Body param: The number of bits per second for the rule. When this value is
+   * exceeded for the set duration, an alert notification is sent. Minimum of 1 and
+   * no maximum.
+   */
+  bandwidth?: number;
+
+  /**
+   * Body param: The number of packets per second for the rule. When this value is
+   * exceeded for the set duration, an alert notification is sent. Minimum of 1 and
+   * no maximum.
+   */
+  packet_threshold?: number;
+
   /**
    * Body param:
    */
-  body: unknown;
+  prefixes?: Array<string>;
 }
 
 export interface RuleListParams {
@@ -189,26 +268,71 @@ export interface RuleEditParams {
    */
   account_id: string;
 
+  /**
+   * Body param: Toggle on if you would like Cloudflare to automatically advertise
+   * the IP Prefixes within the rule via Magic Transit when the rule is triggered.
+   * Only available for users of Magic Transit.
+   */
+  automatic_advertisement?: boolean | null;
+
+  /**
+   * Body param: The number of bits per second for the rule. When this value is
+   * exceeded for the set duration, an alert notification is sent. Minimum of 1 and
+   * no maximum.
+   */
+  bandwidth?: number;
+
+  /**
+   * Body param: The amount of time that the rule threshold must be exceeded to send
+   * an alert notification. The final value must be equivalent to one of the
+   * following 8 values ["1m","5m","10m","15m","20m","30m","45m","60m"]. The format
+   * is AhBmCsDmsEusFns where A, B, C, D, E and F durations are optional; however at
+   * least one unit must be provided.
+   */
+  duration?: string;
+
+  /**
+   * Body param: The name of the rule. Must be unique. Supports characters A-Z, a-z,
+   * 0-9, underscore (\_), dash (-), period (.), and tilde (~). You can’t have a
+   * space in the rule name. Max 256 characters.
+   */
+  name?: string;
+
+  /**
+   * Body param: The number of packets per second for the rule. When this value is
+   * exceeded for the set duration, an alert notification is sent. Minimum of 1 and
+   * no maximum.
+   */
+  packet_threshold?: number;
+
   /**
    * Body param:
    */
-  body: unknown;
+  prefixes?: Array<string>;
 }
 
 export interface RuleGetParams {
   account_id: string;
 }
 
-export namespace Rules {
-  export import MagicNetworkMonitoringRule = RulesAPI.MagicNetworkMonitoringRule;
-  export import MagicNetworkMonitoringRulesSinglePage = RulesAPI.MagicNetworkMonitoringRulesSinglePage;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleDeleteParams = RulesAPI.RuleDeleteParams;
-  export import RuleEditParams = RulesAPI.RuleEditParams;
-  export import RuleGetParams = RulesAPI.RuleGetParams;
-  export import Advertisements = AdvertisementsAPI.Advertisements;
-  export import Advertisement = AdvertisementsAPI.Advertisement;
-  export import AdvertisementEditParams = AdvertisementsAPI.AdvertisementEditParams;
+Rules.MagicNetworkMonitoringRulesSinglePage = MagicNetworkMonitoringRulesSinglePage;
+Rules.Advertisements = Advertisements;
+
+export declare namespace Rules {
+  export {
+    type MagicNetworkMonitoringRule as MagicNetworkMonitoringRule,
+    MagicNetworkMonitoringRulesSinglePage as MagicNetworkMonitoringRulesSinglePage,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleEditParams as RuleEditParams,
+    type RuleGetParams as RuleGetParams,
+  };
+
+  export {
+    Advertisements as Advertisements,
+    type Advertisement as Advertisement,
+    type AdvertisementEditParams as AdvertisementEditParams,
+  };
 }
diff --git a/src/resources/magic-transit/apps.ts b/src/resources/magic-transit/apps.ts
index c8e7789f65..b0a4fe6a15 100644
--- a/src/resources/magic-transit/apps.ts
+++ b/src/resources/magic-transit/apps.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as AppsAPI from './apps';
 import { SinglePage } from '../../pagination';
 
 export class Apps extends APIResource {
@@ -10,9 +9,9 @@ export class Apps extends APIResource {
    * Creates a new App for an account
    */
   create(params: AppCreateParams, options?: Core.RequestOptions): Core.APIPromise<AppCreateResponse | null> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${account_id}/magic/apps`, { body: body, ...options }) as Core.APIPromise<{
+      this._client.post(`/accounts/${account_id}/magic/apps`, { body, ...options }) as Core.APIPromise<{
         result: AppCreateResponse | null;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -26,10 +25,10 @@ export class Apps extends APIResource {
     params: AppUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<AppUpdateResponse | null> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
       this._client.put(`/accounts/${account_id}/magic/apps/${accountAppId}`, {
-        body: body,
+        body,
         ...options,
       }) as Core.APIPromise<{ result: AppUpdateResponse | null }>
     )._thenUnwrap((obj) => obj.result);
@@ -222,88 +221,58 @@ export interface AppDeleteResponse {
   type?: string;
 }
 
-export type AppCreateParams = AppCreateParams.Hostnames | AppCreateParams.Subnets;
+export interface AppCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
 
-export namespace AppCreateParams {
-  export interface Hostnames {
-    /**
-     * Path param: Identifier
-     */
-    account_id: string;
+  /**
+   * Body param: Display name for the app.
+   */
+  name: string;
 
-    /**
-     * Body param:
-     */
-    body: unknown;
-  }
+  /**
+   * Body param: Category of the app.
+   */
+  type: string;
 
-  export interface Subnets {
-    /**
-     * Path param: Identifier
-     */
-    account_id: string;
+  /**
+   * Body param: FQDNs to associate with traffic decisions.
+   */
+  hostnames?: Array<string>;
 
-    /**
-     * Body param:
-     */
-    body: unknown;
-  }
+  /**
+   * Body param: CIDRs to associate with traffic decisions.
+   */
+  ip_subnets?: Array<string>;
 }
 
-export type AppUpdateParams =
-  | AppUpdateParams.UpdateAppName
-  | AppUpdateParams.UpdateAppType
-  | AppUpdateParams.UpdateAppHostnames
-  | AppUpdateParams.UpdateAppSubnets;
-
-export namespace AppUpdateParams {
-  export interface UpdateAppName {
-    /**
-     * Path param: Identifier
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    body: unknown;
-  }
-
-  export interface UpdateAppType {
-    /**
-     * Path param: Identifier
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    body: unknown;
-  }
+export interface AppUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
 
-  export interface UpdateAppHostnames {
-    /**
-     * Path param: Identifier
-     */
-    account_id: string;
+  /**
+   * Body param: FQDNs to associate with traffic decisions.
+   */
+  hostnames?: Array<string>;
 
-    /**
-     * Body param:
-     */
-    body: unknown;
-  }
+  /**
+   * Body param: CIDRs to associate with traffic decisions.
+   */
+  ip_subnets?: Array<string>;
 
-  export interface UpdateAppSubnets {
-    /**
-     * Path param: Identifier
-     */
-    account_id: string;
+  /**
+   * Body param: Display name for the app.
+   */
+  name?: string;
 
-    /**
-     * Body param:
-     */
-    body: unknown;
-  }
+  /**
+   * Body param: Category of the app.
+   */
+  type?: string;
 }
 
 export interface AppListParams {
@@ -320,14 +289,18 @@ export interface AppDeleteParams {
   account_id: string;
 }
 
-export namespace Apps {
-  export import AppCreateResponse = AppsAPI.AppCreateResponse;
-  export import AppUpdateResponse = AppsAPI.AppUpdateResponse;
-  export import AppListResponse = AppsAPI.AppListResponse;
-  export import AppDeleteResponse = AppsAPI.AppDeleteResponse;
-  export import AppListResponsesSinglePage = AppsAPI.AppListResponsesSinglePage;
-  export import AppCreateParams = AppsAPI.AppCreateParams;
-  export import AppUpdateParams = AppsAPI.AppUpdateParams;
-  export import AppListParams = AppsAPI.AppListParams;
-  export import AppDeleteParams = AppsAPI.AppDeleteParams;
+Apps.AppListResponsesSinglePage = AppListResponsesSinglePage;
+
+export declare namespace Apps {
+  export {
+    type AppCreateResponse as AppCreateResponse,
+    type AppUpdateResponse as AppUpdateResponse,
+    type AppListResponse as AppListResponse,
+    type AppDeleteResponse as AppDeleteResponse,
+    AppListResponsesSinglePage as AppListResponsesSinglePage,
+    type AppCreateParams as AppCreateParams,
+    type AppUpdateParams as AppUpdateParams,
+    type AppListParams as AppListParams,
+    type AppDeleteParams as AppDeleteParams,
+  };
 }
diff --git a/src/resources/magic-transit/cf-interconnects.ts b/src/resources/magic-transit/cf-interconnects.ts
index ccfcb42f5e..824b9afe16 100644
--- a/src/resources/magic-transit/cf-interconnects.ts
+++ b/src/resources/magic-transit/cf-interconnects.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as CfInterconnectsAPI from './cf-interconnects';
 import * as MagicTransitAPI from './magic-transit';
 
 export class CfInterconnects extends APIResource {
@@ -16,11 +15,17 @@ export class CfInterconnects extends APIResource {
     params: CfInterconnectUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<CfInterconnectUpdateResponse> {
-    const { account_id, ...body } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget, ...body } = params;
     return (
       this._client.put(`/accounts/${account_id}/magic/cf_interconnects/${cfInterconnectId}`, {
         body,
         ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
       }) as Core.APIPromise<{ result: CfInterconnectUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -32,11 +37,41 @@ export class CfInterconnects extends APIResource {
     params: CfInterconnectListParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<CfInterconnectListResponse> {
-    const { account_id } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
     return (
-      this._client.get(`/accounts/${account_id}/magic/cf_interconnects`, options) as Core.APIPromise<{
-        result: CfInterconnectListResponse;
-      }>
+      this._client.get(`/accounts/${account_id}/magic/cf_interconnects`, {
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: CfInterconnectListResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Updates multiple interconnects associated with an account. Use
+   * `?validate_only=true` as an optional query parameter to only run validation
+   * without persisting changes.
+   */
+  bulkUpdate(
+    params: CfInterconnectBulkUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CfInterconnectBulkUpdateResponse> {
+    const { account_id, body, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/magic/cf_interconnects`, {
+        body: body,
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: CfInterconnectBulkUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -48,12 +83,17 @@ export class CfInterconnects extends APIResource {
     params: CfInterconnectGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<CfInterconnectGetResponse> {
-    const { account_id } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
     return (
-      this._client.get(
-        `/accounts/${account_id}/magic/cf_interconnects/${cfInterconnectId}`,
-        options,
-      ) as Core.APIPromise<{ result: CfInterconnectGetResponse }>
+      this._client.get(`/accounts/${account_id}/magic/cf_interconnects/${cfInterconnectId}`, {
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: CfInterconnectGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -61,7 +101,74 @@ export class CfInterconnects extends APIResource {
 export interface CfInterconnectUpdateResponse {
   modified?: boolean;
 
-  modified_interconnect?: unknown;
+  modified_interconnect?: CfInterconnectUpdateResponse.ModifiedInterconnect;
+}
+
+export namespace CfInterconnectUpdateResponse {
+  export interface ModifiedInterconnect {
+    /**
+     * Tunnel identifier tag.
+     */
+    id?: string;
+
+    /**
+     * The name of the interconnect. The name cannot share a name with other tunnels.
+     */
+    colo_name?: string;
+
+    /**
+     * The date and time the tunnel was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional description of the interconnect.
+     */
+    description?: string;
+
+    /**
+     * The configuration specific to GRE interconnects.
+     */
+    gre?: ModifiedInterconnect.GRE;
+
+    health_check?: MagicTransitAPI.HealthCheck;
+
+    /**
+     * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+     * of the tunnel. Select the subnet from the following private IP space:
+     * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+     */
+    interface_address?: string;
+
+    /**
+     * The date and time the tunnel was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * The Maximum Transmission Unit (MTU) in bytes for the interconnect. The minimum
+     * value is 576.
+     */
+    mtu?: number;
+
+    /**
+     * The name of the interconnect. The name cannot share a name with other tunnels.
+     */
+    name?: string;
+  }
+
+  export namespace ModifiedInterconnect {
+    /**
+     * The configuration specific to GRE interconnects.
+     */
+    export interface GRE {
+      /**
+       * The IP address assigned to the Cloudflare side of the GRE tunnel created as part
+       * of the Interconnect.
+       */
+      cloudflare_endpoint?: string;
+    }
+  }
 }
 
 export interface CfInterconnectListResponse {
@@ -95,7 +202,7 @@ export namespace CfInterconnectListResponse {
      */
     gre?: Interconnect.GRE;
 
-    health_check?: Interconnect.HealthCheck;
+    health_check?: MagicTransitAPI.HealthCheck;
 
     /**
      * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
@@ -132,35 +239,151 @@ export namespace CfInterconnectListResponse {
        */
       cloudflare_endpoint?: string;
     }
+  }
+}
 
-    export interface HealthCheck {
-      /**
-       * Determines whether to run healthchecks for a tunnel.
-       */
-      enabled?: boolean;
+export interface CfInterconnectBulkUpdateResponse {
+  modified?: boolean;
 
-      /**
-       * How frequent the health check is run. The default value is `mid`.
-       */
-      rate?: MagicTransitAPI.HealthCheckRate;
+  modified_interconnects?: Array<CfInterconnectBulkUpdateResponse.ModifiedInterconnect>;
+}
 
-      /**
-       * The destination address in a request type health check. After the healthcheck is
-       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
-       * to this address. This field defaults to `customer_gre_endpoint address`.
-       */
-      target?: string;
+export namespace CfInterconnectBulkUpdateResponse {
+  export interface ModifiedInterconnect {
+    /**
+     * Tunnel identifier tag.
+     */
+    id?: string;
+
+    /**
+     * The name of the interconnect. The name cannot share a name with other tunnels.
+     */
+    colo_name?: string;
+
+    /**
+     * The date and time the tunnel was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional description of the interconnect.
+     */
+    description?: string;
+
+    /**
+     * The configuration specific to GRE interconnects.
+     */
+    gre?: ModifiedInterconnect.GRE;
+
+    health_check?: MagicTransitAPI.HealthCheck;
+
+    /**
+     * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+     * of the tunnel. Select the subnet from the following private IP space:
+     * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+     */
+    interface_address?: string;
+
+    /**
+     * The date and time the tunnel was last modified.
+     */
+    modified_on?: string;
 
+    /**
+     * The Maximum Transmission Unit (MTU) in bytes for the interconnect. The minimum
+     * value is 576.
+     */
+    mtu?: number;
+
+    /**
+     * The name of the interconnect. The name cannot share a name with other tunnels.
+     */
+    name?: string;
+  }
+
+  export namespace ModifiedInterconnect {
+    /**
+     * The configuration specific to GRE interconnects.
+     */
+    export interface GRE {
       /**
-       * The type of healthcheck to run, reply or request. The default value is `reply`.
+       * The IP address assigned to the Cloudflare side of the GRE tunnel created as part
+       * of the Interconnect.
        */
-      type?: MagicTransitAPI.HealthCheckType;
+      cloudflare_endpoint?: string;
     }
   }
 }
 
 export interface CfInterconnectGetResponse {
-  interconnect?: unknown;
+  interconnect?: CfInterconnectGetResponse.Interconnect;
+}
+
+export namespace CfInterconnectGetResponse {
+  export interface Interconnect {
+    /**
+     * Tunnel identifier tag.
+     */
+    id?: string;
+
+    /**
+     * The name of the interconnect. The name cannot share a name with other tunnels.
+     */
+    colo_name?: string;
+
+    /**
+     * The date and time the tunnel was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional description of the interconnect.
+     */
+    description?: string;
+
+    /**
+     * The configuration specific to GRE interconnects.
+     */
+    gre?: Interconnect.GRE;
+
+    health_check?: MagicTransitAPI.HealthCheck;
+
+    /**
+     * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+     * of the tunnel. Select the subnet from the following private IP space:
+     * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+     */
+    interface_address?: string;
+
+    /**
+     * The date and time the tunnel was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * The Maximum Transmission Unit (MTU) in bytes for the interconnect. The minimum
+     * value is 576.
+     */
+    mtu?: number;
+
+    /**
+     * The name of the interconnect. The name cannot share a name with other tunnels.
+     */
+    name?: string;
+  }
+
+  export namespace Interconnect {
+    /**
+     * The configuration specific to GRE interconnects.
+     */
+    export interface GRE {
+      /**
+       * The IP address assigned to the Cloudflare side of the GRE tunnel created as part
+       * of the Interconnect.
+       */
+      cloudflare_endpoint?: string;
+    }
+  }
 }
 
 export interface CfInterconnectUpdateParams {
@@ -182,7 +405,7 @@ export interface CfInterconnectUpdateParams {
   /**
    * Body param:
    */
-  health_check?: CfInterconnectUpdateParams.HealthCheck;
+  health_check?: MagicTransitAPI.HealthCheckParam;
 
   /**
    * Body param: A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for
@@ -196,6 +419,12 @@ export interface CfInterconnectUpdateParams {
    * The minimum value is 576.
    */
   mtu?: number;
+
+  /**
+   * Header param: If true, the health check target in the request and response
+   * bodies will be presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
 export namespace CfInterconnectUpdateParams {
@@ -209,51 +438,61 @@ export namespace CfInterconnectUpdateParams {
      */
     cloudflare_endpoint?: string;
   }
+}
 
-  export interface HealthCheck {
-    /**
-     * Determines whether to run healthchecks for a tunnel.
-     */
-    enabled?: boolean;
-
-    /**
-     * How frequent the health check is run. The default value is `mid`.
-     */
-    rate?: MagicTransitAPI.HealthCheckRateParam;
-
-    /**
-     * The destination address in a request type health check. After the healthcheck is
-     * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
-     * to this address. This field defaults to `customer_gre_endpoint address`.
-     */
-    target?: string;
+export interface CfInterconnectListParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
 
-    /**
-     * The type of healthcheck to run, reply or request. The default value is `reply`.
-     */
-    type?: MagicTransitAPI.HealthCheckTypeParam;
-  }
+  /**
+   * Header param: If true, the health check target in the response body will be
+   * presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
-export interface CfInterconnectListParams {
+export interface CfInterconnectBulkUpdateParams {
   /**
-   * Identifier
+   * Path param: Identifier
    */
   account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+
+  /**
+   * Header param: If true, the health check target in the request and response
+   * bodies will be presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
 export interface CfInterconnectGetParams {
   /**
-   * Identifier
+   * Path param: Identifier
    */
   account_id: string;
+
+  /**
+   * Header param: If true, the health check target in the response body will be
+   * presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
-export namespace CfInterconnects {
-  export import CfInterconnectUpdateResponse = CfInterconnectsAPI.CfInterconnectUpdateResponse;
-  export import CfInterconnectListResponse = CfInterconnectsAPI.CfInterconnectListResponse;
-  export import CfInterconnectGetResponse = CfInterconnectsAPI.CfInterconnectGetResponse;
-  export import CfInterconnectUpdateParams = CfInterconnectsAPI.CfInterconnectUpdateParams;
-  export import CfInterconnectListParams = CfInterconnectsAPI.CfInterconnectListParams;
-  export import CfInterconnectGetParams = CfInterconnectsAPI.CfInterconnectGetParams;
+export declare namespace CfInterconnects {
+  export {
+    type CfInterconnectUpdateResponse as CfInterconnectUpdateResponse,
+    type CfInterconnectListResponse as CfInterconnectListResponse,
+    type CfInterconnectBulkUpdateResponse as CfInterconnectBulkUpdateResponse,
+    type CfInterconnectGetResponse as CfInterconnectGetResponse,
+    type CfInterconnectUpdateParams as CfInterconnectUpdateParams,
+    type CfInterconnectListParams as CfInterconnectListParams,
+    type CfInterconnectBulkUpdateParams as CfInterconnectBulkUpdateParams,
+    type CfInterconnectGetParams as CfInterconnectGetParams,
+  };
 }
diff --git a/src/resources/magic-transit/connectors.ts b/src/resources/magic-transit/connectors.ts
index 290d3b21c7..676bb2215f 100644
--- a/src/resources/magic-transit/connectors.ts
+++ b/src/resources/magic-transit/connectors.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ConnectorsAPI from './connectors';
 import { SinglePage } from '../../pagination';
 
 export class Connectors extends APIResource {
@@ -273,14 +272,18 @@ export interface ConnectorGetParams {
   account_id: string;
 }
 
-export namespace Connectors {
-  export import ConnectorUpdateResponse = ConnectorsAPI.ConnectorUpdateResponse;
-  export import ConnectorListResponse = ConnectorsAPI.ConnectorListResponse;
-  export import ConnectorEditResponse = ConnectorsAPI.ConnectorEditResponse;
-  export import ConnectorGetResponse = ConnectorsAPI.ConnectorGetResponse;
-  export import ConnectorListResponsesSinglePage = ConnectorsAPI.ConnectorListResponsesSinglePage;
-  export import ConnectorUpdateParams = ConnectorsAPI.ConnectorUpdateParams;
-  export import ConnectorListParams = ConnectorsAPI.ConnectorListParams;
-  export import ConnectorEditParams = ConnectorsAPI.ConnectorEditParams;
-  export import ConnectorGetParams = ConnectorsAPI.ConnectorGetParams;
+Connectors.ConnectorListResponsesSinglePage = ConnectorListResponsesSinglePage;
+
+export declare namespace Connectors {
+  export {
+    type ConnectorUpdateResponse as ConnectorUpdateResponse,
+    type ConnectorListResponse as ConnectorListResponse,
+    type ConnectorEditResponse as ConnectorEditResponse,
+    type ConnectorGetResponse as ConnectorGetResponse,
+    ConnectorListResponsesSinglePage as ConnectorListResponsesSinglePage,
+    type ConnectorUpdateParams as ConnectorUpdateParams,
+    type ConnectorListParams as ConnectorListParams,
+    type ConnectorEditParams as ConnectorEditParams,
+    type ConnectorGetParams as ConnectorGetParams,
+  };
 }
diff --git a/src/resources/magic-transit/gre-tunnels.ts b/src/resources/magic-transit/gre-tunnels.ts
index 67276cd33d..119ec7c7d9 100644
--- a/src/resources/magic-transit/gre-tunnels.ts
+++ b/src/resources/magic-transit/gre-tunnels.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as GRETunnelsAPI from './gre-tunnels';
 import * as MagicTransitAPI from './magic-transit';
 
 export class GRETunnels extends APIResource {
@@ -14,11 +13,17 @@ export class GRETunnels extends APIResource {
     params: GRETunnelCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<GRETunnelCreateResponse> {
-    const { account_id, body } = params;
+    const { account_id, body, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
     return (
       this._client.post(`/accounts/${account_id}/magic/gre_tunnels`, {
         body: body,
         ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
       }) as Core.APIPromise<{ result: GRETunnelCreateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -32,11 +37,17 @@ export class GRETunnels extends APIResource {
     params: GRETunnelUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<GRETunnelUpdateResponse> {
-    const { account_id, ...body } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget, ...body } = params;
     return (
       this._client.put(`/accounts/${account_id}/magic/gre_tunnels/${greTunnelId}`, {
         body,
         ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
       }) as Core.APIPromise<{ result: GRETunnelUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -45,11 +56,17 @@ export class GRETunnels extends APIResource {
    * Lists GRE tunnels associated with an account.
    */
   list(params: GRETunnelListParams, options?: Core.RequestOptions): Core.APIPromise<GRETunnelListResponse> {
-    const { account_id } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
     return (
-      this._client.get(`/accounts/${account_id}/magic/gre_tunnels`, options) as Core.APIPromise<{
-        result: GRETunnelListResponse;
-      }>
+      this._client.get(`/accounts/${account_id}/magic/gre_tunnels`, {
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: GRETunnelListResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -62,12 +79,40 @@ export class GRETunnels extends APIResource {
     params: GRETunnelDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<GRETunnelDeleteResponse> {
-    const { account_id } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
     return (
-      this._client.delete(
-        `/accounts/${account_id}/magic/gre_tunnels/${greTunnelId}`,
-        options,
-      ) as Core.APIPromise<{ result: GRETunnelDeleteResponse }>
+      this._client.delete(`/accounts/${account_id}/magic/gre_tunnels/${greTunnelId}`, {
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: GRETunnelDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Updates multiple GRE tunnels. Use `?validate_only=true` as an optional query
+   * parameter to only run validation without persisting changes.
+   */
+  bulkUpdate(
+    params: GRETunnelBulkUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<GRETunnelBulkUpdateResponse> {
+    const { account_id, body, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/magic/gre_tunnels`, {
+        body: body,
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: GRETunnelBulkUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -79,12 +124,17 @@ export class GRETunnels extends APIResource {
     params: GRETunnelGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<GRETunnelGetResponse> {
-    const { account_id } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
     return (
-      this._client.get(
-        `/accounts/${account_id}/magic/gre_tunnels/${greTunnelId}`,
-        options,
-      ) as Core.APIPromise<{ result: GRETunnelGetResponse }>
+      this._client.get(`/accounts/${account_id}/magic/gre_tunnels/${greTunnelId}`, {
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: GRETunnelGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -133,7 +183,7 @@ export namespace GRETunnelCreateResponse {
      */
     description?: string;
 
-    health_check?: MagicTransitAPI.HealthCheck;
+    health_check?: GRETunnel.HealthCheck;
 
     /**
      * The date and time the tunnel was last modified.
@@ -151,12 +201,196 @@ export namespace GRETunnelCreateResponse {
      */
     ttl?: number;
   }
+
+  export namespace GRETunnel {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
+      /**
+       * Determines whether to run healthchecks for a tunnel.
+       */
+      enabled?: boolean;
+
+      /**
+       * How frequent the health check is run. The default value is `mid`.
+       */
+      rate?: MagicTransitAPI.HealthCheckRate;
+
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
+       */
+      target?: HealthCheck.MagicHealthCheckTarget | string;
+
+      /**
+       * The type of healthcheck to run, reply or request. The default value is `reply`.
+       */
+      type?: MagicTransitAPI.HealthCheckType;
+    }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
+  }
 }
 
 export interface GRETunnelUpdateResponse {
   modified?: boolean;
 
-  modified_gre_tunnel?: unknown;
+  modified_gre_tunnel?: GRETunnelUpdateResponse.ModifiedGRETunnel;
+}
+
+export namespace GRETunnelUpdateResponse {
+  export interface ModifiedGRETunnel {
+    /**
+     * The IP address assigned to the Cloudflare side of the GRE tunnel.
+     */
+    cloudflare_gre_endpoint: string;
+
+    /**
+     * The IP address assigned to the customer side of the GRE tunnel.
+     */
+    customer_gre_endpoint: string;
+
+    /**
+     * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+     * of the tunnel. Select the subnet from the following private IP space:
+     * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+     */
+    interface_address: string;
+
+    /**
+     * The name of the tunnel. The name cannot contain spaces or special characters,
+     * must be 15 characters or less, and cannot share a name with another GRE tunnel.
+     */
+    name: string;
+
+    /**
+     * Tunnel identifier tag.
+     */
+    id?: string;
+
+    /**
+     * The date and time the tunnel was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional description of the GRE tunnel.
+     */
+    description?: string;
+
+    health_check?: ModifiedGRETunnel.HealthCheck;
+
+    /**
+     * The date and time the tunnel was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value
+     * is 576.
+     */
+    mtu?: number;
+
+    /**
+     * Time To Live (TTL) in number of hops of the GRE tunnel.
+     */
+    ttl?: number;
+  }
+
+  export namespace ModifiedGRETunnel {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
+      /**
+       * Determines whether to run healthchecks for a tunnel.
+       */
+      enabled?: boolean;
+
+      /**
+       * How frequent the health check is run. The default value is `mid`.
+       */
+      rate?: MagicTransitAPI.HealthCheckRate;
+
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
+       */
+      target?: HealthCheck.MagicHealthCheckTarget | string;
+
+      /**
+       * The type of healthcheck to run, reply or request. The default value is `reply`.
+       */
+      type?: MagicTransitAPI.HealthCheckType;
+    }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
+  }
 }
 
 export interface GRETunnelListResponse {
@@ -203,7 +437,7 @@ export namespace GRETunnelListResponse {
      */
     description?: string;
 
-    health_check?: MagicTransitAPI.HealthCheck;
+    health_check?: GRETunnel.HealthCheck;
 
     /**
      * The date and time the tunnel was last modified.
@@ -221,16 +455,450 @@ export namespace GRETunnelListResponse {
      */
     ttl?: number;
   }
+
+  export namespace GRETunnel {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
+      /**
+       * Determines whether to run healthchecks for a tunnel.
+       */
+      enabled?: boolean;
+
+      /**
+       * How frequent the health check is run. The default value is `mid`.
+       */
+      rate?: MagicTransitAPI.HealthCheckRate;
+
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
+       */
+      target?: HealthCheck.MagicHealthCheckTarget | string;
+
+      /**
+       * The type of healthcheck to run, reply or request. The default value is `reply`.
+       */
+      type?: MagicTransitAPI.HealthCheckType;
+    }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
+  }
 }
 
 export interface GRETunnelDeleteResponse {
   deleted?: boolean;
 
-  deleted_gre_tunnel?: unknown;
+  deleted_gre_tunnel?: GRETunnelDeleteResponse.DeletedGRETunnel;
+}
+
+export namespace GRETunnelDeleteResponse {
+  export interface DeletedGRETunnel {
+    /**
+     * The IP address assigned to the Cloudflare side of the GRE tunnel.
+     */
+    cloudflare_gre_endpoint: string;
+
+    /**
+     * The IP address assigned to the customer side of the GRE tunnel.
+     */
+    customer_gre_endpoint: string;
+
+    /**
+     * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+     * of the tunnel. Select the subnet from the following private IP space:
+     * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+     */
+    interface_address: string;
+
+    /**
+     * The name of the tunnel. The name cannot contain spaces or special characters,
+     * must be 15 characters or less, and cannot share a name with another GRE tunnel.
+     */
+    name: string;
+
+    /**
+     * Tunnel identifier tag.
+     */
+    id?: string;
+
+    /**
+     * The date and time the tunnel was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional description of the GRE tunnel.
+     */
+    description?: string;
+
+    health_check?: DeletedGRETunnel.HealthCheck;
+
+    /**
+     * The date and time the tunnel was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value
+     * is 576.
+     */
+    mtu?: number;
+
+    /**
+     * Time To Live (TTL) in number of hops of the GRE tunnel.
+     */
+    ttl?: number;
+  }
+
+  export namespace DeletedGRETunnel {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
+      /**
+       * Determines whether to run healthchecks for a tunnel.
+       */
+      enabled?: boolean;
+
+      /**
+       * How frequent the health check is run. The default value is `mid`.
+       */
+      rate?: MagicTransitAPI.HealthCheckRate;
+
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
+       */
+      target?: HealthCheck.MagicHealthCheckTarget | string;
+
+      /**
+       * The type of healthcheck to run, reply or request. The default value is `reply`.
+       */
+      type?: MagicTransitAPI.HealthCheckType;
+    }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
+  }
+}
+
+export interface GRETunnelBulkUpdateResponse {
+  modified?: boolean;
+
+  modified_gre_tunnels?: Array<GRETunnelBulkUpdateResponse.ModifiedGRETunnel>;
+}
+
+export namespace GRETunnelBulkUpdateResponse {
+  export interface ModifiedGRETunnel {
+    /**
+     * The IP address assigned to the Cloudflare side of the GRE tunnel.
+     */
+    cloudflare_gre_endpoint: string;
+
+    /**
+     * The IP address assigned to the customer side of the GRE tunnel.
+     */
+    customer_gre_endpoint: string;
+
+    /**
+     * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+     * of the tunnel. Select the subnet from the following private IP space:
+     * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+     */
+    interface_address: string;
+
+    /**
+     * The name of the tunnel. The name cannot contain spaces or special characters,
+     * must be 15 characters or less, and cannot share a name with another GRE tunnel.
+     */
+    name: string;
+
+    /**
+     * Tunnel identifier tag.
+     */
+    id?: string;
+
+    /**
+     * The date and time the tunnel was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional description of the GRE tunnel.
+     */
+    description?: string;
+
+    health_check?: ModifiedGRETunnel.HealthCheck;
+
+    /**
+     * The date and time the tunnel was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value
+     * is 576.
+     */
+    mtu?: number;
+
+    /**
+     * Time To Live (TTL) in number of hops of the GRE tunnel.
+     */
+    ttl?: number;
+  }
+
+  export namespace ModifiedGRETunnel {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
+      /**
+       * Determines whether to run healthchecks for a tunnel.
+       */
+      enabled?: boolean;
+
+      /**
+       * How frequent the health check is run. The default value is `mid`.
+       */
+      rate?: MagicTransitAPI.HealthCheckRate;
+
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
+       */
+      target?: HealthCheck.MagicHealthCheckTarget | string;
+
+      /**
+       * The type of healthcheck to run, reply or request. The default value is `reply`.
+       */
+      type?: MagicTransitAPI.HealthCheckType;
+    }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
+  }
 }
 
 export interface GRETunnelGetResponse {
-  gre_tunnel?: unknown;
+  gre_tunnel?: GRETunnelGetResponse.GRETunnel;
+}
+
+export namespace GRETunnelGetResponse {
+  export interface GRETunnel {
+    /**
+     * The IP address assigned to the Cloudflare side of the GRE tunnel.
+     */
+    cloudflare_gre_endpoint: string;
+
+    /**
+     * The IP address assigned to the customer side of the GRE tunnel.
+     */
+    customer_gre_endpoint: string;
+
+    /**
+     * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+     * of the tunnel. Select the subnet from the following private IP space:
+     * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+     */
+    interface_address: string;
+
+    /**
+     * The name of the tunnel. The name cannot contain spaces or special characters,
+     * must be 15 characters or less, and cannot share a name with another GRE tunnel.
+     */
+    name: string;
+
+    /**
+     * Tunnel identifier tag.
+     */
+    id?: string;
+
+    /**
+     * The date and time the tunnel was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional description of the GRE tunnel.
+     */
+    description?: string;
+
+    health_check?: GRETunnel.HealthCheck;
+
+    /**
+     * The date and time the tunnel was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The minimum value
+     * is 576.
+     */
+    mtu?: number;
+
+    /**
+     * Time To Live (TTL) in number of hops of the GRE tunnel.
+     */
+    ttl?: number;
+  }
+
+  export namespace GRETunnel {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
+      /**
+       * Determines whether to run healthchecks for a tunnel.
+       */
+      enabled?: boolean;
+
+      /**
+       * How frequent the health check is run. The default value is `mid`.
+       */
+      rate?: MagicTransitAPI.HealthCheckRate;
+
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
+       */
+      target?: HealthCheck.MagicHealthCheckTarget | string;
+
+      /**
+       * The type of healthcheck to run, reply or request. The default value is `reply`.
+       */
+      type?: MagicTransitAPI.HealthCheckType;
+    }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
+  }
 }
 
 export interface GRETunnelCreateParams {
@@ -243,6 +911,12 @@ export interface GRETunnelCreateParams {
    * Body param:
    */
   body: unknown;
+
+  /**
+   * Header param: If true, the health check target in the request and response
+   * bodies will be presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
 export interface GRETunnelUpdateParams {
@@ -283,7 +957,7 @@ export interface GRETunnelUpdateParams {
   /**
    * Body param:
    */
-  health_check?: MagicTransitAPI.HealthCheckParam;
+  health_check?: GRETunnelUpdateParams.HealthCheck;
 
   /**
    * Body param: Maximum Transmission Unit (MTU) in bytes for the GRE tunnel. The
@@ -295,38 +969,139 @@ export interface GRETunnelUpdateParams {
    * Body param: Time To Live (TTL) in number of hops of the GRE tunnel.
    */
   ttl?: number;
+
+  /**
+   * Header param: If true, the health check target in the request and response
+   * bodies will be presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
+}
+
+export namespace GRETunnelUpdateParams {
+  export interface HealthCheck {
+    /**
+     * The direction of the flow of the healthcheck. Either unidirectional, where the
+     * probe comes to you via the tunnel and the result comes back to Cloudflare via
+     * the open Internet, or bidirectional where both the probe and result come and go
+     * via the tunnel.
+     */
+    direction?: 'unidirectional' | 'bidirectional';
+
+    /**
+     * Determines whether to run healthchecks for a tunnel.
+     */
+    enabled?: boolean;
+
+    /**
+     * How frequent the health check is run. The default value is `mid`.
+     */
+    rate?: MagicTransitAPI.HealthCheckRateParam;
+
+    /**
+     * The destination address in a request type health check. After the healthcheck is
+     * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+     * to this address. This field defaults to `customer_gre_endpoint address`. This
+     * field is ignored for bidirectional healthchecks as the interface_address (not
+     * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+     * object form if the x-magic-new-hc-target header is set to true and string form
+     * if x-magic-new-hc-target is absent or set to false.
+     */
+    target?: HealthCheck.MagicHealthCheckTarget | string;
+
+    /**
+     * The type of healthcheck to run, reply or request. The default value is `reply`.
+     */
+    type?: MagicTransitAPI.HealthCheckTypeParam;
+  }
+
+  export namespace HealthCheck {
+    /**
+     * The destination address in a request type health check. After the healthcheck is
+     * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+     * to this address. This field defaults to `customer_gre_endpoint address`. This
+     * field is ignored for bidirectional healthchecks as the interface_address (not
+     * assigned to the Cloudflare side of the tunnel) is used as the target.
+     */
+    export interface MagicHealthCheckTarget {
+      /**
+       * The saved health check target. Setting the value to the empty string indicates
+       * that the calculated default value will be used.
+       */
+      saved?: string;
+    }
+  }
 }
 
 export interface GRETunnelListParams {
   /**
-   * Identifier
+   * Path param: Identifier
    */
   account_id: string;
+
+  /**
+   * Header param: If true, the health check target in the response body will be
+   * presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
 export interface GRETunnelDeleteParams {
   /**
-   * Identifier
+   * Path param: Identifier
    */
   account_id: string;
+
+  /**
+   * Header param: If true, the health check target in the response body will be
+   * presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
+}
+
+export interface GRETunnelBulkUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+
+  /**
+   * Header param: If true, the health check target in the request and response
+   * bodies will be presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
 export interface GRETunnelGetParams {
   /**
-   * Identifier
+   * Path param: Identifier
    */
   account_id: string;
+
+  /**
+   * Header param: If true, the health check target in the response body will be
+   * presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
-export namespace GRETunnels {
-  export import GRETunnelCreateResponse = GRETunnelsAPI.GRETunnelCreateResponse;
-  export import GRETunnelUpdateResponse = GRETunnelsAPI.GRETunnelUpdateResponse;
-  export import GRETunnelListResponse = GRETunnelsAPI.GRETunnelListResponse;
-  export import GRETunnelDeleteResponse = GRETunnelsAPI.GRETunnelDeleteResponse;
-  export import GRETunnelGetResponse = GRETunnelsAPI.GRETunnelGetResponse;
-  export import GRETunnelCreateParams = GRETunnelsAPI.GRETunnelCreateParams;
-  export import GRETunnelUpdateParams = GRETunnelsAPI.GRETunnelUpdateParams;
-  export import GRETunnelListParams = GRETunnelsAPI.GRETunnelListParams;
-  export import GRETunnelDeleteParams = GRETunnelsAPI.GRETunnelDeleteParams;
-  export import GRETunnelGetParams = GRETunnelsAPI.GRETunnelGetParams;
+export declare namespace GRETunnels {
+  export {
+    type GRETunnelCreateResponse as GRETunnelCreateResponse,
+    type GRETunnelUpdateResponse as GRETunnelUpdateResponse,
+    type GRETunnelListResponse as GRETunnelListResponse,
+    type GRETunnelDeleteResponse as GRETunnelDeleteResponse,
+    type GRETunnelBulkUpdateResponse as GRETunnelBulkUpdateResponse,
+    type GRETunnelGetResponse as GRETunnelGetResponse,
+    type GRETunnelCreateParams as GRETunnelCreateParams,
+    type GRETunnelUpdateParams as GRETunnelUpdateParams,
+    type GRETunnelListParams as GRETunnelListParams,
+    type GRETunnelDeleteParams as GRETunnelDeleteParams,
+    type GRETunnelBulkUpdateParams as GRETunnelBulkUpdateParams,
+    type GRETunnelGetParams as GRETunnelGetParams,
+  };
 }
diff --git a/src/resources/magic-transit/index.ts b/src/resources/magic-transit/index.ts
index e8710f4ca0..fde6118759 100644
--- a/src/resources/magic-transit/index.ts
+++ b/src/resources/magic-transit/index.ts
@@ -1,93 +1,113 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AppCreateResponse,
-  AppUpdateResponse,
-  AppListResponse,
-  AppDeleteResponse,
-  AppCreateParams,
-  AppUpdateParams,
-  AppListParams,
-  AppDeleteParams,
   AppListResponsesSinglePage,
   Apps,
+  type AppCreateResponse,
+  type AppUpdateResponse,
+  type AppListResponse,
+  type AppDeleteResponse,
+  type AppCreateParams,
+  type AppUpdateParams,
+  type AppListParams,
+  type AppDeleteParams,
 } from './apps';
 export {
-  CfInterconnectUpdateResponse,
-  CfInterconnectListResponse,
-  CfInterconnectGetResponse,
-  CfInterconnectUpdateParams,
-  CfInterconnectListParams,
-  CfInterconnectGetParams,
   CfInterconnects,
+  type CfInterconnectUpdateResponse,
+  type CfInterconnectListResponse,
+  type CfInterconnectBulkUpdateResponse,
+  type CfInterconnectGetResponse,
+  type CfInterconnectUpdateParams,
+  type CfInterconnectListParams,
+  type CfInterconnectBulkUpdateParams,
+  type CfInterconnectGetParams,
 } from './cf-interconnects';
 export {
-  ConnectorUpdateResponse,
-  ConnectorListResponse,
-  ConnectorEditResponse,
-  ConnectorGetResponse,
-  ConnectorUpdateParams,
-  ConnectorListParams,
-  ConnectorEditParams,
-  ConnectorGetParams,
   ConnectorListResponsesSinglePage,
   Connectors,
+  type ConnectorUpdateResponse,
+  type ConnectorListResponse,
+  type ConnectorEditResponse,
+  type ConnectorGetResponse,
+  type ConnectorUpdateParams,
+  type ConnectorListParams,
+  type ConnectorEditParams,
+  type ConnectorGetParams,
 } from './connectors';
 export {
-  GRETunnelCreateResponse,
-  GRETunnelUpdateResponse,
-  GRETunnelListResponse,
-  GRETunnelDeleteResponse,
-  GRETunnelGetResponse,
-  GRETunnelCreateParams,
-  GRETunnelUpdateParams,
-  GRETunnelListParams,
-  GRETunnelDeleteParams,
-  GRETunnelGetParams,
   GRETunnels,
+  type GRETunnelCreateResponse,
+  type GRETunnelUpdateResponse,
+  type GRETunnelListResponse,
+  type GRETunnelDeleteResponse,
+  type GRETunnelBulkUpdateResponse,
+  type GRETunnelGetResponse,
+  type GRETunnelCreateParams,
+  type GRETunnelUpdateParams,
+  type GRETunnelListParams,
+  type GRETunnelDeleteParams,
+  type GRETunnelBulkUpdateParams,
+  type GRETunnelGetParams,
 } from './gre-tunnels';
-export { MagicTransit } from './magic-transit';
 export {
-  PSKMetadata,
-  IPSECTunnelCreateResponse,
-  IPSECTunnelUpdateResponse,
-  IPSECTunnelListResponse,
-  IPSECTunnelDeleteResponse,
-  IPSECTunnelGetResponse,
-  IPSECTunnelPSKGenerateResponse,
-  IPSECTunnelCreateParams,
-  IPSECTunnelUpdateParams,
-  IPSECTunnelListParams,
-  IPSECTunnelDeleteParams,
-  IPSECTunnelGetParams,
-  IPSECTunnelPSKGenerateParams,
   IPSECTunnels,
+  type PSKMetadata,
+  type IPSECTunnelCreateResponse,
+  type IPSECTunnelUpdateResponse,
+  type IPSECTunnelListResponse,
+  type IPSECTunnelDeleteResponse,
+  type IPSECTunnelBulkUpdateResponse,
+  type IPSECTunnelGetResponse,
+  type IPSECTunnelPSKGenerateResponse,
+  type IPSECTunnelCreateParams,
+  type IPSECTunnelUpdateParams,
+  type IPSECTunnelListParams,
+  type IPSECTunnelDeleteParams,
+  type IPSECTunnelBulkUpdateParams,
+  type IPSECTunnelGetParams,
+  type IPSECTunnelPSKGenerateParams,
 } from './ipsec-tunnels';
+export { MagicTransit } from './magic-transit';
+export {
+  PCAPListResponsesSinglePage,
+  PCAPs,
+  type PCAP,
+  type PCAPFilter,
+  type PCAPCreateResponse,
+  type PCAPListResponse,
+  type PCAPGetResponse,
+  type PCAPCreateParams,
+  type PCAPListParams,
+  type PCAPGetParams,
+} from './pcaps/index';
 export {
-  Scope,
-  RouteCreateResponse,
-  RouteUpdateResponse,
-  RouteListResponse,
-  RouteDeleteResponse,
-  RouteEmptyResponse,
-  RouteGetResponse,
-  RouteCreateParams,
-  RouteUpdateParams,
-  RouteListParams,
-  RouteDeleteParams,
-  RouteEmptyParams,
-  RouteGetParams,
   Routes,
+  type Scope,
+  type RouteCreateResponse,
+  type RouteUpdateResponse,
+  type RouteListResponse,
+  type RouteDeleteResponse,
+  type RouteBulkUpdateResponse,
+  type RouteEmptyResponse,
+  type RouteGetResponse,
+  type RouteCreateParams,
+  type RouteUpdateParams,
+  type RouteListParams,
+  type RouteDeleteParams,
+  type RouteBulkUpdateParams,
+  type RouteEmptyParams,
+  type RouteGetParams,
 } from './routes';
 export {
-  Site,
-  SiteLocation,
-  SiteCreateParams,
-  SiteUpdateParams,
-  SiteListParams,
-  SiteDeleteParams,
-  SiteEditParams,
-  SiteGetParams,
   SitesSinglePage,
   Sites,
+  type Site,
+  type SiteLocation,
+  type SiteCreateParams,
+  type SiteUpdateParams,
+  type SiteListParams,
+  type SiteDeleteParams,
+  type SiteEditParams,
+  type SiteGetParams,
 } from './sites/index';
diff --git a/src/resources/magic-transit/ipsec-tunnels.ts b/src/resources/magic-transit/ipsec-tunnels.ts
index f018871a94..132570f9bb 100644
--- a/src/resources/magic-transit/ipsec-tunnels.ts
+++ b/src/resources/magic-transit/ipsec-tunnels.ts
@@ -15,11 +15,17 @@ export class IPSECTunnels extends APIResource {
     params: IPSECTunnelCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<IPSECTunnelCreateResponse> {
-    const { account_id, ...body } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/magic/ipsec_tunnels`, {
         body,
         ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
       }) as Core.APIPromise<{ result: IPSECTunnelCreateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -34,11 +40,17 @@ export class IPSECTunnels extends APIResource {
     params: IPSECTunnelUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<IPSECTunnelUpdateResponse> {
-    const { account_id, ...body } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget, ...body } = params;
     return (
       this._client.put(`/accounts/${account_id}/magic/ipsec_tunnels/${ipsecTunnelId}`, {
         body,
         ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
       }) as Core.APIPromise<{ result: IPSECTunnelUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -50,11 +62,17 @@ export class IPSECTunnels extends APIResource {
     params: IPSECTunnelListParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<IPSECTunnelListResponse> {
-    const { account_id } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
     return (
-      this._client.get(`/accounts/${account_id}/magic/ipsec_tunnels`, options) as Core.APIPromise<{
-        result: IPSECTunnelListResponse;
-      }>
+      this._client.get(`/accounts/${account_id}/magic/ipsec_tunnels`, {
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: IPSECTunnelListResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -68,12 +86,41 @@ export class IPSECTunnels extends APIResource {
     params: IPSECTunnelDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<IPSECTunnelDeleteResponse> {
-    const { account_id } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}/magic/ipsec_tunnels/${ipsecTunnelId}`, {
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: IPSECTunnelDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update multiple IPsec tunnels associated with an account. Use
+   * `?validate_only=true` as an optional query parameter to only run validation
+   * without persisting changes.
+   */
+  bulkUpdate(
+    params: IPSECTunnelBulkUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<IPSECTunnelBulkUpdateResponse> {
+    const { account_id, body, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
     return (
-      this._client.delete(
-        `/accounts/${account_id}/magic/ipsec_tunnels/${ipsecTunnelId}`,
-        options,
-      ) as Core.APIPromise<{ result: IPSECTunnelDeleteResponse }>
+      this._client.put(`/accounts/${account_id}/magic/ipsec_tunnels`, {
+        body: body,
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: IPSECTunnelBulkUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -85,12 +132,17 @@ export class IPSECTunnels extends APIResource {
     params: IPSECTunnelGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<IPSECTunnelGetResponse> {
-    const { account_id } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
     return (
-      this._client.get(
-        `/accounts/${account_id}/magic/ipsec_tunnels/${ipsecTunnelId}`,
-        options,
-      ) as Core.APIPromise<{ result: IPSECTunnelGetResponse }>
+      this._client.get(`/accounts/${account_id}/magic/ipsec_tunnels/${ipsecTunnelId}`, {
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: IPSECTunnelGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -176,6 +228,8 @@ export namespace IPSECTunnelCreateResponse {
      */
     description?: string;
 
+    health_check?: IPSECTunnel.HealthCheck;
+
     /**
      * The date and time the tunnel was last modified.
      */
@@ -191,12 +245,18 @@ export namespace IPSECTunnelCreateResponse {
      * Cloudflare-to-customer direction.
      */
     replay_protection?: boolean;
-
-    tunnel_health_check?: IPSECTunnel.TunnelHealthCheck;
   }
 
   export namespace IPSECTunnel {
-    export interface TunnelHealthCheck {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
       /**
        * Determines whether to run healthchecks for a tunnel.
        */
@@ -210,22 +270,178 @@ export namespace IPSECTunnelCreateResponse {
       /**
        * The destination address in a request type health check. After the healthcheck is
        * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
-       * to this address. This field defaults to `customer_gre_endpoint address`.
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
        */
-      target?: string;
+      target?: HealthCheck.MagicHealthCheckTarget | string;
 
       /**
        * The type of healthcheck to run, reply or request. The default value is `reply`.
        */
       type?: MagicTransitAPI.HealthCheckType;
     }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
   }
 }
 
 export interface IPSECTunnelUpdateResponse {
   modified?: boolean;
 
-  modified_ipsec_tunnel?: unknown;
+  modified_ipsec_tunnel?: IPSECTunnelUpdateResponse.ModifiedIPSECTunnel;
+}
+
+export namespace IPSECTunnelUpdateResponse {
+  export interface ModifiedIPSECTunnel {
+    /**
+     * The IP address assigned to the Cloudflare side of the IPsec tunnel.
+     */
+    cloudflare_endpoint: string;
+
+    /**
+     * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+     * of the tunnel. Select the subnet from the following private IP space:
+     * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+     */
+    interface_address: string;
+
+    /**
+     * The name of the IPsec tunnel. The name cannot share a name with other tunnels.
+     */
+    name: string;
+
+    /**
+     * Tunnel identifier tag.
+     */
+    id?: string;
+
+    /**
+     * When `true`, the tunnel can use a null-cipher (`ENCR_NULL`) in the ESP tunnel
+     * (Phase 2).
+     */
+    allow_null_cipher?: boolean;
+
+    /**
+     * The date and time the tunnel was created.
+     */
+    created_on?: string;
+
+    /**
+     * The IP address assigned to the customer side of the IPsec tunnel. Not required,
+     * but must be set for proactive traceroutes to work.
+     */
+    customer_endpoint?: string;
+
+    /**
+     * An optional description forthe IPsec tunnel.
+     */
+    description?: string;
+
+    health_check?: ModifiedIPSECTunnel.HealthCheck;
+
+    /**
+     * The date and time the tunnel was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * The PSK metadata that includes when the PSK was generated.
+     */
+    psk_metadata?: IPSECTunnelsAPI.PSKMetadata;
+
+    /**
+     * If `true`, then IPsec replay protection will be supported in the
+     * Cloudflare-to-customer direction.
+     */
+    replay_protection?: boolean;
+  }
+
+  export namespace ModifiedIPSECTunnel {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
+      /**
+       * Determines whether to run healthchecks for a tunnel.
+       */
+      enabled?: boolean;
+
+      /**
+       * How frequent the health check is run. The default value is `mid`.
+       */
+      rate?: MagicTransitAPI.HealthCheckRate;
+
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
+       */
+      target?: HealthCheck.MagicHealthCheckTarget | string;
+
+      /**
+       * The type of healthcheck to run, reply or request. The default value is `reply`.
+       */
+      type?: MagicTransitAPI.HealthCheckType;
+    }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
+  }
 }
 
 export interface IPSECTunnelListResponse {
@@ -278,6 +494,8 @@ export namespace IPSECTunnelListResponse {
      */
     description?: string;
 
+    health_check?: IPSECTunnel.HealthCheck;
+
     /**
      * The date and time the tunnel was last modified.
      */
@@ -293,12 +511,18 @@ export namespace IPSECTunnelListResponse {
      * Cloudflare-to-customer direction.
      */
     replay_protection?: boolean;
-
-    tunnel_health_check?: IPSECTunnel.TunnelHealthCheck;
   }
 
   export namespace IPSECTunnel {
-    export interface TunnelHealthCheck {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
       /**
        * Determines whether to run healthchecks for a tunnel.
        */
@@ -312,26 +536,444 @@ export namespace IPSECTunnelListResponse {
       /**
        * The destination address in a request type health check. After the healthcheck is
        * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
-       * to this address. This field defaults to `customer_gre_endpoint address`.
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
        */
-      target?: string;
+      target?: HealthCheck.MagicHealthCheckTarget | string;
 
       /**
        * The type of healthcheck to run, reply or request. The default value is `reply`.
        */
       type?: MagicTransitAPI.HealthCheckType;
     }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
   }
 }
 
 export interface IPSECTunnelDeleteResponse {
   deleted?: boolean;
 
-  deleted_ipsec_tunnel?: unknown;
+  deleted_ipsec_tunnel?: IPSECTunnelDeleteResponse.DeletedIPSECTunnel;
+}
+
+export namespace IPSECTunnelDeleteResponse {
+  export interface DeletedIPSECTunnel {
+    /**
+     * The IP address assigned to the Cloudflare side of the IPsec tunnel.
+     */
+    cloudflare_endpoint: string;
+
+    /**
+     * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+     * of the tunnel. Select the subnet from the following private IP space:
+     * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+     */
+    interface_address: string;
+
+    /**
+     * The name of the IPsec tunnel. The name cannot share a name with other tunnels.
+     */
+    name: string;
+
+    /**
+     * Tunnel identifier tag.
+     */
+    id?: string;
+
+    /**
+     * When `true`, the tunnel can use a null-cipher (`ENCR_NULL`) in the ESP tunnel
+     * (Phase 2).
+     */
+    allow_null_cipher?: boolean;
+
+    /**
+     * The date and time the tunnel was created.
+     */
+    created_on?: string;
+
+    /**
+     * The IP address assigned to the customer side of the IPsec tunnel. Not required,
+     * but must be set for proactive traceroutes to work.
+     */
+    customer_endpoint?: string;
+
+    /**
+     * An optional description forthe IPsec tunnel.
+     */
+    description?: string;
+
+    health_check?: DeletedIPSECTunnel.HealthCheck;
+
+    /**
+     * The date and time the tunnel was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * The PSK metadata that includes when the PSK was generated.
+     */
+    psk_metadata?: IPSECTunnelsAPI.PSKMetadata;
+
+    /**
+     * If `true`, then IPsec replay protection will be supported in the
+     * Cloudflare-to-customer direction.
+     */
+    replay_protection?: boolean;
+  }
+
+  export namespace DeletedIPSECTunnel {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
+      /**
+       * Determines whether to run healthchecks for a tunnel.
+       */
+      enabled?: boolean;
+
+      /**
+       * How frequent the health check is run. The default value is `mid`.
+       */
+      rate?: MagicTransitAPI.HealthCheckRate;
+
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
+       */
+      target?: HealthCheck.MagicHealthCheckTarget | string;
+
+      /**
+       * The type of healthcheck to run, reply or request. The default value is `reply`.
+       */
+      type?: MagicTransitAPI.HealthCheckType;
+    }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
+  }
+}
+
+export interface IPSECTunnelBulkUpdateResponse {
+  modified?: boolean;
+
+  modified_ipsec_tunnels?: Array<IPSECTunnelBulkUpdateResponse.ModifiedIPSECTunnel>;
+}
+
+export namespace IPSECTunnelBulkUpdateResponse {
+  export interface ModifiedIPSECTunnel {
+    /**
+     * The IP address assigned to the Cloudflare side of the IPsec tunnel.
+     */
+    cloudflare_endpoint: string;
+
+    /**
+     * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+     * of the tunnel. Select the subnet from the following private IP space:
+     * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+     */
+    interface_address: string;
+
+    /**
+     * The name of the IPsec tunnel. The name cannot share a name with other tunnels.
+     */
+    name: string;
+
+    /**
+     * Tunnel identifier tag.
+     */
+    id?: string;
+
+    /**
+     * When `true`, the tunnel can use a null-cipher (`ENCR_NULL`) in the ESP tunnel
+     * (Phase 2).
+     */
+    allow_null_cipher?: boolean;
+
+    /**
+     * The date and time the tunnel was created.
+     */
+    created_on?: string;
+
+    /**
+     * The IP address assigned to the customer side of the IPsec tunnel. Not required,
+     * but must be set for proactive traceroutes to work.
+     */
+    customer_endpoint?: string;
+
+    /**
+     * An optional description forthe IPsec tunnel.
+     */
+    description?: string;
+
+    health_check?: ModifiedIPSECTunnel.HealthCheck;
+
+    /**
+     * The date and time the tunnel was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * The PSK metadata that includes when the PSK was generated.
+     */
+    psk_metadata?: IPSECTunnelsAPI.PSKMetadata;
+
+    /**
+     * If `true`, then IPsec replay protection will be supported in the
+     * Cloudflare-to-customer direction.
+     */
+    replay_protection?: boolean;
+  }
+
+  export namespace ModifiedIPSECTunnel {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
+      /**
+       * Determines whether to run healthchecks for a tunnel.
+       */
+      enabled?: boolean;
+
+      /**
+       * How frequent the health check is run. The default value is `mid`.
+       */
+      rate?: MagicTransitAPI.HealthCheckRate;
+
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
+       */
+      target?: HealthCheck.MagicHealthCheckTarget | string;
+
+      /**
+       * The type of healthcheck to run, reply or request. The default value is `reply`.
+       */
+      type?: MagicTransitAPI.HealthCheckType;
+    }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
+  }
 }
 
 export interface IPSECTunnelGetResponse {
-  ipsec_tunnel?: unknown;
+  ipsec_tunnel?: IPSECTunnelGetResponse.IPSECTunnel;
+}
+
+export namespace IPSECTunnelGetResponse {
+  export interface IPSECTunnel {
+    /**
+     * The IP address assigned to the Cloudflare side of the IPsec tunnel.
+     */
+    cloudflare_endpoint: string;
+
+    /**
+     * A 31-bit prefix (/31 in CIDR notation) supporting two hosts, one for each side
+     * of the tunnel. Select the subnet from the following private IP space:
+     * 10.0.0.0–10.255.255.255, 172.16.0.0–172.31.255.255, 192.168.0.0–192.168.255.255.
+     */
+    interface_address: string;
+
+    /**
+     * The name of the IPsec tunnel. The name cannot share a name with other tunnels.
+     */
+    name: string;
+
+    /**
+     * Tunnel identifier tag.
+     */
+    id?: string;
+
+    /**
+     * When `true`, the tunnel can use a null-cipher (`ENCR_NULL`) in the ESP tunnel
+     * (Phase 2).
+     */
+    allow_null_cipher?: boolean;
+
+    /**
+     * The date and time the tunnel was created.
+     */
+    created_on?: string;
+
+    /**
+     * The IP address assigned to the customer side of the IPsec tunnel. Not required,
+     * but must be set for proactive traceroutes to work.
+     */
+    customer_endpoint?: string;
+
+    /**
+     * An optional description forthe IPsec tunnel.
+     */
+    description?: string;
+
+    health_check?: IPSECTunnel.HealthCheck;
+
+    /**
+     * The date and time the tunnel was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * The PSK metadata that includes when the PSK was generated.
+     */
+    psk_metadata?: IPSECTunnelsAPI.PSKMetadata;
+
+    /**
+     * If `true`, then IPsec replay protection will be supported in the
+     * Cloudflare-to-customer direction.
+     */
+    replay_protection?: boolean;
+  }
+
+  export namespace IPSECTunnel {
+    export interface HealthCheck {
+      /**
+       * The direction of the flow of the healthcheck. Either unidirectional, where the
+       * probe comes to you via the tunnel and the result comes back to Cloudflare via
+       * the open Internet, or bidirectional where both the probe and result come and go
+       * via the tunnel.
+       */
+      direction?: 'unidirectional' | 'bidirectional';
+
+      /**
+       * Determines whether to run healthchecks for a tunnel.
+       */
+      enabled?: boolean;
+
+      /**
+       * How frequent the health check is run. The default value is `mid`.
+       */
+      rate?: MagicTransitAPI.HealthCheckRate;
+
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+       * object form if the x-magic-new-hc-target header is set to true and string form
+       * if x-magic-new-hc-target is absent or set to false.
+       */
+      target?: HealthCheck.MagicHealthCheckTarget | string;
+
+      /**
+       * The type of healthcheck to run, reply or request. The default value is `reply`.
+       */
+      type?: MagicTransitAPI.HealthCheckType;
+    }
+
+    export namespace HealthCheck {
+      /**
+       * The destination address in a request type health check. After the healthcheck is
+       * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+       * to this address. This field defaults to `customer_gre_endpoint address`. This
+       * field is ignored for bidirectional healthchecks as the interface_address (not
+       * assigned to the Cloudflare side of the tunnel) is used as the target.
+       */
+      export interface MagicHealthCheckTarget {
+        /**
+         * The effective health check target. If 'saved' is empty, then this field will be
+         * populated with the calculated default value on GET requests. Ignored in POST,
+         * PUT, and PATCH requests.
+         */
+        effective?: string;
+
+        /**
+         * The saved health check target. Setting the value to the empty string indicates
+         * that the calculated default value will be used.
+         */
+        saved?: string;
+      }
+    }
+  }
 }
 
 export interface IPSECTunnelPSKGenerateResponse {
@@ -389,7 +1031,7 @@ export interface IPSECTunnelCreateParams {
   /**
    * Body param:
    */
-  health_check?: MagicTransitAPI.HealthCheckParam;
+  health_check?: IPSECTunnelCreateParams.HealthCheck;
 
   /**
    * Body param: A randomly generated or provided string for use in the IPsec tunnel.
@@ -401,6 +1043,67 @@ export interface IPSECTunnelCreateParams {
    * Cloudflare-to-customer direction.
    */
   replay_protection?: boolean;
+
+  /**
+   * Header param: If true, the health check target in the request and response
+   * bodies will be presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
+}
+
+export namespace IPSECTunnelCreateParams {
+  export interface HealthCheck {
+    /**
+     * The direction of the flow of the healthcheck. Either unidirectional, where the
+     * probe comes to you via the tunnel and the result comes back to Cloudflare via
+     * the open Internet, or bidirectional where both the probe and result come and go
+     * via the tunnel.
+     */
+    direction?: 'unidirectional' | 'bidirectional';
+
+    /**
+     * Determines whether to run healthchecks for a tunnel.
+     */
+    enabled?: boolean;
+
+    /**
+     * How frequent the health check is run. The default value is `mid`.
+     */
+    rate?: MagicTransitAPI.HealthCheckRateParam;
+
+    /**
+     * The destination address in a request type health check. After the healthcheck is
+     * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+     * to this address. This field defaults to `customer_gre_endpoint address`. This
+     * field is ignored for bidirectional healthchecks as the interface_address (not
+     * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+     * object form if the x-magic-new-hc-target header is set to true and string form
+     * if x-magic-new-hc-target is absent or set to false.
+     */
+    target?: HealthCheck.MagicHealthCheckTarget | string;
+
+    /**
+     * The type of healthcheck to run, reply or request. The default value is `reply`.
+     */
+    type?: MagicTransitAPI.HealthCheckTypeParam;
+  }
+
+  export namespace HealthCheck {
+    /**
+     * The destination address in a request type health check. After the healthcheck is
+     * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+     * to this address. This field defaults to `customer_gre_endpoint address`. This
+     * field is ignored for bidirectional healthchecks as the interface_address (not
+     * assigned to the Cloudflare side of the tunnel) is used as the target.
+     */
+    export interface MagicHealthCheckTarget {
+      /**
+       * The saved health check target. Setting the value to the empty string indicates
+       * that the calculated default value will be used.
+       */
+      saved?: string;
+    }
+  }
 }
 
 export interface IPSECTunnelUpdateParams {
@@ -441,7 +1144,7 @@ export interface IPSECTunnelUpdateParams {
   /**
    * Body param:
    */
-  health_check?: MagicTransitAPI.HealthCheckParam;
+  health_check?: IPSECTunnelUpdateParams.HealthCheck;
 
   /**
    * Body param: A randomly generated or provided string for use in the IPsec tunnel.
@@ -453,27 +1156,124 @@ export interface IPSECTunnelUpdateParams {
    * Cloudflare-to-customer direction.
    */
   replay_protection?: boolean;
+
+  /**
+   * Header param: If true, the health check target in the request and response
+   * bodies will be presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
+}
+
+export namespace IPSECTunnelUpdateParams {
+  export interface HealthCheck {
+    /**
+     * The direction of the flow of the healthcheck. Either unidirectional, where the
+     * probe comes to you via the tunnel and the result comes back to Cloudflare via
+     * the open Internet, or bidirectional where both the probe and result come and go
+     * via the tunnel.
+     */
+    direction?: 'unidirectional' | 'bidirectional';
+
+    /**
+     * Determines whether to run healthchecks for a tunnel.
+     */
+    enabled?: boolean;
+
+    /**
+     * How frequent the health check is run. The default value is `mid`.
+     */
+    rate?: MagicTransitAPI.HealthCheckRateParam;
+
+    /**
+     * The destination address in a request type health check. After the healthcheck is
+     * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+     * to this address. This field defaults to `customer_gre_endpoint address`. This
+     * field is ignored for bidirectional healthchecks as the interface_address (not
+     * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+     * object form if the x-magic-new-hc-target header is set to true and string form
+     * if x-magic-new-hc-target is absent or set to false.
+     */
+    target?: HealthCheck.MagicHealthCheckTarget | string;
+
+    /**
+     * The type of healthcheck to run, reply or request. The default value is `reply`.
+     */
+    type?: MagicTransitAPI.HealthCheckTypeParam;
+  }
+
+  export namespace HealthCheck {
+    /**
+     * The destination address in a request type health check. After the healthcheck is
+     * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+     * to this address. This field defaults to `customer_gre_endpoint address`. This
+     * field is ignored for bidirectional healthchecks as the interface_address (not
+     * assigned to the Cloudflare side of the tunnel) is used as the target.
+     */
+    export interface MagicHealthCheckTarget {
+      /**
+       * The saved health check target. Setting the value to the empty string indicates
+       * that the calculated default value will be used.
+       */
+      saved?: string;
+    }
+  }
 }
 
 export interface IPSECTunnelListParams {
   /**
-   * Identifier
+   * Path param: Identifier
    */
   account_id: string;
+
+  /**
+   * Header param: If true, the health check target in the response body will be
+   * presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
 export interface IPSECTunnelDeleteParams {
   /**
-   * Identifier
+   * Path param: Identifier
    */
   account_id: string;
+
+  /**
+   * Header param: If true, the health check target in the response body will be
+   * presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
+}
+
+export interface IPSECTunnelBulkUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+
+  /**
+   * Header param: If true, the health check target in the request and response
+   * bodies will be presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
 export interface IPSECTunnelGetParams {
   /**
-   * Identifier
+   * Path param: Identifier
    */
   account_id: string;
+
+  /**
+   * Header param: If true, the health check target in the response body will be
+   * presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
 export interface IPSECTunnelPSKGenerateParams {
@@ -488,18 +1288,22 @@ export interface IPSECTunnelPSKGenerateParams {
   body: unknown;
 }
 
-export namespace IPSECTunnels {
-  export import PSKMetadata = IPSECTunnelsAPI.PSKMetadata;
-  export import IPSECTunnelCreateResponse = IPSECTunnelsAPI.IPSECTunnelCreateResponse;
-  export import IPSECTunnelUpdateResponse = IPSECTunnelsAPI.IPSECTunnelUpdateResponse;
-  export import IPSECTunnelListResponse = IPSECTunnelsAPI.IPSECTunnelListResponse;
-  export import IPSECTunnelDeleteResponse = IPSECTunnelsAPI.IPSECTunnelDeleteResponse;
-  export import IPSECTunnelGetResponse = IPSECTunnelsAPI.IPSECTunnelGetResponse;
-  export import IPSECTunnelPSKGenerateResponse = IPSECTunnelsAPI.IPSECTunnelPSKGenerateResponse;
-  export import IPSECTunnelCreateParams = IPSECTunnelsAPI.IPSECTunnelCreateParams;
-  export import IPSECTunnelUpdateParams = IPSECTunnelsAPI.IPSECTunnelUpdateParams;
-  export import IPSECTunnelListParams = IPSECTunnelsAPI.IPSECTunnelListParams;
-  export import IPSECTunnelDeleteParams = IPSECTunnelsAPI.IPSECTunnelDeleteParams;
-  export import IPSECTunnelGetParams = IPSECTunnelsAPI.IPSECTunnelGetParams;
-  export import IPSECTunnelPSKGenerateParams = IPSECTunnelsAPI.IPSECTunnelPSKGenerateParams;
+export declare namespace IPSECTunnels {
+  export {
+    type PSKMetadata as PSKMetadata,
+    type IPSECTunnelCreateResponse as IPSECTunnelCreateResponse,
+    type IPSECTunnelUpdateResponse as IPSECTunnelUpdateResponse,
+    type IPSECTunnelListResponse as IPSECTunnelListResponse,
+    type IPSECTunnelDeleteResponse as IPSECTunnelDeleteResponse,
+    type IPSECTunnelBulkUpdateResponse as IPSECTunnelBulkUpdateResponse,
+    type IPSECTunnelGetResponse as IPSECTunnelGetResponse,
+    type IPSECTunnelPSKGenerateResponse as IPSECTunnelPSKGenerateResponse,
+    type IPSECTunnelCreateParams as IPSECTunnelCreateParams,
+    type IPSECTunnelUpdateParams as IPSECTunnelUpdateParams,
+    type IPSECTunnelListParams as IPSECTunnelListParams,
+    type IPSECTunnelDeleteParams as IPSECTunnelDeleteParams,
+    type IPSECTunnelBulkUpdateParams as IPSECTunnelBulkUpdateParams,
+    type IPSECTunnelGetParams as IPSECTunnelGetParams,
+    type IPSECTunnelPSKGenerateParams as IPSECTunnelPSKGenerateParams,
+  };
 }
diff --git a/src/resources/magic-transit/magic-transit.ts b/src/resources/magic-transit/magic-transit.ts
index 91007679c4..f03a6dcb50 100644
--- a/src/resources/magic-transit/magic-transit.ts
+++ b/src/resources/magic-transit/magic-transit.ts
@@ -2,12 +2,123 @@
 
 import { APIResource } from '../../resource';
 import * as AppsAPI from './apps';
+import {
+  AppCreateParams,
+  AppCreateResponse,
+  AppDeleteParams,
+  AppDeleteResponse,
+  AppListParams,
+  AppListResponse,
+  AppListResponsesSinglePage,
+  AppUpdateParams,
+  AppUpdateResponse,
+  Apps,
+} from './apps';
 import * as CfInterconnectsAPI from './cf-interconnects';
+import {
+  CfInterconnectBulkUpdateParams,
+  CfInterconnectBulkUpdateResponse,
+  CfInterconnectGetParams,
+  CfInterconnectGetResponse,
+  CfInterconnectListParams,
+  CfInterconnectListResponse,
+  CfInterconnectUpdateParams,
+  CfInterconnectUpdateResponse,
+  CfInterconnects,
+} from './cf-interconnects';
 import * as ConnectorsAPI from './connectors';
+import {
+  ConnectorEditParams,
+  ConnectorEditResponse,
+  ConnectorGetParams,
+  ConnectorGetResponse,
+  ConnectorListParams,
+  ConnectorListResponse,
+  ConnectorListResponsesSinglePage,
+  ConnectorUpdateParams,
+  ConnectorUpdateResponse,
+  Connectors,
+} from './connectors';
 import * as GRETunnelsAPI from './gre-tunnels';
+import {
+  GRETunnelBulkUpdateParams,
+  GRETunnelBulkUpdateResponse,
+  GRETunnelCreateParams,
+  GRETunnelCreateResponse,
+  GRETunnelDeleteParams,
+  GRETunnelDeleteResponse,
+  GRETunnelGetParams,
+  GRETunnelGetResponse,
+  GRETunnelListParams,
+  GRETunnelListResponse,
+  GRETunnelUpdateParams,
+  GRETunnelUpdateResponse,
+  GRETunnels,
+} from './gre-tunnels';
 import * as IPSECTunnelsAPI from './ipsec-tunnels';
+import {
+  IPSECTunnelBulkUpdateParams,
+  IPSECTunnelBulkUpdateResponse,
+  IPSECTunnelCreateParams,
+  IPSECTunnelCreateResponse,
+  IPSECTunnelDeleteParams,
+  IPSECTunnelDeleteResponse,
+  IPSECTunnelGetParams,
+  IPSECTunnelGetResponse,
+  IPSECTunnelListParams,
+  IPSECTunnelListResponse,
+  IPSECTunnelPSKGenerateParams,
+  IPSECTunnelPSKGenerateResponse,
+  IPSECTunnelUpdateParams,
+  IPSECTunnelUpdateResponse,
+  IPSECTunnels,
+  PSKMetadata,
+} from './ipsec-tunnels';
 import * as RoutesAPI from './routes';
+import {
+  RouteBulkUpdateParams,
+  RouteBulkUpdateResponse,
+  RouteCreateParams,
+  RouteCreateResponse,
+  RouteDeleteParams,
+  RouteDeleteResponse,
+  RouteEmptyParams,
+  RouteEmptyResponse,
+  RouteGetParams,
+  RouteGetResponse,
+  RouteListParams,
+  RouteListResponse,
+  RouteUpdateParams,
+  RouteUpdateResponse,
+  Routes,
+  Scope,
+} from './routes';
+import * as PCAPsAPI from './pcaps/pcaps';
+import {
+  PCAP,
+  PCAPCreateParams,
+  PCAPCreateResponse,
+  PCAPFilter,
+  PCAPGetParams,
+  PCAPGetResponse,
+  PCAPListParams,
+  PCAPListResponse,
+  PCAPListResponsesSinglePage,
+  PCAPs,
+} from './pcaps/pcaps';
 import * as SitesAPI from './sites/sites';
+import {
+  Site,
+  SiteCreateParams,
+  SiteDeleteParams,
+  SiteEditParams,
+  SiteGetParams,
+  SiteListParams,
+  SiteLocation,
+  SiteUpdateParams,
+  Sites,
+  SitesSinglePage,
+} from './sites/sites';
 
 export class MagicTransit extends APIResource {
   apps: AppsAPI.Apps = new AppsAPI.Apps(this._client);
@@ -17,19 +128,10 @@ export class MagicTransit extends APIResource {
   routes: RoutesAPI.Routes = new RoutesAPI.Routes(this._client);
   sites: SitesAPI.Sites = new SitesAPI.Sites(this._client);
   connectors: ConnectorsAPI.Connectors = new ConnectorsAPI.Connectors(this._client);
+  pcaps: PCAPsAPI.PCAPs = new PCAPsAPI.PCAPs(this._client);
 }
 
 export interface HealthCheck {
-  /**
-   * The direction of the flow of the healthcheck. Either unidirectional, where the
-   * probe comes to you via the tunnel and the result comes back to Cloudflare via
-   * the open Internet, or bidirectional where both the probe and result come and go
-   * via the tunnel. Note in the case of bidirecitonal healthchecks, the target field
-   * in health_check is ignored as the interface_address is used to send traffic into
-   * the tunnel.
-   */
-  direction?: 'unidirectional' | 'bidirectional';
-
   /**
    * Determines whether to run healthchecks for a tunnel.
    */
@@ -45,9 +147,11 @@ export interface HealthCheck {
    * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
    * to this address. This field defaults to `customer_gre_endpoint address`. This
    * field is ignored for bidirectional healthchecks as the interface_address (not
-   * assigned to the Cloudflare side of the tunnel) is used as the target.
+   * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+   * object form if the x-magic-new-hc-target header is set to true and string form
+   * if x-magic-new-hc-target is absent or set to false.
    */
-  target?: string;
+  target?: HealthCheck.MagicHealthCheckTarget | string;
 
   /**
    * The type of healthcheck to run, reply or request. The default value is `reply`.
@@ -55,17 +159,31 @@ export interface HealthCheck {
   type?: HealthCheckType;
 }
 
-export interface HealthCheckParam {
+export namespace HealthCheck {
   /**
-   * The direction of the flow of the healthcheck. Either unidirectional, where the
-   * probe comes to you via the tunnel and the result comes back to Cloudflare via
-   * the open Internet, or bidirectional where both the probe and result come and go
-   * via the tunnel. Note in the case of bidirecitonal healthchecks, the target field
-   * in health_check is ignored as the interface_address is used to send traffic into
-   * the tunnel.
+   * The destination address in a request type health check. After the healthcheck is
+   * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+   * to this address. This field defaults to `customer_gre_endpoint address`. This
+   * field is ignored for bidirectional healthchecks as the interface_address (not
+   * assigned to the Cloudflare side of the tunnel) is used as the target.
    */
-  direction?: 'unidirectional' | 'bidirectional';
+  export interface MagicHealthCheckTarget {
+    /**
+     * The effective health check target. If 'saved' is empty, then this field will be
+     * populated with the calculated default value on GET requests. Ignored in POST,
+     * PUT, and PATCH requests.
+     */
+    effective?: string;
+
+    /**
+     * The saved health check target. Setting the value to the empty string indicates
+     * that the calculated default value will be used.
+     */
+    saved?: string;
+  }
+}
 
+export interface HealthCheckParam {
   /**
    * Determines whether to run healthchecks for a tunnel.
    */
@@ -81,9 +199,11 @@ export interface HealthCheckParam {
    * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
    * to this address. This field defaults to `customer_gre_endpoint address`. This
    * field is ignored for bidirectional healthchecks as the interface_address (not
-   * assigned to the Cloudflare side of the tunnel) is used as the target.
+   * assigned to the Cloudflare side of the tunnel) is used as the target. Must be in
+   * object form if the x-magic-new-hc-target header is set to true and string form
+   * if x-magic-new-hc-target is absent or set to false.
    */
-  target?: string;
+  target?: HealthCheckParam.MagicHealthCheckTarget | string;
 
   /**
    * The type of healthcheck to run, reply or request. The default value is `reply`.
@@ -91,6 +211,23 @@ export interface HealthCheckParam {
   type?: HealthCheckTypeParam;
 }
 
+export namespace HealthCheckParam {
+  /**
+   * The destination address in a request type health check. After the healthcheck is
+   * decapsulated at the customer end of the tunnel, the ICMP echo will be forwarded
+   * to this address. This field defaults to `customer_gre_endpoint address`. This
+   * field is ignored for bidirectional healthchecks as the interface_address (not
+   * assigned to the Cloudflare side of the tunnel) is used as the target.
+   */
+  export interface MagicHealthCheckTarget {
+    /**
+     * The saved health check target. Setting the value to the empty string indicates
+     * that the calculated default value will be used.
+     */
+    saved?: string;
+  }
+}
+
 /**
  * How frequent the health check is run. The default value is `mid`.
  */
@@ -111,81 +248,135 @@ export type HealthCheckType = 'reply' | 'request';
  */
 export type HealthCheckTypeParam = 'reply' | 'request';
 
-export namespace MagicTransit {
-  export import Apps = AppsAPI.Apps;
-  export import AppCreateResponse = AppsAPI.AppCreateResponse;
-  export import AppUpdateResponse = AppsAPI.AppUpdateResponse;
-  export import AppListResponse = AppsAPI.AppListResponse;
-  export import AppDeleteResponse = AppsAPI.AppDeleteResponse;
-  export import AppListResponsesSinglePage = AppsAPI.AppListResponsesSinglePage;
-  export import AppCreateParams = AppsAPI.AppCreateParams;
-  export import AppUpdateParams = AppsAPI.AppUpdateParams;
-  export import AppListParams = AppsAPI.AppListParams;
-  export import AppDeleteParams = AppsAPI.AppDeleteParams;
-  export import CfInterconnects = CfInterconnectsAPI.CfInterconnects;
-  export import CfInterconnectUpdateResponse = CfInterconnectsAPI.CfInterconnectUpdateResponse;
-  export import CfInterconnectListResponse = CfInterconnectsAPI.CfInterconnectListResponse;
-  export import CfInterconnectGetResponse = CfInterconnectsAPI.CfInterconnectGetResponse;
-  export import CfInterconnectUpdateParams = CfInterconnectsAPI.CfInterconnectUpdateParams;
-  export import CfInterconnectListParams = CfInterconnectsAPI.CfInterconnectListParams;
-  export import CfInterconnectGetParams = CfInterconnectsAPI.CfInterconnectGetParams;
-  export import GRETunnels = GRETunnelsAPI.GRETunnels;
-  export import GRETunnelCreateResponse = GRETunnelsAPI.GRETunnelCreateResponse;
-  export import GRETunnelUpdateResponse = GRETunnelsAPI.GRETunnelUpdateResponse;
-  export import GRETunnelListResponse = GRETunnelsAPI.GRETunnelListResponse;
-  export import GRETunnelDeleteResponse = GRETunnelsAPI.GRETunnelDeleteResponse;
-  export import GRETunnelGetResponse = GRETunnelsAPI.GRETunnelGetResponse;
-  export import GRETunnelCreateParams = GRETunnelsAPI.GRETunnelCreateParams;
-  export import GRETunnelUpdateParams = GRETunnelsAPI.GRETunnelUpdateParams;
-  export import GRETunnelListParams = GRETunnelsAPI.GRETunnelListParams;
-  export import GRETunnelDeleteParams = GRETunnelsAPI.GRETunnelDeleteParams;
-  export import GRETunnelGetParams = GRETunnelsAPI.GRETunnelGetParams;
-  export import IPSECTunnels = IPSECTunnelsAPI.IPSECTunnels;
-  export import PSKMetadata = IPSECTunnelsAPI.PSKMetadata;
-  export import IPSECTunnelCreateResponse = IPSECTunnelsAPI.IPSECTunnelCreateResponse;
-  export import IPSECTunnelUpdateResponse = IPSECTunnelsAPI.IPSECTunnelUpdateResponse;
-  export import IPSECTunnelListResponse = IPSECTunnelsAPI.IPSECTunnelListResponse;
-  export import IPSECTunnelDeleteResponse = IPSECTunnelsAPI.IPSECTunnelDeleteResponse;
-  export import IPSECTunnelGetResponse = IPSECTunnelsAPI.IPSECTunnelGetResponse;
-  export import IPSECTunnelPSKGenerateResponse = IPSECTunnelsAPI.IPSECTunnelPSKGenerateResponse;
-  export import IPSECTunnelCreateParams = IPSECTunnelsAPI.IPSECTunnelCreateParams;
-  export import IPSECTunnelUpdateParams = IPSECTunnelsAPI.IPSECTunnelUpdateParams;
-  export import IPSECTunnelListParams = IPSECTunnelsAPI.IPSECTunnelListParams;
-  export import IPSECTunnelDeleteParams = IPSECTunnelsAPI.IPSECTunnelDeleteParams;
-  export import IPSECTunnelGetParams = IPSECTunnelsAPI.IPSECTunnelGetParams;
-  export import IPSECTunnelPSKGenerateParams = IPSECTunnelsAPI.IPSECTunnelPSKGenerateParams;
-  export import Routes = RoutesAPI.Routes;
-  export import Scope = RoutesAPI.Scope;
-  export import RouteCreateResponse = RoutesAPI.RouteCreateResponse;
-  export import RouteUpdateResponse = RoutesAPI.RouteUpdateResponse;
-  export import RouteListResponse = RoutesAPI.RouteListResponse;
-  export import RouteDeleteResponse = RoutesAPI.RouteDeleteResponse;
-  export import RouteEmptyResponse = RoutesAPI.RouteEmptyResponse;
-  export import RouteGetResponse = RoutesAPI.RouteGetResponse;
-  export import RouteCreateParams = RoutesAPI.RouteCreateParams;
-  export import RouteUpdateParams = RoutesAPI.RouteUpdateParams;
-  export import RouteListParams = RoutesAPI.RouteListParams;
-  export import RouteDeleteParams = RoutesAPI.RouteDeleteParams;
-  export import RouteEmptyParams = RoutesAPI.RouteEmptyParams;
-  export import RouteGetParams = RoutesAPI.RouteGetParams;
-  export import Sites = SitesAPI.Sites;
-  export import Site = SitesAPI.Site;
-  export import SiteLocation = SitesAPI.SiteLocation;
-  export import SitesSinglePage = SitesAPI.SitesSinglePage;
-  export import SiteCreateParams = SitesAPI.SiteCreateParams;
-  export import SiteUpdateParams = SitesAPI.SiteUpdateParams;
-  export import SiteListParams = SitesAPI.SiteListParams;
-  export import SiteDeleteParams = SitesAPI.SiteDeleteParams;
-  export import SiteEditParams = SitesAPI.SiteEditParams;
-  export import SiteGetParams = SitesAPI.SiteGetParams;
-  export import Connectors = ConnectorsAPI.Connectors;
-  export import ConnectorUpdateResponse = ConnectorsAPI.ConnectorUpdateResponse;
-  export import ConnectorListResponse = ConnectorsAPI.ConnectorListResponse;
-  export import ConnectorEditResponse = ConnectorsAPI.ConnectorEditResponse;
-  export import ConnectorGetResponse = ConnectorsAPI.ConnectorGetResponse;
-  export import ConnectorListResponsesSinglePage = ConnectorsAPI.ConnectorListResponsesSinglePage;
-  export import ConnectorUpdateParams = ConnectorsAPI.ConnectorUpdateParams;
-  export import ConnectorListParams = ConnectorsAPI.ConnectorListParams;
-  export import ConnectorEditParams = ConnectorsAPI.ConnectorEditParams;
-  export import ConnectorGetParams = ConnectorsAPI.ConnectorGetParams;
+MagicTransit.Apps = Apps;
+MagicTransit.AppListResponsesSinglePage = AppListResponsesSinglePage;
+MagicTransit.CfInterconnects = CfInterconnects;
+MagicTransit.GRETunnels = GRETunnels;
+MagicTransit.IPSECTunnels = IPSECTunnels;
+MagicTransit.Routes = Routes;
+MagicTransit.Sites = Sites;
+MagicTransit.SitesSinglePage = SitesSinglePage;
+MagicTransit.Connectors = Connectors;
+MagicTransit.ConnectorListResponsesSinglePage = ConnectorListResponsesSinglePage;
+MagicTransit.PCAPs = PCAPs;
+MagicTransit.PCAPListResponsesSinglePage = PCAPListResponsesSinglePage;
+
+export declare namespace MagicTransit {
+  export {
+    Apps as Apps,
+    type AppCreateResponse as AppCreateResponse,
+    type AppUpdateResponse as AppUpdateResponse,
+    type AppListResponse as AppListResponse,
+    type AppDeleteResponse as AppDeleteResponse,
+    AppListResponsesSinglePage as AppListResponsesSinglePage,
+    type AppCreateParams as AppCreateParams,
+    type AppUpdateParams as AppUpdateParams,
+    type AppListParams as AppListParams,
+    type AppDeleteParams as AppDeleteParams,
+  };
+
+  export {
+    CfInterconnects as CfInterconnects,
+    type CfInterconnectUpdateResponse as CfInterconnectUpdateResponse,
+    type CfInterconnectListResponse as CfInterconnectListResponse,
+    type CfInterconnectBulkUpdateResponse as CfInterconnectBulkUpdateResponse,
+    type CfInterconnectGetResponse as CfInterconnectGetResponse,
+    type CfInterconnectUpdateParams as CfInterconnectUpdateParams,
+    type CfInterconnectListParams as CfInterconnectListParams,
+    type CfInterconnectBulkUpdateParams as CfInterconnectBulkUpdateParams,
+    type CfInterconnectGetParams as CfInterconnectGetParams,
+  };
+
+  export {
+    GRETunnels as GRETunnels,
+    type GRETunnelCreateResponse as GRETunnelCreateResponse,
+    type GRETunnelUpdateResponse as GRETunnelUpdateResponse,
+    type GRETunnelListResponse as GRETunnelListResponse,
+    type GRETunnelDeleteResponse as GRETunnelDeleteResponse,
+    type GRETunnelBulkUpdateResponse as GRETunnelBulkUpdateResponse,
+    type GRETunnelGetResponse as GRETunnelGetResponse,
+    type GRETunnelCreateParams as GRETunnelCreateParams,
+    type GRETunnelUpdateParams as GRETunnelUpdateParams,
+    type GRETunnelListParams as GRETunnelListParams,
+    type GRETunnelDeleteParams as GRETunnelDeleteParams,
+    type GRETunnelBulkUpdateParams as GRETunnelBulkUpdateParams,
+    type GRETunnelGetParams as GRETunnelGetParams,
+  };
+
+  export {
+    IPSECTunnels as IPSECTunnels,
+    type PSKMetadata as PSKMetadata,
+    type IPSECTunnelCreateResponse as IPSECTunnelCreateResponse,
+    type IPSECTunnelUpdateResponse as IPSECTunnelUpdateResponse,
+    type IPSECTunnelListResponse as IPSECTunnelListResponse,
+    type IPSECTunnelDeleteResponse as IPSECTunnelDeleteResponse,
+    type IPSECTunnelBulkUpdateResponse as IPSECTunnelBulkUpdateResponse,
+    type IPSECTunnelGetResponse as IPSECTunnelGetResponse,
+    type IPSECTunnelPSKGenerateResponse as IPSECTunnelPSKGenerateResponse,
+    type IPSECTunnelCreateParams as IPSECTunnelCreateParams,
+    type IPSECTunnelUpdateParams as IPSECTunnelUpdateParams,
+    type IPSECTunnelListParams as IPSECTunnelListParams,
+    type IPSECTunnelDeleteParams as IPSECTunnelDeleteParams,
+    type IPSECTunnelBulkUpdateParams as IPSECTunnelBulkUpdateParams,
+    type IPSECTunnelGetParams as IPSECTunnelGetParams,
+    type IPSECTunnelPSKGenerateParams as IPSECTunnelPSKGenerateParams,
+  };
+
+  export {
+    Routes as Routes,
+    type Scope as Scope,
+    type RouteCreateResponse as RouteCreateResponse,
+    type RouteUpdateResponse as RouteUpdateResponse,
+    type RouteListResponse as RouteListResponse,
+    type RouteDeleteResponse as RouteDeleteResponse,
+    type RouteBulkUpdateResponse as RouteBulkUpdateResponse,
+    type RouteEmptyResponse as RouteEmptyResponse,
+    type RouteGetResponse as RouteGetResponse,
+    type RouteCreateParams as RouteCreateParams,
+    type RouteUpdateParams as RouteUpdateParams,
+    type RouteListParams as RouteListParams,
+    type RouteDeleteParams as RouteDeleteParams,
+    type RouteBulkUpdateParams as RouteBulkUpdateParams,
+    type RouteEmptyParams as RouteEmptyParams,
+    type RouteGetParams as RouteGetParams,
+  };
+
+  export {
+    Sites as Sites,
+    type Site as Site,
+    type SiteLocation as SiteLocation,
+    SitesSinglePage as SitesSinglePage,
+    type SiteCreateParams as SiteCreateParams,
+    type SiteUpdateParams as SiteUpdateParams,
+    type SiteListParams as SiteListParams,
+    type SiteDeleteParams as SiteDeleteParams,
+    type SiteEditParams as SiteEditParams,
+    type SiteGetParams as SiteGetParams,
+  };
+
+  export {
+    Connectors as Connectors,
+    type ConnectorUpdateResponse as ConnectorUpdateResponse,
+    type ConnectorListResponse as ConnectorListResponse,
+    type ConnectorEditResponse as ConnectorEditResponse,
+    type ConnectorGetResponse as ConnectorGetResponse,
+    ConnectorListResponsesSinglePage as ConnectorListResponsesSinglePage,
+    type ConnectorUpdateParams as ConnectorUpdateParams,
+    type ConnectorListParams as ConnectorListParams,
+    type ConnectorEditParams as ConnectorEditParams,
+    type ConnectorGetParams as ConnectorGetParams,
+  };
+
+  export {
+    PCAPs as PCAPs,
+    type PCAP as PCAP,
+    type PCAPFilter as PCAPFilter,
+    type PCAPCreateResponse as PCAPCreateResponse,
+    type PCAPListResponse as PCAPListResponse,
+    type PCAPGetResponse as PCAPGetResponse,
+    PCAPListResponsesSinglePage as PCAPListResponsesSinglePage,
+    type PCAPCreateParams as PCAPCreateParams,
+    type PCAPListParams as PCAPListParams,
+    type PCAPGetParams as PCAPGetParams,
+  };
 }
diff --git a/src/resources/pcaps/download.ts b/src/resources/magic-transit/pcaps/download.ts
similarity index 65%
rename from src/resources/pcaps/download.ts
rename to src/resources/magic-transit/pcaps/download.ts
index 9e001f1fe2..ac50f6fafa 100644
--- a/src/resources/pcaps/download.ts
+++ b/src/resources/magic-transit/pcaps/download.ts
@@ -1,9 +1,8 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as DownloadAPI from './download';
-import { type Response } from '../../_shims/index';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { type Response } from '../../../_shims/index';
 
 export class Download extends APIResource {
   /**
@@ -13,6 +12,7 @@ export class Download extends APIResource {
     const { account_id } = params;
     return this._client.get(`/accounts/${account_id}/pcaps/${pcapId}/download`, {
       ...options,
+      headers: { Accept: 'application/vnd.tcpdump.pcap', ...options?.headers },
       __binaryResponse: true,
     });
   }
@@ -25,6 +25,6 @@ export interface DownloadGetParams {
   account_id: string;
 }
 
-export namespace Download {
-  export import DownloadGetParams = DownloadAPI.DownloadGetParams;
+export declare namespace Download {
+  export { type DownloadGetParams as DownloadGetParams };
 }
diff --git a/src/resources/magic-transit/pcaps/index.ts b/src/resources/magic-transit/pcaps/index.ts
new file mode 100644
index 0000000000..dfcfe14b82
--- /dev/null
+++ b/src/resources/magic-transit/pcaps/index.ts
@@ -0,0 +1,24 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Download, type DownloadGetParams } from './download';
+export {
+  OwnershipResource,
+  type Ownership,
+  type OwnershipGetResponse,
+  type OwnershipCreateParams,
+  type OwnershipDeleteParams,
+  type OwnershipGetParams,
+  type OwnershipValidateParams,
+} from './ownership';
+export {
+  PCAPListResponsesSinglePage,
+  PCAPs,
+  type PCAP,
+  type PCAPFilter,
+  type PCAPCreateResponse,
+  type PCAPListResponse,
+  type PCAPGetResponse,
+  type PCAPCreateParams,
+  type PCAPListParams,
+  type PCAPGetParams,
+} from './pcaps';
diff --git a/src/resources/pcaps/ownership.ts b/src/resources/magic-transit/pcaps/ownership.ts
similarity index 85%
rename from src/resources/pcaps/ownership.ts
rename to src/resources/magic-transit/pcaps/ownership.ts
index 1b67e20f2d..63ebe6d17e 100644
--- a/src/resources/pcaps/ownership.ts
+++ b/src/resources/magic-transit/pcaps/ownership.ts
@@ -1,8 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as OwnershipAPI from './ownership';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
 
 export class OwnershipResource extends APIResource {
   /**
@@ -140,11 +139,13 @@ export interface OwnershipValidateParams {
   ownership_challenge: string;
 }
 
-export namespace OwnershipResource {
-  export import Ownership = OwnershipAPI.Ownership;
-  export import OwnershipGetResponse = OwnershipAPI.OwnershipGetResponse;
-  export import OwnershipCreateParams = OwnershipAPI.OwnershipCreateParams;
-  export import OwnershipDeleteParams = OwnershipAPI.OwnershipDeleteParams;
-  export import OwnershipGetParams = OwnershipAPI.OwnershipGetParams;
-  export import OwnershipValidateParams = OwnershipAPI.OwnershipValidateParams;
+export declare namespace OwnershipResource {
+  export {
+    type Ownership as Ownership,
+    type OwnershipGetResponse as OwnershipGetResponse,
+    type OwnershipCreateParams as OwnershipCreateParams,
+    type OwnershipDeleteParams as OwnershipDeleteParams,
+    type OwnershipGetParams as OwnershipGetParams,
+    type OwnershipValidateParams as OwnershipValidateParams,
+  };
 }
diff --git a/src/resources/pcaps/pcaps.ts b/src/resources/magic-transit/pcaps/pcaps.ts
similarity index 84%
rename from src/resources/pcaps/pcaps.ts
rename to src/resources/magic-transit/pcaps/pcaps.ts
index f92aa8754a..932036f5cc 100644
--- a/src/resources/pcaps/pcaps.ts
+++ b/src/resources/magic-transit/pcaps/pcaps.ts
@@ -1,11 +1,21 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
 import * as PCAPsAPI from './pcaps';
 import * as DownloadAPI from './download';
+import { Download, DownloadGetParams } from './download';
 import * as OwnershipAPI from './ownership';
-import { SinglePage } from '../../pagination';
+import {
+  Ownership,
+  OwnershipCreateParams,
+  OwnershipDeleteParams,
+  OwnershipGetParams,
+  OwnershipGetResponse,
+  OwnershipResource,
+  OwnershipValidateParams,
+} from './ownership';
+import { SinglePage } from '../../../pagination';
 
 export class PCAPs extends APIResource {
   ownership: OwnershipAPI.OwnershipResource = new OwnershipAPI.OwnershipResource(this._client);
@@ -159,10 +169,10 @@ export interface PCAPFilterParam {
   source_port?: number;
 }
 
-export type PCAPCreateResponse = PCAP | PCAPCreateResponse.MagicVisibilityPCAPsResponseFull;
+export type PCAPCreateResponse = PCAP | PCAPCreateResponse.MagicVisibilityPCAPsPCAPsResponseFull;
 
 export namespace PCAPCreateResponse {
-  export interface MagicVisibilityPCAPsResponseFull {
+  export interface MagicVisibilityPCAPsPCAPsResponseFull {
     /**
      * The ID for the packet capture.
      */
@@ -233,10 +243,10 @@ export namespace PCAPCreateResponse {
   }
 }
 
-export type PCAPListResponse = PCAP | PCAPListResponse.MagicVisibilityPCAPsResponseFull;
+export type PCAPListResponse = PCAP | PCAPListResponse.MagicVisibilityPCAPsPCAPsResponseFull;
 
 export namespace PCAPListResponse {
-  export interface MagicVisibilityPCAPsResponseFull {
+  export interface MagicVisibilityPCAPsPCAPsResponseFull {
     /**
      * The ID for the packet capture.
      */
@@ -307,10 +317,10 @@ export namespace PCAPListResponse {
   }
 }
 
-export type PCAPGetResponse = PCAP | PCAPGetResponse.MagicVisibilityPCAPsResponseFull;
+export type PCAPGetResponse = PCAP | PCAPGetResponse.MagicVisibilityPCAPsPCAPsResponseFull;
 
 export namespace PCAPGetResponse {
-  export interface MagicVisibilityPCAPsResponseFull {
+  export interface MagicVisibilityPCAPsPCAPsResponseFull {
     /**
      * The ID for the packet capture.
      */
@@ -382,11 +392,11 @@ export namespace PCAPGetResponse {
 }
 
 export type PCAPCreateParams =
-  | PCAPCreateParams.MagicVisibilityPCAPsRequestSimple
-  | PCAPCreateParams.MagicVisibilityPCAPsRequestFull;
+  | PCAPCreateParams.MagicVisibilityPCAPsPCAPsRequestSimple
+  | PCAPCreateParams.MagicVisibilityPCAPsPCAPsRequestFull;
 
-export namespace PCAPCreateParams {
-  export interface MagicVisibilityPCAPsRequestSimple {
+export declare namespace PCAPCreateParams {
+  export interface MagicVisibilityPCAPsPCAPsRequestSimple {
     /**
      * Path param: Identifier
      */
@@ -420,7 +430,7 @@ export namespace PCAPCreateParams {
     filter_v1?: PCAPFilterParam;
   }
 
-  export interface MagicVisibilityPCAPsRequestFull {
+  export interface MagicVisibilityPCAPsPCAPsRequestFull {
     /**
      * Path param: Identifier
      */
@@ -488,14 +498,32 @@ export interface PCAPGetParams {
   account_id: string;
 }
 
-export namespace PCAPs {
-  export import OwnershipResource = OwnershipAPI.OwnershipResource;
-  export import Ownership = OwnershipAPI.Ownership;
-  export import OwnershipGetResponse = OwnershipAPI.OwnershipGetResponse;
-  export import OwnershipCreateParams = OwnershipAPI.OwnershipCreateParams;
-  export import OwnershipDeleteParams = OwnershipAPI.OwnershipDeleteParams;
-  export import OwnershipGetParams = OwnershipAPI.OwnershipGetParams;
-  export import OwnershipValidateParams = OwnershipAPI.OwnershipValidateParams;
-  export import Download = DownloadAPI.Download;
-  export import DownloadGetParams = DownloadAPI.DownloadGetParams;
+PCAPs.PCAPListResponsesSinglePage = PCAPListResponsesSinglePage;
+PCAPs.OwnershipResource = OwnershipResource;
+PCAPs.Download = Download;
+
+export declare namespace PCAPs {
+  export {
+    type PCAP as PCAP,
+    type PCAPFilter as PCAPFilter,
+    type PCAPCreateResponse as PCAPCreateResponse,
+    type PCAPListResponse as PCAPListResponse,
+    type PCAPGetResponse as PCAPGetResponse,
+    PCAPListResponsesSinglePage as PCAPListResponsesSinglePage,
+    type PCAPCreateParams as PCAPCreateParams,
+    type PCAPListParams as PCAPListParams,
+    type PCAPGetParams as PCAPGetParams,
+  };
+
+  export {
+    OwnershipResource as OwnershipResource,
+    type Ownership as Ownership,
+    type OwnershipGetResponse as OwnershipGetResponse,
+    type OwnershipCreateParams as OwnershipCreateParams,
+    type OwnershipDeleteParams as OwnershipDeleteParams,
+    type OwnershipGetParams as OwnershipGetParams,
+    type OwnershipValidateParams as OwnershipValidateParams,
+  };
+
+  export { Download as Download, type DownloadGetParams as DownloadGetParams };
 }
diff --git a/src/resources/magic-transit/routes.ts b/src/resources/magic-transit/routes.ts
index 0eb6604507..841f3aaf9d 100644
--- a/src/resources/magic-transit/routes.ts
+++ b/src/resources/magic-transit/routes.ts
@@ -65,6 +65,23 @@ export class Routes extends APIResource {
     )._thenUnwrap((obj) => obj.result);
   }
 
+  /**
+   * Update multiple Magic static routes. Use `?validate_only=true` as an optional
+   * query parameter to run validation only without persisting changes. Only fields
+   * for a route that need to be changed need be provided.
+   */
+  bulkUpdate(
+    params: RouteBulkUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RouteBulkUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/magic/routes`, { body, ...options }) as Core.APIPromise<{
+        result: RouteBulkUpdateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Delete multiple Magic static routes.
    */
@@ -180,7 +197,56 @@ export namespace RouteCreateResponse {
 export interface RouteUpdateResponse {
   modified?: boolean;
 
-  modified_route?: unknown;
+  modified_route?: RouteUpdateResponse.ModifiedRoute;
+}
+
+export namespace RouteUpdateResponse {
+  export interface ModifiedRoute {
+    /**
+     * The next-hop IP Address for the static route.
+     */
+    nexthop: string;
+
+    /**
+     * IP Prefix in Classless Inter-Domain Routing format.
+     */
+    prefix: string;
+
+    /**
+     * Priority of the static route.
+     */
+    priority: number;
+
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * When the route was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional human provided description of the static route.
+     */
+    description?: string;
+
+    /**
+     * When the route was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * Used only for ECMP routes.
+     */
+    scope?: RoutesAPI.Scope;
+
+    /**
+     * Optional weight of the ECMP scope - if provided.
+     */
+    weight?: number;
+  }
 }
 
 export interface RouteListResponse {
@@ -239,17 +305,219 @@ export namespace RouteListResponse {
 export interface RouteDeleteResponse {
   deleted?: boolean;
 
-  deleted_route?: unknown;
+  deleted_route?: RouteDeleteResponse.DeletedRoute;
+}
+
+export namespace RouteDeleteResponse {
+  export interface DeletedRoute {
+    /**
+     * The next-hop IP Address for the static route.
+     */
+    nexthop: string;
+
+    /**
+     * IP Prefix in Classless Inter-Domain Routing format.
+     */
+    prefix: string;
+
+    /**
+     * Priority of the static route.
+     */
+    priority: number;
+
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * When the route was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional human provided description of the static route.
+     */
+    description?: string;
+
+    /**
+     * When the route was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * Used only for ECMP routes.
+     */
+    scope?: RoutesAPI.Scope;
+
+    /**
+     * Optional weight of the ECMP scope - if provided.
+     */
+    weight?: number;
+  }
+}
+
+export interface RouteBulkUpdateResponse {
+  modified?: boolean;
+
+  modified_routes?: Array<RouteBulkUpdateResponse.ModifiedRoute>;
+}
+
+export namespace RouteBulkUpdateResponse {
+  export interface ModifiedRoute {
+    /**
+     * The next-hop IP Address for the static route.
+     */
+    nexthop: string;
+
+    /**
+     * IP Prefix in Classless Inter-Domain Routing format.
+     */
+    prefix: string;
+
+    /**
+     * Priority of the static route.
+     */
+    priority: number;
+
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * When the route was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional human provided description of the static route.
+     */
+    description?: string;
+
+    /**
+     * When the route was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * Used only for ECMP routes.
+     */
+    scope?: RoutesAPI.Scope;
+
+    /**
+     * Optional weight of the ECMP scope - if provided.
+     */
+    weight?: number;
+  }
 }
 
 export interface RouteEmptyResponse {
   deleted?: boolean;
 
-  deleted_routes?: unknown;
+  deleted_routes?: Array<RouteEmptyResponse.DeletedRoute>;
+}
+
+export namespace RouteEmptyResponse {
+  export interface DeletedRoute {
+    /**
+     * The next-hop IP Address for the static route.
+     */
+    nexthop: string;
+
+    /**
+     * IP Prefix in Classless Inter-Domain Routing format.
+     */
+    prefix: string;
+
+    /**
+     * Priority of the static route.
+     */
+    priority: number;
+
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * When the route was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional human provided description of the static route.
+     */
+    description?: string;
+
+    /**
+     * When the route was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * Used only for ECMP routes.
+     */
+    scope?: RoutesAPI.Scope;
+
+    /**
+     * Optional weight of the ECMP scope - if provided.
+     */
+    weight?: number;
+  }
 }
 
 export interface RouteGetResponse {
-  route?: unknown;
+  route?: RouteGetResponse.Route;
+}
+
+export namespace RouteGetResponse {
+  export interface Route {
+    /**
+     * The next-hop IP Address for the static route.
+     */
+    nexthop: string;
+
+    /**
+     * IP Prefix in Classless Inter-Domain Routing format.
+     */
+    prefix: string;
+
+    /**
+     * Priority of the static route.
+     */
+    priority: number;
+
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * When the route was created.
+     */
+    created_on?: string;
+
+    /**
+     * An optional human provided description of the static route.
+     */
+    description?: string;
+
+    /**
+     * When the route was last modified.
+     */
+    modified_on?: string;
+
+    /**
+     * Used only for ECMP routes.
+     */
+    scope?: RoutesAPI.Scope;
+
+    /**
+     * Optional weight of the ECMP scope - if provided.
+     */
+    weight?: number;
+  }
 }
 
 export interface RouteCreateParams {
@@ -315,6 +583,57 @@ export interface RouteDeleteParams {
   account_id: string;
 }
 
+export interface RouteBulkUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  routes: Array<RouteBulkUpdateParams.Route>;
+}
+
+export namespace RouteBulkUpdateParams {
+  export interface Route {
+    /**
+     * Identifier
+     */
+    id: string;
+
+    /**
+     * The next-hop IP Address for the static route.
+     */
+    nexthop: string;
+
+    /**
+     * IP Prefix in Classless Inter-Domain Routing format.
+     */
+    prefix: string;
+
+    /**
+     * Priority of the static route.
+     */
+    priority: number;
+
+    /**
+     * An optional human provided description of the static route.
+     */
+    description?: string;
+
+    /**
+     * Used only for ECMP routes.
+     */
+    scope?: RoutesAPI.ScopeParam;
+
+    /**
+     * Optional weight of the ECMP scope - if provided.
+     */
+    weight?: number;
+  }
+}
+
 export interface RouteEmptyParams {
   /**
    * Identifier
@@ -329,18 +648,22 @@ export interface RouteGetParams {
   account_id: string;
 }
 
-export namespace Routes {
-  export import Scope = RoutesAPI.Scope;
-  export import RouteCreateResponse = RoutesAPI.RouteCreateResponse;
-  export import RouteUpdateResponse = RoutesAPI.RouteUpdateResponse;
-  export import RouteListResponse = RoutesAPI.RouteListResponse;
-  export import RouteDeleteResponse = RoutesAPI.RouteDeleteResponse;
-  export import RouteEmptyResponse = RoutesAPI.RouteEmptyResponse;
-  export import RouteGetResponse = RoutesAPI.RouteGetResponse;
-  export import RouteCreateParams = RoutesAPI.RouteCreateParams;
-  export import RouteUpdateParams = RoutesAPI.RouteUpdateParams;
-  export import RouteListParams = RoutesAPI.RouteListParams;
-  export import RouteDeleteParams = RoutesAPI.RouteDeleteParams;
-  export import RouteEmptyParams = RoutesAPI.RouteEmptyParams;
-  export import RouteGetParams = RoutesAPI.RouteGetParams;
+export declare namespace Routes {
+  export {
+    type Scope as Scope,
+    type RouteCreateResponse as RouteCreateResponse,
+    type RouteUpdateResponse as RouteUpdateResponse,
+    type RouteListResponse as RouteListResponse,
+    type RouteDeleteResponse as RouteDeleteResponse,
+    type RouteBulkUpdateResponse as RouteBulkUpdateResponse,
+    type RouteEmptyResponse as RouteEmptyResponse,
+    type RouteGetResponse as RouteGetResponse,
+    type RouteCreateParams as RouteCreateParams,
+    type RouteUpdateParams as RouteUpdateParams,
+    type RouteListParams as RouteListParams,
+    type RouteDeleteParams as RouteDeleteParams,
+    type RouteBulkUpdateParams as RouteBulkUpdateParams,
+    type RouteEmptyParams as RouteEmptyParams,
+    type RouteGetParams as RouteGetParams,
+  };
 }
diff --git a/src/resources/magic-transit/sites/acls.ts b/src/resources/magic-transit/sites/acls.ts
index 5eafeb1a53..05e9cf87ac 100644
--- a/src/resources/magic-transit/sites/acls.ts
+++ b/src/resources/magic-transit/sites/acls.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ACLsAPI from './acls';
 import { SinglePage } from '../../../pagination';
 
 export class ACLs extends APIResource {
@@ -207,12 +206,12 @@ export type AllowedProtocolParam = 'tcp' | 'udp' | 'icmp';
 /**
  * A valid IPv4 address.
  */
-export type Subnet = string | string;
+export type Subnet = string;
 
 /**
  * A valid IPv4 address.
  */
-export type SubnetParam = string | string;
+export type SubnetParam = string;
 
 export interface ACLCreateParams {
   /**
@@ -355,16 +354,20 @@ export interface ACLGetParams {
   account_id: string;
 }
 
-export namespace ACLs {
-  export import ACL = ACLsAPI.ACL;
-  export import ACLConfiguration = ACLsAPI.ACLConfiguration;
-  export import AllowedProtocol = ACLsAPI.AllowedProtocol;
-  export import Subnet = ACLsAPI.Subnet;
-  export import ACLsSinglePage = ACLsAPI.ACLsSinglePage;
-  export import ACLCreateParams = ACLsAPI.ACLCreateParams;
-  export import ACLUpdateParams = ACLsAPI.ACLUpdateParams;
-  export import ACLListParams = ACLsAPI.ACLListParams;
-  export import ACLDeleteParams = ACLsAPI.ACLDeleteParams;
-  export import ACLEditParams = ACLsAPI.ACLEditParams;
-  export import ACLGetParams = ACLsAPI.ACLGetParams;
+ACLs.ACLsSinglePage = ACLsSinglePage;
+
+export declare namespace ACLs {
+  export {
+    type ACL as ACL,
+    type ACLConfiguration as ACLConfiguration,
+    type AllowedProtocol as AllowedProtocol,
+    type Subnet as Subnet,
+    ACLsSinglePage as ACLsSinglePage,
+    type ACLCreateParams as ACLCreateParams,
+    type ACLUpdateParams as ACLUpdateParams,
+    type ACLListParams as ACLListParams,
+    type ACLDeleteParams as ACLDeleteParams,
+    type ACLEditParams as ACLEditParams,
+    type ACLGetParams as ACLGetParams,
+  };
 }
diff --git a/src/resources/magic-transit/sites/index.ts b/src/resources/magic-transit/sites/index.ts
index d401e52d54..05d15dab06 100644
--- a/src/resources/magic-transit/sites/index.ts
+++ b/src/resources/magic-transit/sites/index.ts
@@ -1,58 +1,58 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  ACL,
-  ACLConfiguration,
-  AllowedProtocol,
-  Subnet,
-  ACLCreateParams,
-  ACLUpdateParams,
-  ACLListParams,
-  ACLDeleteParams,
-  ACLEditParams,
-  ACLGetParams,
   ACLsSinglePage,
   ACLs,
+  type ACL,
+  type ACLConfiguration,
+  type AllowedProtocol,
+  type Subnet,
+  type ACLCreateParams,
+  type ACLUpdateParams,
+  type ACLListParams,
+  type ACLDeleteParams,
+  type ACLEditParams,
+  type ACLGetParams,
 } from './acls';
 export {
-  DHCPRelay,
-  DHCPServer,
-  LAN,
-  LANStaticAddressing,
-  Nat,
-  RoutedSubnet,
-  LANCreateResponse,
-  LANCreateParams,
-  LANUpdateParams,
-  LANListParams,
-  LANDeleteParams,
-  LANEditParams,
-  LANGetParams,
   LANsSinglePage,
   LANs,
+  type DHCPRelay,
+  type DHCPServer,
+  type LAN,
+  type LANStaticAddressing,
+  type Nat,
+  type RoutedSubnet,
+  type LANCreateResponse,
+  type LANCreateParams,
+  type LANUpdateParams,
+  type LANListParams,
+  type LANDeleteParams,
+  type LANEditParams,
+  type LANGetParams,
 } from './lans';
 export {
-  Site,
-  SiteLocation,
-  SiteCreateParams,
-  SiteUpdateParams,
-  SiteListParams,
-  SiteDeleteParams,
-  SiteEditParams,
-  SiteGetParams,
   SitesSinglePage,
   Sites,
+  type Site,
+  type SiteLocation,
+  type SiteCreateParams,
+  type SiteUpdateParams,
+  type SiteListParams,
+  type SiteDeleteParams,
+  type SiteEditParams,
+  type SiteGetParams,
 } from './sites';
 export {
-  WAN,
-  WANStaticAddressing,
-  WANCreateResponse,
-  WANCreateParams,
-  WANUpdateParams,
-  WANListParams,
-  WANDeleteParams,
-  WANEditParams,
-  WANGetParams,
   WANsSinglePage,
   WANs,
+  type WAN,
+  type WANStaticAddressing,
+  type WANCreateResponse,
+  type WANCreateParams,
+  type WANUpdateParams,
+  type WANListParams,
+  type WANDeleteParams,
+  type WANEditParams,
+  type WANGetParams,
 } from './wans';
diff --git a/src/resources/magic-transit/sites/lans.ts b/src/resources/magic-transit/sites/lans.ts
index 25a3dce314..681f5aca4e 100644
--- a/src/resources/magic-transit/sites/lans.ts
+++ b/src/resources/magic-transit/sites/lans.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as LANsAPI from './lans';
 import { SinglePage } from '../../../pagination';
 
 export class LANs extends APIResource {
@@ -454,19 +453,23 @@ export interface LANGetParams {
   account_id: string;
 }
 
-export namespace LANs {
-  export import DHCPRelay = LANsAPI.DHCPRelay;
-  export import DHCPServer = LANsAPI.DHCPServer;
-  export import LAN = LANsAPI.LAN;
-  export import LANStaticAddressing = LANsAPI.LANStaticAddressing;
-  export import Nat = LANsAPI.Nat;
-  export import RoutedSubnet = LANsAPI.RoutedSubnet;
-  export import LANCreateResponse = LANsAPI.LANCreateResponse;
-  export import LANsSinglePage = LANsAPI.LANsSinglePage;
-  export import LANCreateParams = LANsAPI.LANCreateParams;
-  export import LANUpdateParams = LANsAPI.LANUpdateParams;
-  export import LANListParams = LANsAPI.LANListParams;
-  export import LANDeleteParams = LANsAPI.LANDeleteParams;
-  export import LANEditParams = LANsAPI.LANEditParams;
-  export import LANGetParams = LANsAPI.LANGetParams;
+LANs.LANsSinglePage = LANsSinglePage;
+
+export declare namespace LANs {
+  export {
+    type DHCPRelay as DHCPRelay,
+    type DHCPServer as DHCPServer,
+    type LAN as LAN,
+    type LANStaticAddressing as LANStaticAddressing,
+    type Nat as Nat,
+    type RoutedSubnet as RoutedSubnet,
+    type LANCreateResponse as LANCreateResponse,
+    LANsSinglePage as LANsSinglePage,
+    type LANCreateParams as LANCreateParams,
+    type LANUpdateParams as LANUpdateParams,
+    type LANListParams as LANListParams,
+    type LANDeleteParams as LANDeleteParams,
+    type LANEditParams as LANEditParams,
+    type LANGetParams as LANGetParams,
+  };
 }
diff --git a/src/resources/magic-transit/sites/sites.ts b/src/resources/magic-transit/sites/sites.ts
index 50ad637c44..00484b3abc 100644
--- a/src/resources/magic-transit/sites/sites.ts
+++ b/src/resources/magic-transit/sites/sites.ts
@@ -2,10 +2,53 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as SitesAPI from './sites';
 import * as ACLsAPI from './acls';
+import {
+  ACL,
+  ACLConfiguration,
+  ACLCreateParams,
+  ACLDeleteParams,
+  ACLEditParams,
+  ACLGetParams,
+  ACLListParams,
+  ACLUpdateParams,
+  ACLs,
+  ACLsSinglePage,
+  AllowedProtocol,
+  Subnet,
+} from './acls';
 import * as LANsAPI from './lans';
+import {
+  DHCPRelay,
+  DHCPServer,
+  LAN,
+  LANCreateParams,
+  LANCreateResponse,
+  LANDeleteParams,
+  LANEditParams,
+  LANGetParams,
+  LANListParams,
+  LANStaticAddressing,
+  LANUpdateParams,
+  LANs,
+  LANsSinglePage,
+  Nat,
+  RoutedSubnet,
+} from './lans';
 import * as WANsAPI from './wans';
+import {
+  WAN,
+  WANCreateParams,
+  WANCreateResponse,
+  WANDeleteParams,
+  WANEditParams,
+  WANGetParams,
+  WANListParams,
+  WANStaticAddressing,
+  WANUpdateParams,
+  WANs,
+  WANsSinglePage,
+} from './wans';
 import { SinglePage } from '../../../pagination';
 
 export class Sites extends APIResource {
@@ -80,11 +123,17 @@ export class Sites extends APIResource {
    * Get a specific Site.
    */
   get(siteId: string, params: SiteGetParams, options?: Core.RequestOptions): Core.APIPromise<Site> {
-    const { account_id } = params;
+    const { account_id, 'x-magic-new-hc-target': xMagicNewHcTarget } = params;
     return (
-      this._client.get(`/accounts/${account_id}/magic/sites/${siteId}`, options) as Core.APIPromise<{
-        result: Site;
-      }>
+      this._client.get(`/accounts/${account_id}/magic/sites/${siteId}`, {
+        ...options,
+        headers: {
+          ...(xMagicNewHcTarget?.toString() != null ?
+            { 'x-magic-new-hc-target': xMagicNewHcTarget?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: Site }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -282,57 +331,82 @@ export interface SiteEditParams {
 
 export interface SiteGetParams {
   /**
-   * Identifier
+   * Path param: Identifier
    */
   account_id: string;
+
+  /**
+   * Header param: If true, the health check target in the response body will be
+   * presented using the new object format. Defaults to false.
+   */
+  'x-magic-new-hc-target'?: boolean;
 }
 
-export namespace Sites {
-  export import Site = SitesAPI.Site;
-  export import SiteLocation = SitesAPI.SiteLocation;
-  export import SitesSinglePage = SitesAPI.SitesSinglePage;
-  export import SiteCreateParams = SitesAPI.SiteCreateParams;
-  export import SiteUpdateParams = SitesAPI.SiteUpdateParams;
-  export import SiteListParams = SitesAPI.SiteListParams;
-  export import SiteDeleteParams = SitesAPI.SiteDeleteParams;
-  export import SiteEditParams = SitesAPI.SiteEditParams;
-  export import SiteGetParams = SitesAPI.SiteGetParams;
-  export import ACLs = ACLsAPI.ACLs;
-  export import ACL = ACLsAPI.ACL;
-  export import ACLConfiguration = ACLsAPI.ACLConfiguration;
-  export import AllowedProtocol = ACLsAPI.AllowedProtocol;
-  export import Subnet = ACLsAPI.Subnet;
-  export import ACLsSinglePage = ACLsAPI.ACLsSinglePage;
-  export import ACLCreateParams = ACLsAPI.ACLCreateParams;
-  export import ACLUpdateParams = ACLsAPI.ACLUpdateParams;
-  export import ACLListParams = ACLsAPI.ACLListParams;
-  export import ACLDeleteParams = ACLsAPI.ACLDeleteParams;
-  export import ACLEditParams = ACLsAPI.ACLEditParams;
-  export import ACLGetParams = ACLsAPI.ACLGetParams;
-  export import LANs = LANsAPI.LANs;
-  export import DHCPRelay = LANsAPI.DHCPRelay;
-  export import DHCPServer = LANsAPI.DHCPServer;
-  export import LAN = LANsAPI.LAN;
-  export import LANStaticAddressing = LANsAPI.LANStaticAddressing;
-  export import Nat = LANsAPI.Nat;
-  export import RoutedSubnet = LANsAPI.RoutedSubnet;
-  export import LANCreateResponse = LANsAPI.LANCreateResponse;
-  export import LANsSinglePage = LANsAPI.LANsSinglePage;
-  export import LANCreateParams = LANsAPI.LANCreateParams;
-  export import LANUpdateParams = LANsAPI.LANUpdateParams;
-  export import LANListParams = LANsAPI.LANListParams;
-  export import LANDeleteParams = LANsAPI.LANDeleteParams;
-  export import LANEditParams = LANsAPI.LANEditParams;
-  export import LANGetParams = LANsAPI.LANGetParams;
-  export import WANs = WANsAPI.WANs;
-  export import WAN = WANsAPI.WAN;
-  export import WANStaticAddressing = WANsAPI.WANStaticAddressing;
-  export import WANCreateResponse = WANsAPI.WANCreateResponse;
-  export import WANsSinglePage = WANsAPI.WANsSinglePage;
-  export import WANCreateParams = WANsAPI.WANCreateParams;
-  export import WANUpdateParams = WANsAPI.WANUpdateParams;
-  export import WANListParams = WANsAPI.WANListParams;
-  export import WANDeleteParams = WANsAPI.WANDeleteParams;
-  export import WANEditParams = WANsAPI.WANEditParams;
-  export import WANGetParams = WANsAPI.WANGetParams;
+Sites.SitesSinglePage = SitesSinglePage;
+Sites.ACLs = ACLs;
+Sites.ACLsSinglePage = ACLsSinglePage;
+Sites.LANs = LANs;
+Sites.LANsSinglePage = LANsSinglePage;
+Sites.WANs = WANs;
+Sites.WANsSinglePage = WANsSinglePage;
+
+export declare namespace Sites {
+  export {
+    type Site as Site,
+    type SiteLocation as SiteLocation,
+    SitesSinglePage as SitesSinglePage,
+    type SiteCreateParams as SiteCreateParams,
+    type SiteUpdateParams as SiteUpdateParams,
+    type SiteListParams as SiteListParams,
+    type SiteDeleteParams as SiteDeleteParams,
+    type SiteEditParams as SiteEditParams,
+    type SiteGetParams as SiteGetParams,
+  };
+
+  export {
+    ACLs as ACLs,
+    type ACL as ACL,
+    type ACLConfiguration as ACLConfiguration,
+    type AllowedProtocol as AllowedProtocol,
+    type Subnet as Subnet,
+    ACLsSinglePage as ACLsSinglePage,
+    type ACLCreateParams as ACLCreateParams,
+    type ACLUpdateParams as ACLUpdateParams,
+    type ACLListParams as ACLListParams,
+    type ACLDeleteParams as ACLDeleteParams,
+    type ACLEditParams as ACLEditParams,
+    type ACLGetParams as ACLGetParams,
+  };
+
+  export {
+    LANs as LANs,
+    type DHCPRelay as DHCPRelay,
+    type DHCPServer as DHCPServer,
+    type LAN as LAN,
+    type LANStaticAddressing as LANStaticAddressing,
+    type Nat as Nat,
+    type RoutedSubnet as RoutedSubnet,
+    type LANCreateResponse as LANCreateResponse,
+    LANsSinglePage as LANsSinglePage,
+    type LANCreateParams as LANCreateParams,
+    type LANUpdateParams as LANUpdateParams,
+    type LANListParams as LANListParams,
+    type LANDeleteParams as LANDeleteParams,
+    type LANEditParams as LANEditParams,
+    type LANGetParams as LANGetParams,
+  };
+
+  export {
+    WANs as WANs,
+    type WAN as WAN,
+    type WANStaticAddressing as WANStaticAddressing,
+    type WANCreateResponse as WANCreateResponse,
+    WANsSinglePage as WANsSinglePage,
+    type WANCreateParams as WANCreateParams,
+    type WANUpdateParams as WANUpdateParams,
+    type WANListParams as WANListParams,
+    type WANDeleteParams as WANDeleteParams,
+    type WANEditParams as WANEditParams,
+    type WANGetParams as WANGetParams,
+  };
 }
diff --git a/src/resources/magic-transit/sites/wans.ts b/src/resources/magic-transit/sites/wans.ts
index c11e1c51ed..e94147aa1e 100644
--- a/src/resources/magic-transit/sites/wans.ts
+++ b/src/resources/magic-transit/sites/wans.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as WANsAPI from './wans';
 import { SinglePage } from '../../../pagination';
 
 export class WANs extends APIResource {
@@ -120,6 +119,12 @@ export interface WAN {
    */
   id?: string;
 
+  /**
+   * Magic WAN health check rate for tunnels created on this link. The default value
+   * is `mid`.
+   */
+  health_check_rate?: 'low' | 'mid' | 'high';
+
   name?: string;
 
   physport?: number;
@@ -310,15 +315,19 @@ export interface WANGetParams {
   account_id: string;
 }
 
-export namespace WANs {
-  export import WAN = WANsAPI.WAN;
-  export import WANStaticAddressing = WANsAPI.WANStaticAddressing;
-  export import WANCreateResponse = WANsAPI.WANCreateResponse;
-  export import WANsSinglePage = WANsAPI.WANsSinglePage;
-  export import WANCreateParams = WANsAPI.WANCreateParams;
-  export import WANUpdateParams = WANsAPI.WANUpdateParams;
-  export import WANListParams = WANsAPI.WANListParams;
-  export import WANDeleteParams = WANsAPI.WANDeleteParams;
-  export import WANEditParams = WANsAPI.WANEditParams;
-  export import WANGetParams = WANsAPI.WANGetParams;
+WANs.WANsSinglePage = WANsSinglePage;
+
+export declare namespace WANs {
+  export {
+    type WAN as WAN,
+    type WANStaticAddressing as WANStaticAddressing,
+    type WANCreateResponse as WANCreateResponse,
+    WANsSinglePage as WANsSinglePage,
+    type WANCreateParams as WANCreateParams,
+    type WANUpdateParams as WANUpdateParams,
+    type WANListParams as WANListParams,
+    type WANDeleteParams as WANDeleteParams,
+    type WANEditParams as WANEditParams,
+    type WANGetParams as WANGetParams,
+  };
 }
diff --git a/src/resources/managed-headers.ts b/src/resources/managed-headers.ts
deleted file mode 100644
index 145f245242..0000000000
--- a/src/resources/managed-headers.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../resource';
-import * as Core from '../core';
-
-export class ManagedHeaders extends APIResource {
-  /**
-   * Fetches a list of all Managed Transforms.
-   */
-  list(
-    params: ManagedHeaderListParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<ManagedHeaderListResponse> {
-    const { zone_id } = params;
-    return this._client.get(`/zones/${zone_id}/managed_headers`, options);
-  }
-
-  /**
-   * Updates the status of one or more Managed Transforms.
-   */
-  edit(
-    params: ManagedHeaderEditParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<ManagedHeaderEditResponse> {
-    const { zone_id, ...body } = params;
-    return this._client.patch(`/zones/${zone_id}/managed_headers`, { body, ...options });
-  }
-}
-
-export interface RequestModel {
-  /**
-   * Human-readable identifier of the Managed Transform.
-   */
-  id?: string;
-
-  /**
-   * When true, the Managed Transform is enabled.
-   */
-  enabled?: boolean;
-}
-
-export interface RequestModelParam {
-  /**
-   * Human-readable identifier of the Managed Transform.
-   */
-  id?: string;
-
-  /**
-   * When true, the Managed Transform is enabled.
-   */
-  enabled?: boolean;
-}
-
-export interface ManagedHeaderListResponse {
-  managed_request_headers?: Array<RequestModel>;
-
-  managed_response_headers?: Array<RequestModel>;
-}
-
-export interface ManagedHeaderEditResponse {
-  managed_request_headers?: Array<ManagedHeaderEditResponse.ManagedRequestHeader>;
-
-  managed_response_headers?: Array<ManagedHeaderEditResponse.ManagedResponseHeader>;
-}
-
-export namespace ManagedHeaderEditResponse {
-  export interface ManagedRequestHeader {
-    /**
-     * Human-readable identifier of the Managed Transform.
-     */
-    id?: string;
-
-    /**
-     * When true, the Managed Transform is available in the current Cloudflare plan.
-     */
-    available?: boolean;
-
-    /**
-     * When true, the Managed Transform is enabled.
-     */
-    enabled?: boolean;
-  }
-
-  export interface ManagedResponseHeader {
-    /**
-     * Human-readable identifier of the Managed Transform.
-     */
-    id?: string;
-
-    /**
-     * When true, the Managed Transform is available in the current Cloudflare plan.
-     */
-    available?: boolean;
-
-    /**
-     * When true, the Managed Transform is enabled.
-     */
-    enabled?: boolean;
-  }
-}
-
-export interface ManagedHeaderListParams {
-  /**
-   * Identifier
-   */
-  zone_id: string;
-}
-
-export interface ManagedHeaderEditParams {
-  /**
-   * Path param: Identifier
-   */
-  zone_id: string;
-
-  /**
-   * Body param:
-   */
-  managed_request_headers: Array<RequestModelParam>;
-
-  /**
-   * Body param:
-   */
-  managed_response_headers: Array<RequestModelParam>;
-}
diff --git a/src/resources/managed-transforms.ts b/src/resources/managed-transforms.ts
new file mode 100644
index 0000000000..846003dc4b
--- /dev/null
+++ b/src/resources/managed-transforms.ts
@@ -0,0 +1,248 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../resource';
+import * as Core from '../core';
+
+export class ManagedTransforms extends APIResource {
+  /**
+   * Fetches a list of all Managed Transforms.
+   */
+  list(
+    params: ManagedTransformListParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ManagedTransformListResponse> {
+    const { zone_id } = params;
+    return (
+      this._client.get(`/zones/${zone_id}/managed_headers`, options) as Core.APIPromise<{
+        result: ManagedTransformListResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Disables all Managed Transforms.
+   */
+  delete(params: ManagedTransformDeleteParams, options?: Core.RequestOptions): Core.APIPromise<void> {
+    const { zone_id } = params;
+    return this._client.delete(`/zones/${zone_id}/managed_headers`, {
+      ...options,
+      headers: { Accept: '*/*', ...options?.headers },
+    });
+  }
+
+  /**
+   * Updates the status of one or more Managed Transforms.
+   */
+  edit(
+    params: ManagedTransformEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ManagedTransformEditResponse> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.patch(`/zones/${zone_id}/managed_headers`, { body, ...options }) as Core.APIPromise<{
+        result: ManagedTransformEditResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+/**
+ * A result.
+ */
+export interface ManagedTransformListResponse {
+  /**
+   * The list of Managed Request Transforms.
+   */
+  managed_request_headers: Array<ManagedTransformListResponse.ManagedRequestHeader>;
+
+  /**
+   * The list of Managed Response Transforms.
+   */
+  managed_response_headers: Array<ManagedTransformListResponse.ManagedResponseHeader>;
+}
+
+export namespace ManagedTransformListResponse {
+  /**
+   * A Managed Transform object.
+   */
+  export interface ManagedRequestHeader {
+    /**
+     * The human-readable identifier of the Managed Transform.
+     */
+    id: string;
+
+    /**
+     * Whether the Managed Transform is enabled.
+     */
+    enabled: boolean;
+
+    /**
+     * Whether the Managed Transform conflicts with the currently-enabled Managed
+     * Transforms.
+     */
+    has_conflict: boolean;
+
+    /**
+     * The Managed Transforms that this Managed Transform conflicts with.
+     */
+    conflicts_with?: Array<string>;
+  }
+
+  /**
+   * A Managed Transform object.
+   */
+  export interface ManagedResponseHeader {
+    /**
+     * The human-readable identifier of the Managed Transform.
+     */
+    id: string;
+
+    /**
+     * Whether the Managed Transform is enabled.
+     */
+    enabled: boolean;
+
+    /**
+     * Whether the Managed Transform conflicts with the currently-enabled Managed
+     * Transforms.
+     */
+    has_conflict: boolean;
+
+    /**
+     * The Managed Transforms that this Managed Transform conflicts with.
+     */
+    conflicts_with?: Array<string>;
+  }
+}
+
+/**
+ * A result.
+ */
+export interface ManagedTransformEditResponse {
+  /**
+   * The list of Managed Request Transforms.
+   */
+  managed_request_headers: Array<ManagedTransformEditResponse.ManagedRequestHeader>;
+
+  /**
+   * The list of Managed Response Transforms.
+   */
+  managed_response_headers: Array<ManagedTransformEditResponse.ManagedResponseHeader>;
+}
+
+export namespace ManagedTransformEditResponse {
+  /**
+   * A Managed Transform object.
+   */
+  export interface ManagedRequestHeader {
+    /**
+     * The human-readable identifier of the Managed Transform.
+     */
+    id: string;
+
+    /**
+     * Whether the Managed Transform is enabled.
+     */
+    enabled: boolean;
+
+    /**
+     * Whether the Managed Transform conflicts with the currently-enabled Managed
+     * Transforms.
+     */
+    has_conflict: boolean;
+
+    /**
+     * The Managed Transforms that this Managed Transform conflicts with.
+     */
+    conflicts_with?: Array<string>;
+  }
+
+  /**
+   * A Managed Transform object.
+   */
+  export interface ManagedResponseHeader {
+    /**
+     * The human-readable identifier of the Managed Transform.
+     */
+    id: string;
+
+    /**
+     * Whether the Managed Transform is enabled.
+     */
+    enabled: boolean;
+
+    /**
+     * Whether the Managed Transform conflicts with the currently-enabled Managed
+     * Transforms.
+     */
+    has_conflict: boolean;
+
+    /**
+     * The Managed Transforms that this Managed Transform conflicts with.
+     */
+    conflicts_with?: Array<string>;
+  }
+}
+
+export interface ManagedTransformListParams {
+  /**
+   * The unique ID of the zone.
+   */
+  zone_id: string;
+}
+
+export interface ManagedTransformDeleteParams {
+  /**
+   * The unique ID of the zone.
+   */
+  zone_id: string;
+}
+
+export interface ManagedTransformEditParams {
+  /**
+   * Path param: The unique ID of the zone.
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The list of Managed Request Transforms.
+   */
+  managed_request_headers: Array<ManagedTransformEditParams.ManagedRequestHeader>;
+
+  /**
+   * Body param: The list of Managed Response Transforms.
+   */
+  managed_response_headers: Array<ManagedTransformEditParams.ManagedResponseHeader>;
+}
+
+export namespace ManagedTransformEditParams {
+  /**
+   * A Managed Transform object.
+   */
+  export interface ManagedRequestHeader {
+    /**
+     * The human-readable identifier of the Managed Transform.
+     */
+    id: string;
+
+    /**
+     * Whether the Managed Transform is enabled.
+     */
+    enabled: boolean;
+  }
+
+  /**
+   * A Managed Transform object.
+   */
+  export interface ManagedResponseHeader {
+    /**
+     * The human-readable identifier of the Managed Transform.
+     */
+    id: string;
+
+    /**
+     * Whether the Managed Transform is enabled.
+     */
+    enabled: boolean;
+  }
+}
diff --git a/src/resources/memberships.ts b/src/resources/memberships.ts
index 3d939cff86..1f851d6f85 100644
--- a/src/resources/memberships.ts
+++ b/src/resources/memberships.ts
@@ -86,7 +86,7 @@ export interface Membership {
   permissions?: Membership.Permissions;
 
   /**
-   * List of role names for the user at the account.
+   * List of role names the membership has for this account.
    */
   roles?: Array<string>;
 
@@ -152,7 +152,7 @@ export interface MembershipUpdateResponse {
   policies?: Array<MembershipUpdateResponse.Policy>;
 
   /**
-   * List of role names for the user at the account.
+   * List of role names the membership has for this account.
    */
   roles?: Array<string>;
 
@@ -228,7 +228,7 @@ export namespace MembershipUpdateResponse {
       /**
        * Attributes associated to the permission group.
        */
-      meta?: unknown;
+      meta?: PermissionGroup.Meta;
 
       /**
        * Name of the group.
@@ -236,6 +236,17 @@ export namespace MembershipUpdateResponse {
       name?: string;
     }
 
+    export namespace PermissionGroup {
+      /**
+       * Attributes associated to the permission group.
+       */
+      export interface Meta {
+        key?: string;
+
+        value?: string;
+      }
+    }
+
     /**
      * A group of scoped resources.
      */
@@ -253,7 +264,7 @@ export namespace MembershipUpdateResponse {
       /**
        * Attributes associated to the resource group.
        */
-      meta?: unknown;
+      meta?: ResourceGroup.Meta;
 
       /**
        * Name of the resource group.
@@ -291,6 +302,15 @@ export namespace MembershipUpdateResponse {
           key: string;
         }
       }
+
+      /**
+       * Attributes associated to the resource group.
+       */
+      export interface Meta {
+        key?: string;
+
+        value?: string;
+      }
     }
   }
 }
@@ -327,7 +347,7 @@ export interface MembershipGetResponse {
   policies?: Array<MembershipGetResponse.Policy>;
 
   /**
-   * List of role names for the user at the account.
+   * List of role names the membership has for this account.
    */
   roles?: Array<string>;
 
@@ -403,7 +423,7 @@ export namespace MembershipGetResponse {
       /**
        * Attributes associated to the permission group.
        */
-      meta?: unknown;
+      meta?: PermissionGroup.Meta;
 
       /**
        * Name of the group.
@@ -411,6 +431,17 @@ export namespace MembershipGetResponse {
       name?: string;
     }
 
+    export namespace PermissionGroup {
+      /**
+       * Attributes associated to the permission group.
+       */
+      export interface Meta {
+        key?: string;
+
+        value?: string;
+      }
+    }
+
     /**
      * A group of scoped resources.
      */
@@ -428,7 +459,7 @@ export namespace MembershipGetResponse {
       /**
        * Attributes associated to the resource group.
        */
-      meta?: unknown;
+      meta?: ResourceGroup.Meta;
 
       /**
        * Name of the resource group.
@@ -466,6 +497,15 @@ export namespace MembershipGetResponse {
           key: string;
         }
       }
+
+      /**
+       * Attributes associated to the resource group.
+       */
+      export interface Meta {
+        key?: string;
+
+        value?: string;
+      }
     }
   }
 }
diff --git a/src/resources/mtls-certificates/associations.ts b/src/resources/mtls-certificates/associations.ts
index 52e6cc8d62..2911f21991 100644
--- a/src/resources/mtls-certificates/associations.ts
+++ b/src/resources/mtls-certificates/associations.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as AssociationsAPI from './associations';
 
 export class Associations extends APIResource {
   /**
@@ -12,13 +11,13 @@ export class Associations extends APIResource {
     mtlsCertificateId: string,
     params: AssociationGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<AssociationGetResponse | null> {
+  ): Core.APIPromise<AssociationGetResponse> {
     const { account_id } = params;
     return (
       this._client.get(
         `/accounts/${account_id}/mtls_certificates/${mtlsCertificateId}/associations`,
         options,
-      ) as Core.APIPromise<{ result: AssociationGetResponse | null }>
+      ) as Core.APIPromise<{ result: AssociationGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -44,8 +43,10 @@ export interface AssociationGetParams {
   account_id: string;
 }
 
-export namespace Associations {
-  export import CertificateAsssociation = AssociationsAPI.CertificateAsssociation;
-  export import AssociationGetResponse = AssociationsAPI.AssociationGetResponse;
-  export import AssociationGetParams = AssociationsAPI.AssociationGetParams;
+export declare namespace Associations {
+  export {
+    type CertificateAsssociation as CertificateAsssociation,
+    type AssociationGetResponse as AssociationGetResponse,
+    type AssociationGetParams as AssociationGetParams,
+  };
 }
diff --git a/src/resources/mtls-certificates/index.ts b/src/resources/mtls-certificates/index.ts
index 882977d36a..6be2b62a6c 100644
--- a/src/resources/mtls-certificates/index.ts
+++ b/src/resources/mtls-certificates/index.ts
@@ -1,9 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  CertificateAsssociation,
-  AssociationGetResponse,
-  AssociationGetParams,
   Associations,
+  type CertificateAsssociation,
+  type AssociationGetResponse,
+  type AssociationGetParams,
 } from './associations';
 export { MTLSCertificates } from './mtls-certificates';
diff --git a/src/resources/mtls-certificates/mtls-certificates.ts b/src/resources/mtls-certificates/mtls-certificates.ts
index 081b6726b9..c19ddc74ce 100644
--- a/src/resources/mtls-certificates/mtls-certificates.ts
+++ b/src/resources/mtls-certificates/mtls-certificates.ts
@@ -3,6 +3,12 @@
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as AssociationsAPI from './associations';
+import {
+  AssociationGetParams,
+  AssociationGetResponse,
+  Associations,
+  CertificateAsssociation,
+} from './associations';
 import { SinglePage } from '../../pagination';
 
 export class MTLSCertificates extends APIResource {
@@ -225,9 +231,13 @@ export interface MTLSCertificateGetParams {
   account_id: string;
 }
 
-export namespace MTLSCertificates {
-  export import Associations = AssociationsAPI.Associations;
-  export import CertificateAsssociation = AssociationsAPI.CertificateAsssociation;
-  export import AssociationGetResponse = AssociationsAPI.AssociationGetResponse;
-  export import AssociationGetParams = AssociationsAPI.AssociationGetParams;
+MTLSCertificates.Associations = Associations;
+
+export declare namespace MTLSCertificates {
+  export {
+    Associations as Associations,
+    type CertificateAsssociation as CertificateAsssociation,
+    type AssociationGetResponse as AssociationGetResponse,
+    type AssociationGetParams as AssociationGetParams,
+  };
 }
diff --git a/src/resources/origin-ca-certificates.ts b/src/resources/origin-ca-certificates.ts
index dfc9ebc0bf..7943184e7f 100644
--- a/src/resources/origin-ca-certificates.ts
+++ b/src/resources/origin-ca-certificates.ts
@@ -9,23 +9,23 @@ import { SinglePage } from '../pagination';
 
 export class OriginCACertificates extends APIResource {
   /**
-   * Create an Origin CA certificate. Use your Origin CA Key as your User Service Key
-   * when calling this endpoint ([see above](#requests)).
+   * Create an Origin CA certificate. You can use an Origin CA Key as your User
+   * Service Key or an API token when calling this endpoint ([see above](#requests)).
    */
   create(
     body: OriginCACertificateCreateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<OriginCACertificateCreateResponse> {
+  ): Core.APIPromise<OriginCACertificate> {
     return (
       this._client.post('/certificates', { body, ...options }) as Core.APIPromise<{
-        result: OriginCACertificateCreateResponse;
+        result: OriginCACertificate;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * List all existing Origin CA certificates for a given zone. Use your Origin CA
-   * Key as your User Service Key when calling this endpoint
+   * List all existing Origin CA certificates for a given zone. You can use an Origin
+   * CA Key as your User Service Key or an API token when calling this endpoint
    * ([see above](#requests)).
    */
   list(
@@ -44,9 +44,9 @@ export class OriginCACertificates extends APIResource {
   }
 
   /**
-   * Revoke an existing Origin CA certificate by its serial number. Use your Origin
-   * CA Key as your User Service Key when calling this endpoint
-   * ([see above](#requests)).
+   * Revoke an existing Origin CA certificate by its serial number. You can use an
+   * Origin CA Key as your User Service Key or an API token when calling this
+   * endpoint ([see above](#requests)).
    */
   delete(
     certificateId: string,
@@ -60,14 +60,14 @@ export class OriginCACertificates extends APIResource {
   }
 
   /**
-   * Get an existing Origin CA certificate by its serial number. Use your Origin CA
-   * Key as your User Service Key when calling this endpoint
-   * ([see above](#requests)).
+   * Get an existing Origin CA certificate by its serial number. You can use an
+   * Origin CA Key as your User Service Key or an API token when calling this
+   * endpoint ([see above](#requests)).
    */
-  get(certificateId: string, options?: Core.RequestOptions): Core.APIPromise<OriginCACertificateGetResponse> {
+  get(certificateId: string, options?: Core.RequestOptions): Core.APIPromise<OriginCACertificate> {
     return (
       this._client.get(`/certificates/${certificateId}`, options) as Core.APIPromise<{
-        result: OriginCACertificateGetResponse;
+        result: OriginCACertificate;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -85,7 +85,7 @@ export interface OriginCACertificate {
    * Array of hostnames or wildcard names (e.g., \*.example.com) bound to the
    * certificate.
    */
-  hostnames: Array<unknown>;
+  hostnames: Array<string>;
 
   /**
    * Signature type desired on certificate ("origin-rsa" (rsa), "origin-ecc" (ecdsa),
@@ -114,16 +114,17 @@ export interface OriginCACertificate {
   expires_on?: string;
 }
 
-export type OriginCACertificateCreateResponse = unknown | string | null;
-
 export interface OriginCACertificateDeleteResponse {
   /**
    * Identifier
    */
   id?: string;
-}
 
-export type OriginCACertificateGetResponse = unknown | string | null;
+  /**
+   * When the certificate was revoked.
+   */
+  revoked_at?: string;
+}
 
 export interface OriginCACertificateCreateParams {
   /**
@@ -135,7 +136,7 @@ export interface OriginCACertificateCreateParams {
    * Array of hostnames or wildcard names (e.g., \*.example.com) bound to the
    * certificate.
    */
-  hostnames?: Array<unknown>;
+  hostnames?: Array<string>;
 
   /**
    * Signature type desired on certificate ("origin-rsa" (rsa), "origin-ecc" (ecdsa),
diff --git a/src/resources/origin-post-quantum-encryption.ts b/src/resources/origin-post-quantum-encryption.ts
index 21d625df12..1e98d6ffd1 100644
--- a/src/resources/origin-post-quantum-encryption.ts
+++ b/src/resources/origin-post-quantum-encryption.ts
@@ -46,9 +46,49 @@ export class OriginPostQuantumEncryption extends APIResource {
   }
 }
 
-export type OriginPostQuantumEncryptionUpdateResponse = unknown | string | null;
+export interface OriginPostQuantumEncryptionUpdateResponse {
+  /**
+   * Value of the zone setting.
+   */
+  id: 'origin_pqe';
+
+  /**
+   * Whether the setting is editable
+   */
+  editable: boolean;
+
+  /**
+   * The value of the feature
+   */
+  value: 'preferred' | 'supported' | 'off';
+
+  /**
+   * Last time this setting was modified.
+   */
+  modified_on?: string | null;
+}
 
-export type OriginPostQuantumEncryptionGetResponse = unknown | string | null;
+export interface OriginPostQuantumEncryptionGetResponse {
+  /**
+   * Value of the zone setting.
+   */
+  id: 'origin_pqe';
+
+  /**
+   * Whether the setting is editable
+   */
+  editable: boolean;
+
+  /**
+   * The value of the feature
+   */
+  value: 'preferred' | 'supported' | 'off';
+
+  /**
+   * Last time this setting was modified.
+   */
+  modified_on?: string | null;
+}
 
 export interface OriginPostQuantumEncryptionUpdateParams {
   /**
diff --git a/src/resources/origin-tls-client-auth/hostnames/certificates.ts b/src/resources/origin-tls-client-auth/hostnames/certificates.ts
index d4375c1989..64f8e3d28b 100644
--- a/src/resources/origin-tls-client-auth/hostnames/certificates.ts
+++ b/src/resources/origin-tls-client-auth/hostnames/certificates.ts
@@ -2,9 +2,8 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as CertificatesAPI from './certificates';
 import * as HostnamesAPI from './hostnames';
-import { AuthenticatedOriginPullsSinglePage } from './hostnames';
+import { SinglePage } from '../../../pagination';
 
 export class Certificates extends APIResource {
   /**
@@ -30,11 +29,11 @@ export class Certificates extends APIResource {
   list(
     params: CertificateListParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<AuthenticatedOriginPullsSinglePage, HostnamesAPI.AuthenticatedOriginPull> {
+  ): Core.PagePromise<CertificateListResponsesSinglePage, CertificateListResponse> {
     const { zone_id } = params;
     return this._client.getAPIList(
       `/zones/${zone_id}/origin_tls_client_auth/hostnames/certificates`,
-      AuthenticatedOriginPullsSinglePage,
+      CertificateListResponsesSinglePage,
       options,
     );
   }
@@ -74,6 +73,8 @@ export class Certificates extends APIResource {
   }
 }
 
+export class CertificateListResponsesSinglePage extends SinglePage<CertificateListResponse> {}
+
 export interface Certificate {
   /**
    * Identifier
@@ -172,6 +173,40 @@ export interface CertificateCreateResponse {
   uploaded_on?: string;
 }
 
+export interface CertificateListResponse extends HostnamesAPI.AuthenticatedOriginPull {
+  /**
+   * Identifier
+   */
+  id?: string;
+
+  /**
+   * Identifier
+   */
+  cert_id?: string;
+
+  /**
+   * The hostname certificate.
+   */
+  certificate?: string;
+
+  /**
+   * Indicates whether hostname-level authenticated origin pulls is enabled. A null
+   * value voids the association.
+   */
+  enabled?: boolean | null;
+
+  /**
+   * The hostname on the origin for which the client certificate uploaded will be
+   * used.
+   */
+  hostname?: string;
+
+  /**
+   * The hostname certificate's private key.
+   */
+  private_key?: string;
+}
+
 export interface CertificateDeleteResponse {
   /**
    * Identifier
@@ -308,15 +343,19 @@ export interface CertificateGetParams {
   zone_id: string;
 }
 
-export namespace Certificates {
-  export import Certificate = CertificatesAPI.Certificate;
-  export import CertificateCreateResponse = CertificatesAPI.CertificateCreateResponse;
-  export import CertificateDeleteResponse = CertificatesAPI.CertificateDeleteResponse;
-  export import CertificateGetResponse = CertificatesAPI.CertificateGetResponse;
-  export import CertificateCreateParams = CertificatesAPI.CertificateCreateParams;
-  export import CertificateListParams = CertificatesAPI.CertificateListParams;
-  export import CertificateDeleteParams = CertificatesAPI.CertificateDeleteParams;
-  export import CertificateGetParams = CertificatesAPI.CertificateGetParams;
+Certificates.CertificateListResponsesSinglePage = CertificateListResponsesSinglePage;
+
+export declare namespace Certificates {
+  export {
+    type Certificate as Certificate,
+    type CertificateCreateResponse as CertificateCreateResponse,
+    type CertificateListResponse as CertificateListResponse,
+    type CertificateDeleteResponse as CertificateDeleteResponse,
+    type CertificateGetResponse as CertificateGetResponse,
+    CertificateListResponsesSinglePage as CertificateListResponsesSinglePage,
+    type CertificateCreateParams as CertificateCreateParams,
+    type CertificateListParams as CertificateListParams,
+    type CertificateDeleteParams as CertificateDeleteParams,
+    type CertificateGetParams as CertificateGetParams,
+  };
 }
-
-export { AuthenticatedOriginPullsSinglePage };
diff --git a/src/resources/origin-tls-client-auth/hostnames/hostnames.ts b/src/resources/origin-tls-client-auth/hostnames/hostnames.ts
index 2bd8a0bd91..54f8424b38 100644
--- a/src/resources/origin-tls-client-auth/hostnames/hostnames.ts
+++ b/src/resources/origin-tls-client-auth/hostnames/hostnames.ts
@@ -4,7 +4,19 @@ import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
 import * as HostnamesAPI from './hostnames';
 import * as CertificatesAPI from './certificates';
-import { SinglePage } from '../../../pagination';
+import {
+  Certificate,
+  CertificateCreateParams,
+  CertificateCreateResponse,
+  CertificateDeleteParams,
+  CertificateDeleteResponse,
+  CertificateGetParams,
+  CertificateGetResponse,
+  CertificateListParams,
+  CertificateListResponse,
+  CertificateListResponsesSinglePage,
+  Certificates,
+} from './certificates';
 
 export class Hostnames extends APIResource {
   certificates: CertificatesAPI.Certificates = new CertificatesAPI.Certificates(this._client);
@@ -19,13 +31,13 @@ export class Hostnames extends APIResource {
   update(
     params: HostnameUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<HostnameUpdateResponse | null> {
+  ): Core.APIPromise<HostnameUpdateResponse> {
     const { zone_id, ...body } = params;
     return (
       this._client.put(`/zones/${zone_id}/origin_tls_client_auth/hostnames`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: HostnameUpdateResponse | null }>
+      }) as Core.APIPromise<{ result: HostnameUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -47,8 +59,6 @@ export class Hostnames extends APIResource {
   }
 }
 
-export class AuthenticatedOriginPullsSinglePage extends SinglePage<AuthenticatedOriginPull> {}
-
 export interface AuthenticatedOriginPull {
   /**
    * Identifier
@@ -137,7 +147,43 @@ export interface AuthenticatedOriginPull {
   updated_at?: string;
 }
 
-export type HostnameUpdateResponse = Array<AuthenticatedOriginPull>;
+export type HostnameUpdateResponse = Array<HostnameUpdateResponse.HostnameUpdateResponseItem>;
+
+export namespace HostnameUpdateResponse {
+  export interface HostnameUpdateResponseItem extends HostnamesAPI.AuthenticatedOriginPull {
+    /**
+     * Identifier
+     */
+    id?: string;
+
+    /**
+     * Identifier
+     */
+    cert_id?: string;
+
+    /**
+     * The hostname certificate.
+     */
+    certificate?: string;
+
+    /**
+     * Indicates whether hostname-level authenticated origin pulls is enabled. A null
+     * value voids the association.
+     */
+    enabled?: boolean | null;
+
+    /**
+     * The hostname on the origin for which the client certificate uploaded will be
+     * used.
+     */
+    hostname?: string;
+
+    /**
+     * The hostname certificate's private key.
+     */
+    private_key?: string;
+  }
+}
 
 export interface HostnameUpdateParams {
   /**
@@ -179,18 +225,28 @@ export interface HostnameGetParams {
   zone_id: string;
 }
 
-export namespace Hostnames {
-  export import AuthenticatedOriginPull = HostnamesAPI.AuthenticatedOriginPull;
-  export import HostnameUpdateResponse = HostnamesAPI.HostnameUpdateResponse;
-  export import HostnameUpdateParams = HostnamesAPI.HostnameUpdateParams;
-  export import HostnameGetParams = HostnamesAPI.HostnameGetParams;
-  export import Certificates = CertificatesAPI.Certificates;
-  export import Certificate = CertificatesAPI.Certificate;
-  export import CertificateCreateResponse = CertificatesAPI.CertificateCreateResponse;
-  export import CertificateDeleteResponse = CertificatesAPI.CertificateDeleteResponse;
-  export import CertificateGetResponse = CertificatesAPI.CertificateGetResponse;
-  export import CertificateCreateParams = CertificatesAPI.CertificateCreateParams;
-  export import CertificateListParams = CertificatesAPI.CertificateListParams;
-  export import CertificateDeleteParams = CertificatesAPI.CertificateDeleteParams;
-  export import CertificateGetParams = CertificatesAPI.CertificateGetParams;
+Hostnames.Certificates = Certificates;
+Hostnames.CertificateListResponsesSinglePage = CertificateListResponsesSinglePage;
+
+export declare namespace Hostnames {
+  export {
+    type AuthenticatedOriginPull as AuthenticatedOriginPull,
+    type HostnameUpdateResponse as HostnameUpdateResponse,
+    type HostnameUpdateParams as HostnameUpdateParams,
+    type HostnameGetParams as HostnameGetParams,
+  };
+
+  export {
+    Certificates as Certificates,
+    type Certificate as Certificate,
+    type CertificateCreateResponse as CertificateCreateResponse,
+    type CertificateListResponse as CertificateListResponse,
+    type CertificateDeleteResponse as CertificateDeleteResponse,
+    type CertificateGetResponse as CertificateGetResponse,
+    CertificateListResponsesSinglePage as CertificateListResponsesSinglePage,
+    type CertificateCreateParams as CertificateCreateParams,
+    type CertificateListParams as CertificateListParams,
+    type CertificateDeleteParams as CertificateDeleteParams,
+    type CertificateGetParams as CertificateGetParams,
+  };
 }
diff --git a/src/resources/origin-tls-client-auth/hostnames/index.ts b/src/resources/origin-tls-client-auth/hostnames/index.ts
index 94a2484f02..44addae209 100644
--- a/src/resources/origin-tls-client-auth/hostnames/index.ts
+++ b/src/resources/origin-tls-client-auth/hostnames/index.ts
@@ -1,21 +1,22 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AuthenticatedOriginPull,
-  HostnameUpdateResponse,
-  HostnameUpdateParams,
-  HostnameGetParams,
-  AuthenticatedOriginPullsSinglePage,
-  Hostnames,
-} from './hostnames';
-export {
-  Certificate,
-  CertificateCreateResponse,
-  CertificateDeleteResponse,
-  CertificateGetResponse,
-  CertificateCreateParams,
-  CertificateListParams,
-  CertificateDeleteParams,
-  CertificateGetParams,
+  CertificateListResponsesSinglePage,
   Certificates,
+  type Certificate,
+  type CertificateCreateResponse,
+  type CertificateListResponse,
+  type CertificateDeleteResponse,
+  type CertificateGetResponse,
+  type CertificateCreateParams,
+  type CertificateListParams,
+  type CertificateDeleteParams,
+  type CertificateGetParams,
 } from './certificates';
+export {
+  Hostnames,
+  type AuthenticatedOriginPull,
+  type HostnameUpdateResponse,
+  type HostnameUpdateParams,
+  type HostnameGetParams,
+} from './hostnames';
diff --git a/src/resources/origin-tls-client-auth/index.ts b/src/resources/origin-tls-client-auth/index.ts
index 5a4d6f8bd9..3806aff718 100644
--- a/src/resources/origin-tls-client-auth/index.ts
+++ b/src/resources/origin-tls-client-auth/index.ts
@@ -1,18 +1,17 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AuthenticatedOriginPull,
-  HostnameUpdateResponse,
-  HostnameUpdateParams,
-  HostnameGetParams,
-  AuthenticatedOriginPullsSinglePage,
   Hostnames,
+  type AuthenticatedOriginPull,
+  type HostnameUpdateResponse,
+  type HostnameUpdateParams,
+  type HostnameGetParams,
 } from './hostnames/index';
 export { OriginTLSClientAuth } from './origin-tls-client-auth';
 export {
-  SettingUpdateResponse,
-  SettingGetResponse,
-  SettingUpdateParams,
-  SettingGetParams,
   Settings,
+  type SettingUpdateResponse,
+  type SettingGetResponse,
+  type SettingUpdateParams,
+  type SettingGetParams,
 } from './settings';
diff --git a/src/resources/origin-tls-client-auth/origin-tls-client-auth.ts b/src/resources/origin-tls-client-auth/origin-tls-client-auth.ts
index 328c67bd8f..3383db1e90 100644
--- a/src/resources/origin-tls-client-auth/origin-tls-client-auth.ts
+++ b/src/resources/origin-tls-client-auth/origin-tls-client-auth.ts
@@ -3,7 +3,21 @@
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as SettingsAPI from './settings';
+import {
+  SettingGetParams,
+  SettingGetResponse,
+  SettingUpdateParams,
+  SettingUpdateResponse,
+  Settings,
+} from './settings';
 import * as HostnamesAPI from './hostnames/hostnames';
+import {
+  AuthenticatedOriginPull,
+  HostnameGetParams,
+  HostnameUpdateParams,
+  HostnameUpdateResponse,
+  Hostnames,
+} from './hostnames/hostnames';
 import { SinglePage } from '../../pagination';
 
 export class OriginTLSClientAuth extends APIResource {
@@ -35,11 +49,11 @@ export class OriginTLSClientAuth extends APIResource {
   list(
     params: OriginTLSClientAuthListParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<ZoneAuthenticatedOriginPullsSinglePage, ZoneAuthenticatedOriginPull> {
+  ): Core.PagePromise<OriginTLSClientAuthListResponsesSinglePage, OriginTLSClientAuthListResponse> {
     const { zone_id } = params;
     return this._client.getAPIList(
       `/zones/${zone_id}/origin_tls_client_auth`,
-      ZoneAuthenticatedOriginPullsSinglePage,
+      OriginTLSClientAuthListResponsesSinglePage,
       options,
     );
   }
@@ -79,7 +93,7 @@ export class OriginTLSClientAuth extends APIResource {
   }
 }
 
-export class ZoneAuthenticatedOriginPullsSinglePage extends SinglePage<ZoneAuthenticatedOriginPull> {}
+export class OriginTLSClientAuthListResponsesSinglePage extends SinglePage<OriginTLSClientAuthListResponse> {}
 
 export interface ZoneAuthenticatedOriginPull {
   /**
@@ -125,11 +139,93 @@ export interface ZoneAuthenticatedOriginPull {
   uploaded_on?: string;
 }
 
-export type OriginTLSClientAuthCreateResponse = unknown | string | null;
+export interface OriginTLSClientAuthCreateResponse extends ZoneAuthenticatedOriginPull {
+  /**
+   * Identifier
+   */
+  id?: string;
+
+  /**
+   * The zone's leaf certificate.
+   */
+  certificate?: string;
+
+  /**
+   * Indicates whether zone-level authenticated origin pulls is enabled.
+   */
+  enabled?: boolean;
+
+  /**
+   * The zone's private key.
+   */
+  private_key?: string;
+}
+
+export interface OriginTLSClientAuthListResponse extends ZoneAuthenticatedOriginPull {
+  /**
+   * Identifier
+   */
+  id?: string;
 
-export type OriginTLSClientAuthDeleteResponse = unknown | string | null;
+  /**
+   * The zone's leaf certificate.
+   */
+  certificate?: string;
 
-export type OriginTLSClientAuthGetResponse = unknown | string | null;
+  /**
+   * Indicates whether zone-level authenticated origin pulls is enabled.
+   */
+  enabled?: boolean;
+
+  /**
+   * The zone's private key.
+   */
+  private_key?: string;
+}
+
+export interface OriginTLSClientAuthDeleteResponse extends ZoneAuthenticatedOriginPull {
+  /**
+   * Identifier
+   */
+  id?: string;
+
+  /**
+   * The zone's leaf certificate.
+   */
+  certificate?: string;
+
+  /**
+   * Indicates whether zone-level authenticated origin pulls is enabled.
+   */
+  enabled?: boolean;
+
+  /**
+   * The zone's private key.
+   */
+  private_key?: string;
+}
+
+export interface OriginTLSClientAuthGetResponse extends ZoneAuthenticatedOriginPull {
+  /**
+   * Identifier
+   */
+  id?: string;
+
+  /**
+   * The zone's leaf certificate.
+   */
+  certificate?: string;
+
+  /**
+   * Indicates whether zone-level authenticated origin pulls is enabled.
+   */
+  enabled?: boolean;
+
+  /**
+   * The zone's private key.
+   */
+  private_key?: string;
+}
 
 export interface OriginTLSClientAuthCreateParams {
   /**
@@ -169,15 +265,23 @@ export interface OriginTLSClientAuthGetParams {
   zone_id: string;
 }
 
-export namespace OriginTLSClientAuth {
-  export import Hostnames = HostnamesAPI.Hostnames;
-  export import AuthenticatedOriginPull = HostnamesAPI.AuthenticatedOriginPull;
-  export import HostnameUpdateResponse = HostnamesAPI.HostnameUpdateResponse;
-  export import HostnameUpdateParams = HostnamesAPI.HostnameUpdateParams;
-  export import HostnameGetParams = HostnamesAPI.HostnameGetParams;
-  export import Settings = SettingsAPI.Settings;
-  export import SettingUpdateResponse = SettingsAPI.SettingUpdateResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingUpdateParams = SettingsAPI.SettingUpdateParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
+OriginTLSClientAuth.Hostnames = Hostnames;
+OriginTLSClientAuth.Settings = Settings;
+
+export declare namespace OriginTLSClientAuth {
+  export {
+    Hostnames as Hostnames,
+    type AuthenticatedOriginPull as AuthenticatedOriginPull,
+    type HostnameUpdateResponse as HostnameUpdateResponse,
+    type HostnameUpdateParams as HostnameUpdateParams,
+    type HostnameGetParams as HostnameGetParams,
+  };
+
+  export {
+    Settings as Settings,
+    type SettingUpdateResponse as SettingUpdateResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingUpdateParams as SettingUpdateParams,
+    type SettingGetParams as SettingGetParams,
+  };
 }
diff --git a/src/resources/origin-tls-client-auth/settings.ts b/src/resources/origin-tls-client-auth/settings.ts
index 072e4afe87..39f6d5a9ab 100644
--- a/src/resources/origin-tls-client-auth/settings.ts
+++ b/src/resources/origin-tls-client-auth/settings.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SettingsAPI from './settings';
 
 export class Settings extends APIResource {
   /**
@@ -67,9 +66,11 @@ export interface SettingGetParams {
   zone_id: string;
 }
 
-export namespace Settings {
-  export import SettingUpdateResponse = SettingsAPI.SettingUpdateResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingUpdateParams = SettingsAPI.SettingUpdateParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
+export declare namespace Settings {
+  export {
+    type SettingUpdateResponse as SettingUpdateResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingUpdateParams as SettingUpdateParams,
+    type SettingGetParams as SettingGetParams,
+  };
 }
diff --git a/src/resources/page-rules.ts b/src/resources/page-rules.ts
new file mode 100644
index 0000000000..dc3d566d5d
--- /dev/null
+++ b/src/resources/page-rules.ts
@@ -0,0 +1,1856 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../resource';
+import * as Core from '../core';
+import * as SettingsAPI from './zones/settings';
+
+export class PageRules extends APIResource {
+  /**
+   * Creates a new Page Rule.
+   */
+  create(params: PageRuleCreateParams, options?: Core.RequestOptions): Core.APIPromise<PageRule> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.post(`/zones/${zone_id}/pagerules`, { body, ...options }) as Core.APIPromise<{
+        result: PageRule;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Replaces the configuration of an existing Page Rule. The configuration of the
+   * updated Page Rule will exactly match the data passed in the API request.
+   */
+  update(
+    pageruleId: string,
+    params: PageRuleUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PageRule> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.put(`/zones/${zone_id}/pagerules/${pageruleId}`, { body, ...options }) as Core.APIPromise<{
+        result: PageRule;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches Page Rules in a zone.
+   */
+  list(params: PageRuleListParams, options?: Core.RequestOptions): Core.APIPromise<PageRuleListResponse> {
+    const { zone_id, ...query } = params;
+    return (
+      this._client.get(`/zones/${zone_id}/pagerules`, { query, ...options }) as Core.APIPromise<{
+        result: PageRuleListResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Deletes an existing Page Rule.
+   */
+  delete(
+    pageruleId: string,
+    params: PageRuleDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PageRuleDeleteResponse | null> {
+    const { zone_id } = params;
+    return (
+      this._client.delete(`/zones/${zone_id}/pagerules/${pageruleId}`, options) as Core.APIPromise<{
+        result: PageRuleDeleteResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Updates one or more fields of an existing Page Rule.
+   */
+  edit(
+    pageruleId: string,
+    params: PageRuleEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PageRule> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.patch(`/zones/${zone_id}/pagerules/${pageruleId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: PageRule }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches the details of a Page Rule.
+   */
+  get(
+    pageruleId: string,
+    params: PageRuleGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PageRule> {
+    const { zone_id } = params;
+    return (
+      this._client.get(`/zones/${zone_id}/pagerules/${pageruleId}`, options) as Core.APIPromise<{
+        result: PageRule;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface PageRule {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  /**
+   * The set of actions to perform if the targets of this rule match the request.
+   * Actions can redirect to another URL or override settings, but not both.
+   */
+  actions: Array<
+    | SettingsAPI.AlwaysUseHTTPS
+    | SettingsAPI.AutomaticHTTPSRewrites
+    | SettingsAPI.BrowserCacheTTL
+    | SettingsAPI.BrowserCheck
+    | PageRule.BypassCacheOnCookie
+    | PageRule.CacheByDeviceType
+    | PageRule.CacheDeceptionArmor
+    | PageRule.CacheKeyFields
+    | SettingsAPI.CacheLevel
+    | PageRule.CacheOnCookie
+    | PageRule.CacheTTLByStatus
+    | PageRule.DisableApps
+    | PageRule.DisablePerformance
+    | PageRule.DisableSecurity
+    | PageRule.DisableZaraz
+    | PageRule.EdgeCacheTTL
+    | SettingsAPI.EmailObfuscation
+    | PageRule.ExplicitCacheControl
+    | PageRule.ForwardingURL
+    | PageRule.HostHeaderOverride
+    | SettingsAPI.IPGeolocation
+    | SettingsAPI.Mirage
+    | SettingsAPI.OpportunisticEncryption
+    | SettingsAPI.OriginErrorPagePassThru
+    | SettingsAPI.Polish
+    | PageRule.ResolveOverride
+    | PageRule.RespectStrongEtag
+    | SettingsAPI.ResponseBuffering
+    | SettingsAPI.RocketLoader
+    | SettingsAPI.SecurityLevel
+    | SettingsAPI.SortQueryStringForCache
+    | SettingsAPI.SSL
+    | SettingsAPI.TrueClientIPHeader
+    | SettingsAPI.WAF
+  >;
+
+  /**
+   * The timestamp of when the Page Rule was created.
+   */
+  created_on: string;
+
+  /**
+   * The timestamp of when the Page Rule was last modified.
+   */
+  modified_on: string;
+
+  /**
+   * The priority of the rule, used to define which Page Rule is processed over
+   * another. A higher number indicates a higher priority. For example, if you have a
+   * catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
+   * take precedence (rule B: `/images/special/*`), specify a higher priority for
+   * rule B so it overrides rule A.
+   */
+  priority: number;
+
+  /**
+   * The status of the Page Rule.
+   */
+  status: 'active' | 'disabled';
+
+  /**
+   * The rule targets to evaluate on each request.
+   */
+  targets: Array<Target>;
+}
+
+export namespace PageRule {
+  export interface BypassCacheOnCookie {
+    /**
+     * Bypass cache and fetch resources from the origin server if a regular expression
+     * matches against a cookie name present in the request.
+     */
+    id?: 'bypass_cache_on_cookie';
+
+    /**
+     * The regular expression to use for matching cookie names in the request. Refer to
+     * [Bypass Cache on Cookie setting](https://developers.cloudflare.com/rules/page-rules/reference/additional-reference/#bypass-cache-on-cookie-setting)
+     * to learn about limited regular expression support.
+     */
+    value?: string;
+  }
+
+  export interface CacheByDeviceType {
+    /**
+     * Separate cached content based on the visitor's device type.
+     */
+    id?: 'cache_by_device_type';
+
+    /**
+     * The status of Cache By Device Type.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface CacheDeceptionArmor {
+    /**
+     * Protect from web cache deception attacks while still allowing static assets to
+     * be cached. This setting verifies that the URL's extension matches the returned
+     * `Content-Type`.
+     */
+    id?: 'cache_deception_armor';
+
+    /**
+     * The status of Cache Deception Armor.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface CacheKeyFields {
+    /**
+     * Control specifically what variables to include when deciding which resources to
+     * cache. This allows customers to determine what to cache based on something other
+     * than just the URL.
+     */
+    id?: 'cache_key_fields';
+
+    value?: CacheKeyFields.Value;
+  }
+
+  export namespace CacheKeyFields {
+    export interface Value {
+      /**
+       * Controls which cookies appear in the Cache Key.
+       */
+      cookie?: Value.Cookie;
+
+      /**
+       * Controls which headers go into the Cache Key. Exactly one of `include` or
+       * `exclude` is expected.
+       */
+      header?: Value.Header;
+
+      /**
+       * Determines which host header to include in the Cache Key.
+       */
+      host?: Value.Host;
+
+      /**
+       * Controls which URL query string parameters go into the Cache Key. Exactly one of
+       * `include` or `exclude` is expected.
+       */
+      query_string?: Value.QueryString;
+
+      /**
+       * Feature fields to add features about the end-user (client) into the Cache Key.
+       */
+      user?: Value.User;
+    }
+
+    export namespace Value {
+      /**
+       * Controls which cookies appear in the Cache Key.
+       */
+      export interface Cookie {
+        /**
+         * A list of cookies to check for the presence of, without including their actual
+         * values.
+         */
+        check_presence?: Array<string>;
+
+        /**
+         * A list of cookies to include.
+         */
+        include?: Array<string>;
+      }
+
+      /**
+       * Controls which headers go into the Cache Key. Exactly one of `include` or
+       * `exclude` is expected.
+       */
+      export interface Header {
+        /**
+         * A list of headers to check for the presence of, without including their actual
+         * values.
+         */
+        check_presence?: Array<string>;
+
+        /**
+         * A list of headers to ignore.
+         */
+        exclude?: Array<string>;
+
+        /**
+         * A list of headers to include.
+         */
+        include?: Array<string>;
+      }
+
+      /**
+       * Determines which host header to include in the Cache Key.
+       */
+      export interface Host {
+        /**
+         * Whether to include the Host header in the HTTP request sent to the origin.
+         */
+        resolved?: boolean;
+      }
+
+      /**
+       * Controls which URL query string parameters go into the Cache Key. Exactly one of
+       * `include` or `exclude` is expected.
+       */
+      export interface QueryString {
+        /**
+         * Ignore all query string parameters.
+         */
+        exclude?: '*' | Array<string>;
+
+        /**
+         * Include all query string parameters.
+         */
+        include?: '*' | Array<string>;
+      }
+
+      /**
+       * Feature fields to add features about the end-user (client) into the Cache Key.
+       */
+      export interface User {
+        /**
+         * Classifies a request as `mobile`, `desktop`, or `tablet` based on the User
+         * Agent.
+         */
+        device_type?: boolean;
+
+        /**
+         * Includes the client's country, derived from the IP address.
+         */
+        geo?: boolean;
+
+        /**
+         * Includes the first language code contained in the `Accept-Language` header sent
+         * by the client.
+         */
+        lang?: boolean;
+      }
+    }
+  }
+
+  export interface CacheOnCookie {
+    /**
+     * Apply the Cache Everything option (Cache Level setting) based on a regular
+     * expression match against a cookie name.
+     */
+    id?: 'cache_on_cookie';
+
+    /**
+     * The regular expression to use for matching cookie names in the request.
+     */
+    value?: string;
+  }
+
+  export interface CacheTTLByStatus {
+    /**
+     * Enterprise customers can set cache time-to-live (TTL) based on the response
+     * status from the origin web server. Cache TTL refers to the duration of a
+     * resource in the Cloudflare network before being marked as stale or discarded
+     * from cache. Status codes are returned by a resource's origin. Setting cache TTL
+     * based on response status overrides the default cache behavior (standard caching)
+     * for static files and overrides cache instructions sent by the origin web server.
+     * To cache non-static assets, set a Cache Level of Cache Everything using a Page
+     * Rule. Setting no-store Cache-Control or a low TTL (using `max-age`/`s-maxage`)
+     * increases requests to origin web servers and decreases performance.
+     */
+    id?: 'cache_ttl_by_status';
+
+    /**
+     * A JSON object containing status codes and their corresponding TTLs. Each
+     * key-value pair in the cache TTL by status cache rule has the following syntax
+     *
+     * - `status_code`: An integer value such as 200 or 500. status_code matches the
+     *   exact status code from the origin web server. Valid status codes are between
+     *   100-999.
+     * - `status_code_range`: Integer values for from and to. status_code_range matches
+     *   any status code from the origin web server within the specified range.
+     * - `value`: An integer value that defines the duration an asset is valid in
+     *   seconds or one of the following strings: no-store (equivalent to -1), no-cache
+     *   (equivalent to 0).
+     */
+    value?: Record<string, 'no-cache' | 'no-store' | number>;
+  }
+
+  export interface DisableApps {
+    /**
+     * Turn off all active
+     * [Cloudflare Apps](https://developers.cloudflare.com/support/more-dashboard-apps/cloudflare-apps/)
+     * (deprecated).
+     */
+    id?: 'disable_apps';
+  }
+
+  export interface DisablePerformance {
+    /**
+     * Turn off
+     * [Rocket Loader](https://developers.cloudflare.com/speed/optimization/content/rocket-loader/),
+     * [Mirage](https://developers.cloudflare.com/speed/optimization/images/mirage/),
+     * and [Polish](https://developers.cloudflare.com/images/polish/).
+     */
+    id?: 'disable_performance';
+  }
+
+  export interface DisableSecurity {
+    /**
+     * Turn off
+     * [Email Obfuscation](https://developers.cloudflare.com/waf/tools/scrape-shield/email-address-obfuscation/),
+     * [Rate Limiting (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-rate-limiting/),
+     * [Scrape Shield](https://developers.cloudflare.com/waf/tools/scrape-shield/),
+     * [URL (Zone) Lockdown](https://developers.cloudflare.com/waf/tools/zone-lockdown/),
+     * and
+     * [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+     */
+    id?: 'disable_security';
+  }
+
+  export interface DisableZaraz {
+    /**
+     * Turn off [Zaraz](https://developers.cloudflare.com/zaraz/).
+     */
+    id?: 'disable_zaraz';
+  }
+
+  export interface EdgeCacheTTL {
+    /**
+     * Specify how long to cache a resource in the Cloudflare global network. _Edge
+     * Cache TTL_ is not visible in response headers.
+     */
+    id?: 'edge_cache_ttl';
+
+    value?: number;
+  }
+
+  export interface ExplicitCacheControl {
+    /**
+     * Origin Cache Control is enabled by default for Free, Pro, and Business domains
+     * and disabled by default for Enterprise domains.
+     */
+    id?: 'explicit_cache_control';
+
+    /**
+     * The status of Origin Cache Control.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface ForwardingURL {
+    /**
+     * Redirects one URL to another using an `HTTP 301/302` redirect. Refer to
+     * [Wildcard matching and referencing](https://developers.cloudflare.com/rules/page-rules/reference/wildcard-matching/).
+     */
+    id?: 'forwarding_url';
+
+    value?: ForwardingURL.Value;
+  }
+
+  export namespace ForwardingURL {
+    export interface Value {
+      /**
+       * The status code to use for the URL redirect. 301 is a permanent redirect. 302 is
+       * a temporary redirect.
+       */
+      status_code?: 301 | 302;
+
+      /**
+       * The URL to redirect the request to. Notes: ${num} refers to the position of '\*'
+       * in the constraint value.
+       */
+      url?: string;
+    }
+  }
+
+  export interface HostHeaderOverride {
+    /**
+     * Apply a specific host header.
+     */
+    id?: 'host_header_override';
+
+    /**
+     * The hostname to use in the `Host` header
+     */
+    value?: string;
+  }
+
+  export interface ResolveOverride {
+    /**
+     * Change the origin address to the value specified in this setting.
+     */
+    id?: 'resolve_override';
+
+    /**
+     * The origin address you want to override with.
+     */
+    value?: string;
+  }
+
+  export interface RespectStrongEtag {
+    /**
+     * Turn on or off byte-for-byte equivalency checks between the Cloudflare cache and
+     * the origin server.
+     */
+    id?: 'respect_strong_etag';
+
+    /**
+     * The status of Respect Strong ETags
+     */
+    value?: 'on' | 'off';
+  }
+}
+
+/**
+ * URL target.
+ */
+export interface Target {
+  /**
+   * String constraint.
+   */
+  constraint?: Target.Constraint;
+
+  /**
+   * A target based on the URL of the request.
+   */
+  target?: 'url';
+}
+
+export namespace Target {
+  /**
+   * String constraint.
+   */
+  export interface Constraint {
+    /**
+     * The matches operator can use asterisks and pipes as wildcard and 'or' operators.
+     */
+    operator: 'matches' | 'contains' | 'equals' | 'not_equal' | 'not_contain';
+
+    /**
+     * The URL pattern to match against the current request. The pattern may contain up
+     * to four asterisks ('\*') as placeholders.
+     */
+    value: string;
+  }
+}
+
+/**
+ * URL target.
+ */
+export interface TargetParam {
+  /**
+   * String constraint.
+   */
+  constraint?: TargetParam.Constraint;
+
+  /**
+   * A target based on the URL of the request.
+   */
+  target?: 'url';
+}
+
+export namespace TargetParam {
+  /**
+   * String constraint.
+   */
+  export interface Constraint {
+    /**
+     * The matches operator can use asterisks and pipes as wildcard and 'or' operators.
+     */
+    operator: 'matches' | 'contains' | 'equals' | 'not_equal' | 'not_contain';
+
+    /**
+     * The URL pattern to match against the current request. The pattern may contain up
+     * to four asterisks ('\*') as placeholders.
+     */
+    value: string;
+  }
+}
+
+export type PageRuleListResponse = Array<PageRule>;
+
+export interface PageRuleDeleteResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+}
+
+export interface PageRuleCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The set of actions to perform if the targets of this rule match the
+   * request. Actions can redirect to another URL or override settings, but not both.
+   */
+  actions: Array<
+    | SettingsAPI.AlwaysUseHTTPSParam
+    | SettingsAPI.AutomaticHTTPSRewritesParam
+    | SettingsAPI.BrowserCacheTTLParam
+    | SettingsAPI.BrowserCheckParam
+    | PageRuleCreateParams.BypassCacheOnCookie
+    | PageRuleCreateParams.CacheByDeviceType
+    | PageRuleCreateParams.CacheDeceptionArmor
+    | PageRuleCreateParams.CacheKeyFields
+    | SettingsAPI.CacheLevelParam
+    | PageRuleCreateParams.CacheOnCookie
+    | PageRuleCreateParams.CacheTTLByStatus
+    | PageRuleCreateParams.DisableApps
+    | PageRuleCreateParams.DisablePerformance
+    | PageRuleCreateParams.DisableSecurity
+    | PageRuleCreateParams.DisableZaraz
+    | PageRuleCreateParams.EdgeCacheTTL
+    | SettingsAPI.EmailObfuscationParam
+    | PageRuleCreateParams.ExplicitCacheControl
+    | PageRuleCreateParams.ForwardingURL
+    | PageRuleCreateParams.HostHeaderOverride
+    | SettingsAPI.IPGeolocationParam
+    | SettingsAPI.MirageParam
+    | SettingsAPI.OpportunisticEncryptionParam
+    | SettingsAPI.OriginErrorPagePassThruParam
+    | SettingsAPI.PolishParam
+    | PageRuleCreateParams.ResolveOverride
+    | PageRuleCreateParams.RespectStrongEtag
+    | SettingsAPI.ResponseBufferingParam
+    | SettingsAPI.RocketLoaderParam
+    | SettingsAPI.SecurityLevelParam
+    | SettingsAPI.SortQueryStringForCacheParam
+    | SettingsAPI.SSLParam
+    | SettingsAPI.TrueClientIPHeaderParam
+    | SettingsAPI.WAFParam
+  >;
+
+  /**
+   * Body param: The rule targets to evaluate on each request.
+   */
+  targets: Array<TargetParam>;
+
+  /**
+   * Body param: The priority of the rule, used to define which Page Rule is
+   * processed over another. A higher number indicates a higher priority. For
+   * example, if you have a catch-all Page Rule (rule A: `/images/*`) but want a more
+   * specific Page Rule to take precedence (rule B: `/images/special/*`), specify a
+   * higher priority for rule B so it overrides rule A.
+   */
+  priority?: number;
+
+  /**
+   * Body param: The status of the Page Rule.
+   */
+  status?: 'active' | 'disabled';
+}
+
+export namespace PageRuleCreateParams {
+  export interface BypassCacheOnCookie {
+    /**
+     * Bypass cache and fetch resources from the origin server if a regular expression
+     * matches against a cookie name present in the request.
+     */
+    id?: 'bypass_cache_on_cookie';
+
+    /**
+     * The regular expression to use for matching cookie names in the request. Refer to
+     * [Bypass Cache on Cookie setting](https://developers.cloudflare.com/rules/page-rules/reference/additional-reference/#bypass-cache-on-cookie-setting)
+     * to learn about limited regular expression support.
+     */
+    value?: string;
+  }
+
+  export interface CacheByDeviceType {
+    /**
+     * Separate cached content based on the visitor's device type.
+     */
+    id?: 'cache_by_device_type';
+
+    /**
+     * The status of Cache By Device Type.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface CacheDeceptionArmor {
+    /**
+     * Protect from web cache deception attacks while still allowing static assets to
+     * be cached. This setting verifies that the URL's extension matches the returned
+     * `Content-Type`.
+     */
+    id?: 'cache_deception_armor';
+
+    /**
+     * The status of Cache Deception Armor.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface CacheKeyFields {
+    /**
+     * Control specifically what variables to include when deciding which resources to
+     * cache. This allows customers to determine what to cache based on something other
+     * than just the URL.
+     */
+    id?: 'cache_key_fields';
+
+    value?: CacheKeyFields.Value;
+  }
+
+  export namespace CacheKeyFields {
+    export interface Value {
+      /**
+       * Controls which cookies appear in the Cache Key.
+       */
+      cookie?: Value.Cookie;
+
+      /**
+       * Controls which headers go into the Cache Key. Exactly one of `include` or
+       * `exclude` is expected.
+       */
+      header?: Value.Header;
+
+      /**
+       * Determines which host header to include in the Cache Key.
+       */
+      host?: Value.Host;
+
+      /**
+       * Controls which URL query string parameters go into the Cache Key. Exactly one of
+       * `include` or `exclude` is expected.
+       */
+      query_string?: Value.QueryString;
+
+      /**
+       * Feature fields to add features about the end-user (client) into the Cache Key.
+       */
+      user?: Value.User;
+    }
+
+    export namespace Value {
+      /**
+       * Controls which cookies appear in the Cache Key.
+       */
+      export interface Cookie {
+        /**
+         * A list of cookies to check for the presence of, without including their actual
+         * values.
+         */
+        check_presence?: Array<string>;
+
+        /**
+         * A list of cookies to include.
+         */
+        include?: Array<string>;
+      }
+
+      /**
+       * Controls which headers go into the Cache Key. Exactly one of `include` or
+       * `exclude` is expected.
+       */
+      export interface Header {
+        /**
+         * A list of headers to check for the presence of, without including their actual
+         * values.
+         */
+        check_presence?: Array<string>;
+
+        /**
+         * A list of headers to ignore.
+         */
+        exclude?: Array<string>;
+
+        /**
+         * A list of headers to include.
+         */
+        include?: Array<string>;
+      }
+
+      /**
+       * Determines which host header to include in the Cache Key.
+       */
+      export interface Host {
+        /**
+         * Whether to include the Host header in the HTTP request sent to the origin.
+         */
+        resolved?: boolean;
+      }
+
+      /**
+       * Controls which URL query string parameters go into the Cache Key. Exactly one of
+       * `include` or `exclude` is expected.
+       */
+      export interface QueryString {
+        /**
+         * Ignore all query string parameters.
+         */
+        exclude?: '*' | Array<string>;
+
+        /**
+         * Include all query string parameters.
+         */
+        include?: '*' | Array<string>;
+      }
+
+      /**
+       * Feature fields to add features about the end-user (client) into the Cache Key.
+       */
+      export interface User {
+        /**
+         * Classifies a request as `mobile`, `desktop`, or `tablet` based on the User
+         * Agent.
+         */
+        device_type?: boolean;
+
+        /**
+         * Includes the client's country, derived from the IP address.
+         */
+        geo?: boolean;
+
+        /**
+         * Includes the first language code contained in the `Accept-Language` header sent
+         * by the client.
+         */
+        lang?: boolean;
+      }
+    }
+  }
+
+  export interface CacheOnCookie {
+    /**
+     * Apply the Cache Everything option (Cache Level setting) based on a regular
+     * expression match against a cookie name.
+     */
+    id?: 'cache_on_cookie';
+
+    /**
+     * The regular expression to use for matching cookie names in the request.
+     */
+    value?: string;
+  }
+
+  export interface CacheTTLByStatus {
+    /**
+     * Enterprise customers can set cache time-to-live (TTL) based on the response
+     * status from the origin web server. Cache TTL refers to the duration of a
+     * resource in the Cloudflare network before being marked as stale or discarded
+     * from cache. Status codes are returned by a resource's origin. Setting cache TTL
+     * based on response status overrides the default cache behavior (standard caching)
+     * for static files and overrides cache instructions sent by the origin web server.
+     * To cache non-static assets, set a Cache Level of Cache Everything using a Page
+     * Rule. Setting no-store Cache-Control or a low TTL (using `max-age`/`s-maxage`)
+     * increases requests to origin web servers and decreases performance.
+     */
+    id?: 'cache_ttl_by_status';
+
+    /**
+     * A JSON object containing status codes and their corresponding TTLs. Each
+     * key-value pair in the cache TTL by status cache rule has the following syntax
+     *
+     * - `status_code`: An integer value such as 200 or 500. status_code matches the
+     *   exact status code from the origin web server. Valid status codes are between
+     *   100-999.
+     * - `status_code_range`: Integer values for from and to. status_code_range matches
+     *   any status code from the origin web server within the specified range.
+     * - `value`: An integer value that defines the duration an asset is valid in
+     *   seconds or one of the following strings: no-store (equivalent to -1), no-cache
+     *   (equivalent to 0).
+     */
+    value?: Record<string, 'no-cache' | 'no-store' | number>;
+  }
+
+  export interface DisableApps {
+    /**
+     * Turn off all active
+     * [Cloudflare Apps](https://developers.cloudflare.com/support/more-dashboard-apps/cloudflare-apps/)
+     * (deprecated).
+     */
+    id?: 'disable_apps';
+  }
+
+  export interface DisablePerformance {
+    /**
+     * Turn off
+     * [Rocket Loader](https://developers.cloudflare.com/speed/optimization/content/rocket-loader/),
+     * [Mirage](https://developers.cloudflare.com/speed/optimization/images/mirage/),
+     * and [Polish](https://developers.cloudflare.com/images/polish/).
+     */
+    id?: 'disable_performance';
+  }
+
+  export interface DisableSecurity {
+    /**
+     * Turn off
+     * [Email Obfuscation](https://developers.cloudflare.com/waf/tools/scrape-shield/email-address-obfuscation/),
+     * [Rate Limiting (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-rate-limiting/),
+     * [Scrape Shield](https://developers.cloudflare.com/waf/tools/scrape-shield/),
+     * [URL (Zone) Lockdown](https://developers.cloudflare.com/waf/tools/zone-lockdown/),
+     * and
+     * [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+     */
+    id?: 'disable_security';
+  }
+
+  export interface DisableZaraz {
+    /**
+     * Turn off [Zaraz](https://developers.cloudflare.com/zaraz/).
+     */
+    id?: 'disable_zaraz';
+  }
+
+  export interface EdgeCacheTTL {
+    /**
+     * Specify how long to cache a resource in the Cloudflare global network. _Edge
+     * Cache TTL_ is not visible in response headers.
+     */
+    id?: 'edge_cache_ttl';
+
+    value?: number;
+  }
+
+  export interface ExplicitCacheControl {
+    /**
+     * Origin Cache Control is enabled by default for Free, Pro, and Business domains
+     * and disabled by default for Enterprise domains.
+     */
+    id?: 'explicit_cache_control';
+
+    /**
+     * The status of Origin Cache Control.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface ForwardingURL {
+    /**
+     * Redirects one URL to another using an `HTTP 301/302` redirect. Refer to
+     * [Wildcard matching and referencing](https://developers.cloudflare.com/rules/page-rules/reference/wildcard-matching/).
+     */
+    id?: 'forwarding_url';
+
+    value?: ForwardingURL.Value;
+  }
+
+  export namespace ForwardingURL {
+    export interface Value {
+      /**
+       * The status code to use for the URL redirect. 301 is a permanent redirect. 302 is
+       * a temporary redirect.
+       */
+      status_code?: 301 | 302;
+
+      /**
+       * The URL to redirect the request to. Notes: ${num} refers to the position of '\*'
+       * in the constraint value.
+       */
+      url?: string;
+    }
+  }
+
+  export interface HostHeaderOverride {
+    /**
+     * Apply a specific host header.
+     */
+    id?: 'host_header_override';
+
+    /**
+     * The hostname to use in the `Host` header
+     */
+    value?: string;
+  }
+
+  export interface ResolveOverride {
+    /**
+     * Change the origin address to the value specified in this setting.
+     */
+    id?: 'resolve_override';
+
+    /**
+     * The origin address you want to override with.
+     */
+    value?: string;
+  }
+
+  export interface RespectStrongEtag {
+    /**
+     * Turn on or off byte-for-byte equivalency checks between the Cloudflare cache and
+     * the origin server.
+     */
+    id?: 'respect_strong_etag';
+
+    /**
+     * The status of Respect Strong ETags
+     */
+    value?: 'on' | 'off';
+  }
+}
+
+export interface PageRuleUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The set of actions to perform if the targets of this rule match the
+   * request. Actions can redirect to another URL or override settings, but not both.
+   */
+  actions: Array<
+    | SettingsAPI.AlwaysUseHTTPSParam
+    | SettingsAPI.AutomaticHTTPSRewritesParam
+    | SettingsAPI.BrowserCacheTTLParam
+    | SettingsAPI.BrowserCheckParam
+    | PageRuleUpdateParams.BypassCacheOnCookie
+    | PageRuleUpdateParams.CacheByDeviceType
+    | PageRuleUpdateParams.CacheDeceptionArmor
+    | PageRuleUpdateParams.CacheKeyFields
+    | SettingsAPI.CacheLevelParam
+    | PageRuleUpdateParams.CacheOnCookie
+    | PageRuleUpdateParams.CacheTTLByStatus
+    | PageRuleUpdateParams.DisableApps
+    | PageRuleUpdateParams.DisablePerformance
+    | PageRuleUpdateParams.DisableSecurity
+    | PageRuleUpdateParams.DisableZaraz
+    | PageRuleUpdateParams.EdgeCacheTTL
+    | SettingsAPI.EmailObfuscationParam
+    | PageRuleUpdateParams.ExplicitCacheControl
+    | PageRuleUpdateParams.ForwardingURL
+    | PageRuleUpdateParams.HostHeaderOverride
+    | SettingsAPI.IPGeolocationParam
+    | SettingsAPI.MirageParam
+    | SettingsAPI.OpportunisticEncryptionParam
+    | SettingsAPI.OriginErrorPagePassThruParam
+    | SettingsAPI.PolishParam
+    | PageRuleUpdateParams.ResolveOverride
+    | PageRuleUpdateParams.RespectStrongEtag
+    | SettingsAPI.ResponseBufferingParam
+    | SettingsAPI.RocketLoaderParam
+    | SettingsAPI.SecurityLevelParam
+    | SettingsAPI.SortQueryStringForCacheParam
+    | SettingsAPI.SSLParam
+    | SettingsAPI.TrueClientIPHeaderParam
+    | SettingsAPI.WAFParam
+  >;
+
+  /**
+   * Body param: The rule targets to evaluate on each request.
+   */
+  targets: Array<TargetParam>;
+
+  /**
+   * Body param: The priority of the rule, used to define which Page Rule is
+   * processed over another. A higher number indicates a higher priority. For
+   * example, if you have a catch-all Page Rule (rule A: `/images/*`) but want a more
+   * specific Page Rule to take precedence (rule B: `/images/special/*`), specify a
+   * higher priority for rule B so it overrides rule A.
+   */
+  priority?: number;
+
+  /**
+   * Body param: The status of the Page Rule.
+   */
+  status?: 'active' | 'disabled';
+}
+
+export namespace PageRuleUpdateParams {
+  export interface BypassCacheOnCookie {
+    /**
+     * Bypass cache and fetch resources from the origin server if a regular expression
+     * matches against a cookie name present in the request.
+     */
+    id?: 'bypass_cache_on_cookie';
+
+    /**
+     * The regular expression to use for matching cookie names in the request. Refer to
+     * [Bypass Cache on Cookie setting](https://developers.cloudflare.com/rules/page-rules/reference/additional-reference/#bypass-cache-on-cookie-setting)
+     * to learn about limited regular expression support.
+     */
+    value?: string;
+  }
+
+  export interface CacheByDeviceType {
+    /**
+     * Separate cached content based on the visitor's device type.
+     */
+    id?: 'cache_by_device_type';
+
+    /**
+     * The status of Cache By Device Type.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface CacheDeceptionArmor {
+    /**
+     * Protect from web cache deception attacks while still allowing static assets to
+     * be cached. This setting verifies that the URL's extension matches the returned
+     * `Content-Type`.
+     */
+    id?: 'cache_deception_armor';
+
+    /**
+     * The status of Cache Deception Armor.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface CacheKeyFields {
+    /**
+     * Control specifically what variables to include when deciding which resources to
+     * cache. This allows customers to determine what to cache based on something other
+     * than just the URL.
+     */
+    id?: 'cache_key_fields';
+
+    value?: CacheKeyFields.Value;
+  }
+
+  export namespace CacheKeyFields {
+    export interface Value {
+      /**
+       * Controls which cookies appear in the Cache Key.
+       */
+      cookie?: Value.Cookie;
+
+      /**
+       * Controls which headers go into the Cache Key. Exactly one of `include` or
+       * `exclude` is expected.
+       */
+      header?: Value.Header;
+
+      /**
+       * Determines which host header to include in the Cache Key.
+       */
+      host?: Value.Host;
+
+      /**
+       * Controls which URL query string parameters go into the Cache Key. Exactly one of
+       * `include` or `exclude` is expected.
+       */
+      query_string?: Value.QueryString;
+
+      /**
+       * Feature fields to add features about the end-user (client) into the Cache Key.
+       */
+      user?: Value.User;
+    }
+
+    export namespace Value {
+      /**
+       * Controls which cookies appear in the Cache Key.
+       */
+      export interface Cookie {
+        /**
+         * A list of cookies to check for the presence of, without including their actual
+         * values.
+         */
+        check_presence?: Array<string>;
+
+        /**
+         * A list of cookies to include.
+         */
+        include?: Array<string>;
+      }
+
+      /**
+       * Controls which headers go into the Cache Key. Exactly one of `include` or
+       * `exclude` is expected.
+       */
+      export interface Header {
+        /**
+         * A list of headers to check for the presence of, without including their actual
+         * values.
+         */
+        check_presence?: Array<string>;
+
+        /**
+         * A list of headers to ignore.
+         */
+        exclude?: Array<string>;
+
+        /**
+         * A list of headers to include.
+         */
+        include?: Array<string>;
+      }
+
+      /**
+       * Determines which host header to include in the Cache Key.
+       */
+      export interface Host {
+        /**
+         * Whether to include the Host header in the HTTP request sent to the origin.
+         */
+        resolved?: boolean;
+      }
+
+      /**
+       * Controls which URL query string parameters go into the Cache Key. Exactly one of
+       * `include` or `exclude` is expected.
+       */
+      export interface QueryString {
+        /**
+         * Ignore all query string parameters.
+         */
+        exclude?: '*' | Array<string>;
+
+        /**
+         * Include all query string parameters.
+         */
+        include?: '*' | Array<string>;
+      }
+
+      /**
+       * Feature fields to add features about the end-user (client) into the Cache Key.
+       */
+      export interface User {
+        /**
+         * Classifies a request as `mobile`, `desktop`, or `tablet` based on the User
+         * Agent.
+         */
+        device_type?: boolean;
+
+        /**
+         * Includes the client's country, derived from the IP address.
+         */
+        geo?: boolean;
+
+        /**
+         * Includes the first language code contained in the `Accept-Language` header sent
+         * by the client.
+         */
+        lang?: boolean;
+      }
+    }
+  }
+
+  export interface CacheOnCookie {
+    /**
+     * Apply the Cache Everything option (Cache Level setting) based on a regular
+     * expression match against a cookie name.
+     */
+    id?: 'cache_on_cookie';
+
+    /**
+     * The regular expression to use for matching cookie names in the request.
+     */
+    value?: string;
+  }
+
+  export interface CacheTTLByStatus {
+    /**
+     * Enterprise customers can set cache time-to-live (TTL) based on the response
+     * status from the origin web server. Cache TTL refers to the duration of a
+     * resource in the Cloudflare network before being marked as stale or discarded
+     * from cache. Status codes are returned by a resource's origin. Setting cache TTL
+     * based on response status overrides the default cache behavior (standard caching)
+     * for static files and overrides cache instructions sent by the origin web server.
+     * To cache non-static assets, set a Cache Level of Cache Everything using a Page
+     * Rule. Setting no-store Cache-Control or a low TTL (using `max-age`/`s-maxage`)
+     * increases requests to origin web servers and decreases performance.
+     */
+    id?: 'cache_ttl_by_status';
+
+    /**
+     * A JSON object containing status codes and their corresponding TTLs. Each
+     * key-value pair in the cache TTL by status cache rule has the following syntax
+     *
+     * - `status_code`: An integer value such as 200 or 500. status_code matches the
+     *   exact status code from the origin web server. Valid status codes are between
+     *   100-999.
+     * - `status_code_range`: Integer values for from and to. status_code_range matches
+     *   any status code from the origin web server within the specified range.
+     * - `value`: An integer value that defines the duration an asset is valid in
+     *   seconds or one of the following strings: no-store (equivalent to -1), no-cache
+     *   (equivalent to 0).
+     */
+    value?: Record<string, 'no-cache' | 'no-store' | number>;
+  }
+
+  export interface DisableApps {
+    /**
+     * Turn off all active
+     * [Cloudflare Apps](https://developers.cloudflare.com/support/more-dashboard-apps/cloudflare-apps/)
+     * (deprecated).
+     */
+    id?: 'disable_apps';
+  }
+
+  export interface DisablePerformance {
+    /**
+     * Turn off
+     * [Rocket Loader](https://developers.cloudflare.com/speed/optimization/content/rocket-loader/),
+     * [Mirage](https://developers.cloudflare.com/speed/optimization/images/mirage/),
+     * and [Polish](https://developers.cloudflare.com/images/polish/).
+     */
+    id?: 'disable_performance';
+  }
+
+  export interface DisableSecurity {
+    /**
+     * Turn off
+     * [Email Obfuscation](https://developers.cloudflare.com/waf/tools/scrape-shield/email-address-obfuscation/),
+     * [Rate Limiting (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-rate-limiting/),
+     * [Scrape Shield](https://developers.cloudflare.com/waf/tools/scrape-shield/),
+     * [URL (Zone) Lockdown](https://developers.cloudflare.com/waf/tools/zone-lockdown/),
+     * and
+     * [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+     */
+    id?: 'disable_security';
+  }
+
+  export interface DisableZaraz {
+    /**
+     * Turn off [Zaraz](https://developers.cloudflare.com/zaraz/).
+     */
+    id?: 'disable_zaraz';
+  }
+
+  export interface EdgeCacheTTL {
+    /**
+     * Specify how long to cache a resource in the Cloudflare global network. _Edge
+     * Cache TTL_ is not visible in response headers.
+     */
+    id?: 'edge_cache_ttl';
+
+    value?: number;
+  }
+
+  export interface ExplicitCacheControl {
+    /**
+     * Origin Cache Control is enabled by default for Free, Pro, and Business domains
+     * and disabled by default for Enterprise domains.
+     */
+    id?: 'explicit_cache_control';
+
+    /**
+     * The status of Origin Cache Control.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface ForwardingURL {
+    /**
+     * Redirects one URL to another using an `HTTP 301/302` redirect. Refer to
+     * [Wildcard matching and referencing](https://developers.cloudflare.com/rules/page-rules/reference/wildcard-matching/).
+     */
+    id?: 'forwarding_url';
+
+    value?: ForwardingURL.Value;
+  }
+
+  export namespace ForwardingURL {
+    export interface Value {
+      /**
+       * The status code to use for the URL redirect. 301 is a permanent redirect. 302 is
+       * a temporary redirect.
+       */
+      status_code?: 301 | 302;
+
+      /**
+       * The URL to redirect the request to. Notes: ${num} refers to the position of '\*'
+       * in the constraint value.
+       */
+      url?: string;
+    }
+  }
+
+  export interface HostHeaderOverride {
+    /**
+     * Apply a specific host header.
+     */
+    id?: 'host_header_override';
+
+    /**
+     * The hostname to use in the `Host` header
+     */
+    value?: string;
+  }
+
+  export interface ResolveOverride {
+    /**
+     * Change the origin address to the value specified in this setting.
+     */
+    id?: 'resolve_override';
+
+    /**
+     * The origin address you want to override with.
+     */
+    value?: string;
+  }
+
+  export interface RespectStrongEtag {
+    /**
+     * Turn on or off byte-for-byte equivalency checks between the Cloudflare cache and
+     * the origin server.
+     */
+    id?: 'respect_strong_etag';
+
+    /**
+     * The status of Respect Strong ETags
+     */
+    value?: 'on' | 'off';
+  }
+}
+
+export interface PageRuleListParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: The direction used to sort returned Page Rules.
+   */
+  direction?: 'asc' | 'desc';
+
+  /**
+   * Query param: When set to `all`, all the search requirements must match. When set
+   * to `any`, only one of the search requirements has to match.
+   */
+  match?: 'any' | 'all';
+
+  /**
+   * Query param: The field used to sort returned Page Rules.
+   */
+  order?: 'status' | 'priority';
+
+  /**
+   * Query param: The status of the Page Rule.
+   */
+  status?: 'active' | 'disabled';
+}
+
+export interface PageRuleDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface PageRuleEditParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The set of actions to perform if the targets of this rule match the
+   * request. Actions can redirect to another URL or override settings, but not both.
+   */
+  actions?: Array<
+    | SettingsAPI.AlwaysUseHTTPSParam
+    | SettingsAPI.AutomaticHTTPSRewritesParam
+    | SettingsAPI.BrowserCacheTTLParam
+    | SettingsAPI.BrowserCheckParam
+    | PageRuleEditParams.BypassCacheOnCookie
+    | PageRuleEditParams.CacheByDeviceType
+    | PageRuleEditParams.CacheDeceptionArmor
+    | PageRuleEditParams.CacheKeyFields
+    | SettingsAPI.CacheLevelParam
+    | PageRuleEditParams.CacheOnCookie
+    | PageRuleEditParams.CacheTTLByStatus
+    | PageRuleEditParams.DisableApps
+    | PageRuleEditParams.DisablePerformance
+    | PageRuleEditParams.DisableSecurity
+    | PageRuleEditParams.DisableZaraz
+    | PageRuleEditParams.EdgeCacheTTL
+    | SettingsAPI.EmailObfuscationParam
+    | PageRuleEditParams.ExplicitCacheControl
+    | PageRuleEditParams.ForwardingURL
+    | PageRuleEditParams.HostHeaderOverride
+    | SettingsAPI.IPGeolocationParam
+    | SettingsAPI.MirageParam
+    | SettingsAPI.OpportunisticEncryptionParam
+    | SettingsAPI.OriginErrorPagePassThruParam
+    | SettingsAPI.PolishParam
+    | PageRuleEditParams.ResolveOverride
+    | PageRuleEditParams.RespectStrongEtag
+    | SettingsAPI.ResponseBufferingParam
+    | SettingsAPI.RocketLoaderParam
+    | SettingsAPI.SecurityLevelParam
+    | SettingsAPI.SortQueryStringForCacheParam
+    | SettingsAPI.SSLParam
+    | SettingsAPI.TrueClientIPHeaderParam
+    | SettingsAPI.WAFParam
+  >;
+
+  /**
+   * Body param: The priority of the rule, used to define which Page Rule is
+   * processed over another. A higher number indicates a higher priority. For
+   * example, if you have a catch-all Page Rule (rule A: `/images/*`) but want a more
+   * specific Page Rule to take precedence (rule B: `/images/special/*`), specify a
+   * higher priority for rule B so it overrides rule A.
+   */
+  priority?: number;
+
+  /**
+   * Body param: The status of the Page Rule.
+   */
+  status?: 'active' | 'disabled';
+
+  /**
+   * Body param: The rule targets to evaluate on each request.
+   */
+  targets?: Array<TargetParam>;
+}
+
+export namespace PageRuleEditParams {
+  export interface BypassCacheOnCookie {
+    /**
+     * Bypass cache and fetch resources from the origin server if a regular expression
+     * matches against a cookie name present in the request.
+     */
+    id?: 'bypass_cache_on_cookie';
+
+    /**
+     * The regular expression to use for matching cookie names in the request. Refer to
+     * [Bypass Cache on Cookie setting](https://developers.cloudflare.com/rules/page-rules/reference/additional-reference/#bypass-cache-on-cookie-setting)
+     * to learn about limited regular expression support.
+     */
+    value?: string;
+  }
+
+  export interface CacheByDeviceType {
+    /**
+     * Separate cached content based on the visitor's device type.
+     */
+    id?: 'cache_by_device_type';
+
+    /**
+     * The status of Cache By Device Type.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface CacheDeceptionArmor {
+    /**
+     * Protect from web cache deception attacks while still allowing static assets to
+     * be cached. This setting verifies that the URL's extension matches the returned
+     * `Content-Type`.
+     */
+    id?: 'cache_deception_armor';
+
+    /**
+     * The status of Cache Deception Armor.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface CacheKeyFields {
+    /**
+     * Control specifically what variables to include when deciding which resources to
+     * cache. This allows customers to determine what to cache based on something other
+     * than just the URL.
+     */
+    id?: 'cache_key_fields';
+
+    value?: CacheKeyFields.Value;
+  }
+
+  export namespace CacheKeyFields {
+    export interface Value {
+      /**
+       * Controls which cookies appear in the Cache Key.
+       */
+      cookie?: Value.Cookie;
+
+      /**
+       * Controls which headers go into the Cache Key. Exactly one of `include` or
+       * `exclude` is expected.
+       */
+      header?: Value.Header;
+
+      /**
+       * Determines which host header to include in the Cache Key.
+       */
+      host?: Value.Host;
+
+      /**
+       * Controls which URL query string parameters go into the Cache Key. Exactly one of
+       * `include` or `exclude` is expected.
+       */
+      query_string?: Value.QueryString;
+
+      /**
+       * Feature fields to add features about the end-user (client) into the Cache Key.
+       */
+      user?: Value.User;
+    }
+
+    export namespace Value {
+      /**
+       * Controls which cookies appear in the Cache Key.
+       */
+      export interface Cookie {
+        /**
+         * A list of cookies to check for the presence of, without including their actual
+         * values.
+         */
+        check_presence?: Array<string>;
+
+        /**
+         * A list of cookies to include.
+         */
+        include?: Array<string>;
+      }
+
+      /**
+       * Controls which headers go into the Cache Key. Exactly one of `include` or
+       * `exclude` is expected.
+       */
+      export interface Header {
+        /**
+         * A list of headers to check for the presence of, without including their actual
+         * values.
+         */
+        check_presence?: Array<string>;
+
+        /**
+         * A list of headers to ignore.
+         */
+        exclude?: Array<string>;
+
+        /**
+         * A list of headers to include.
+         */
+        include?: Array<string>;
+      }
+
+      /**
+       * Determines which host header to include in the Cache Key.
+       */
+      export interface Host {
+        /**
+         * Whether to include the Host header in the HTTP request sent to the origin.
+         */
+        resolved?: boolean;
+      }
+
+      /**
+       * Controls which URL query string parameters go into the Cache Key. Exactly one of
+       * `include` or `exclude` is expected.
+       */
+      export interface QueryString {
+        /**
+         * Ignore all query string parameters.
+         */
+        exclude?: '*' | Array<string>;
+
+        /**
+         * Include all query string parameters.
+         */
+        include?: '*' | Array<string>;
+      }
+
+      /**
+       * Feature fields to add features about the end-user (client) into the Cache Key.
+       */
+      export interface User {
+        /**
+         * Classifies a request as `mobile`, `desktop`, or `tablet` based on the User
+         * Agent.
+         */
+        device_type?: boolean;
+
+        /**
+         * Includes the client's country, derived from the IP address.
+         */
+        geo?: boolean;
+
+        /**
+         * Includes the first language code contained in the `Accept-Language` header sent
+         * by the client.
+         */
+        lang?: boolean;
+      }
+    }
+  }
+
+  export interface CacheOnCookie {
+    /**
+     * Apply the Cache Everything option (Cache Level setting) based on a regular
+     * expression match against a cookie name.
+     */
+    id?: 'cache_on_cookie';
+
+    /**
+     * The regular expression to use for matching cookie names in the request.
+     */
+    value?: string;
+  }
+
+  export interface CacheTTLByStatus {
+    /**
+     * Enterprise customers can set cache time-to-live (TTL) based on the response
+     * status from the origin web server. Cache TTL refers to the duration of a
+     * resource in the Cloudflare network before being marked as stale or discarded
+     * from cache. Status codes are returned by a resource's origin. Setting cache TTL
+     * based on response status overrides the default cache behavior (standard caching)
+     * for static files and overrides cache instructions sent by the origin web server.
+     * To cache non-static assets, set a Cache Level of Cache Everything using a Page
+     * Rule. Setting no-store Cache-Control or a low TTL (using `max-age`/`s-maxage`)
+     * increases requests to origin web servers and decreases performance.
+     */
+    id?: 'cache_ttl_by_status';
+
+    /**
+     * A JSON object containing status codes and their corresponding TTLs. Each
+     * key-value pair in the cache TTL by status cache rule has the following syntax
+     *
+     * - `status_code`: An integer value such as 200 or 500. status_code matches the
+     *   exact status code from the origin web server. Valid status codes are between
+     *   100-999.
+     * - `status_code_range`: Integer values for from and to. status_code_range matches
+     *   any status code from the origin web server within the specified range.
+     * - `value`: An integer value that defines the duration an asset is valid in
+     *   seconds or one of the following strings: no-store (equivalent to -1), no-cache
+     *   (equivalent to 0).
+     */
+    value?: Record<string, 'no-cache' | 'no-store' | number>;
+  }
+
+  export interface DisableApps {
+    /**
+     * Turn off all active
+     * [Cloudflare Apps](https://developers.cloudflare.com/support/more-dashboard-apps/cloudflare-apps/)
+     * (deprecated).
+     */
+    id?: 'disable_apps';
+  }
+
+  export interface DisablePerformance {
+    /**
+     * Turn off
+     * [Rocket Loader](https://developers.cloudflare.com/speed/optimization/content/rocket-loader/),
+     * [Mirage](https://developers.cloudflare.com/speed/optimization/images/mirage/),
+     * and [Polish](https://developers.cloudflare.com/images/polish/).
+     */
+    id?: 'disable_performance';
+  }
+
+  export interface DisableSecurity {
+    /**
+     * Turn off
+     * [Email Obfuscation](https://developers.cloudflare.com/waf/tools/scrape-shield/email-address-obfuscation/),
+     * [Rate Limiting (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-rate-limiting/),
+     * [Scrape Shield](https://developers.cloudflare.com/waf/tools/scrape-shield/),
+     * [URL (Zone) Lockdown](https://developers.cloudflare.com/waf/tools/zone-lockdown/),
+     * and
+     * [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+     */
+    id?: 'disable_security';
+  }
+
+  export interface DisableZaraz {
+    /**
+     * Turn off [Zaraz](https://developers.cloudflare.com/zaraz/).
+     */
+    id?: 'disable_zaraz';
+  }
+
+  export interface EdgeCacheTTL {
+    /**
+     * Specify how long to cache a resource in the Cloudflare global network. _Edge
+     * Cache TTL_ is not visible in response headers.
+     */
+    id?: 'edge_cache_ttl';
+
+    value?: number;
+  }
+
+  export interface ExplicitCacheControl {
+    /**
+     * Origin Cache Control is enabled by default for Free, Pro, and Business domains
+     * and disabled by default for Enterprise domains.
+     */
+    id?: 'explicit_cache_control';
+
+    /**
+     * The status of Origin Cache Control.
+     */
+    value?: 'on' | 'off';
+  }
+
+  export interface ForwardingURL {
+    /**
+     * Redirects one URL to another using an `HTTP 301/302` redirect. Refer to
+     * [Wildcard matching and referencing](https://developers.cloudflare.com/rules/page-rules/reference/wildcard-matching/).
+     */
+    id?: 'forwarding_url';
+
+    value?: ForwardingURL.Value;
+  }
+
+  export namespace ForwardingURL {
+    export interface Value {
+      /**
+       * The status code to use for the URL redirect. 301 is a permanent redirect. 302 is
+       * a temporary redirect.
+       */
+      status_code?: 301 | 302;
+
+      /**
+       * The URL to redirect the request to. Notes: ${num} refers to the position of '\*'
+       * in the constraint value.
+       */
+      url?: string;
+    }
+  }
+
+  export interface HostHeaderOverride {
+    /**
+     * Apply a specific host header.
+     */
+    id?: 'host_header_override';
+
+    /**
+     * The hostname to use in the `Host` header
+     */
+    value?: string;
+  }
+
+  export interface ResolveOverride {
+    /**
+     * Change the origin address to the value specified in this setting.
+     */
+    id?: 'resolve_override';
+
+    /**
+     * The origin address you want to override with.
+     */
+    value?: string;
+  }
+
+  export interface RespectStrongEtag {
+    /**
+     * Turn on or off byte-for-byte equivalency checks between the Cloudflare cache and
+     * the origin server.
+     */
+    id?: 'respect_strong_etag';
+
+    /**
+     * The status of Respect Strong ETags
+     */
+    value?: 'on' | 'off';
+  }
+}
+
+export interface PageRuleGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
diff --git a/src/resources/page-shield/connections.ts b/src/resources/page-shield/connections.ts
index abd89a815e..ce3b22ba9e 100644
--- a/src/resources/page-shield/connections.ts
+++ b/src/resources/page-shield/connections.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ConnectionsAPI from './connections';
 import { SinglePage } from '../../pagination';
 
 export class Connections extends APIResource {
@@ -95,8 +94,7 @@ export interface ConnectionListParams {
   exclude_urls?: string;
 
   /**
-   * Query param: Export the list of connections as a file. Cannot be used with
-   * per_page or page options.
+   * Query param: Export the list of connections as a file.
    */
   export?: 'csv';
 
@@ -119,10 +117,9 @@ export interface ConnectionListParams {
    * Query param: The current page number of the paginated results.
    *
    * We additionally support a special value "all". When "all" is used, the API will
-   * return all the connections with the applied filters in a single page.
-   * Additionally, when using this value, the API will not return the categorisation
-   * data for the URL and domain of the connections. This feature is best-effort and
-   * it may only work for zones with a low number of connections
+   * return all the connections with the applied filters in a single page. This
+   * feature is best-effort and it may only work for zones with a low number of
+   * connections
    */
   page?: string;
 
@@ -168,9 +165,13 @@ export interface ConnectionGetParams {
   zone_id: string;
 }
 
-export namespace Connections {
-  export import Connection = ConnectionsAPI.Connection;
-  export import ConnectionsSinglePage = ConnectionsAPI.ConnectionsSinglePage;
-  export import ConnectionListParams = ConnectionsAPI.ConnectionListParams;
-  export import ConnectionGetParams = ConnectionsAPI.ConnectionGetParams;
+Connections.ConnectionsSinglePage = ConnectionsSinglePage;
+
+export declare namespace Connections {
+  export {
+    type Connection as Connection,
+    ConnectionsSinglePage as ConnectionsSinglePage,
+    type ConnectionListParams as ConnectionListParams,
+    type ConnectionGetParams as ConnectionGetParams,
+  };
 }
diff --git a/src/resources/page-shield/cookies.ts b/src/resources/page-shield/cookies.ts
index 660825e7a7..d4bf8b8437 100644
--- a/src/resources/page-shield/cookies.ts
+++ b/src/resources/page-shield/cookies.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as CookiesAPI from './cookies';
 import { SinglePage } from '../../pagination';
 
 export class Cookies extends APIResource {
@@ -123,8 +122,7 @@ export interface CookieListParams {
   domain?: string;
 
   /**
-   * Query param: Export the list of cookies as a file. Cannot be used with per_page
-   * or page options.
+   * Query param: Export the list of cookies as a file.
    */
   export?: 'csv';
 
@@ -157,6 +155,10 @@ export interface CookieListParams {
 
   /**
    * Query param: The current page number of the paginated results.
+   *
+   * We additionally support a special value "all". When "all" is used, the API will
+   * return all the cookies with the applied filters in a single page. This feature
+   * is best-effort and it may only work for zones with a low number of cookies
    */
   page?: string;
 
@@ -206,10 +208,14 @@ export interface CookieGetParams {
   zone_id: string;
 }
 
-export namespace Cookies {
-  export import CookieListResponse = CookiesAPI.CookieListResponse;
-  export import CookieGetResponse = CookiesAPI.CookieGetResponse;
-  export import CookieListResponsesSinglePage = CookiesAPI.CookieListResponsesSinglePage;
-  export import CookieListParams = CookiesAPI.CookieListParams;
-  export import CookieGetParams = CookiesAPI.CookieGetParams;
+Cookies.CookieListResponsesSinglePage = CookieListResponsesSinglePage;
+
+export declare namespace Cookies {
+  export {
+    type CookieListResponse as CookieListResponse,
+    type CookieGetResponse as CookieGetResponse,
+    CookieListResponsesSinglePage as CookieListResponsesSinglePage,
+    type CookieListParams as CookieListParams,
+    type CookieGetParams as CookieGetParams,
+  };
 }
diff --git a/src/resources/page-shield/index.ts b/src/resources/page-shield/index.ts
index a631e0d533..bf92a68b75 100644
--- a/src/resources/page-shield/index.ts
+++ b/src/resources/page-shield/index.ts
@@ -1,40 +1,40 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Connection,
-  ConnectionListParams,
-  ConnectionGetParams,
   ConnectionsSinglePage,
   Connections,
+  type Connection,
+  type ConnectionListParams,
+  type ConnectionGetParams,
 } from './connections';
 export {
-  CookieListResponse,
-  CookieGetResponse,
-  CookieListParams,
-  CookieGetParams,
   CookieListResponsesSinglePage,
   Cookies,
+  type CookieListResponse,
+  type CookieGetResponse,
+  type CookieListParams,
+  type CookieGetParams,
 } from './cookies';
 export { PageShield } from './page-shield';
 export {
-  Policy,
-  PolicyCreateResponse,
-  PolicyUpdateResponse,
-  PolicyListResponse,
-  PolicyGetResponse,
-  PolicyCreateParams,
-  PolicyUpdateParams,
-  PolicyListParams,
-  PolicyDeleteParams,
-  PolicyGetParams,
   PolicyListResponsesSinglePage,
   Policies,
+  type Policy,
+  type PolicyCreateResponse,
+  type PolicyUpdateResponse,
+  type PolicyListResponse,
+  type PolicyGetResponse,
+  type PolicyCreateParams,
+  type PolicyUpdateParams,
+  type PolicyListParams,
+  type PolicyDeleteParams,
+  type PolicyGetParams,
 } from './policies';
 export {
-  Script,
-  ScriptGetResponse,
-  ScriptListParams,
-  ScriptGetParams,
   ScriptsSinglePage,
   Scripts,
+  type Script,
+  type ScriptGetResponse,
+  type ScriptListParams,
+  type ScriptGetParams,
 } from './scripts';
diff --git a/src/resources/page-shield/page-shield.ts b/src/resources/page-shield/page-shield.ts
index ee7ccd4dc3..8c3c9a9393 100644
--- a/src/resources/page-shield/page-shield.ts
+++ b/src/resources/page-shield/page-shield.ts
@@ -3,9 +3,46 @@
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as ConnectionsAPI from './connections';
+import {
+  Connection,
+  ConnectionGetParams,
+  ConnectionListParams,
+  Connections,
+  ConnectionsSinglePage,
+} from './connections';
 import * as CookiesAPI from './cookies';
+import {
+  CookieGetParams,
+  CookieGetResponse,
+  CookieListParams,
+  CookieListResponse,
+  CookieListResponsesSinglePage,
+  Cookies,
+} from './cookies';
 import * as PoliciesAPI from './policies';
+import {
+  Policies,
+  Policy,
+  PolicyCreateParams,
+  PolicyCreateResponse,
+  PolicyDeleteParams,
+  PolicyGetParams,
+  PolicyGetResponse,
+  PolicyListParams,
+  PolicyListResponse,
+  PolicyListResponsesSinglePage,
+  PolicyUpdateParams,
+  PolicyUpdateResponse,
+} from './policies';
 import * as ScriptsAPI from './scripts';
+import {
+  Script,
+  ScriptGetParams,
+  ScriptGetResponse,
+  ScriptListParams,
+  Scripts,
+  ScriptsSinglePage,
+} from './scripts';
 
 export class PageShield extends APIResource {
   policies: PoliciesAPI.Policies = new PoliciesAPI.Policies(this._client);
@@ -118,34 +155,54 @@ export interface PageShieldGetParams {
   zone_id: string;
 }
 
-export namespace PageShield {
-  export import Policies = PoliciesAPI.Policies;
-  export import Policy = PoliciesAPI.Policy;
-  export import PolicyCreateResponse = PoliciesAPI.PolicyCreateResponse;
-  export import PolicyUpdateResponse = PoliciesAPI.PolicyUpdateResponse;
-  export import PolicyListResponse = PoliciesAPI.PolicyListResponse;
-  export import PolicyGetResponse = PoliciesAPI.PolicyGetResponse;
-  export import PolicyListResponsesSinglePage = PoliciesAPI.PolicyListResponsesSinglePage;
-  export import PolicyCreateParams = PoliciesAPI.PolicyCreateParams;
-  export import PolicyUpdateParams = PoliciesAPI.PolicyUpdateParams;
-  export import PolicyListParams = PoliciesAPI.PolicyListParams;
-  export import PolicyDeleteParams = PoliciesAPI.PolicyDeleteParams;
-  export import PolicyGetParams = PoliciesAPI.PolicyGetParams;
-  export import Connections = ConnectionsAPI.Connections;
-  export import Connection = ConnectionsAPI.Connection;
-  export import ConnectionsSinglePage = ConnectionsAPI.ConnectionsSinglePage;
-  export import ConnectionListParams = ConnectionsAPI.ConnectionListParams;
-  export import ConnectionGetParams = ConnectionsAPI.ConnectionGetParams;
-  export import Scripts = ScriptsAPI.Scripts;
-  export import Script = ScriptsAPI.Script;
-  export import ScriptGetResponse = ScriptsAPI.ScriptGetResponse;
-  export import ScriptsSinglePage = ScriptsAPI.ScriptsSinglePage;
-  export import ScriptListParams = ScriptsAPI.ScriptListParams;
-  export import ScriptGetParams = ScriptsAPI.ScriptGetParams;
-  export import Cookies = CookiesAPI.Cookies;
-  export import CookieListResponse = CookiesAPI.CookieListResponse;
-  export import CookieGetResponse = CookiesAPI.CookieGetResponse;
-  export import CookieListResponsesSinglePage = CookiesAPI.CookieListResponsesSinglePage;
-  export import CookieListParams = CookiesAPI.CookieListParams;
-  export import CookieGetParams = CookiesAPI.CookieGetParams;
+PageShield.Policies = Policies;
+PageShield.PolicyListResponsesSinglePage = PolicyListResponsesSinglePage;
+PageShield.Connections = Connections;
+PageShield.ConnectionsSinglePage = ConnectionsSinglePage;
+PageShield.Scripts = Scripts;
+PageShield.ScriptsSinglePage = ScriptsSinglePage;
+PageShield.Cookies = Cookies;
+PageShield.CookieListResponsesSinglePage = CookieListResponsesSinglePage;
+
+export declare namespace PageShield {
+  export {
+    Policies as Policies,
+    type Policy as Policy,
+    type PolicyCreateResponse as PolicyCreateResponse,
+    type PolicyUpdateResponse as PolicyUpdateResponse,
+    type PolicyListResponse as PolicyListResponse,
+    type PolicyGetResponse as PolicyGetResponse,
+    PolicyListResponsesSinglePage as PolicyListResponsesSinglePage,
+    type PolicyCreateParams as PolicyCreateParams,
+    type PolicyUpdateParams as PolicyUpdateParams,
+    type PolicyListParams as PolicyListParams,
+    type PolicyDeleteParams as PolicyDeleteParams,
+    type PolicyGetParams as PolicyGetParams,
+  };
+
+  export {
+    Connections as Connections,
+    type Connection as Connection,
+    ConnectionsSinglePage as ConnectionsSinglePage,
+    type ConnectionListParams as ConnectionListParams,
+    type ConnectionGetParams as ConnectionGetParams,
+  };
+
+  export {
+    Scripts as Scripts,
+    type Script as Script,
+    type ScriptGetResponse as ScriptGetResponse,
+    ScriptsSinglePage as ScriptsSinglePage,
+    type ScriptListParams as ScriptListParams,
+    type ScriptGetParams as ScriptGetParams,
+  };
+
+  export {
+    Cookies as Cookies,
+    type CookieListResponse as CookieListResponse,
+    type CookieGetResponse as CookieGetResponse,
+    CookieListResponsesSinglePage as CookieListResponsesSinglePage,
+    type CookieListParams as CookieListParams,
+    type CookieGetParams as CookieGetParams,
+  };
 }
diff --git a/src/resources/page-shield/policies.ts b/src/resources/page-shield/policies.ts
index 2451235529..4d9b853f4c 100644
--- a/src/resources/page-shield/policies.ts
+++ b/src/resources/page-shield/policies.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as PoliciesAPI from './policies';
 import { SinglePage } from '../../pagination';
 
 export class Policies extends APIResource {
@@ -330,16 +329,20 @@ export interface PolicyGetParams {
   zone_id: string;
 }
 
-export namespace Policies {
-  export import Policy = PoliciesAPI.Policy;
-  export import PolicyCreateResponse = PoliciesAPI.PolicyCreateResponse;
-  export import PolicyUpdateResponse = PoliciesAPI.PolicyUpdateResponse;
-  export import PolicyListResponse = PoliciesAPI.PolicyListResponse;
-  export import PolicyGetResponse = PoliciesAPI.PolicyGetResponse;
-  export import PolicyListResponsesSinglePage = PoliciesAPI.PolicyListResponsesSinglePage;
-  export import PolicyCreateParams = PoliciesAPI.PolicyCreateParams;
-  export import PolicyUpdateParams = PoliciesAPI.PolicyUpdateParams;
-  export import PolicyListParams = PoliciesAPI.PolicyListParams;
-  export import PolicyDeleteParams = PoliciesAPI.PolicyDeleteParams;
-  export import PolicyGetParams = PoliciesAPI.PolicyGetParams;
+Policies.PolicyListResponsesSinglePage = PolicyListResponsesSinglePage;
+
+export declare namespace Policies {
+  export {
+    type Policy as Policy,
+    type PolicyCreateResponse as PolicyCreateResponse,
+    type PolicyUpdateResponse as PolicyUpdateResponse,
+    type PolicyListResponse as PolicyListResponse,
+    type PolicyGetResponse as PolicyGetResponse,
+    PolicyListResponsesSinglePage as PolicyListResponsesSinglePage,
+    type PolicyCreateParams as PolicyCreateParams,
+    type PolicyUpdateParams as PolicyUpdateParams,
+    type PolicyListParams as PolicyListParams,
+    type PolicyDeleteParams as PolicyDeleteParams,
+    type PolicyGetParams as PolicyGetParams,
+  };
 }
diff --git a/src/resources/page-shield/scripts.ts b/src/resources/page-shield/scripts.ts
index 53d81c26dd..b46260d62e 100644
--- a/src/resources/page-shield/scripts.ts
+++ b/src/resources/page-shield/scripts.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ScriptsAPI from './scripts';
 import { SinglePage } from '../../pagination';
 
 export class Scripts extends APIResource {
@@ -54,6 +53,11 @@ export interface Script {
 
   url_contains_cdn_cgi_path: boolean;
 
+  /**
+   * The cryptomining score of the JavaScript content.
+   */
+  cryptomining_score?: number | null;
+
   /**
    * The dataflow score of the JavaScript content.
    */
@@ -78,10 +82,20 @@ export interface Script {
    */
   js_integrity_score?: number | null;
 
+  /**
+   * The magecart score of the JavaScript content.
+   */
+  magecart_score?: number | null;
+
   malicious_domain_categories?: Array<string>;
 
   malicious_url_categories?: Array<string>;
 
+  /**
+   * The malware score of the JavaScript content.
+   */
+  malware_score?: number | null;
+
   /**
    * The obfuscation score of the JavaScript content.
    */
@@ -110,6 +124,11 @@ export interface ScriptGetResponse {
 
   url_contains_cdn_cgi_path: boolean;
 
+  /**
+   * The cryptomining score of the JavaScript content.
+   */
+  cryptomining_score?: number | null;
+
   /**
    * The dataflow score of the JavaScript content.
    */
@@ -134,10 +153,20 @@ export interface ScriptGetResponse {
    */
   js_integrity_score?: number | null;
 
+  /**
+   * The magecart score of the JavaScript content.
+   */
+  magecart_score?: number | null;
+
   malicious_domain_categories?: Array<string>;
 
   malicious_url_categories?: Array<string>;
 
+  /**
+   * The malware score of the JavaScript content.
+   */
+  malware_score?: number | null;
+
   /**
    * The obfuscation score of the JavaScript content.
    */
@@ -155,6 +184,11 @@ export namespace ScriptGetResponse {
    * The version of the analyzed script.
    */
   export interface Version {
+    /**
+     * The cryptomining score of the JavaScript content.
+     */
+    cryptomining_score?: number | null;
+
     /**
      * The dataflow score of the JavaScript content.
      */
@@ -175,6 +209,16 @@ export namespace ScriptGetResponse {
      */
     js_integrity_score?: number | null;
 
+    /**
+     * The magecart score of the JavaScript content.
+     */
+    magecart_score?: number | null;
+
+    /**
+     * The malware score of the JavaScript content.
+     */
+    malware_score?: number | null;
+
     /**
      * The obfuscation score of the JavaScript content.
      */
@@ -214,8 +258,7 @@ export interface ScriptListParams {
   exclude_urls?: string;
 
   /**
-   * Query param: Export the list of scripts as a file. Cannot be used with per_page
-   * or page options.
+   * Query param: Export the list of scripts as a file.
    */
   export?: 'csv';
 
@@ -238,10 +281,8 @@ export interface ScriptListParams {
    * Query param: The current page number of the paginated results.
    *
    * We additionally support a special value "all". When "all" is used, the API will
-   * return all the scripts with the applied filters in a single page. Additionally,
-   * when using this value, the API will not return the script versions or
-   * categorisation data for the URL and domain of the scripts. This feature is
-   * best-effort and it may only work for zones with a low number of scripts
+   * return all the scripts with the applied filters in a single page. This feature
+   * is best-effort and it may only work for zones with a low number of scripts
    */
   page?: string;
 
@@ -286,10 +327,14 @@ export interface ScriptGetParams {
   zone_id: string;
 }
 
-export namespace Scripts {
-  export import Script = ScriptsAPI.Script;
-  export import ScriptGetResponse = ScriptsAPI.ScriptGetResponse;
-  export import ScriptsSinglePage = ScriptsAPI.ScriptsSinglePage;
-  export import ScriptListParams = ScriptsAPI.ScriptListParams;
-  export import ScriptGetParams = ScriptsAPI.ScriptGetParams;
+Scripts.ScriptsSinglePage = ScriptsSinglePage;
+
+export declare namespace Scripts {
+  export {
+    type Script as Script,
+    type ScriptGetResponse as ScriptGetResponse,
+    ScriptsSinglePage as ScriptsSinglePage,
+    type ScriptListParams as ScriptListParams,
+    type ScriptGetParams as ScriptGetParams,
+  };
 }
diff --git a/src/resources/pagerules/index.ts b/src/resources/pagerules/index.ts
deleted file mode 100644
index f215e9d6c3..0000000000
--- a/src/resources/pagerules/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { Pagerules } from './pagerules';
-export { SettingListResponse, SettingListParams, Settings } from './settings';
diff --git a/src/resources/pagerules/pagerules.ts b/src/resources/pagerules/pagerules.ts
deleted file mode 100644
index 491a711027..0000000000
--- a/src/resources/pagerules/pagerules.ts
+++ /dev/null
@@ -1,436 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as SettingsAPI from './settings';
-
-export class Pagerules extends APIResource {
-  settings: SettingsAPI.Settings = new SettingsAPI.Settings(this._client);
-
-  /**
-   * Creates a new Page Rule.
-   *
-   * @deprecated The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details.
-   */
-  create(
-    params: PageruleCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<PageruleCreateResponse> {
-    const { zone_id, ...body } = params;
-    return (
-      this._client.post(`/zones/${zone_id}/pagerules`, { body, ...options }) as Core.APIPromise<{
-        result: PageruleCreateResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Replaces the configuration of an existing Page Rule. The configuration of the
-   * updated Page Rule will exactly match the data passed in the API request.
-   *
-   * @deprecated The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details.
-   */
-  update(
-    pageruleId: string,
-    params: PageruleUpdateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<PageruleUpdateResponse> {
-    const { zone_id, ...body } = params;
-    return (
-      this._client.put(`/zones/${zone_id}/pagerules/${pageruleId}`, { body, ...options }) as Core.APIPromise<{
-        result: PageruleUpdateResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Fetches Page Rules in a zone.
-   *
-   * @deprecated The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details.
-   */
-  list(params: PageruleListParams, options?: Core.RequestOptions): Core.APIPromise<PageruleListResponse> {
-    const { zone_id, ...query } = params;
-    return (
-      this._client.get(`/zones/${zone_id}/pagerules`, { query, ...options }) as Core.APIPromise<{
-        result: PageruleListResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Deletes an existing Page Rule.
-   *
-   * @deprecated The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details.
-   */
-  delete(
-    pageruleId: string,
-    params: PageruleDeleteParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<PageruleDeleteResponse | null> {
-    const { zone_id } = params;
-    return (
-      this._client.delete(`/zones/${zone_id}/pagerules/${pageruleId}`, options) as Core.APIPromise<{
-        result: PageruleDeleteResponse | null;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Updates one or more fields of an existing Page Rule.
-   *
-   * @deprecated The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details.
-   */
-  edit(
-    pageruleId: string,
-    params: PageruleEditParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<PageruleEditResponse> {
-    const { zone_id, ...body } = params;
-    return (
-      this._client.patch(`/zones/${zone_id}/pagerules/${pageruleId}`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: PageruleEditResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Fetches the details of a Page Rule.
-   *
-   * @deprecated The Page Rules API is deprecated in favour of the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#page-rules for full details.
-   */
-  get(
-    pageruleId: string,
-    params: PageruleGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<PageruleGetResponse> {
-    const { zone_id } = params;
-    return (
-      this._client.get(`/zones/${zone_id}/pagerules/${pageruleId}`, options) as Core.APIPromise<{
-        result: PageruleGetResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export interface PageRule {
-  /**
-   * Identifier
-   */
-  id: string;
-
-  /**
-   * The set of actions to perform if the targets of this rule match the request.
-   * Actions can redirect to another URL or override settings, but not both.
-   */
-  actions: Array<Route>;
-
-  /**
-   * The timestamp of when the Page Rule was created.
-   */
-  created_on: string;
-
-  /**
-   * The timestamp of when the Page Rule was last modified.
-   */
-  modified_on: string;
-
-  /**
-   * The priority of the rule, used to define which Page Rule is processed over
-   * another. A higher number indicates a higher priority. For example, if you have a
-   * catch-all Page Rule (rule A: `/images/*`) but want a more specific Page Rule to
-   * take precedence (rule B: `/images/special/*`), specify a higher priority for
-   * rule B so it overrides rule A.
-   */
-  priority: number;
-
-  /**
-   * The status of the Page Rule.
-   */
-  status: 'active' | 'disabled';
-
-  /**
-   * The rule targets to evaluate on each request.
-   */
-  targets: Array<Target>;
-}
-
-export interface Route {
-  /**
-   * The timestamp of when the override was last modified.
-   */
-  modified_on?: string;
-
-  /**
-   * The type of route.
-   */
-  name?: 'forward_url';
-
-  value?: Route.Value;
-}
-
-export namespace Route {
-  export interface Value {
-    /**
-     * The response type for the URL redirect.
-     */
-    type?: 'temporary' | 'permanent';
-
-    /**
-     * The URL to redirect the request to. Notes: ${num} refers to the position of '\*'
-     * in the constraint value.
-     */
-    url?: string;
-  }
-}
-
-export interface RouteParam {
-  /**
-   * The type of route.
-   */
-  name?: 'forward_url';
-
-  value?: RouteParam.Value;
-}
-
-export namespace RouteParam {
-  export interface Value {
-    /**
-     * The response type for the URL redirect.
-     */
-    type?: 'temporary' | 'permanent';
-
-    /**
-     * The URL to redirect the request to. Notes: ${num} refers to the position of '\*'
-     * in the constraint value.
-     */
-    url?: string;
-  }
-}
-
-/**
- * URL target.
- */
-export interface Target {
-  /**
-   * String constraint.
-   */
-  constraint?: Target.Constraint;
-
-  /**
-   * A target based on the URL of the request.
-   */
-  target?: 'url';
-}
-
-export namespace Target {
-  /**
-   * String constraint.
-   */
-  export interface Constraint {
-    /**
-     * The matches operator can use asterisks and pipes as wildcard and 'or' operators.
-     */
-    operator: 'matches' | 'contains' | 'equals' | 'not_equal' | 'not_contain';
-
-    /**
-     * The URL pattern to match against the current request. The pattern may contain up
-     * to four asterisks ('\*') as placeholders.
-     */
-    value: string;
-  }
-}
-
-/**
- * URL target.
- */
-export interface TargetParam {
-  /**
-   * String constraint.
-   */
-  constraint?: TargetParam.Constraint;
-
-  /**
-   * A target based on the URL of the request.
-   */
-  target?: 'url';
-}
-
-export namespace TargetParam {
-  /**
-   * String constraint.
-   */
-  export interface Constraint {
-    /**
-     * The matches operator can use asterisks and pipes as wildcard and 'or' operators.
-     */
-    operator: 'matches' | 'contains' | 'equals' | 'not_equal' | 'not_contain';
-
-    /**
-     * The URL pattern to match against the current request. The pattern may contain up
-     * to four asterisks ('\*') as placeholders.
-     */
-    value: string;
-  }
-}
-
-export type PageruleCreateResponse = unknown | string | null;
-
-export type PageruleUpdateResponse = unknown | string | null;
-
-export type PageruleListResponse = Array<PageRule>;
-
-export interface PageruleDeleteResponse {
-  /**
-   * Identifier
-   */
-  id: string;
-}
-
-export type PageruleEditResponse = unknown | string | null;
-
-export type PageruleGetResponse = unknown | string | null;
-
-export interface PageruleCreateParams {
-  /**
-   * Path param: Identifier
-   */
-  zone_id: string;
-
-  /**
-   * Body param: The set of actions to perform if the targets of this rule match the
-   * request. Actions can redirect to another URL or override settings, but not both.
-   */
-  actions: Array<RouteParam>;
-
-  /**
-   * Body param: The rule targets to evaluate on each request.
-   */
-  targets: Array<TargetParam>;
-
-  /**
-   * Body param: The priority of the rule, used to define which Page Rule is
-   * processed over another. A higher number indicates a higher priority. For
-   * example, if you have a catch-all Page Rule (rule A: `/images/*`) but want a more
-   * specific Page Rule to take precedence (rule B: `/images/special/*`), specify a
-   * higher priority for rule B so it overrides rule A.
-   */
-  priority?: number;
-
-  /**
-   * Body param: The status of the Page Rule.
-   */
-  status?: 'active' | 'disabled';
-}
-
-export interface PageruleUpdateParams {
-  /**
-   * Path param: Identifier
-   */
-  zone_id: string;
-
-  /**
-   * Body param: The set of actions to perform if the targets of this rule match the
-   * request. Actions can redirect to another URL or override settings, but not both.
-   */
-  actions: Array<RouteParam>;
-
-  /**
-   * Body param: The rule targets to evaluate on each request.
-   */
-  targets: Array<TargetParam>;
-
-  /**
-   * Body param: The priority of the rule, used to define which Page Rule is
-   * processed over another. A higher number indicates a higher priority. For
-   * example, if you have a catch-all Page Rule (rule A: `/images/*`) but want a more
-   * specific Page Rule to take precedence (rule B: `/images/special/*`), specify a
-   * higher priority for rule B so it overrides rule A.
-   */
-  priority?: number;
-
-  /**
-   * Body param: The status of the Page Rule.
-   */
-  status?: 'active' | 'disabled';
-}
-
-export interface PageruleListParams {
-  /**
-   * Path param: Identifier
-   */
-  zone_id: string;
-
-  /**
-   * Query param: The direction used to sort returned Page Rules.
-   */
-  direction?: 'asc' | 'desc';
-
-  /**
-   * Query param: When set to `all`, all the search requirements must match. When set
-   * to `any`, only one of the search requirements has to match.
-   */
-  match?: 'any' | 'all';
-
-  /**
-   * Query param: The field used to sort returned Page Rules.
-   */
-  order?: 'status' | 'priority';
-
-  /**
-   * Query param: The status of the Page Rule.
-   */
-  status?: 'active' | 'disabled';
-}
-
-export interface PageruleDeleteParams {
-  /**
-   * Identifier
-   */
-  zone_id: string;
-}
-
-export interface PageruleEditParams {
-  /**
-   * Path param: Identifier
-   */
-  zone_id: string;
-
-  /**
-   * Body param: The set of actions to perform if the targets of this rule match the
-   * request. Actions can redirect to another URL or override settings, but not both.
-   */
-  actions?: Array<RouteParam>;
-
-  /**
-   * Body param: The priority of the rule, used to define which Page Rule is
-   * processed over another. A higher number indicates a higher priority. For
-   * example, if you have a catch-all Page Rule (rule A: `/images/*`) but want a more
-   * specific Page Rule to take precedence (rule B: `/images/special/*`), specify a
-   * higher priority for rule B so it overrides rule A.
-   */
-  priority?: number;
-
-  /**
-   * Body param: The status of the Page Rule.
-   */
-  status?: 'active' | 'disabled';
-
-  /**
-   * Body param: The rule targets to evaluate on each request.
-   */
-  targets?: Array<TargetParam>;
-}
-
-export interface PageruleGetParams {
-  /**
-   * Identifier
-   */
-  zone_id: string;
-}
-
-export namespace Pagerules {
-  export import Settings = SettingsAPI.Settings;
-  export import SettingListResponse = SettingsAPI.SettingListResponse;
-  export import SettingListParams = SettingsAPI.SettingListParams;
-}
diff --git a/src/resources/pagerules/settings.ts b/src/resources/pagerules/settings.ts
deleted file mode 100644
index dea5891eee..0000000000
--- a/src/resources/pagerules/settings.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as SettingsAPI from './settings';
-
-export class Settings extends APIResource {
-  /**
-   * Returns a list of settings (and their details) that Page Rules can apply to
-   * matching requests.
-   */
-  list(params: SettingListParams, options?: Core.RequestOptions): Core.APIPromise<SettingListResponse> {
-    const { zone_id } = params;
-    return (
-      this._client.get(`/zones/${zone_id}/pagerules/settings`, options) as Core.APIPromise<{
-        result: SettingListResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-/**
- * Settings available for the zone.
- */
-export type SettingListResponse = Array<unknown>;
-
-export interface SettingListParams {
-  /**
-   * Identifier
-   */
-  zone_id: string;
-}
-
-export namespace Settings {
-  export import SettingListResponse = SettingsAPI.SettingListResponse;
-  export import SettingListParams = SettingsAPI.SettingListParams;
-}
diff --git a/src/resources/pages/index.ts b/src/resources/pages/index.ts
index 194be95605..2b2862b5c1 100644
--- a/src/resources/pages/index.ts
+++ b/src/resources/pages/index.ts
@@ -1,20 +1,18 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Deployment,
-  Project,
-  Stage,
-  ProjectCreateResponse,
-  ProjectDeleteResponse,
-  ProjectEditResponse,
-  ProjectPurgeBuildCacheResponse,
-  ProjectCreateParams,
-  ProjectListParams,
-  ProjectDeleteParams,
-  ProjectEditParams,
-  ProjectGetParams,
-  ProjectPurgeBuildCacheParams,
   DeploymentsSinglePage,
   Projects,
+  type Deployment,
+  type Project,
+  type Stage,
+  type ProjectDeleteResponse,
+  type ProjectPurgeBuildCacheResponse,
+  type ProjectCreateParams,
+  type ProjectListParams,
+  type ProjectDeleteParams,
+  type ProjectEditParams,
+  type ProjectGetParams,
+  type ProjectPurgeBuildCacheParams,
 } from './projects/index';
 export { Pages } from './pages';
diff --git a/src/resources/pages/pages.ts b/src/resources/pages/pages.ts
index 4e351fdce8..e92779690f 100644
--- a/src/resources/pages/pages.ts
+++ b/src/resources/pages/pages.ts
@@ -2,25 +2,43 @@
 
 import { APIResource } from '../../resource';
 import * as ProjectsAPI from './projects/projects';
+import {
+  Deployment,
+  DeploymentsSinglePage,
+  Project,
+  ProjectCreateParams,
+  ProjectDeleteParams,
+  ProjectDeleteResponse,
+  ProjectEditParams,
+  ProjectGetParams,
+  ProjectListParams,
+  ProjectPurgeBuildCacheParams,
+  ProjectPurgeBuildCacheResponse,
+  Projects,
+  Stage,
+} from './projects/projects';
 
 export class Pages extends APIResource {
   projects: ProjectsAPI.Projects = new ProjectsAPI.Projects(this._client);
 }
 
-export namespace Pages {
-  export import Projects = ProjectsAPI.Projects;
-  export import Deployment = ProjectsAPI.Deployment;
-  export import Project = ProjectsAPI.Project;
-  export import Stage = ProjectsAPI.Stage;
-  export import ProjectCreateResponse = ProjectsAPI.ProjectCreateResponse;
-  export import ProjectDeleteResponse = ProjectsAPI.ProjectDeleteResponse;
-  export import ProjectEditResponse = ProjectsAPI.ProjectEditResponse;
-  export import ProjectPurgeBuildCacheResponse = ProjectsAPI.ProjectPurgeBuildCacheResponse;
-  export import DeploymentsSinglePage = ProjectsAPI.DeploymentsSinglePage;
-  export import ProjectCreateParams = ProjectsAPI.ProjectCreateParams;
-  export import ProjectListParams = ProjectsAPI.ProjectListParams;
-  export import ProjectDeleteParams = ProjectsAPI.ProjectDeleteParams;
-  export import ProjectEditParams = ProjectsAPI.ProjectEditParams;
-  export import ProjectGetParams = ProjectsAPI.ProjectGetParams;
-  export import ProjectPurgeBuildCacheParams = ProjectsAPI.ProjectPurgeBuildCacheParams;
+Pages.Projects = Projects;
+Pages.DeploymentsSinglePage = DeploymentsSinglePage;
+
+export declare namespace Pages {
+  export {
+    Projects as Projects,
+    type Deployment as Deployment,
+    type Project as Project,
+    type Stage as Stage,
+    type ProjectDeleteResponse as ProjectDeleteResponse,
+    type ProjectPurgeBuildCacheResponse as ProjectPurgeBuildCacheResponse,
+    DeploymentsSinglePage as DeploymentsSinglePage,
+    type ProjectCreateParams as ProjectCreateParams,
+    type ProjectListParams as ProjectListParams,
+    type ProjectDeleteParams as ProjectDeleteParams,
+    type ProjectEditParams as ProjectEditParams,
+    type ProjectGetParams as ProjectGetParams,
+    type ProjectPurgeBuildCacheParams as ProjectPurgeBuildCacheParams,
+  };
 }
diff --git a/src/resources/pages/projects/deployments/deployments.ts b/src/resources/pages/projects/deployments/deployments.ts
index fe06366998..6d5c149ff2 100644
--- a/src/resources/pages/projects/deployments/deployments.ts
+++ b/src/resources/pages/projects/deployments/deployments.ts
@@ -2,10 +2,10 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as DeploymentsAPI from './deployments';
 import * as ProjectsAPI from '../projects';
 import { DeploymentsSinglePage } from '../projects';
 import * as HistoryAPI from './history/history';
+import { History } from './history/history';
 
 export class Deployments extends APIResource {
   history: HistoryAPI.History = new HistoryAPI.History(this._client);
@@ -52,12 +52,14 @@ export class Deployments extends APIResource {
     deploymentId: string,
     params: DeploymentDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<unknown> {
+  ): Core.APIPromise<DeploymentDeleteResponse | null> {
     const { account_id } = params;
-    return this._client.delete(
-      `/accounts/${account_id}/pages/projects/${projectName}/deployments/${deploymentId}`,
-      options,
-    );
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/pages/projects/${projectName}/deployments/${deploymentId}`,
+        options,
+      ) as Core.APIPromise<{ result: DeploymentDeleteResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
   }
 
   /**
@@ -181,15 +183,20 @@ export interface DeploymentRollbackParams {
   body: unknown;
 }
 
-export namespace Deployments {
-  export import DeploymentDeleteResponse = DeploymentsAPI.DeploymentDeleteResponse;
-  export import DeploymentCreateParams = DeploymentsAPI.DeploymentCreateParams;
-  export import DeploymentListParams = DeploymentsAPI.DeploymentListParams;
-  export import DeploymentDeleteParams = DeploymentsAPI.DeploymentDeleteParams;
-  export import DeploymentGetParams = DeploymentsAPI.DeploymentGetParams;
-  export import DeploymentRetryParams = DeploymentsAPI.DeploymentRetryParams;
-  export import DeploymentRollbackParams = DeploymentsAPI.DeploymentRollbackParams;
-  export import History = HistoryAPI.History;
+Deployments.History = History;
+
+export declare namespace Deployments {
+  export {
+    type DeploymentDeleteResponse as DeploymentDeleteResponse,
+    type DeploymentCreateParams as DeploymentCreateParams,
+    type DeploymentListParams as DeploymentListParams,
+    type DeploymentDeleteParams as DeploymentDeleteParams,
+    type DeploymentGetParams as DeploymentGetParams,
+    type DeploymentRetryParams as DeploymentRetryParams,
+    type DeploymentRollbackParams as DeploymentRollbackParams,
+  };
+
+  export { History as History };
 }
 
 export { DeploymentsSinglePage };
diff --git a/src/resources/pages/projects/deployments/history/history.ts b/src/resources/pages/projects/deployments/history/history.ts
index e174423465..24977c4ae9 100644
--- a/src/resources/pages/projects/deployments/history/history.ts
+++ b/src/resources/pages/projects/deployments/history/history.ts
@@ -2,13 +2,14 @@
 
 import { APIResource } from '../../../../../resource';
 import * as LogsAPI from './logs';
+import { LogGetParams, LogGetResponse, Logs } from './logs';
 
 export class History extends APIResource {
   logs: LogsAPI.Logs = new LogsAPI.Logs(this._client);
 }
 
-export namespace History {
-  export import Logs = LogsAPI.Logs;
-  export import LogGetResponse = LogsAPI.LogGetResponse;
-  export import LogGetParams = LogsAPI.LogGetParams;
+History.Logs = Logs;
+
+export declare namespace History {
+  export { Logs as Logs, type LogGetResponse as LogGetResponse, type LogGetParams as LogGetParams };
 }
diff --git a/src/resources/pages/projects/deployments/history/index.ts b/src/resources/pages/projects/deployments/history/index.ts
index bf9496576a..a48342acad 100644
--- a/src/resources/pages/projects/deployments/history/index.ts
+++ b/src/resources/pages/projects/deployments/history/index.ts
@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { History } from './history';
-export { LogGetResponse, LogGetParams, Logs } from './logs';
+export { Logs, type LogGetResponse, type LogGetParams } from './logs';
diff --git a/src/resources/pages/projects/deployments/history/logs.ts b/src/resources/pages/projects/deployments/history/logs.ts
index afab8faafc..ef1d33024d 100644
--- a/src/resources/pages/projects/deployments/history/logs.ts
+++ b/src/resources/pages/projects/deployments/history/logs.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../../resource';
 import * as Core from '../../../../../core';
-import * as LogsAPI from './logs';
 
 export class Logs extends APIResource {
   /**
@@ -24,7 +23,21 @@ export class Logs extends APIResource {
   }
 }
 
-export type LogGetResponse = unknown | Array<unknown> | string;
+export interface LogGetResponse {
+  data?: Array<LogGetResponse.Data>;
+
+  includes_container_logs?: boolean;
+
+  total?: number;
+}
+
+export namespace LogGetResponse {
+  export interface Data {
+    line?: string;
+
+    ts?: string;
+  }
+}
 
 export interface LogGetParams {
   /**
@@ -33,7 +46,6 @@ export interface LogGetParams {
   account_id: string;
 }
 
-export namespace Logs {
-  export import LogGetResponse = LogsAPI.LogGetResponse;
-  export import LogGetParams = LogsAPI.LogGetParams;
+export declare namespace Logs {
+  export { type LogGetResponse as LogGetResponse, type LogGetParams as LogGetParams };
 }
diff --git a/src/resources/pages/projects/deployments/index.ts b/src/resources/pages/projects/deployments/index.ts
index 20871897dd..e111d2b387 100644
--- a/src/resources/pages/projects/deployments/index.ts
+++ b/src/resources/pages/projects/deployments/index.ts
@@ -1,13 +1,13 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  DeploymentDeleteResponse,
-  DeploymentCreateParams,
-  DeploymentListParams,
-  DeploymentDeleteParams,
-  DeploymentGetParams,
-  DeploymentRetryParams,
-  DeploymentRollbackParams,
   Deployments,
+  type DeploymentDeleteResponse,
+  type DeploymentCreateParams,
+  type DeploymentListParams,
+  type DeploymentDeleteParams,
+  type DeploymentGetParams,
+  type DeploymentRetryParams,
+  type DeploymentRollbackParams,
 } from './deployments';
 export { History } from './history/index';
diff --git a/src/resources/pages/projects/domains.ts b/src/resources/pages/projects/domains.ts
index f4efe5fc28..ff5377248b 100644
--- a/src/resources/pages/projects/domains.ts
+++ b/src/resources/pages/projects/domains.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as DomainsAPI from './domains';
 import { SinglePage } from '../../../pagination';
 
 export class Domains extends APIResource {
@@ -14,10 +13,10 @@ export class Domains extends APIResource {
     params: DomainCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<DomainCreateResponse | null> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/pages/projects/${projectName}/domains`, {
-        body: body,
+        body,
         ...options,
       }) as Core.APIPromise<{ result: DomainCreateResponse | null }>
     )._thenUnwrap((obj) => obj.result);
@@ -47,12 +46,14 @@ export class Domains extends APIResource {
     domainName: string,
     params: DomainDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<unknown> {
+  ): Core.APIPromise<DomainDeleteResponse | null> {
     const { account_id } = params;
-    return this._client.delete(
-      `/accounts/${account_id}/pages/projects/${projectName}/domains/${domainName}`,
-      options,
-    );
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/pages/projects/${projectName}/domains/${domainName}`,
+        options,
+      ) as Core.APIPromise<{ result: DomainDeleteResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
   }
 
   /**
@@ -94,15 +95,167 @@ export class Domains extends APIResource {
 
 export class DomainListResponsesSinglePage extends SinglePage<DomainListResponse> {}
 
-export type DomainCreateResponse = unknown | Array<unknown> | string;
+export interface DomainCreateResponse {
+  id?: string;
+
+  certificate_authority?: 'google' | 'lets_encrypt';
+
+  created_on?: string;
+
+  domain_id?: string;
+
+  name?: string;
+
+  status?: 'initializing' | 'pending' | 'active' | 'deactivated' | 'blocked' | 'error';
+
+  validation_data?: DomainCreateResponse.ValidationData;
+
+  verification_data?: DomainCreateResponse.VerificationData;
+
+  zone_tag?: string;
+}
+
+export namespace DomainCreateResponse {
+  export interface ValidationData {
+    error_message?: string;
+
+    method?: 'http' | 'txt';
+
+    status?: 'initializing' | 'pending' | 'active' | 'deactivated' | 'error';
+
+    txt_name?: string;
+
+    txt_value?: string;
+  }
+
+  export interface VerificationData {
+    error_message?: string;
+
+    status?: 'pending' | 'active' | 'deactivated' | 'blocked' | 'error';
+  }
+}
+
+export interface DomainListResponse {
+  id?: string;
+
+  certificate_authority?: 'google' | 'lets_encrypt';
+
+  created_on?: string;
+
+  domain_id?: string;
+
+  name?: string;
+
+  status?: 'initializing' | 'pending' | 'active' | 'deactivated' | 'blocked' | 'error';
+
+  validation_data?: DomainListResponse.ValidationData;
+
+  verification_data?: DomainListResponse.VerificationData;
+
+  zone_tag?: string;
+}
+
+export namespace DomainListResponse {
+  export interface ValidationData {
+    error_message?: string;
+
+    method?: 'http' | 'txt';
+
+    status?: 'initializing' | 'pending' | 'active' | 'deactivated' | 'error';
+
+    txt_name?: string;
+
+    txt_value?: string;
+  }
+
+  export interface VerificationData {
+    error_message?: string;
 
-export type DomainListResponse = unknown;
+    status?: 'pending' | 'active' | 'deactivated' | 'blocked' | 'error';
+  }
+}
 
 export type DomainDeleteResponse = unknown;
 
-export type DomainEditResponse = unknown | Array<unknown> | string;
+export interface DomainEditResponse {
+  id?: string;
+
+  certificate_authority?: 'google' | 'lets_encrypt';
+
+  created_on?: string;
+
+  domain_id?: string;
+
+  name?: string;
+
+  status?: 'initializing' | 'pending' | 'active' | 'deactivated' | 'blocked' | 'error';
+
+  validation_data?: DomainEditResponse.ValidationData;
+
+  verification_data?: DomainEditResponse.VerificationData;
+
+  zone_tag?: string;
+}
+
+export namespace DomainEditResponse {
+  export interface ValidationData {
+    error_message?: string;
+
+    method?: 'http' | 'txt';
+
+    status?: 'initializing' | 'pending' | 'active' | 'deactivated' | 'error';
+
+    txt_name?: string;
+
+    txt_value?: string;
+  }
+
+  export interface VerificationData {
+    error_message?: string;
+
+    status?: 'pending' | 'active' | 'deactivated' | 'blocked' | 'error';
+  }
+}
 
-export type DomainGetResponse = unknown | Array<unknown> | string;
+export interface DomainGetResponse {
+  id?: string;
+
+  certificate_authority?: 'google' | 'lets_encrypt';
+
+  created_on?: string;
+
+  domain_id?: string;
+
+  name?: string;
+
+  status?: 'initializing' | 'pending' | 'active' | 'deactivated' | 'blocked' | 'error';
+
+  validation_data?: DomainGetResponse.ValidationData;
+
+  verification_data?: DomainGetResponse.VerificationData;
+
+  zone_tag?: string;
+}
+
+export namespace DomainGetResponse {
+  export interface ValidationData {
+    error_message?: string;
+
+    method?: 'http' | 'txt';
+
+    status?: 'initializing' | 'pending' | 'active' | 'deactivated' | 'error';
+
+    txt_name?: string;
+
+    txt_value?: string;
+  }
+
+  export interface VerificationData {
+    error_message?: string;
+
+    status?: 'pending' | 'active' | 'deactivated' | 'blocked' | 'error';
+  }
+}
 
 export interface DomainCreateParams {
   /**
@@ -113,7 +266,7 @@ export interface DomainCreateParams {
   /**
    * Body param:
    */
-  body: unknown;
+  name?: string;
 }
 
 export interface DomainListParams {
@@ -149,16 +302,20 @@ export interface DomainGetParams {
   account_id: string;
 }
 
-export namespace Domains {
-  export import DomainCreateResponse = DomainsAPI.DomainCreateResponse;
-  export import DomainListResponse = DomainsAPI.DomainListResponse;
-  export import DomainDeleteResponse = DomainsAPI.DomainDeleteResponse;
-  export import DomainEditResponse = DomainsAPI.DomainEditResponse;
-  export import DomainGetResponse = DomainsAPI.DomainGetResponse;
-  export import DomainListResponsesSinglePage = DomainsAPI.DomainListResponsesSinglePage;
-  export import DomainCreateParams = DomainsAPI.DomainCreateParams;
-  export import DomainListParams = DomainsAPI.DomainListParams;
-  export import DomainDeleteParams = DomainsAPI.DomainDeleteParams;
-  export import DomainEditParams = DomainsAPI.DomainEditParams;
-  export import DomainGetParams = DomainsAPI.DomainGetParams;
+Domains.DomainListResponsesSinglePage = DomainListResponsesSinglePage;
+
+export declare namespace Domains {
+  export {
+    type DomainCreateResponse as DomainCreateResponse,
+    type DomainListResponse as DomainListResponse,
+    type DomainDeleteResponse as DomainDeleteResponse,
+    type DomainEditResponse as DomainEditResponse,
+    type DomainGetResponse as DomainGetResponse,
+    DomainListResponsesSinglePage as DomainListResponsesSinglePage,
+    type DomainCreateParams as DomainCreateParams,
+    type DomainListParams as DomainListParams,
+    type DomainDeleteParams as DomainDeleteParams,
+    type DomainEditParams as DomainEditParams,
+    type DomainGetParams as DomainGetParams,
+  };
 }
diff --git a/src/resources/pages/projects/index.ts b/src/resources/pages/projects/index.ts
index b5abbeca7b..a40f121ec5 100644
--- a/src/resources/pages/projects/index.ts
+++ b/src/resources/pages/projects/index.ts
@@ -1,43 +1,41 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Deployment,
-  Project,
-  Stage,
-  ProjectCreateResponse,
-  ProjectDeleteResponse,
-  ProjectEditResponse,
-  ProjectPurgeBuildCacheResponse,
-  ProjectCreateParams,
-  ProjectListParams,
-  ProjectDeleteParams,
-  ProjectEditParams,
-  ProjectGetParams,
-  ProjectPurgeBuildCacheParams,
+  Deployments,
+  type DeploymentDeleteResponse,
+  type DeploymentCreateParams,
+  type DeploymentListParams,
+  type DeploymentDeleteParams,
+  type DeploymentGetParams,
+  type DeploymentRetryParams,
+  type DeploymentRollbackParams,
+} from './deployments/index';
+export {
   DeploymentsSinglePage,
   Projects,
+  type Deployment,
+  type Project,
+  type Stage,
+  type ProjectDeleteResponse,
+  type ProjectPurgeBuildCacheResponse,
+  type ProjectCreateParams,
+  type ProjectListParams,
+  type ProjectDeleteParams,
+  type ProjectEditParams,
+  type ProjectGetParams,
+  type ProjectPurgeBuildCacheParams,
 } from './projects';
 export {
-  DeploymentDeleteResponse,
-  DeploymentCreateParams,
-  DeploymentListParams,
-  DeploymentDeleteParams,
-  DeploymentGetParams,
-  DeploymentRetryParams,
-  DeploymentRollbackParams,
-  Deployments,
-} from './deployments/index';
-export {
-  DomainCreateResponse,
-  DomainListResponse,
-  DomainDeleteResponse,
-  DomainEditResponse,
-  DomainGetResponse,
-  DomainCreateParams,
-  DomainListParams,
-  DomainDeleteParams,
-  DomainEditParams,
-  DomainGetParams,
   DomainListResponsesSinglePage,
   Domains,
+  type DomainCreateResponse,
+  type DomainListResponse,
+  type DomainDeleteResponse,
+  type DomainEditResponse,
+  type DomainGetResponse,
+  type DomainCreateParams,
+  type DomainListParams,
+  type DomainDeleteParams,
+  type DomainEditParams,
+  type DomainGetParams,
 } from './domains';
diff --git a/src/resources/pages/projects/projects.ts b/src/resources/pages/projects/projects.ts
index 7c3ac064d6..d4c4cb02ae 100644
--- a/src/resources/pages/projects/projects.ts
+++ b/src/resources/pages/projects/projects.ts
@@ -2,9 +2,32 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ProjectsAPI from './projects';
 import * as DomainsAPI from './domains';
+import {
+  DomainCreateParams,
+  DomainCreateResponse,
+  DomainDeleteParams,
+  DomainDeleteResponse,
+  DomainEditParams,
+  DomainEditResponse,
+  DomainGetParams,
+  DomainGetResponse,
+  DomainListParams,
+  DomainListResponse,
+  DomainListResponsesSinglePage,
+  Domains,
+} from './domains';
 import * as DeploymentsAPI from './deployments/deployments';
+import {
+  DeploymentCreateParams,
+  DeploymentDeleteParams,
+  DeploymentDeleteResponse,
+  DeploymentGetParams,
+  DeploymentListParams,
+  DeploymentRetryParams,
+  DeploymentRollbackParams,
+  Deployments,
+} from './deployments/deployments';
 import { SinglePage } from '../../../pagination';
 
 export class Projects extends APIResource {
@@ -14,11 +37,11 @@ export class Projects extends APIResource {
   /**
    * Create a new project.
    */
-  create(params: ProjectCreateParams, options?: Core.RequestOptions): Core.APIPromise<ProjectCreateResponse> {
+  create(params: ProjectCreateParams, options?: Core.RequestOptions): Core.APIPromise<Project> {
     const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/pages/projects`, { body, ...options }) as Core.APIPromise<{
-        result: ProjectCreateResponse;
+        result: Project;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -41,9 +64,14 @@ export class Projects extends APIResource {
     projectName: string,
     params: ProjectDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<unknown> {
+  ): Core.APIPromise<ProjectDeleteResponse | null> {
     const { account_id } = params;
-    return this._client.delete(`/accounts/${account_id}/pages/projects/${projectName}`, options);
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/pages/projects/${projectName}`,
+        options,
+      ) as Core.APIPromise<{ result: ProjectDeleteResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
   }
 
   /**
@@ -54,13 +82,13 @@ export class Projects extends APIResource {
     projectName: string,
     params: ProjectEditParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ProjectEditResponse> {
-    const { account_id, body } = params;
+  ): Core.APIPromise<Project> {
+    const { account_id, ...body } = params;
     return (
       this._client.patch(`/accounts/${account_id}/pages/projects/${projectName}`, {
-        body: body,
+        body,
         ...options,
-      }) as Core.APIPromise<{ result: ProjectEditResponse }>
+      }) as Core.APIPromise<{ result: Project }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -87,12 +115,14 @@ export class Projects extends APIResource {
     projectName: string,
     params: ProjectPurgeBuildCacheParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<unknown> {
+  ): Core.APIPromise<ProjectPurgeBuildCacheResponse | null> {
     const { account_id } = params;
-    return this._client.post(
-      `/accounts/${account_id}/pages/projects/${projectName}/purge_build_cache`,
-      options,
-    );
+    return (
+      this._client.post(
+        `/accounts/${account_id}/pages/projects/${projectName}/purge_build_cache`,
+        options,
+      ) as Core.APIPromise<{ result: ProjectPurgeBuildCacheResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
   }
 }
 
@@ -107,9 +137,12 @@ export interface Deployment {
   /**
    * A list of alias URLs pointing to this deployment.
    */
-  aliases?: Array<unknown> | null;
+  aliases?: Array<string> | null;
 
-  build_config?: unknown;
+  /**
+   * Configs for the project build process.
+   */
+  build_config?: Deployment.BuildConfig;
 
   /**
    * When the deployment was created.
@@ -124,7 +157,7 @@ export interface Deployment {
   /**
    * A dict of env variables to build this deploy.
    */
-  env_vars?: unknown;
+  env_vars?: Record<string, Deployment.EnvVars | null>;
 
   /**
    * Type of deploy.
@@ -136,7 +169,10 @@ export interface Deployment {
    */
   is_skipped?: boolean;
 
-  latest_stage?: unknown;
+  /**
+   * The status of the deployment.
+   */
+  latest_stage?: Stage;
 
   /**
    * When the deployment was last modified.
@@ -158,7 +194,7 @@ export interface Deployment {
    */
   short_id?: string;
 
-  source?: unknown;
+  source?: Deployment.Source;
 
   /**
    * List of past stages.
@@ -172,6 +208,41 @@ export interface Deployment {
 }
 
 export namespace Deployment {
+  /**
+   * Configs for the project build process.
+   */
+  export interface BuildConfig {
+    /**
+     * Enable build caching for the project.
+     */
+    build_caching?: boolean | null;
+
+    /**
+     * Command used to build project.
+     */
+    build_command?: string | null;
+
+    /**
+     * Output directory of the build.
+     */
+    destination_dir?: string | null;
+
+    /**
+     * Directory to run the command.
+     */
+    root_dir?: string | null;
+
+    /**
+     * The classifying tag for analytics.
+     */
+    web_analytics_tag?: string | null;
+
+    /**
+     * The auth token for analytics.
+     */
+    web_analytics_token?: string | null;
+  }
+
   /**
    * Info about what caused the deployment.
    */
@@ -208,9 +279,54 @@ export namespace Deployment {
       commit_message?: string;
     }
   }
-}
 
-export interface DeploymentParam {}
+  /**
+   * Environment variable.
+   */
+  export interface EnvVars {
+    /**
+     * Environment variable value.
+     */
+    value: string;
+
+    /**
+     * The type of environment variable.
+     */
+    type?: string;
+  }
+
+  export interface Source {
+    config?: Source.Config;
+
+    type?: string;
+  }
+
+  export namespace Source {
+    export interface Config {
+      deployments_enabled?: boolean;
+
+      owner?: string;
+
+      path_excludes?: Array<string>;
+
+      path_includes?: Array<string>;
+
+      pr_comments_enabled?: boolean;
+
+      preview_branch_excludes?: Array<string>;
+
+      preview_branch_includes?: Array<string>;
+
+      preview_deployment_setting?: 'all' | 'none' | 'custom';
+
+      production_branch?: string;
+
+      production_deployments_enabled?: boolean;
+
+      repo_name?: string;
+    }
+  }
+}
 
 export interface Project {
   /**
@@ -223,7 +339,10 @@ export interface Project {
    */
   build_config?: Project.BuildConfig;
 
-  canonical_deployment?: Deployment;
+  /**
+   * Most recent deployment to the repo.
+   */
+  canonical_deployment?: Deployment | null;
 
   /**
    * When the project was created.
@@ -238,9 +357,12 @@ export interface Project {
   /**
    * A list of associated custom domains for the project.
    */
-  domains?: Array<unknown>;
+  domains?: Array<string>;
 
-  latest_deployment?: Deployment;
+  /**
+   * Most recent deployment to the repo.
+   */
+  latest_deployment?: Deployment | null;
 
   /**
    * Name of the project.
@@ -252,7 +374,7 @@ export interface Project {
    */
   production_branch?: string;
 
-  source?: unknown;
+  source?: Project.Source;
 
   /**
    * The Cloudflare subdomain associated with the project.
@@ -319,17 +441,17 @@ export namespace Project {
       /**
        * Constellation bindings used for Pages Functions.
        */
-      ai_bindings?: Preview.AIBindings | null;
+      ai_bindings?: Record<string, Preview.AIBindings | null> | null;
 
       /**
        * Analytics Engine bindings used for Pages Functions.
        */
-      analytics_engine_datasets?: Preview.AnalyticsEngineDatasets | null;
+      analytics_engine_datasets?: Record<string, Preview.AnalyticsEngineDatasets | null> | null;
 
       /**
        * Browser bindings used for Pages Functions.
        */
-      browsers?: Preview.Browsers | null;
+      browsers?: Record<string, Preview.Browsers | null> | null;
 
       /**
        * Compatibility date used for Pages Functions.
@@ -339,37 +461,37 @@ export namespace Project {
       /**
        * Compatibility flags used for Pages Functions.
        */
-      compatibility_flags?: Array<unknown>;
+      compatibility_flags?: Array<string>;
 
       /**
        * D1 databases used for Pages Functions.
        */
-      d1_databases?: Preview.D1Databases | null;
+      d1_databases?: Record<string, Preview.D1Databases | null> | null;
 
       /**
        * Durabble Object namespaces used for Pages Functions.
        */
-      durable_object_namespaces?: Preview.DurableObjectNamespaces | null;
+      durable_object_namespaces?: Record<string, Preview.DurableObjectNamespaces | null> | null;
 
       /**
        * Environment variables for build configs.
        */
-      env_vars?: Preview.EnvVars | null;
+      env_vars?: Record<string, Preview.EnvVars | null> | null;
 
       /**
        * Hyperdrive bindings used for Pages Functions.
        */
-      hyperdrive_bindings?: Preview.HyperdriveBindings | null;
+      hyperdrive_bindings?: Record<string, Preview.HyperdriveBindings | null> | null;
 
       /**
        * KV namespaces used for Pages Functions.
        */
-      kv_namespaces?: Preview.KVNamespaces;
+      kv_namespaces?: Record<string, Preview.KVNamespaces | null> | null;
 
       /**
        * mTLS bindings used for Pages Functions.
        */
-      mtls_certificates?: Preview.MTLSCertificates | null;
+      mtls_certificates?: Record<string, Preview.MTLSCertificates | null> | null;
 
       /**
        * Placement setting used for Pages Functions.
@@ -379,205 +501,104 @@ export namespace Project {
       /**
        * Queue Producer bindings used for Pages Functions.
        */
-      queue_producers?: Preview.QueueProducers | null;
+      queue_producers?: Record<string, Preview.QueueProducers | null> | null;
 
       /**
        * R2 buckets used for Pages Functions.
        */
-      r2_buckets?: Preview.R2Buckets | null;
+      r2_buckets?: Record<string, Preview.R2Buckets | null> | null;
 
       /**
        * Services used for Pages Functions.
        */
-      services?: Preview.Services | null;
+      services?: Record<string, Preview.Services | null> | null;
 
       /**
        * Vectorize bindings used for Pages Functions.
        */
-      vectorize_bindings?: Preview.VectorizeBindings | null;
+      vectorize_bindings?: Record<string, Preview.VectorizeBindings | null> | null;
     }
 
     export namespace Preview {
       /**
-       * Constellation bindings used for Pages Functions.
+       * AI binding.
        */
       export interface AIBindings {
-        /**
-         * AI binding.
-         */
-        AI_BINDING?: AIBindings.AIBinding;
-      }
-
-      export namespace AIBindings {
-        /**
-         * AI binding.
-         */
-        export interface AIBinding {
-          project_id?: unknown;
-        }
+        project_id?: string;
       }
 
       /**
-       * Analytics Engine bindings used for Pages Functions.
+       * Analytics Engine binding.
        */
       export interface AnalyticsEngineDatasets {
         /**
-         * Analytics Engine binding.
-         */
-        ANALYTICS_ENGINE_BINDING?: AnalyticsEngineDatasets.AnalyticsEngineBinding;
-      }
-
-      export namespace AnalyticsEngineDatasets {
-        /**
-         * Analytics Engine binding.
+         * Name of the dataset.
          */
-        export interface AnalyticsEngineBinding {
-          /**
-           * Name of the dataset.
-           */
-          dataset?: string;
-        }
+        dataset?: string;
       }
 
       /**
-       * Browser bindings used for Pages Functions.
+       * Browser binding.
        */
-      export interface Browsers {
-        /**
-         * Browser binding.
-         */
-        BROWSER?: unknown;
-      }
+      export interface Browsers {}
 
       /**
-       * D1 databases used for Pages Functions.
+       * D1 binding.
        */
       export interface D1Databases {
         /**
-         * D1 binding.
+         * UUID of the D1 database.
          */
-        D1_BINDING?: D1Databases.D1Binding;
-      }
-
-      export namespace D1Databases {
-        /**
-         * D1 binding.
-         */
-        export interface D1Binding {
-          /**
-           * UUID of the D1 database.
-           */
-          id?: string;
-        }
+        id?: string;
       }
 
       /**
-       * Durabble Object namespaces used for Pages Functions.
+       * Durabble Object binding.
        */
       export interface DurableObjectNamespaces {
         /**
-         * Durabble Object binding.
-         */
-        DO_BINDING?: DurableObjectNamespaces.DoBinding;
-      }
-
-      export namespace DurableObjectNamespaces {
-        /**
-         * Durabble Object binding.
+         * ID of the Durabble Object namespace.
          */
-        export interface DoBinding {
-          /**
-           * ID of the Durabble Object namespace.
-           */
-          namespace_id?: string;
-        }
+        namespace_id?: string;
       }
 
       /**
-       * Environment variables for build configs.
+       * Environment variable.
        */
       export interface EnvVars {
         /**
-         * Environment variable.
+         * Environment variable value.
          */
-        ENVIRONMENT_VARIABLE?: EnvVars.EnvironmentVariable;
-      }
+        value: string;
 
-      export namespace EnvVars {
         /**
-         * Environment variable.
+         * The type of environment variable.
          */
-        export interface EnvironmentVariable {
-          /**
-           * The type of environment variable (plain text or secret)
-           */
-          type?: 'plain_text' | 'secret_text';
-
-          /**
-           * Environment variable value.
-           */
-          value?: string;
-        }
+        type?: 'plain_text' | 'secret_text';
       }
 
       /**
-       * Hyperdrive bindings used for Pages Functions.
+       * Hyperdrive binding.
        */
       export interface HyperdriveBindings {
-        /**
-         * Hyperdrive binding.
-         */
-        HYPERDRIVE?: HyperdriveBindings.Hyperdrive;
-      }
-
-      export namespace HyperdriveBindings {
-        /**
-         * Hyperdrive binding.
-         */
-        export interface Hyperdrive {
-          id?: string;
-        }
+        id?: string;
       }
 
       /**
-       * KV namespaces used for Pages Functions.
+       * KV namespace binding.
        */
       export interface KVNamespaces {
         /**
-         * KV binding.
-         */
-        KV_BINDING?: KVNamespaces.KVBinding;
-      }
-
-      export namespace KVNamespaces {
-        /**
-         * KV binding.
+         * ID of the KV namespace.
          */
-        export interface KVBinding {
-          /**
-           * ID of the KV namespace.
-           */
-          namespace_id?: string;
-        }
+        namespace_id?: string;
       }
 
       /**
-       * mTLS bindings used for Pages Functions.
+       * mTLS binding.
        */
       export interface MTLSCertificates {
-        /**
-         * mTLS binding.
-         */
-        MTLS?: MTLSCertificates.MTLS;
-      }
-
-      export namespace MTLSCertificates {
-        /**
-         * mTLS binding.
-         */
-        export interface MTLS {
-          certificate_id?: string;
-        }
+        certificate_id?: string;
       }
 
       /**
@@ -591,103 +612,55 @@ export namespace Project {
       }
 
       /**
-       * Queue Producer bindings used for Pages Functions.
+       * Queue Producer binding.
        */
       export interface QueueProducers {
         /**
-         * Queue Producer binding.
+         * Name of the Queue.
          */
-        QUEUE_PRODUCER_BINDING?: QueueProducers.QueueProducerBinding;
-      }
-
-      export namespace QueueProducers {
-        /**
-         * Queue Producer binding.
-         */
-        export interface QueueProducerBinding {
-          /**
-           * Name of the Queue.
-           */
-          name?: string;
-        }
+        name?: string;
       }
 
       /**
-       * R2 buckets used for Pages Functions.
+       * R2 binding.
        */
       export interface R2Buckets {
         /**
-         * R2 binding.
+         * Jurisdiction of the R2 bucket.
          */
-        R2_BINDING?: R2Buckets.R2Binding;
-      }
+        jurisdiction?: string | null;
 
-      export namespace R2Buckets {
         /**
-         * R2 binding.
+         * Name of the R2 bucket.
          */
-        export interface R2Binding {
-          /**
-           * Jurisdiction of the R2 bucket.
-           */
-          jurisdiction?: string | null;
-
-          /**
-           * Name of the R2 bucket.
-           */
-          name?: string;
-        }
+        name?: string;
       }
 
       /**
-       * Services used for Pages Functions.
+       * Service binding.
        */
       export interface Services {
         /**
-         * Service binding.
+         * The entrypoint to bind to.
          */
-        SERVICE_BINDING?: Services.ServiceBinding;
-      }
+        entrypoint?: string | null;
 
-      export namespace Services {
         /**
-         * Service binding.
+         * The Service environment.
          */
-        export interface ServiceBinding {
-          /**
-           * The entrypoint to bind to.
-           */
-          entrypoint?: string | null;
-
-          /**
-           * The Service environment.
-           */
-          environment?: string;
+        environment?: string;
 
-          /**
-           * The Service name.
-           */
-          service?: string;
-        }
+        /**
+         * The Service name.
+         */
+        service?: string;
       }
 
       /**
-       * Vectorize bindings used for Pages Functions.
+       * Vectorize binding.
        */
       export interface VectorizeBindings {
-        /**
-         * Vectorize binding.
-         */
-        VECTORIZE?: VectorizeBindings.Vectorize;
-      }
-
-      export namespace VectorizeBindings {
-        /**
-         * Vectorize binding.
-         */
-        export interface Vectorize {
-          index_name?: string;
-        }
+        index_name?: string;
       }
     }
 
@@ -698,17 +671,17 @@ export namespace Project {
       /**
        * Constellation bindings used for Pages Functions.
        */
-      ai_bindings?: Production.AIBindings | null;
+      ai_bindings?: Record<string, Production.AIBindings | null> | null;
 
       /**
        * Analytics Engine bindings used for Pages Functions.
        */
-      analytics_engine_datasets?: Production.AnalyticsEngineDatasets | null;
+      analytics_engine_datasets?: Record<string, Production.AnalyticsEngineDatasets | null> | null;
 
       /**
        * Browser bindings used for Pages Functions.
        */
-      browsers?: Production.Browsers | null;
+      browsers?: Record<string, Production.Browsers | null> | null;
 
       /**
        * Compatibility date used for Pages Functions.
@@ -718,37 +691,37 @@ export namespace Project {
       /**
        * Compatibility flags used for Pages Functions.
        */
-      compatibility_flags?: Array<unknown>;
+      compatibility_flags?: Array<string>;
 
       /**
        * D1 databases used for Pages Functions.
        */
-      d1_databases?: Production.D1Databases | null;
+      d1_databases?: Record<string, Production.D1Databases | null> | null;
 
       /**
        * Durabble Object namespaces used for Pages Functions.
        */
-      durable_object_namespaces?: Production.DurableObjectNamespaces | null;
+      durable_object_namespaces?: Record<string, Production.DurableObjectNamespaces | null> | null;
 
       /**
        * Environment variables for build configs.
        */
-      env_vars?: Production.EnvVars | null;
+      env_vars?: Record<string, Production.EnvVars | null> | null;
 
       /**
        * Hyperdrive bindings used for Pages Functions.
        */
-      hyperdrive_bindings?: Production.HyperdriveBindings | null;
+      hyperdrive_bindings?: Record<string, Production.HyperdriveBindings | null> | null;
 
       /**
        * KV namespaces used for Pages Functions.
        */
-      kv_namespaces?: Production.KVNamespaces;
+      kv_namespaces?: Record<string, Production.KVNamespaces | null> | null;
 
       /**
        * mTLS bindings used for Pages Functions.
        */
-      mtls_certificates?: Production.MTLSCertificates | null;
+      mtls_certificates?: Record<string, Production.MTLSCertificates | null> | null;
 
       /**
        * Placement setting used for Pages Functions.
@@ -758,205 +731,104 @@ export namespace Project {
       /**
        * Queue Producer bindings used for Pages Functions.
        */
-      queue_producers?: Production.QueueProducers | null;
+      queue_producers?: Record<string, Production.QueueProducers | null> | null;
 
       /**
        * R2 buckets used for Pages Functions.
        */
-      r2_buckets?: Production.R2Buckets | null;
+      r2_buckets?: Record<string, Production.R2Buckets | null> | null;
 
       /**
        * Services used for Pages Functions.
        */
-      services?: Production.Services | null;
+      services?: Record<string, Production.Services | null> | null;
 
       /**
        * Vectorize bindings used for Pages Functions.
        */
-      vectorize_bindings?: Production.VectorizeBindings | null;
+      vectorize_bindings?: Record<string, Production.VectorizeBindings | null> | null;
     }
 
     export namespace Production {
       /**
-       * Constellation bindings used for Pages Functions.
+       * AI binding.
        */
       export interface AIBindings {
-        /**
-         * AI binding.
-         */
-        AI_BINDING?: AIBindings.AIBinding;
-      }
-
-      export namespace AIBindings {
-        /**
-         * AI binding.
-         */
-        export interface AIBinding {
-          project_id?: unknown;
-        }
+        project_id?: string;
       }
 
       /**
-       * Analytics Engine bindings used for Pages Functions.
+       * Analytics Engine binding.
        */
       export interface AnalyticsEngineDatasets {
         /**
-         * Analytics Engine binding.
-         */
-        ANALYTICS_ENGINE_BINDING?: AnalyticsEngineDatasets.AnalyticsEngineBinding;
-      }
-
-      export namespace AnalyticsEngineDatasets {
-        /**
-         * Analytics Engine binding.
+         * Name of the dataset.
          */
-        export interface AnalyticsEngineBinding {
-          /**
-           * Name of the dataset.
-           */
-          dataset?: string;
-        }
+        dataset?: string;
       }
 
       /**
-       * Browser bindings used for Pages Functions.
+       * Browser binding.
        */
-      export interface Browsers {
-        /**
-         * Browser binding.
-         */
-        BROWSER?: unknown;
-      }
+      export interface Browsers {}
 
       /**
-       * D1 databases used for Pages Functions.
+       * D1 binding.
        */
       export interface D1Databases {
         /**
-         * D1 binding.
-         */
-        D1_BINDING?: D1Databases.D1Binding;
-      }
-
-      export namespace D1Databases {
-        /**
-         * D1 binding.
+         * UUID of the D1 database.
          */
-        export interface D1Binding {
-          /**
-           * UUID of the D1 database.
-           */
-          id?: string;
-        }
+        id?: string;
       }
 
       /**
-       * Durabble Object namespaces used for Pages Functions.
+       * Durabble Object binding.
        */
       export interface DurableObjectNamespaces {
         /**
-         * Durabble Object binding.
-         */
-        DO_BINDING?: DurableObjectNamespaces.DoBinding;
-      }
-
-      export namespace DurableObjectNamespaces {
-        /**
-         * Durabble Object binding.
+         * ID of the Durabble Object namespace.
          */
-        export interface DoBinding {
-          /**
-           * ID of the Durabble Object namespace.
-           */
-          namespace_id?: string;
-        }
+        namespace_id?: string;
       }
 
       /**
-       * Environment variables for build configs.
+       * Environment variable.
        */
       export interface EnvVars {
         /**
-         * Environment variable.
+         * Environment variable value.
          */
-        ENVIRONMENT_VARIABLE?: EnvVars.EnvironmentVariable;
-      }
+        value: string;
 
-      export namespace EnvVars {
         /**
-         * Environment variable.
+         * The type of environment variable.
          */
-        export interface EnvironmentVariable {
-          /**
-           * The type of environment variable (plain text or secret)
-           */
-          type?: 'plain_text' | 'secret_text';
-
-          /**
-           * Environment variable value.
-           */
-          value?: string;
-        }
+        type?: 'plain_text' | 'secret_text';
       }
 
       /**
-       * Hyperdrive bindings used for Pages Functions.
+       * Hyperdrive binding.
        */
       export interface HyperdriveBindings {
-        /**
-         * Hyperdrive binding.
-         */
-        HYPERDRIVE?: HyperdriveBindings.Hyperdrive;
-      }
-
-      export namespace HyperdriveBindings {
-        /**
-         * Hyperdrive binding.
-         */
-        export interface Hyperdrive {
-          id?: string;
-        }
+        id?: string;
       }
 
       /**
-       * KV namespaces used for Pages Functions.
+       * KV namespace binding.
        */
       export interface KVNamespaces {
         /**
-         * KV binding.
+         * ID of the KV namespace.
          */
-        KV_BINDING?: KVNamespaces.KVBinding;
-      }
-
-      export namespace KVNamespaces {
-        /**
-         * KV binding.
-         */
-        export interface KVBinding {
-          /**
-           * ID of the KV namespace.
-           */
-          namespace_id?: string;
-        }
+        namespace_id?: string;
       }
 
       /**
-       * mTLS bindings used for Pages Functions.
+       * mTLS binding.
        */
       export interface MTLSCertificates {
-        /**
-         * mTLS binding.
-         */
-        MTLS?: MTLSCertificates.MTLS;
-      }
-
-      export namespace MTLSCertificates {
-        /**
-         * mTLS binding.
-         */
-        export interface MTLS {
-          certificate_id?: string;
-        }
+        certificate_id?: string;
       }
 
       /**
@@ -970,104 +842,88 @@ export namespace Project {
       }
 
       /**
-       * Queue Producer bindings used for Pages Functions.
+       * Queue Producer binding.
        */
       export interface QueueProducers {
         /**
-         * Queue Producer binding.
-         */
-        QUEUE_PRODUCER_BINDING?: QueueProducers.QueueProducerBinding;
-      }
-
-      export namespace QueueProducers {
-        /**
-         * Queue Producer binding.
+         * Name of the Queue.
          */
-        export interface QueueProducerBinding {
-          /**
-           * Name of the Queue.
-           */
-          name?: string;
-        }
+        name?: string;
       }
 
       /**
-       * R2 buckets used for Pages Functions.
+       * R2 binding.
        */
       export interface R2Buckets {
         /**
-         * R2 binding.
+         * Jurisdiction of the R2 bucket.
          */
-        R2_BINDING?: R2Buckets.R2Binding;
-      }
+        jurisdiction?: string | null;
 
-      export namespace R2Buckets {
         /**
-         * R2 binding.
+         * Name of the R2 bucket.
          */
-        export interface R2Binding {
-          /**
-           * Jurisdiction of the R2 bucket.
-           */
-          jurisdiction?: string | null;
-
-          /**
-           * Name of the R2 bucket.
-           */
-          name?: string;
-        }
+        name?: string;
       }
 
       /**
-       * Services used for Pages Functions.
+       * Service binding.
        */
       export interface Services {
         /**
-         * Service binding.
+         * The entrypoint to bind to.
          */
-        SERVICE_BINDING?: Services.ServiceBinding;
-      }
+        entrypoint?: string | null;
 
-      export namespace Services {
         /**
-         * Service binding.
+         * The Service environment.
          */
-        export interface ServiceBinding {
-          /**
-           * The entrypoint to bind to.
-           */
-          entrypoint?: string | null;
-
-          /**
-           * The Service environment.
-           */
-          environment?: string;
+        environment?: string;
 
-          /**
-           * The Service name.
-           */
-          service?: string;
-        }
+        /**
+         * The Service name.
+         */
+        service?: string;
       }
 
       /**
-       * Vectorize bindings used for Pages Functions.
+       * Vectorize binding.
        */
       export interface VectorizeBindings {
-        /**
-         * Vectorize binding.
-         */
-        VECTORIZE?: VectorizeBindings.Vectorize;
+        index_name?: string;
       }
+    }
+  }
 
-      export namespace VectorizeBindings {
-        /**
-         * Vectorize binding.
-         */
-        export interface Vectorize {
-          index_name?: string;
-        }
-      }
+  export interface Source {
+    config?: Source.Config;
+
+    type?: string;
+  }
+
+  export namespace Source {
+    export interface Config {
+      deployments_enabled?: boolean;
+
+      owner?: string;
+
+      path_excludes?: Array<string>;
+
+      path_includes?: Array<string>;
+
+      pr_comments_enabled?: boolean;
+
+      preview_branch_excludes?: Array<string>;
+
+      preview_branch_includes?: Array<string>;
+
+      preview_deployment_setting?: 'all' | 'none' | 'custom';
+
+      production_branch?: string;
+
+      production_deployments_enabled?: boolean;
+
+      repo_name?: string;
     }
   }
 }
@@ -1097,22 +953,8 @@ export interface Stage {
   status?: string;
 }
 
-/**
- * The status of the deployment.
- */
-export interface StageParam {
-  /**
-   * The current build stage.
-   */
-  name?: string;
-}
-
-export type ProjectCreateResponse = unknown | Array<unknown> | string;
-
 export type ProjectDeleteResponse = unknown;
 
-export type ProjectEditResponse = unknown | Array<unknown> | string;
-
 export type ProjectPurgeBuildCacheResponse = unknown;
 
 export interface ProjectCreateParams {
@@ -1126,21 +968,11 @@ export interface ProjectCreateParams {
    */
   build_config?: ProjectCreateParams.BuildConfig;
 
-  /**
-   * Body param:
-   */
-  canonical_deployment?: DeploymentParam;
-
   /**
    * Body param: Configs for deployments in a project.
    */
   deployment_configs?: ProjectCreateParams.DeploymentConfigs;
 
-  /**
-   * Body param:
-   */
-  latest_deployment?: DeploymentParam;
-
   /**
    * Body param: Name of the project.
    */
@@ -1212,17 +1044,17 @@ export namespace ProjectCreateParams {
       /**
        * Constellation bindings used for Pages Functions.
        */
-      ai_bindings?: Preview.AIBindings | null;
+      ai_bindings?: Record<string, Preview.AIBindings | null> | null;
 
       /**
        * Analytics Engine bindings used for Pages Functions.
        */
-      analytics_engine_datasets?: Preview.AnalyticsEngineDatasets | null;
+      analytics_engine_datasets?: Record<string, Preview.AnalyticsEngineDatasets | null> | null;
 
       /**
        * Browser bindings used for Pages Functions.
        */
-      browsers?: Preview.Browsers | null;
+      browsers?: Record<string, Preview.Browsers | null> | null;
 
       /**
        * Compatibility date used for Pages Functions.
@@ -1232,37 +1064,37 @@ export namespace ProjectCreateParams {
       /**
        * Compatibility flags used for Pages Functions.
        */
-      compatibility_flags?: Array<unknown>;
+      compatibility_flags?: Array<string>;
 
       /**
        * D1 databases used for Pages Functions.
        */
-      d1_databases?: Preview.D1Databases | null;
+      d1_databases?: Record<string, Preview.D1Databases | null> | null;
 
       /**
        * Durabble Object namespaces used for Pages Functions.
        */
-      durable_object_namespaces?: Preview.DurableObjectNamespaces | null;
+      durable_object_namespaces?: Record<string, Preview.DurableObjectNamespaces | null> | null;
 
       /**
        * Environment variables for build configs.
        */
-      env_vars?: Preview.EnvVars | null;
+      env_vars?: Record<string, Preview.EnvVars | null> | null;
 
       /**
        * Hyperdrive bindings used for Pages Functions.
        */
-      hyperdrive_bindings?: Preview.HyperdriveBindings | null;
+      hyperdrive_bindings?: Record<string, Preview.HyperdriveBindings | null> | null;
 
       /**
        * KV namespaces used for Pages Functions.
        */
-      kv_namespaces?: Preview.KVNamespaces;
+      kv_namespaces?: Record<string, Preview.KVNamespaces | null> | null;
 
       /**
        * mTLS bindings used for Pages Functions.
        */
-      mtls_certificates?: Preview.MTLSCertificates | null;
+      mtls_certificates?: Record<string, Preview.MTLSCertificates | null> | null;
 
       /**
        * Placement setting used for Pages Functions.
@@ -1272,205 +1104,334 @@ export namespace ProjectCreateParams {
       /**
        * Queue Producer bindings used for Pages Functions.
        */
-      queue_producers?: Preview.QueueProducers | null;
+      queue_producers?: Record<string, Preview.QueueProducers | null> | null;
 
       /**
        * R2 buckets used for Pages Functions.
        */
-      r2_buckets?: Preview.R2Buckets | null;
+      r2_buckets?: Record<string, Preview.R2Buckets | null> | null;
 
       /**
        * Services used for Pages Functions.
        */
-      services?: Preview.Services | null;
+      services?: Record<string, Preview.Services | null> | null;
 
       /**
        * Vectorize bindings used for Pages Functions.
        */
-      vectorize_bindings?: Preview.VectorizeBindings | null;
+      vectorize_bindings?: Record<string, Preview.VectorizeBindings | null> | null;
     }
 
     export namespace Preview {
       /**
-       * Constellation bindings used for Pages Functions.
+       * AI binding.
        */
       export interface AIBindings {
-        /**
-         * AI binding.
-         */
-        AI_BINDING?: AIBindings.AIBinding;
-      }
-
-      export namespace AIBindings {
-        /**
-         * AI binding.
-         */
-        export interface AIBinding {
-          project_id?: unknown;
-        }
+        project_id?: string;
       }
 
       /**
-       * Analytics Engine bindings used for Pages Functions.
+       * Analytics Engine binding.
        */
       export interface AnalyticsEngineDatasets {
         /**
-         * Analytics Engine binding.
+         * Name of the dataset.
          */
-        ANALYTICS_ENGINE_BINDING?: AnalyticsEngineDatasets.AnalyticsEngineBinding;
+        dataset?: string;
       }
 
-      export namespace AnalyticsEngineDatasets {
-        /**
-         * Analytics Engine binding.
+      /**
+       * Browser binding.
+       */
+      export interface Browsers {}
+
+      /**
+       * D1 binding.
+       */
+      export interface D1Databases {
+        /**
+         * UUID of the D1 database.
          */
-        export interface AnalyticsEngineBinding {
-          /**
-           * Name of the dataset.
-           */
-          dataset?: string;
-        }
+        id?: string;
       }
 
       /**
-       * Browser bindings used for Pages Functions.
+       * Durabble Object binding.
        */
-      export interface Browsers {
+      export interface DurableObjectNamespaces {
         /**
-         * Browser binding.
+         * ID of the Durabble Object namespace.
          */
-        BROWSER?: unknown;
+        namespace_id?: string;
       }
 
       /**
-       * D1 databases used for Pages Functions.
+       * Environment variable.
        */
-      export interface D1Databases {
+      export interface EnvVars {
         /**
-         * D1 binding.
+         * Environment variable value.
          */
-        D1_BINDING?: D1Databases.D1Binding;
-      }
+        value: string;
 
-      export namespace D1Databases {
         /**
-         * D1 binding.
+         * The type of environment variable.
          */
-        export interface D1Binding {
-          /**
-           * UUID of the D1 database.
-           */
-          id?: string;
-        }
+        type?: 'plain_text' | 'secret_text';
       }
 
       /**
-       * Durabble Object namespaces used for Pages Functions.
+       * Hyperdrive binding.
        */
-      export interface DurableObjectNamespaces {
+      export interface HyperdriveBindings {
+        id?: string;
+      }
+
+      /**
+       * KV namespace binding.
+       */
+      export interface KVNamespaces {
         /**
-         * Durabble Object binding.
+         * ID of the KV namespace.
          */
-        DO_BINDING?: DurableObjectNamespaces.DoBinding;
+        namespace_id?: string;
       }
 
-      export namespace DurableObjectNamespaces {
+      /**
+       * mTLS binding.
+       */
+      export interface MTLSCertificates {
+        certificate_id?: string;
+      }
+
+      /**
+       * Placement setting used for Pages Functions.
+       */
+      export interface Placement {
         /**
-         * Durabble Object binding.
+         * Placement mode.
          */
-        export interface DoBinding {
-          /**
-           * ID of the Durabble Object namespace.
-           */
-          namespace_id?: string;
-        }
+        mode?: string;
       }
 
       /**
-       * Environment variables for build configs.
+       * Queue Producer binding.
        */
-      export interface EnvVars {
+      export interface QueueProducers {
         /**
-         * Environment variable.
+         * Name of the Queue.
          */
-        ENVIRONMENT_VARIABLE?: EnvVars.EnvironmentVariable;
+        name?: string;
       }
 
-      export namespace EnvVars {
+      /**
+       * R2 binding.
+       */
+      export interface R2Buckets {
         /**
-         * Environment variable.
+         * Jurisdiction of the R2 bucket.
          */
-        export interface EnvironmentVariable {
-          /**
-           * The type of environment variable (plain text or secret)
-           */
-          type?: 'plain_text' | 'secret_text';
+        jurisdiction?: string | null;
 
-          /**
-           * Environment variable value.
-           */
-          value?: string;
-        }
+        /**
+         * Name of the R2 bucket.
+         */
+        name?: string;
       }
 
       /**
-       * Hyperdrive bindings used for Pages Functions.
+       * Service binding.
        */
-      export interface HyperdriveBindings {
+      export interface Services {
         /**
-         * Hyperdrive binding.
+         * The entrypoint to bind to.
          */
-        HYPERDRIVE?: HyperdriveBindings.Hyperdrive;
-      }
+        entrypoint?: string | null;
+
+        /**
+         * The Service environment.
+         */
+        environment?: string;
 
-      export namespace HyperdriveBindings {
         /**
-         * Hyperdrive binding.
+         * The Service name.
          */
-        export interface Hyperdrive {
-          id?: string;
-        }
+        service?: string;
       }
 
+      /**
+       * Vectorize binding.
+       */
+      export interface VectorizeBindings {
+        index_name?: string;
+      }
+    }
+
+    /**
+     * Configs for production deploys.
+     */
+    export interface Production {
+      /**
+       * Constellation bindings used for Pages Functions.
+       */
+      ai_bindings?: Record<string, Production.AIBindings | null> | null;
+
+      /**
+       * Analytics Engine bindings used for Pages Functions.
+       */
+      analytics_engine_datasets?: Record<string, Production.AnalyticsEngineDatasets | null> | null;
+
+      /**
+       * Browser bindings used for Pages Functions.
+       */
+      browsers?: Record<string, Production.Browsers | null> | null;
+
+      /**
+       * Compatibility date used for Pages Functions.
+       */
+      compatibility_date?: string;
+
+      /**
+       * Compatibility flags used for Pages Functions.
+       */
+      compatibility_flags?: Array<string>;
+
+      /**
+       * D1 databases used for Pages Functions.
+       */
+      d1_databases?: Record<string, Production.D1Databases | null> | null;
+
+      /**
+       * Durabble Object namespaces used for Pages Functions.
+       */
+      durable_object_namespaces?: Record<string, Production.DurableObjectNamespaces | null> | null;
+
+      /**
+       * Environment variables for build configs.
+       */
+      env_vars?: Record<string, Production.EnvVars | null> | null;
+
+      /**
+       * Hyperdrive bindings used for Pages Functions.
+       */
+      hyperdrive_bindings?: Record<string, Production.HyperdriveBindings | null> | null;
+
       /**
        * KV namespaces used for Pages Functions.
        */
-      export interface KVNamespaces {
+      kv_namespaces?: Record<string, Production.KVNamespaces | null> | null;
+
+      /**
+       * mTLS bindings used for Pages Functions.
+       */
+      mtls_certificates?: Record<string, Production.MTLSCertificates | null> | null;
+
+      /**
+       * Placement setting used for Pages Functions.
+       */
+      placement?: Production.Placement | null;
+
+      /**
+       * Queue Producer bindings used for Pages Functions.
+       */
+      queue_producers?: Record<string, Production.QueueProducers | null> | null;
+
+      /**
+       * R2 buckets used for Pages Functions.
+       */
+      r2_buckets?: Record<string, Production.R2Buckets | null> | null;
+
+      /**
+       * Services used for Pages Functions.
+       */
+      services?: Record<string, Production.Services | null> | null;
+
+      /**
+       * Vectorize bindings used for Pages Functions.
+       */
+      vectorize_bindings?: Record<string, Production.VectorizeBindings | null> | null;
+    }
+
+    export namespace Production {
+      /**
+       * AI binding.
+       */
+      export interface AIBindings {
+        project_id?: string;
+      }
+
+      /**
+       * Analytics Engine binding.
+       */
+      export interface AnalyticsEngineDatasets {
         /**
-         * KV binding.
+         * Name of the dataset.
          */
-        KV_BINDING?: KVNamespaces.KVBinding;
+        dataset?: string;
       }
 
-      export namespace KVNamespaces {
+      /**
+       * Browser binding.
+       */
+      export interface Browsers {}
+
+      /**
+       * D1 binding.
+       */
+      export interface D1Databases {
         /**
-         * KV binding.
+         * UUID of the D1 database.
          */
-        export interface KVBinding {
-          /**
-           * ID of the KV namespace.
-           */
-          namespace_id?: string;
-        }
+        id?: string;
       }
 
       /**
-       * mTLS bindings used for Pages Functions.
+       * Durabble Object binding.
        */
-      export interface MTLSCertificates {
+      export interface DurableObjectNamespaces {
         /**
-         * mTLS binding.
+         * ID of the Durabble Object namespace.
          */
-        MTLS?: MTLSCertificates.MTLS;
+        namespace_id?: string;
       }
 
-      export namespace MTLSCertificates {
+      /**
+       * Environment variable.
+       */
+      export interface EnvVars {
+        /**
+         * Environment variable value.
+         */
+        value: string;
+
         /**
-         * mTLS binding.
+         * The type of environment variable.
          */
-        export interface MTLS {
-          certificate_id?: string;
-        }
+        type?: 'plain_text' | 'secret_text';
+      }
+
+      /**
+       * Hyperdrive binding.
+       */
+      export interface HyperdriveBindings {
+        id?: string;
+      }
+
+      /**
+       * KV namespace binding.
+       */
+      export interface KVNamespaces {
+        /**
+         * ID of the KV namespace.
+         */
+        namespace_id?: string;
+      }
+
+      /**
+       * mTLS binding.
+       */
+      export interface MTLSCertificates {
+        certificate_id?: string;
       }
 
       /**
@@ -1484,124 +1445,172 @@ export namespace ProjectCreateParams {
       }
 
       /**
-       * Queue Producer bindings used for Pages Functions.
+       * Queue Producer binding.
        */
       export interface QueueProducers {
         /**
-         * Queue Producer binding.
+         * Name of the Queue.
          */
-        QUEUE_PRODUCER_BINDING?: QueueProducers.QueueProducerBinding;
-      }
-
-      export namespace QueueProducers {
-        /**
-         * Queue Producer binding.
-         */
-        export interface QueueProducerBinding {
-          /**
-           * Name of the Queue.
-           */
-          name?: string;
-        }
+        name?: string;
       }
 
       /**
-       * R2 buckets used for Pages Functions.
+       * R2 binding.
        */
       export interface R2Buckets {
         /**
-         * R2 binding.
+         * Jurisdiction of the R2 bucket.
          */
-        R2_BINDING?: R2Buckets.R2Binding;
-      }
+        jurisdiction?: string | null;
 
-      export namespace R2Buckets {
         /**
-         * R2 binding.
+         * Name of the R2 bucket.
          */
-        export interface R2Binding {
-          /**
-           * Jurisdiction of the R2 bucket.
-           */
-          jurisdiction?: string | null;
-
-          /**
-           * Name of the R2 bucket.
-           */
-          name?: string;
-        }
+        name?: string;
       }
 
       /**
-       * Services used for Pages Functions.
+       * Service binding.
        */
       export interface Services {
         /**
-         * Service binding.
+         * The entrypoint to bind to.
          */
-        SERVICE_BINDING?: Services.ServiceBinding;
-      }
+        entrypoint?: string | null;
 
-      export namespace Services {
         /**
-         * Service binding.
+         * The Service environment.
          */
-        export interface ServiceBinding {
-          /**
-           * The entrypoint to bind to.
-           */
-          entrypoint?: string | null;
+        environment?: string;
 
-          /**
-           * The Service environment.
-           */
-          environment?: string;
-
-          /**
-           * The Service name.
-           */
-          service?: string;
-        }
+        /**
+         * The Service name.
+         */
+        service?: string;
       }
 
       /**
-       * Vectorize bindings used for Pages Functions.
+       * Vectorize binding.
        */
       export interface VectorizeBindings {
-        /**
-         * Vectorize binding.
-         */
-        VECTORIZE?: VectorizeBindings.Vectorize;
-      }
-
-      export namespace VectorizeBindings {
-        /**
-         * Vectorize binding.
-         */
-        export interface Vectorize {
-          index_name?: string;
-        }
+        index_name?: string;
       }
     }
+  }
+}
+
+export interface ProjectListParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface ProjectDeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface ProjectEditParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: Configs for the project build process.
+   */
+  build_config?: ProjectEditParams.BuildConfig;
+
+  /**
+   * Body param: Configs for deployments in a project.
+   */
+  deployment_configs?: ProjectEditParams.DeploymentConfigs;
+
+  /**
+   * Body param: Name of the project.
+   */
+  name?: string;
+
+  /**
+   * Body param: Production branch of the project. Used to identify production
+   * deployments.
+   */
+  production_branch?: string;
+}
+
+export namespace ProjectEditParams {
+  /**
+   * Configs for the project build process.
+   */
+  export interface BuildConfig {
+    /**
+     * Enable build caching for the project.
+     */
+    build_caching?: boolean | null;
+
+    /**
+     * Command used to build project.
+     */
+    build_command?: string | null;
+
+    /**
+     * Output directory of the build.
+     */
+    destination_dir?: string | null;
+
+    /**
+     * Directory to run the command.
+     */
+    root_dir?: string | null;
+
+    /**
+     * The classifying tag for analytics.
+     */
+    web_analytics_tag?: string | null;
+
+    /**
+     * The auth token for analytics.
+     */
+    web_analytics_token?: string | null;
+  }
+
+  /**
+   * Configs for deployments in a project.
+   */
+  export interface DeploymentConfigs {
+    /**
+     * Configs for preview deploys.
+     */
+    preview?: DeploymentConfigs.Preview;
 
     /**
      * Configs for production deploys.
      */
-    export interface Production {
+    production?: DeploymentConfigs.Production;
+  }
+
+  export namespace DeploymentConfigs {
+    /**
+     * Configs for preview deploys.
+     */
+    export interface Preview {
       /**
        * Constellation bindings used for Pages Functions.
        */
-      ai_bindings?: Production.AIBindings | null;
+      ai_bindings?: Record<string, Preview.AIBindings | null> | null;
 
       /**
        * Analytics Engine bindings used for Pages Functions.
        */
-      analytics_engine_datasets?: Production.AnalyticsEngineDatasets | null;
+      analytics_engine_datasets?: Record<string, Preview.AnalyticsEngineDatasets | null> | null;
 
       /**
        * Browser bindings used for Pages Functions.
        */
-      browsers?: Production.Browsers | null;
+      browsers?: Record<string, Preview.Browsers | null> | null;
 
       /**
        * Compatibility date used for Pages Functions.
@@ -1611,245 +1620,374 @@ export namespace ProjectCreateParams {
       /**
        * Compatibility flags used for Pages Functions.
        */
-      compatibility_flags?: Array<unknown>;
+      compatibility_flags?: Array<string>;
 
       /**
        * D1 databases used for Pages Functions.
        */
-      d1_databases?: Production.D1Databases | null;
+      d1_databases?: Record<string, Preview.D1Databases | null> | null;
 
       /**
        * Durabble Object namespaces used for Pages Functions.
        */
-      durable_object_namespaces?: Production.DurableObjectNamespaces | null;
+      durable_object_namespaces?: Record<string, Preview.DurableObjectNamespaces | null> | null;
 
       /**
        * Environment variables for build configs.
        */
-      env_vars?: Production.EnvVars | null;
+      env_vars?: Record<string, Preview.EnvVars | null> | null;
 
       /**
        * Hyperdrive bindings used for Pages Functions.
        */
-      hyperdrive_bindings?: Production.HyperdriveBindings | null;
+      hyperdrive_bindings?: Record<string, Preview.HyperdriveBindings | null> | null;
 
       /**
        * KV namespaces used for Pages Functions.
        */
-      kv_namespaces?: Production.KVNamespaces;
+      kv_namespaces?: Record<string, Preview.KVNamespaces | null> | null;
 
       /**
        * mTLS bindings used for Pages Functions.
        */
-      mtls_certificates?: Production.MTLSCertificates | null;
+      mtls_certificates?: Record<string, Preview.MTLSCertificates | null> | null;
 
       /**
        * Placement setting used for Pages Functions.
        */
-      placement?: Production.Placement | null;
+      placement?: Preview.Placement | null;
 
       /**
        * Queue Producer bindings used for Pages Functions.
        */
-      queue_producers?: Production.QueueProducers | null;
+      queue_producers?: Record<string, Preview.QueueProducers | null> | null;
 
       /**
        * R2 buckets used for Pages Functions.
        */
-      r2_buckets?: Production.R2Buckets | null;
+      r2_buckets?: Record<string, Preview.R2Buckets | null> | null;
 
       /**
        * Services used for Pages Functions.
        */
-      services?: Production.Services | null;
+      services?: Record<string, Preview.Services | null> | null;
 
       /**
        * Vectorize bindings used for Pages Functions.
        */
-      vectorize_bindings?: Production.VectorizeBindings | null;
+      vectorize_bindings?: Record<string, Preview.VectorizeBindings | null> | null;
     }
 
-    export namespace Production {
+    export namespace Preview {
       /**
-       * Constellation bindings used for Pages Functions.
+       * AI binding.
        */
       export interface AIBindings {
+        project_id?: string;
+      }
+
+      /**
+       * Analytics Engine binding.
+       */
+      export interface AnalyticsEngineDatasets {
         /**
-         * AI binding.
+         * Name of the dataset.
          */
-        AI_BINDING?: AIBindings.AIBinding;
+        dataset?: string;
       }
 
-      export namespace AIBindings {
+      /**
+       * Browser binding.
+       */
+      export interface Browsers {}
+
+      /**
+       * D1 binding.
+       */
+      export interface D1Databases {
         /**
-         * AI binding.
+         * UUID of the D1 database.
          */
-        export interface AIBinding {
-          project_id?: unknown;
-        }
+        id?: string;
       }
 
       /**
-       * Analytics Engine bindings used for Pages Functions.
+       * Durabble Object binding.
        */
-      export interface AnalyticsEngineDatasets {
+      export interface DurableObjectNamespaces {
         /**
-         * Analytics Engine binding.
+         * ID of the Durabble Object namespace.
          */
-        ANALYTICS_ENGINE_BINDING?: AnalyticsEngineDatasets.AnalyticsEngineBinding;
+        namespace_id?: string;
       }
 
-      export namespace AnalyticsEngineDatasets {
+      /**
+       * Environment variable.
+       */
+      export interface EnvVars {
         /**
-         * Analytics Engine binding.
+         * Environment variable value.
          */
-        export interface AnalyticsEngineBinding {
-          /**
-           * Name of the dataset.
-           */
-          dataset?: string;
-        }
+        value: string;
+
+        /**
+         * The type of environment variable.
+         */
+        type?: 'plain_text' | 'secret_text';
       }
 
       /**
-       * Browser bindings used for Pages Functions.
+       * Hyperdrive binding.
        */
-      export interface Browsers {
+      export interface HyperdriveBindings {
+        id?: string;
+      }
+
+      /**
+       * KV namespace binding.
+       */
+      export interface KVNamespaces {
         /**
-         * Browser binding.
+         * ID of the KV namespace.
          */
-        BROWSER?: unknown;
+        namespace_id?: string;
       }
 
       /**
-       * D1 databases used for Pages Functions.
+       * mTLS binding.
        */
-      export interface D1Databases {
+      export interface MTLSCertificates {
+        certificate_id?: string;
+      }
+
+      /**
+       * Placement setting used for Pages Functions.
+       */
+      export interface Placement {
         /**
-         * D1 binding.
+         * Placement mode.
          */
-        D1_BINDING?: D1Databases.D1Binding;
+        mode?: string;
       }
 
-      export namespace D1Databases {
+      /**
+       * Queue Producer binding.
+       */
+      export interface QueueProducers {
         /**
-         * D1 binding.
+         * Name of the Queue.
          */
-        export interface D1Binding {
-          /**
-           * UUID of the D1 database.
-           */
-          id?: string;
-        }
+        name?: string;
       }
 
       /**
-       * Durabble Object namespaces used for Pages Functions.
+       * R2 binding.
        */
-      export interface DurableObjectNamespaces {
+      export interface R2Buckets {
         /**
-         * Durabble Object binding.
+         * Jurisdiction of the R2 bucket.
          */
-        DO_BINDING?: DurableObjectNamespaces.DoBinding;
-      }
+        jurisdiction?: string | null;
 
-      export namespace DurableObjectNamespaces {
         /**
-         * Durabble Object binding.
+         * Name of the R2 bucket.
          */
-        export interface DoBinding {
-          /**
-           * ID of the Durabble Object namespace.
-           */
-          namespace_id?: string;
-        }
+        name?: string;
       }
 
       /**
-       * Environment variables for build configs.
+       * Service binding.
        */
-      export interface EnvVars {
+      export interface Services {
         /**
-         * Environment variable.
+         * The entrypoint to bind to.
          */
-        ENVIRONMENT_VARIABLE?: EnvVars.EnvironmentVariable;
-      }
+        entrypoint?: string | null;
 
-      export namespace EnvVars {
         /**
-         * Environment variable.
+         * The Service environment.
          */
-        export interface EnvironmentVariable {
-          /**
-           * The type of environment variable (plain text or secret)
-           */
-          type?: 'plain_text' | 'secret_text';
+        environment?: string;
 
-          /**
-           * Environment variable value.
-           */
-          value?: string;
-        }
+        /**
+         * The Service name.
+         */
+        service?: string;
       }
 
+      /**
+       * Vectorize binding.
+       */
+      export interface VectorizeBindings {
+        index_name?: string;
+      }
+    }
+
+    /**
+     * Configs for production deploys.
+     */
+    export interface Production {
+      /**
+       * Constellation bindings used for Pages Functions.
+       */
+      ai_bindings?: Record<string, Production.AIBindings | null> | null;
+
+      /**
+       * Analytics Engine bindings used for Pages Functions.
+       */
+      analytics_engine_datasets?: Record<string, Production.AnalyticsEngineDatasets | null> | null;
+
+      /**
+       * Browser bindings used for Pages Functions.
+       */
+      browsers?: Record<string, Production.Browsers | null> | null;
+
+      /**
+       * Compatibility date used for Pages Functions.
+       */
+      compatibility_date?: string;
+
+      /**
+       * Compatibility flags used for Pages Functions.
+       */
+      compatibility_flags?: Array<string>;
+
+      /**
+       * D1 databases used for Pages Functions.
+       */
+      d1_databases?: Record<string, Production.D1Databases | null> | null;
+
+      /**
+       * Durabble Object namespaces used for Pages Functions.
+       */
+      durable_object_namespaces?: Record<string, Production.DurableObjectNamespaces | null> | null;
+
+      /**
+       * Environment variables for build configs.
+       */
+      env_vars?: Record<string, Production.EnvVars | null> | null;
+
       /**
        * Hyperdrive bindings used for Pages Functions.
        */
-      export interface HyperdriveBindings {
-        /**
-         * Hyperdrive binding.
-         */
-        HYPERDRIVE?: HyperdriveBindings.Hyperdrive;
+      hyperdrive_bindings?: Record<string, Production.HyperdriveBindings | null> | null;
+
+      /**
+       * KV namespaces used for Pages Functions.
+       */
+      kv_namespaces?: Record<string, Production.KVNamespaces | null> | null;
+
+      /**
+       * mTLS bindings used for Pages Functions.
+       */
+      mtls_certificates?: Record<string, Production.MTLSCertificates | null> | null;
+
+      /**
+       * Placement setting used for Pages Functions.
+       */
+      placement?: Production.Placement | null;
+
+      /**
+       * Queue Producer bindings used for Pages Functions.
+       */
+      queue_producers?: Record<string, Production.QueueProducers | null> | null;
+
+      /**
+       * R2 buckets used for Pages Functions.
+       */
+      r2_buckets?: Record<string, Production.R2Buckets | null> | null;
+
+      /**
+       * Services used for Pages Functions.
+       */
+      services?: Record<string, Production.Services | null> | null;
+
+      /**
+       * Vectorize bindings used for Pages Functions.
+       */
+      vectorize_bindings?: Record<string, Production.VectorizeBindings | null> | null;
+    }
+
+    export namespace Production {
+      /**
+       * AI binding.
+       */
+      export interface AIBindings {
+        project_id?: string;
       }
 
-      export namespace HyperdriveBindings {
+      /**
+       * Analytics Engine binding.
+       */
+      export interface AnalyticsEngineDatasets {
         /**
-         * Hyperdrive binding.
+         * Name of the dataset.
          */
-        export interface Hyperdrive {
-          id?: string;
-        }
+        dataset?: string;
       }
 
       /**
-       * KV namespaces used for Pages Functions.
+       * Browser binding.
        */
-      export interface KVNamespaces {
+      export interface Browsers {}
+
+      /**
+       * D1 binding.
+       */
+      export interface D1Databases {
         /**
-         * KV binding.
+         * UUID of the D1 database.
          */
-        KV_BINDING?: KVNamespaces.KVBinding;
+        id?: string;
       }
 
-      export namespace KVNamespaces {
+      /**
+       * Durabble Object binding.
+       */
+      export interface DurableObjectNamespaces {
         /**
-         * KV binding.
+         * ID of the Durabble Object namespace.
          */
-        export interface KVBinding {
-          /**
-           * ID of the KV namespace.
-           */
-          namespace_id?: string;
-        }
+        namespace_id?: string;
       }
 
       /**
-       * mTLS bindings used for Pages Functions.
+       * Environment variable.
        */
-      export interface MTLSCertificates {
+      export interface EnvVars {
+        /**
+         * Environment variable value.
+         */
+        value: string;
+
         /**
-         * mTLS binding.
+         * The type of environment variable.
          */
-        MTLS?: MTLSCertificates.MTLS;
+        type?: 'plain_text' | 'secret_text';
+      }
+
+      /**
+       * Hyperdrive binding.
+       */
+      export interface HyperdriveBindings {
+        id?: string;
       }
 
-      export namespace MTLSCertificates {
+      /**
+       * KV namespace binding.
+       */
+      export interface KVNamespaces {
         /**
-         * mTLS binding.
+         * ID of the KV namespace.
          */
-        export interface MTLS {
-          certificate_id?: string;
-        }
+        namespace_id?: string;
+      }
+
+      /**
+       * mTLS binding.
+       */
+      export interface MTLSCertificates {
+        certificate_id?: string;
       }
 
       /**
@@ -1863,134 +2001,60 @@ export namespace ProjectCreateParams {
       }
 
       /**
-       * Queue Producer bindings used for Pages Functions.
+       * Queue Producer binding.
        */
       export interface QueueProducers {
         /**
-         * Queue Producer binding.
-         */
-        QUEUE_PRODUCER_BINDING?: QueueProducers.QueueProducerBinding;
-      }
-
-      export namespace QueueProducers {
-        /**
-         * Queue Producer binding.
+         * Name of the Queue.
          */
-        export interface QueueProducerBinding {
-          /**
-           * Name of the Queue.
-           */
-          name?: string;
-        }
+        name?: string;
       }
 
       /**
-       * R2 buckets used for Pages Functions.
+       * R2 binding.
        */
       export interface R2Buckets {
         /**
-         * R2 binding.
+         * Jurisdiction of the R2 bucket.
          */
-        R2_BINDING?: R2Buckets.R2Binding;
-      }
+        jurisdiction?: string | null;
 
-      export namespace R2Buckets {
         /**
-         * R2 binding.
+         * Name of the R2 bucket.
          */
-        export interface R2Binding {
-          /**
-           * Jurisdiction of the R2 bucket.
-           */
-          jurisdiction?: string | null;
-
-          /**
-           * Name of the R2 bucket.
-           */
-          name?: string;
-        }
+        name?: string;
       }
 
       /**
-       * Services used for Pages Functions.
+       * Service binding.
        */
       export interface Services {
         /**
-         * Service binding.
+         * The entrypoint to bind to.
          */
-        SERVICE_BINDING?: Services.ServiceBinding;
-      }
+        entrypoint?: string | null;
 
-      export namespace Services {
         /**
-         * Service binding.
+         * The Service environment.
          */
-        export interface ServiceBinding {
-          /**
-           * The entrypoint to bind to.
-           */
-          entrypoint?: string | null;
-
-          /**
-           * The Service environment.
-           */
-          environment?: string;
+        environment?: string;
 
-          /**
-           * The Service name.
-           */
-          service?: string;
-        }
+        /**
+         * The Service name.
+         */
+        service?: string;
       }
 
       /**
-       * Vectorize bindings used for Pages Functions.
+       * Vectorize binding.
        */
       export interface VectorizeBindings {
-        /**
-         * Vectorize binding.
-         */
-        VECTORIZE?: VectorizeBindings.Vectorize;
-      }
-
-      export namespace VectorizeBindings {
-        /**
-         * Vectorize binding.
-         */
-        export interface Vectorize {
-          index_name?: string;
-        }
+        index_name?: string;
       }
     }
   }
 }
 
-export interface ProjectListParams {
-  /**
-   * Identifier
-   */
-  account_id: string;
-}
-
-export interface ProjectDeleteParams {
-  /**
-   * Identifier
-   */
-  account_id: string;
-}
-
-export interface ProjectEditParams {
-  /**
-   * Path param: Identifier
-   */
-  account_id: string;
-
-  /**
-   * Body param:
-   */
-  body: unknown;
-}
-
 export interface ProjectGetParams {
   /**
    * Identifier
@@ -2005,39 +2069,50 @@ export interface ProjectPurgeBuildCacheParams {
   account_id: string;
 }
 
-export namespace Projects {
-  export import Deployment = ProjectsAPI.Deployment;
-  export import Project = ProjectsAPI.Project;
-  export import Stage = ProjectsAPI.Stage;
-  export import ProjectCreateResponse = ProjectsAPI.ProjectCreateResponse;
-  export import ProjectDeleteResponse = ProjectsAPI.ProjectDeleteResponse;
-  export import ProjectEditResponse = ProjectsAPI.ProjectEditResponse;
-  export import ProjectPurgeBuildCacheResponse = ProjectsAPI.ProjectPurgeBuildCacheResponse;
-  export import DeploymentsSinglePage = ProjectsAPI.DeploymentsSinglePage;
-  export import ProjectCreateParams = ProjectsAPI.ProjectCreateParams;
-  export import ProjectListParams = ProjectsAPI.ProjectListParams;
-  export import ProjectDeleteParams = ProjectsAPI.ProjectDeleteParams;
-  export import ProjectEditParams = ProjectsAPI.ProjectEditParams;
-  export import ProjectGetParams = ProjectsAPI.ProjectGetParams;
-  export import ProjectPurgeBuildCacheParams = ProjectsAPI.ProjectPurgeBuildCacheParams;
-  export import Deployments = DeploymentsAPI.Deployments;
-  export import DeploymentDeleteResponse = DeploymentsAPI.DeploymentDeleteResponse;
-  export import DeploymentCreateParams = DeploymentsAPI.DeploymentCreateParams;
-  export import DeploymentListParams = DeploymentsAPI.DeploymentListParams;
-  export import DeploymentDeleteParams = DeploymentsAPI.DeploymentDeleteParams;
-  export import DeploymentGetParams = DeploymentsAPI.DeploymentGetParams;
-  export import DeploymentRetryParams = DeploymentsAPI.DeploymentRetryParams;
-  export import DeploymentRollbackParams = DeploymentsAPI.DeploymentRollbackParams;
-  export import Domains = DomainsAPI.Domains;
-  export import DomainCreateResponse = DomainsAPI.DomainCreateResponse;
-  export import DomainListResponse = DomainsAPI.DomainListResponse;
-  export import DomainDeleteResponse = DomainsAPI.DomainDeleteResponse;
-  export import DomainEditResponse = DomainsAPI.DomainEditResponse;
-  export import DomainGetResponse = DomainsAPI.DomainGetResponse;
-  export import DomainListResponsesSinglePage = DomainsAPI.DomainListResponsesSinglePage;
-  export import DomainCreateParams = DomainsAPI.DomainCreateParams;
-  export import DomainListParams = DomainsAPI.DomainListParams;
-  export import DomainDeleteParams = DomainsAPI.DomainDeleteParams;
-  export import DomainEditParams = DomainsAPI.DomainEditParams;
-  export import DomainGetParams = DomainsAPI.DomainGetParams;
+Projects.DeploymentsSinglePage = DeploymentsSinglePage;
+Projects.Deployments = Deployments;
+Projects.Domains = Domains;
+Projects.DomainListResponsesSinglePage = DomainListResponsesSinglePage;
+
+export declare namespace Projects {
+  export {
+    type Deployment as Deployment,
+    type Project as Project,
+    type Stage as Stage,
+    type ProjectDeleteResponse as ProjectDeleteResponse,
+    type ProjectPurgeBuildCacheResponse as ProjectPurgeBuildCacheResponse,
+    DeploymentsSinglePage as DeploymentsSinglePage,
+    type ProjectCreateParams as ProjectCreateParams,
+    type ProjectListParams as ProjectListParams,
+    type ProjectDeleteParams as ProjectDeleteParams,
+    type ProjectEditParams as ProjectEditParams,
+    type ProjectGetParams as ProjectGetParams,
+    type ProjectPurgeBuildCacheParams as ProjectPurgeBuildCacheParams,
+  };
+
+  export {
+    Deployments as Deployments,
+    type DeploymentDeleteResponse as DeploymentDeleteResponse,
+    type DeploymentCreateParams as DeploymentCreateParams,
+    type DeploymentListParams as DeploymentListParams,
+    type DeploymentDeleteParams as DeploymentDeleteParams,
+    type DeploymentGetParams as DeploymentGetParams,
+    type DeploymentRetryParams as DeploymentRetryParams,
+    type DeploymentRollbackParams as DeploymentRollbackParams,
+  };
+
+  export {
+    Domains as Domains,
+    type DomainCreateResponse as DomainCreateResponse,
+    type DomainListResponse as DomainListResponse,
+    type DomainDeleteResponse as DomainDeleteResponse,
+    type DomainEditResponse as DomainEditResponse,
+    type DomainGetResponse as DomainGetResponse,
+    DomainListResponsesSinglePage as DomainListResponsesSinglePage,
+    type DomainCreateParams as DomainCreateParams,
+    type DomainListParams as DomainListParams,
+    type DomainDeleteParams as DomainDeleteParams,
+    type DomainEditParams as DomainEditParams,
+    type DomainGetParams as DomainGetParams,
+  };
 }
diff --git a/src/resources/pcaps/index.ts b/src/resources/pcaps/index.ts
deleted file mode 100644
index 416c8b86b4..0000000000
--- a/src/resources/pcaps/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { DownloadGetParams, Download } from './download';
-export {
-  Ownership,
-  OwnershipGetResponse,
-  OwnershipCreateParams,
-  OwnershipDeleteParams,
-  OwnershipGetParams,
-  OwnershipValidateParams,
-  OwnershipResource,
-} from './ownership';
-export { PCAPs } from './pcaps';
diff --git a/src/resources/queues/consumers.ts b/src/resources/queues/consumers.ts
index 52da5916cf..79f7ba9d7f 100644
--- a/src/resources/queues/consumers.ts
+++ b/src/resources/queues/consumers.ts
@@ -2,23 +2,23 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ConsumersAPI from './consumers';
+import * as Shared from '../shared';
 
 export class Consumers extends APIResource {
   /**
-   * Creates a new consumer for a queue.
+   * Creates a new consumer for a Queue
    */
   create(
     queueId: string,
     params: ConsumerCreateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ConsumerCreateResponse | null> {
-    const { account_id, body } = params;
+  ): Core.APIPromise<Consumer> {
+    const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/queues/${queueId}/consumers`, {
-        body: body,
+        body,
         ...options,
-      }) as Core.APIPromise<{ result: ConsumerCreateResponse | null }>
+      }) as Core.APIPromise<{ result: Consumer }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -30,13 +30,13 @@ export class Consumers extends APIResource {
     consumerId: string,
     params: ConsumerUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ConsumerUpdateResponse | null> {
-    const { account_id, body } = params;
+  ): Core.APIPromise<Consumer> {
+    const { account_id, ...body } = params;
     return (
       this._client.put(`/accounts/${account_id}/queues/${queueId}/consumers/${consumerId}`, {
-        body: body,
+        body,
         ...options,
-      }) as Core.APIPromise<{ result: ConsumerUpdateResponse | null }>
+      }) as Core.APIPromise<{ result: Consumer }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -48,159 +48,392 @@ export class Consumers extends APIResource {
     consumerId: string,
     params: ConsumerDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ConsumerDeleteResponse | null> {
+  ): Core.APIPromise<ConsumerDeleteResponse> {
     const { account_id } = params;
-    return (
-      this._client.delete(
-        `/accounts/${account_id}/queues/${queueId}/consumers/${consumerId}`,
-        options,
-      ) as Core.APIPromise<{ result: ConsumerDeleteResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.delete(`/accounts/${account_id}/queues/${queueId}/consumers/${consumerId}`, options);
   }
 
   /**
-   * Returns the consumers for a queue.
+   * Returns the consumers for a Queue
    */
   get(
     queueId: string,
     params: ConsumerGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ConsumerGetResponse | null> {
+  ): Core.APIPromise<ConsumerGetResponse> {
     const { account_id } = params;
     return (
       this._client.get(`/accounts/${account_id}/queues/${queueId}/consumers`, options) as Core.APIPromise<{
-        result: ConsumerGetResponse | null;
+        result: ConsumerGetResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export interface Consumer {
-  created_on?: unknown;
+export type Consumer = Consumer.MqWorkerConsumer | Consumer.MqHTTPConsumer;
 
-  environment?: unknown;
+export namespace Consumer {
+  export interface MqWorkerConsumer {
+    /**
+     * A Resource identifier.
+     */
+    consumer_id?: string;
 
-  queue_name?: unknown;
+    created_on?: string;
 
-  service?: unknown;
+    /**
+     * A Resource identifier.
+     */
+    queue_id?: string;
 
-  settings?: Consumer.Settings;
-}
+    /**
+     * Name of a Worker
+     */
+    script?: string;
 
-export namespace Consumer {
-  export interface Settings {
+    settings?: MqWorkerConsumer.Settings;
+
+    type?: 'worker';
+  }
+
+  export namespace MqWorkerConsumer {
+    export interface Settings {
+      /**
+       * The maximum number of messages to include in a batch.
+       */
+      batch_size?: number;
+
+      /**
+       * Maximum number of concurrent consumers that may consume from this Queue. Set to
+       * `null` to automatically opt in to the platform's maximum (recommended).
+       */
+      max_concurrency?: number;
+
+      /**
+       * The maximum number of retries
+       */
+      max_retries?: number;
+
+      /**
+       * The number of milliseconds to wait for a batch to fill up before attempting to
+       * deliver it
+       */
+      max_wait_time_ms?: number;
+
+      /**
+       * The number of seconds to delay before making the message available for another
+       * attempt.
+       */
+      retry_delay?: number;
+    }
+  }
+
+  export interface MqHTTPConsumer {
     /**
-     * The maximum number of messages to include in a batch
+     * A Resource identifier.
      */
-    batch_size?: number;
+    consumer_id?: string;
+
+    created_on?: string;
 
-    max_retries?: number;
+    /**
+     * A Resource identifier.
+     */
+    queue_id?: string;
+
+    settings?: MqHTTPConsumer.Settings;
+
+    type?: 'http_pull';
+  }
 
-    max_wait_time_ms?: number;
+  export namespace MqHTTPConsumer {
+    export interface Settings {
+      /**
+       * The maximum number of messages to include in a batch.
+       */
+      batch_size?: number;
+
+      /**
+       * The maximum number of retries
+       */
+      max_retries?: number;
+
+      /**
+       * The number of seconds to delay before making the message available for another
+       * attempt.
+       */
+      retry_delay?: number;
+
+      /**
+       * The number of milliseconds that a message is exclusively leased. After the
+       * timeout, the message becomes available for another attempt.
+       */
+      visibility_timeout_ms?: number;
+    }
   }
 }
 
-export interface ConsumerCreateResponse {
-  created_on?: unknown;
+export interface ConsumerDeleteResponse {
+  errors?: Array<Shared.ResponseInfo>;
 
-  dead_letter_queue?: string;
+  messages?: Array<string>;
 
-  environment?: unknown;
+  /**
+   * Indicates if the API call was successful or not.
+   */
+  success?: true;
+}
 
-  queue_name?: unknown;
+export type ConsumerGetResponse = Array<Consumer>;
 
-  script_name?: unknown;
+export type ConsumerCreateParams =
+  | ConsumerCreateParams.MqWorkerConsumer
+  | ConsumerCreateParams.MqHTTPConsumer;
 
-  settings?: ConsumerCreateResponse.Settings;
-}
+export declare namespace ConsumerCreateParams {
+  export interface MqWorkerConsumer {
+    /**
+     * Path param: A Resource identifier.
+     */
+    account_id: string;
 
-export namespace ConsumerCreateResponse {
-  export interface Settings {
     /**
-     * The maximum number of messages to include in a batch
+     * Body param:
      */
-    batch_size?: number;
+    dead_letter_queue?: string;
 
-    max_retries?: number;
+    /**
+     * Body param: Name of a Worker
+     */
+    script_name?: string;
 
-    max_wait_time_ms?: number;
+    /**
+     * Body param:
+     */
+    settings?: ConsumerCreateParams.MqWorkerConsumer.Settings;
+
+    /**
+     * Body param:
+     */
+    type?: 'worker';
   }
-}
 
-export interface ConsumerUpdateResponse {
-  created_on?: unknown;
+  export namespace MqWorkerConsumer {
+    export interface Settings {
+      /**
+       * The maximum number of messages to include in a batch.
+       */
+      batch_size?: number;
+
+      /**
+       * Maximum number of concurrent consumers that may consume from this Queue. Set to
+       * `null` to automatically opt in to the platform's maximum (recommended).
+       */
+      max_concurrency?: number;
+
+      /**
+       * The maximum number of retries
+       */
+      max_retries?: number;
+
+      /**
+       * The number of milliseconds to wait for a batch to fill up before attempting to
+       * deliver it
+       */
+      max_wait_time_ms?: number;
+
+      /**
+       * The number of seconds to delay before making the message available for another
+       * attempt.
+       */
+      retry_delay?: number;
+    }
+  }
 
-  dead_letter_queue?: string;
+  export interface MqHTTPConsumer {
+    /**
+     * Path param: A Resource identifier.
+     */
+    account_id: string;
 
-  environment?: unknown;
+    /**
+     * Body param:
+     */
+    dead_letter_queue?: string;
 
-  queue_name?: unknown;
+    /**
+     * Body param:
+     */
+    settings?: ConsumerCreateParams.MqHTTPConsumer.Settings;
 
-  script_name?: unknown;
+    /**
+     * Body param:
+     */
+    type?: 'http_pull';
+  }
 
-  settings?: ConsumerUpdateResponse.Settings;
+  export namespace MqHTTPConsumer {
+    export interface Settings {
+      /**
+       * The maximum number of messages to include in a batch.
+       */
+      batch_size?: number;
+
+      /**
+       * The maximum number of retries
+       */
+      max_retries?: number;
+
+      /**
+       * The number of seconds to delay before making the message available for another
+       * attempt.
+       */
+      retry_delay?: number;
+
+      /**
+       * The number of milliseconds that a message is exclusively leased. After the
+       * timeout, the message becomes available for another attempt.
+       */
+      visibility_timeout_ms?: number;
+    }
+  }
 }
 
-export namespace ConsumerUpdateResponse {
-  export interface Settings {
-    batch_size?: number;
+export type ConsumerUpdateParams =
+  | ConsumerUpdateParams.MqWorkerConsumer
+  | ConsumerUpdateParams.MqHTTPConsumer;
 
-    max_retries?: number;
+export declare namespace ConsumerUpdateParams {
+  export interface MqWorkerConsumer {
+    /**
+     * Path param: A Resource identifier.
+     */
+    account_id: string;
 
-    max_wait_time_ms?: number;
+    /**
+     * Body param:
+     */
+    dead_letter_queue?: string;
+
+    /**
+     * Body param: Name of a Worker
+     */
+    script_name?: string;
+
+    /**
+     * Body param:
+     */
+    settings?: ConsumerUpdateParams.MqWorkerConsumer.Settings;
+
+    /**
+     * Body param:
+     */
+    type?: 'worker';
   }
-}
 
-export type ConsumerDeleteResponse = unknown | Array<unknown> | string;
+  export namespace MqWorkerConsumer {
+    export interface Settings {
+      /**
+       * The maximum number of messages to include in a batch.
+       */
+      batch_size?: number;
+
+      /**
+       * Maximum number of concurrent consumers that may consume from this Queue. Set to
+       * `null` to automatically opt in to the platform's maximum (recommended).
+       */
+      max_concurrency?: number;
+
+      /**
+       * The maximum number of retries
+       */
+      max_retries?: number;
+
+      /**
+       * The number of milliseconds to wait for a batch to fill up before attempting to
+       * deliver it
+       */
+      max_wait_time_ms?: number;
+
+      /**
+       * The number of seconds to delay before making the message available for another
+       * attempt.
+       */
+      retry_delay?: number;
+    }
+  }
 
-export type ConsumerGetResponse = Array<Consumer>;
+  export interface MqHTTPConsumer {
+    /**
+     * Path param: A Resource identifier.
+     */
+    account_id: string;
 
-export interface ConsumerCreateParams {
-  /**
-   * Path param: Identifier
-   */
-  account_id: string;
+    /**
+     * Body param:
+     */
+    dead_letter_queue?: string;
 
-  /**
-   * Body param:
-   */
-  body: unknown;
-}
+    /**
+     * Body param:
+     */
+    settings?: ConsumerUpdateParams.MqHTTPConsumer.Settings;
 
-export interface ConsumerUpdateParams {
-  /**
-   * Path param: Identifier
-   */
-  account_id: string;
+    /**
+     * Body param:
+     */
+    type?: 'http_pull';
+  }
 
-  /**
-   * Body param:
-   */
-  body: unknown;
+  export namespace MqHTTPConsumer {
+    export interface Settings {
+      /**
+       * The maximum number of messages to include in a batch.
+       */
+      batch_size?: number;
+
+      /**
+       * The maximum number of retries
+       */
+      max_retries?: number;
+
+      /**
+       * The number of seconds to delay before making the message available for another
+       * attempt.
+       */
+      retry_delay?: number;
+
+      /**
+       * The number of milliseconds that a message is exclusively leased. After the
+       * timeout, the message becomes available for another attempt.
+       */
+      visibility_timeout_ms?: number;
+    }
+  }
 }
 
 export interface ConsumerDeleteParams {
   /**
-   * Identifier
+   * A Resource identifier.
    */
   account_id: string;
 }
 
 export interface ConsumerGetParams {
   /**
-   * Identifier
+   * A Resource identifier.
    */
   account_id: string;
 }
 
-export namespace Consumers {
-  export import Consumer = ConsumersAPI.Consumer;
-  export import ConsumerCreateResponse = ConsumersAPI.ConsumerCreateResponse;
-  export import ConsumerUpdateResponse = ConsumersAPI.ConsumerUpdateResponse;
-  export import ConsumerDeleteResponse = ConsumersAPI.ConsumerDeleteResponse;
-  export import ConsumerGetResponse = ConsumersAPI.ConsumerGetResponse;
-  export import ConsumerCreateParams = ConsumersAPI.ConsumerCreateParams;
-  export import ConsumerUpdateParams = ConsumersAPI.ConsumerUpdateParams;
-  export import ConsumerDeleteParams = ConsumersAPI.ConsumerDeleteParams;
-  export import ConsumerGetParams = ConsumersAPI.ConsumerGetParams;
+export declare namespace Consumers {
+  export {
+    type Consumer as Consumer,
+    type ConsumerDeleteResponse as ConsumerDeleteResponse,
+    type ConsumerGetResponse as ConsumerGetResponse,
+    type ConsumerCreateParams as ConsumerCreateParams,
+    type ConsumerUpdateParams as ConsumerUpdateParams,
+    type ConsumerDeleteParams as ConsumerDeleteParams,
+    type ConsumerGetParams as ConsumerGetParams,
+  };
 }
diff --git a/src/resources/queues/index.ts b/src/resources/queues/index.ts
index a152604a51..dd45a34efc 100644
--- a/src/resources/queues/index.ts
+++ b/src/resources/queues/index.ts
@@ -1,22 +1,20 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Consumer,
-  ConsumerCreateResponse,
-  ConsumerUpdateResponse,
-  ConsumerDeleteResponse,
-  ConsumerGetResponse,
-  ConsumerCreateParams,
-  ConsumerUpdateParams,
-  ConsumerDeleteParams,
-  ConsumerGetParams,
   Consumers,
+  type Consumer,
+  type ConsumerDeleteResponse,
+  type ConsumerGetResponse,
+  type ConsumerCreateParams,
+  type ConsumerUpdateParams,
+  type ConsumerDeleteParams,
+  type ConsumerGetParams,
 } from './consumers';
 export {
-  MessageAckResponse,
-  MessagePullResponse,
-  MessageAckParams,
-  MessagePullParams,
   Messages,
+  type MessageAckResponse,
+  type MessagePullResponse,
+  type MessageAckParams,
+  type MessagePullParams,
 } from './messages';
 export { Queues } from './queues';
diff --git a/src/resources/queues/messages.ts b/src/resources/queues/messages.ts
index 9f2b0309e3..cab0149def 100644
--- a/src/resources/queues/messages.ts
+++ b/src/resources/queues/messages.ts
@@ -2,52 +2,51 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as MessagesAPI from './messages';
 
 export class Messages extends APIResource {
   /**
-   * Acknowledge + Retry messages from a Queue.
+   * Acknowledge + Retry messages from a Queue
    */
   ack(
     queueId: string,
     params: MessageAckParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<MessageAckResponse | null> {
+  ): Core.APIPromise<MessageAckResponse> {
     const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/queues/${queueId}/messages/ack`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: MessageAckResponse | null }>
+      }) as Core.APIPromise<{ result: MessageAckResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Pull a batch of messages from a Queue.
+   * Pull a batch of messages from a Queue
    */
   pull(
     queueId: string,
     params: MessagePullParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<MessagePullResponse | null> {
+  ): Core.APIPromise<MessagePullResponse> {
     const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/queues/${queueId}/messages/pull`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: MessagePullResponse | null }>
+      }) as Core.APIPromise<{ result: MessagePullResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
 export interface MessageAckResponse {
   /**
-   * The number of messages that were succesfully acknowledged
+   * The number of messages that were succesfully acknowledged.
    */
   ackCount?: number;
 
   /**
-   * The number of messages that were succesfully retried
+   * The number of messages that were succesfully retried.
    */
   retryCount?: number;
 
@@ -64,6 +63,10 @@ export namespace MessagePullResponse {
 
     body?: string;
 
+    /**
+     * An ID that represents an "in-flight" message that has been pulled from a Queue.
+     * You must hold on to this ID and use it to acknowledge this message.
+     */
     lease_id?: string;
 
     metadata?: unknown;
@@ -74,7 +77,7 @@ export namespace MessagePullResponse {
 
 export interface MessageAckParams {
   /**
-   * Path param: Identifier
+   * Path param: A Resource identifier.
    */
   account_id: string;
 
@@ -92,7 +95,8 @@ export interface MessageAckParams {
 export namespace MessageAckParams {
   export interface Ack {
     /**
-     * Lease ID for a message to acknowledge.
+     * An ID that represents an "in-flight" message that has been pulled from a Queue.
+     * You must hold on to this ID and use it to acknowledge this message.
      */
     lease_id?: string;
   }
@@ -105,7 +109,8 @@ export namespace MessageAckParams {
     delay_seconds?: number;
 
     /**
-     * Lease ID for a message to retry.
+     * An ID that represents an "in-flight" message that has been pulled from a Queue.
+     * You must hold on to this ID and use it to acknowledge this message.
      */
     lease_id?: string;
   }
@@ -113,12 +118,12 @@ export namespace MessageAckParams {
 
 export interface MessagePullParams {
   /**
-   * Path param: Identifier
+   * Path param: A Resource identifier.
    */
   account_id: string;
 
   /**
-   * Body param: The maximum number of messages to include in a batch
+   * Body param: The maximum number of messages to include in a batch.
    */
   batch_size?: number;
 
@@ -129,9 +134,11 @@ export interface MessagePullParams {
   visibility_timeout_ms?: number;
 }
 
-export namespace Messages {
-  export import MessageAckResponse = MessagesAPI.MessageAckResponse;
-  export import MessagePullResponse = MessagesAPI.MessagePullResponse;
-  export import MessageAckParams = MessagesAPI.MessageAckParams;
-  export import MessagePullParams = MessagesAPI.MessagePullParams;
+export declare namespace Messages {
+  export {
+    type MessageAckResponse as MessageAckResponse,
+    type MessagePullResponse as MessagePullResponse,
+    type MessageAckParams as MessageAckParams,
+    type MessagePullParams as MessagePullParams,
+  };
 }
diff --git a/src/resources/queues/queues.ts b/src/resources/queues/queues.ts
index acbb704628..e94587b929 100644
--- a/src/resources/queues/queues.ts
+++ b/src/resources/queues/queues.ts
@@ -2,8 +2,26 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
+import * as Shared from '../shared';
 import * as ConsumersAPI from './consumers';
+import {
+  Consumer,
+  ConsumerCreateParams,
+  ConsumerDeleteParams,
+  ConsumerDeleteResponse,
+  ConsumerGetParams,
+  ConsumerGetResponse,
+  ConsumerUpdateParams,
+  Consumers,
+} from './consumers';
 import * as MessagesAPI from './messages';
+import {
+  MessageAckParams,
+  MessageAckResponse,
+  MessagePullParams,
+  MessagePullResponse,
+  Messages,
+} from './messages';
 import { SinglePage } from '../../pagination';
 
 export class Queues extends APIResource {
@@ -11,31 +29,28 @@ export class Queues extends APIResource {
   messages: MessagesAPI.Messages = new MessagesAPI.Messages(this._client);
 
   /**
-   * Creates a new queue.
+   * Create a new queue
    */
-  create(params: QueueCreateParams, options?: Core.RequestOptions): Core.APIPromise<QueueCreated | null> {
-    const { account_id, body } = params;
+  create(params: QueueCreateParams, options?: Core.RequestOptions): Core.APIPromise<Queue> {
+    const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${account_id}/queues`, { body: body, ...options }) as Core.APIPromise<{
-        result: QueueCreated | null;
+      this._client.post(`/accounts/${account_id}/queues`, { body, ...options }) as Core.APIPromise<{
+        result: Queue;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Updates a queue.
+   * Updates a Queue. Note that this endpoint does not support partial updates. If
+   * successful, the Queue's configuration is overwritten with the supplied
+   * configuration.
    */
-  update(
-    queueId: string,
-    params: QueueUpdateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<QueueUpdated | null> {
-    const { account_id, body } = params;
+  update(queueId: string, params: QueueUpdateParams, options?: Core.RequestOptions): Core.APIPromise<Queue> {
+    const { account_id, ...body } = params;
     return (
-      this._client.put(`/accounts/${account_id}/queues/${queueId}`, {
-        body: body,
-        ...options,
-      }) as Core.APIPromise<{ result: QueueUpdated | null }>
+      this._client.put(`/accounts/${account_id}/queues/${queueId}`, { body, ...options }) as Core.APIPromise<{
+        result: Queue;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -48,29 +63,25 @@ export class Queues extends APIResource {
   }
 
   /**
-   * Deletes a queue.
+   * Deletes a queue
    */
   delete(
     queueId: string,
     params: QueueDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<QueueDeleteResponse | null> {
+  ): Core.APIPromise<QueueDeleteResponse> {
     const { account_id } = params;
-    return (
-      this._client.delete(`/accounts/${account_id}/queues/${queueId}`, options) as Core.APIPromise<{
-        result: QueueDeleteResponse | null;
-      }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.delete(`/accounts/${account_id}/queues/${queueId}`, options);
   }
 
   /**
-   * Get information about a specific queue.
+   * Get details about a specific queue.
    */
-  get(queueId: string, params: QueueGetParams, options?: Core.RequestOptions): Core.APIPromise<Queue | null> {
+  get(queueId: string, params: QueueGetParams, options?: Core.RequestOptions): Core.APIPromise<Queue> {
     const { account_id } = params;
     return (
       this._client.get(`/accounts/${account_id}/queues/${queueId}`, options) as Core.APIPromise<{
-        result: Queue | null;
+        result: Queue;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -79,104 +90,146 @@ export class Queues extends APIResource {
 export class QueuesSinglePage extends SinglePage<Queue> {}
 
 export interface Queue {
-  consumers?: unknown;
+  consumers?: Array<ConsumersAPI.Consumer>;
 
-  consumers_total_count?: unknown;
+  consumers_total_count?: number;
 
-  created_on?: unknown;
+  created_on?: string;
 
-  modified_on?: unknown;
+  modified_on?: string;
 
-  producers?: unknown;
+  producers?: Array<Queue.MqWorkerProducer | Queue.MqR2Producer>;
 
-  producers_total_count?: unknown;
+  producers_total_count?: number;
 
   queue_id?: string;
 
   queue_name?: string;
+
+  settings?: Queue.Settings;
 }
 
-export interface QueueCreated {
-  created_on?: unknown;
+export namespace Queue {
+  export interface MqWorkerProducer {
+    script?: string;
 
-  modified_on?: unknown;
+    type?: 'worker';
+  }
 
-  queue_id?: string;
+  export interface MqR2Producer {
+    bucket_name?: string;
 
-  queue_name?: string;
-}
+    type?: 'r2_bucket';
+  }
+
+  export interface Settings {
+    /**
+     * Number of seconds to delay delivery of all messages to consumers.
+     */
+    delivery_delay?: number;
 
-export interface QueueUpdated {
-  created_on?: unknown;
+    /**
+     * Number of seconds after which an unconsumed message will be delayed.
+     */
+    message_retention_period?: number;
+  }
+}
 
-  modified_on?: unknown;
+export interface QueueDeleteResponse {
+  errors?: Array<Shared.ResponseInfo>;
 
-  queue_id?: string;
+  messages?: Array<string>;
 
-  queue_name?: string;
+  /**
+   * Indicates if the API call was successful or not.
+   */
+  success?: true;
 }
 
-export type QueueDeleteResponse = unknown | Array<unknown> | string;
-
 export interface QueueCreateParams {
   /**
-   * Path param: Identifier
+   * Path param: A Resource identifier.
    */
   account_id: string;
 
   /**
    * Body param:
    */
-  body: unknown;
+  queue_name: string;
 }
 
 export interface QueueUpdateParams {
   /**
-   * Path param: Identifier
+   * Path param: A Resource identifier.
    */
   account_id: string;
 
   /**
    * Body param:
    */
-  body: unknown;
+  queue_name?: string;
+
+  /**
+   * Body param:
+   */
+  settings?: QueueUpdateParams.Settings;
+}
+
+export namespace QueueUpdateParams {
+  export interface Settings {
+    /**
+     * Number of seconds to delay delivery of all messages to consumers.
+     */
+    delivery_delay?: number;
+
+    /**
+     * Number of seconds after which an unconsumed message will be delayed.
+     */
+    message_retention_period?: number;
+  }
 }
 
 export interface QueueListParams {
   /**
-   * Identifier
+   * A Resource identifier.
    */
   account_id: string;
 }
 
 export interface QueueDeleteParams {
   /**
-   * Identifier
+   * A Resource identifier.
    */
   account_id: string;
 }
 
 export interface QueueGetParams {
   /**
-   * Identifier
+   * A Resource identifier.
    */
   account_id: string;
 }
 
-export namespace Queues {
-  export import Consumers = ConsumersAPI.Consumers;
-  export import Consumer = ConsumersAPI.Consumer;
-  export import ConsumerCreateResponse = ConsumersAPI.ConsumerCreateResponse;
-  export import ConsumerUpdateResponse = ConsumersAPI.ConsumerUpdateResponse;
-  export import ConsumerDeleteResponse = ConsumersAPI.ConsumerDeleteResponse;
-  export import ConsumerGetResponse = ConsumersAPI.ConsumerGetResponse;
-  export import ConsumerCreateParams = ConsumersAPI.ConsumerCreateParams;
-  export import ConsumerUpdateParams = ConsumersAPI.ConsumerUpdateParams;
-  export import ConsumerDeleteParams = ConsumersAPI.ConsumerDeleteParams;
-  export import ConsumerGetParams = ConsumersAPI.ConsumerGetParams;
-  export import Messages = MessagesAPI.Messages;
-  export import MessageAckResponse = MessagesAPI.MessageAckResponse;
-  export import MessagePullResponse = MessagesAPI.MessagePullResponse;
-  export import MessageAckParams = MessagesAPI.MessageAckParams;
-  export import MessagePullParams = MessagesAPI.MessagePullParams;
+Queues.Consumers = Consumers;
+Queues.Messages = Messages;
+
+export declare namespace Queues {
+  export {
+    Consumers as Consumers,
+    type Consumer as Consumer,
+    type ConsumerDeleteResponse as ConsumerDeleteResponse,
+    type ConsumerGetResponse as ConsumerGetResponse,
+    type ConsumerCreateParams as ConsumerCreateParams,
+    type ConsumerUpdateParams as ConsumerUpdateParams,
+    type ConsumerDeleteParams as ConsumerDeleteParams,
+    type ConsumerGetParams as ConsumerGetParams,
+  };
+
+  export {
+    Messages as Messages,
+    type MessageAckResponse as MessageAckResponse,
+    type MessagePullResponse as MessagePullResponse,
+    type MessageAckParams as MessageAckParams,
+    type MessagePullParams as MessagePullParams,
+  };
 }
diff --git a/src/resources/r2/buckets.ts b/src/resources/r2/buckets.ts
deleted file mode 100644
index 3f1b2b9d25..0000000000
--- a/src/resources/r2/buckets.ts
+++ /dev/null
@@ -1,167 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as BucketsAPI from './buckets';
-import { CursorPagination, type CursorPaginationParams } from '../../pagination';
-
-export class Buckets extends APIResource {
-  /**
-   * Creates a new R2 bucket.
-   */
-  create(params: BucketCreateParams, options?: Core.RequestOptions): Core.APIPromise<Bucket> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.post(`/accounts/${account_id}/r2/buckets`, { body, ...options }) as Core.APIPromise<{
-        result: Bucket;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Lists all R2 buckets on your account
-   */
-  list(
-    params: BucketListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<BucketsCursorPagination, Bucket> {
-    const { account_id, ...query } = params;
-    return this._client.getAPIList(`/accounts/${account_id}/r2/buckets`, BucketsCursorPagination, {
-      query,
-      ...options,
-    });
-  }
-
-  /**
-   * Deletes an existing R2 bucket.
-   */
-  delete(
-    bucketName: string,
-    params: BucketDeleteParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<BucketDeleteResponse> {
-    const { account_id } = params;
-    return (
-      this._client.delete(`/accounts/${account_id}/r2/buckets/${bucketName}`, options) as Core.APIPromise<{
-        result: BucketDeleteResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Gets metadata for an existing R2 bucket.
-   */
-  get(bucketName: string, params: BucketGetParams, options?: Core.RequestOptions): Core.APIPromise<Bucket> {
-    const { account_id } = params;
-    return (
-      this._client.get(`/accounts/${account_id}/r2/buckets/${bucketName}`, options) as Core.APIPromise<{
-        result: Bucket;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export class BucketsCursorPagination extends CursorPagination<Bucket> {}
-
-/**
- * A single R2 bucket
- */
-export interface Bucket {
-  /**
-   * Creation timestamp
-   */
-  creation_date?: string;
-
-  /**
-   * Location of the bucket
-   */
-  location?: 'apac' | 'eeur' | 'enam' | 'weur' | 'wnam';
-
-  /**
-   * Name of the bucket
-   */
-  name?: string;
-
-  /**
-   * Storage class for newly uploaded objects, unless specified otherwise.
-   */
-  storage_class?: 'Standard' | 'InfrequentAccess';
-}
-
-export type BucketDeleteResponse = unknown;
-
-export interface BucketCreateParams {
-  /**
-   * Path param: Account ID
-   */
-  account_id: string;
-
-  /**
-   * Body param: Name of the bucket
-   */
-  name: string;
-
-  /**
-   * Body param: Location of the bucket
-   */
-  locationHint?: 'apac' | 'eeur' | 'enam' | 'weur' | 'wnam';
-
-  /**
-   * Body param: Storage class for newly uploaded objects, unless specified
-   * otherwise.
-   */
-  storageClass?: 'Standard' | 'InfrequentAccess';
-}
-
-export interface BucketListParams extends CursorPaginationParams {
-  /**
-   * Path param: Account ID
-   */
-  account_id: string;
-
-  /**
-   * Query param: Direction to order buckets
-   */
-  direction?: 'asc' | 'desc';
-
-  /**
-   * Query param: Bucket names to filter by. Only buckets with this phrase in their
-   * name will be returned.
-   */
-  name_contains?: string;
-
-  /**
-   * Query param: Field to order buckets by
-   */
-  order?: 'name';
-
-  /**
-   * Query param: Bucket name to start searching after. Buckets are ordered
-   * lexicographically.
-   */
-  start_after?: string;
-}
-
-export interface BucketDeleteParams {
-  /**
-   * Account ID
-   */
-  account_id: string;
-}
-
-export interface BucketGetParams {
-  /**
-   * Account ID
-   */
-  account_id: string;
-}
-
-export namespace Buckets {
-  export import Bucket = BucketsAPI.Bucket;
-  export import BucketDeleteResponse = BucketsAPI.BucketDeleteResponse;
-  export import BucketsCursorPagination = BucketsAPI.BucketsCursorPagination;
-  export import BucketCreateParams = BucketsAPI.BucketCreateParams;
-  export import BucketListParams = BucketsAPI.BucketListParams;
-  export import BucketDeleteParams = BucketsAPI.BucketDeleteParams;
-  export import BucketGetParams = BucketsAPI.BucketGetParams;
-}
diff --git a/src/resources/r2/buckets/buckets.ts b/src/resources/r2/buckets/buckets.ts
new file mode 100644
index 0000000000..15c4a3362a
--- /dev/null
+++ b/src/resources/r2/buckets/buckets.ts
@@ -0,0 +1,302 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as CORSAPI from './cors';
+import {
+  CORS,
+  CORSDeleteParams,
+  CORSDeleteResponse,
+  CORSGetParams,
+  CORSGetResponse,
+  CORSUpdateParams,
+  CORSUpdateResponse,
+} from './cors';
+import * as LifecycleAPI from './lifecycle';
+import {
+  Lifecycle,
+  LifecycleGetParams,
+  LifecycleGetResponse,
+  LifecycleUpdateParams,
+  LifecycleUpdateResponse,
+} from './lifecycle';
+import * as SippyAPI from './sippy';
+import {
+  Provider,
+  Sippy,
+  SippyDeleteParams,
+  SippyDeleteResponse,
+  SippyGetParams,
+  SippyResource,
+  SippyUpdateParams,
+} from './sippy';
+import * as DomainsAPI from './domains/domains';
+import { Domains } from './domains/domains';
+import * as EventNotificationsAPI from './event-notifications/event-notifications';
+import { EventNotifications } from './event-notifications/event-notifications';
+
+export class Buckets extends APIResource {
+  lifecycle: LifecycleAPI.Lifecycle = new LifecycleAPI.Lifecycle(this._client);
+  cors: CORSAPI.CORS = new CORSAPI.CORS(this._client);
+  domains: DomainsAPI.Domains = new DomainsAPI.Domains(this._client);
+  eventNotifications: EventNotificationsAPI.EventNotifications = new EventNotificationsAPI.EventNotifications(
+    this._client,
+  );
+  sippy: SippyAPI.SippyResource = new SippyAPI.SippyResource(this._client);
+
+  /**
+   * Creates a new R2 bucket.
+   */
+  create(params: BucketCreateParams, options?: Core.RequestOptions): Core.APIPromise<Bucket> {
+    const { account_id, jurisdiction, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/r2/buckets`, {
+        body,
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: Bucket }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists all R2 buckets on your account
+   */
+  list(params: BucketListParams, options?: Core.RequestOptions): Core.APIPromise<BucketListResponse> {
+    const { account_id, jurisdiction, ...query } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/r2/buckets`, {
+        query,
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: BucketListResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Deletes an existing R2 bucket.
+   */
+  delete(
+    bucketName: string,
+    params: BucketDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<BucketDeleteResponse> {
+    const { account_id, jurisdiction } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}/r2/buckets/${bucketName}`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: BucketDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Gets metadata for an existing R2 bucket.
+   */
+  get(bucketName: string, params: BucketGetParams, options?: Core.RequestOptions): Core.APIPromise<Bucket> {
+    const { account_id, jurisdiction } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/r2/buckets/${bucketName}`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: Bucket }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+/**
+ * A single R2 bucket
+ */
+export interface Bucket {
+  /**
+   * Creation timestamp
+   */
+  creation_date?: string;
+
+  /**
+   * Location of the bucket
+   */
+  location?: 'apac' | 'eeur' | 'enam' | 'weur' | 'wnam';
+
+  /**
+   * Name of the bucket
+   */
+  name?: string;
+
+  /**
+   * Storage class for newly uploaded objects, unless specified otherwise.
+   */
+  storage_class?: 'Standard' | 'InfrequentAccess';
+}
+
+export interface BucketListResponse {
+  buckets?: Array<Bucket>;
+}
+
+export type BucketDeleteResponse = unknown;
+
+export interface BucketCreateParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Body param: Name of the bucket
+   */
+  name: string;
+
+  /**
+   * Body param: Location of the bucket
+   */
+  locationHint?: 'apac' | 'eeur' | 'enam' | 'weur' | 'wnam';
+
+  /**
+   * Body param: Storage class for newly uploaded objects, unless specified
+   * otherwise.
+   */
+  storageClass?: 'Standard' | 'InfrequentAccess';
+
+  /**
+   * Header param: Creates the bucket in the provided jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export interface BucketListParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Query param: Pagination cursor received during the last List Buckets call. R2
+   * buckets are paginated using cursors instead of page numbers.
+   */
+  cursor?: string;
+
+  /**
+   * Query param: Direction to order buckets
+   */
+  direction?: 'asc' | 'desc';
+
+  /**
+   * Query param: Bucket names to filter by. Only buckets with this phrase in their
+   * name will be returned.
+   */
+  name_contains?: string;
+
+  /**
+   * Query param: Field to order buckets by
+   */
+  order?: 'name';
+
+  /**
+   * Query param: Maximum number of buckets to return in a single call
+   */
+  per_page?: number;
+
+  /**
+   * Query param: Bucket name to start searching after. Buckets are ordered
+   * lexicographically.
+   */
+  start_after?: string;
+
+  /**
+   * Header param: Lists buckets in the provided jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export interface BucketDeleteParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export interface BucketGetParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+Buckets.Lifecycle = Lifecycle;
+Buckets.CORS = CORS;
+Buckets.Domains = Domains;
+Buckets.EventNotifications = EventNotifications;
+Buckets.SippyResource = SippyResource;
+
+export declare namespace Buckets {
+  export {
+    type Bucket as Bucket,
+    type BucketListResponse as BucketListResponse,
+    type BucketDeleteResponse as BucketDeleteResponse,
+    type BucketCreateParams as BucketCreateParams,
+    type BucketListParams as BucketListParams,
+    type BucketDeleteParams as BucketDeleteParams,
+    type BucketGetParams as BucketGetParams,
+  };
+
+  export {
+    Lifecycle as Lifecycle,
+    type LifecycleUpdateResponse as LifecycleUpdateResponse,
+    type LifecycleGetResponse as LifecycleGetResponse,
+    type LifecycleUpdateParams as LifecycleUpdateParams,
+    type LifecycleGetParams as LifecycleGetParams,
+  };
+
+  export {
+    CORS as CORS,
+    type CORSUpdateResponse as CORSUpdateResponse,
+    type CORSDeleteResponse as CORSDeleteResponse,
+    type CORSGetResponse as CORSGetResponse,
+    type CORSUpdateParams as CORSUpdateParams,
+    type CORSDeleteParams as CORSDeleteParams,
+    type CORSGetParams as CORSGetParams,
+  };
+
+  export { Domains as Domains };
+
+  export { EventNotifications as EventNotifications };
+
+  export {
+    SippyResource as SippyResource,
+    type Provider as Provider,
+    type Sippy as Sippy,
+    type SippyDeleteResponse as SippyDeleteResponse,
+    type SippyUpdateParams as SippyUpdateParams,
+    type SippyDeleteParams as SippyDeleteParams,
+    type SippyGetParams as SippyGetParams,
+  };
+}
diff --git a/src/resources/r2/buckets/cors.ts b/src/resources/r2/buckets/cors.ts
new file mode 100644
index 0000000000..9f160a9d7d
--- /dev/null
+++ b/src/resources/r2/buckets/cors.ts
@@ -0,0 +1,245 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class CORS extends APIResource {
+  /**
+   * Set the CORS policy for a bucket
+   */
+  update(
+    bucketName: string,
+    params: CORSUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CORSUpdateResponse> {
+    const { account_id, jurisdiction, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/r2/buckets/${bucketName}/cors`, {
+        body,
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: CORSUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Delete the CORS policy for a bucket
+   */
+  delete(
+    bucketName: string,
+    params: CORSDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CORSDeleteResponse> {
+    const { account_id, jurisdiction } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}/r2/buckets/${bucketName}/cors`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: CORSDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get the CORS policy for a bucket
+   */
+  get(
+    bucketName: string,
+    params: CORSGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CORSGetResponse> {
+    const { account_id, jurisdiction } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/r2/buckets/${bucketName}/cors`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: CORSGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type CORSUpdateResponse = unknown;
+
+export type CORSDeleteResponse = unknown;
+
+export interface CORSGetResponse {
+  rules?: Array<CORSGetResponse.Rule>;
+}
+
+export namespace CORSGetResponse {
+  export interface Rule {
+    /**
+     * Object specifying allowed origins, methods and headers for this CORS rule.
+     */
+    allowed: Rule.Allowed;
+
+    /**
+     * Identifier for this rule
+     */
+    id?: string;
+
+    /**
+     * Specifies the headers that can be exposed back, and accessed by, the JavaScript
+     * making the cross-origin request. If you need to access headers beyond the
+     * safelisted response headers, such as Content-Encoding or cf-cache-status, you
+     * must specify it here.
+     */
+    exposeHeaders?: Array<string>;
+
+    /**
+     * Specifies the amount of time (in seconds) browsers are allowed to cache CORS
+     * preflight responses. Browsers may limit this to 2 hours or less, even if the
+     * maximum value (86400) is specified.
+     */
+    maxAgeSeconds?: number;
+  }
+
+  export namespace Rule {
+    /**
+     * Object specifying allowed origins, methods and headers for this CORS rule.
+     */
+    export interface Allowed {
+      /**
+       * Specifies the value for the Access-Control-Allow-Methods header R2 sets when
+       * requesting objects in a bucket from a browser.
+       */
+      methods: Array<'GET' | 'PUT' | 'POST' | 'DELETE' | 'HEAD'>;
+
+      /**
+       * Specifies the value for the Access-Control-Allow-Origin header R2 sets when
+       * requesting objects in a bucket from a browser.
+       */
+      origins: Array<string>;
+
+      /**
+       * Specifies the value for the Access-Control-Allow-Headers header R2 sets when
+       * requesting objects in this bucket from a browser. Cross-origin requests that
+       * include custom headers (e.g. x-user-id) should specify these headers as
+       * AllowedHeaders.
+       */
+      headers?: Array<string>;
+    }
+  }
+}
+
+export interface CORSUpdateParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  rules?: Array<CORSUpdateParams.Rule>;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export namespace CORSUpdateParams {
+  export interface Rule {
+    /**
+     * Object specifying allowed origins, methods and headers for this CORS rule.
+     */
+    allowed: Rule.Allowed;
+
+    /**
+     * Identifier for this rule
+     */
+    id?: string;
+
+    /**
+     * Specifies the headers that can be exposed back, and accessed by, the JavaScript
+     * making the cross-origin request. If you need to access headers beyond the
+     * safelisted response headers, such as Content-Encoding or cf-cache-status, you
+     * must specify it here.
+     */
+    exposeHeaders?: Array<string>;
+
+    /**
+     * Specifies the amount of time (in seconds) browsers are allowed to cache CORS
+     * preflight responses. Browsers may limit this to 2 hours or less, even if the
+     * maximum value (86400) is specified.
+     */
+    maxAgeSeconds?: number;
+  }
+
+  export namespace Rule {
+    /**
+     * Object specifying allowed origins, methods and headers for this CORS rule.
+     */
+    export interface Allowed {
+      /**
+       * Specifies the value for the Access-Control-Allow-Methods header R2 sets when
+       * requesting objects in a bucket from a browser.
+       */
+      methods: Array<'GET' | 'PUT' | 'POST' | 'DELETE' | 'HEAD'>;
+
+      /**
+       * Specifies the value for the Access-Control-Allow-Origin header R2 sets when
+       * requesting objects in a bucket from a browser.
+       */
+      origins: Array<string>;
+
+      /**
+       * Specifies the value for the Access-Control-Allow-Headers header R2 sets when
+       * requesting objects in this bucket from a browser. Cross-origin requests that
+       * include custom headers (e.g. x-user-id) should specify these headers as
+       * AllowedHeaders.
+       */
+      headers?: Array<string>;
+    }
+  }
+}
+
+export interface CORSDeleteParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export interface CORSGetParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export declare namespace CORS {
+  export {
+    type CORSUpdateResponse as CORSUpdateResponse,
+    type CORSDeleteResponse as CORSDeleteResponse,
+    type CORSGetResponse as CORSGetResponse,
+    type CORSUpdateParams as CORSUpdateParams,
+    type CORSDeleteParams as CORSDeleteParams,
+    type CORSGetParams as CORSGetParams,
+  };
+}
diff --git a/src/resources/r2/buckets/domains/custom.ts b/src/resources/r2/buckets/domains/custom.ts
new file mode 100644
index 0000000000..c947622e1d
--- /dev/null
+++ b/src/resources/r2/buckets/domains/custom.ts
@@ -0,0 +1,367 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+
+export class Custom extends APIResource {
+  /**
+   * Register a new custom domain for an existing R2 bucket.
+   */
+  create(
+    bucketName: string,
+    params: CustomCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CustomCreateResponse> {
+    const { account_id, jurisdiction, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/r2/buckets/${bucketName}/domains/custom`, {
+        body,
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: CustomCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Edit the configuration for a custom domain on an existing R2 bucket.
+   */
+  update(
+    bucketName: string,
+    domainName: string,
+    params: CustomUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CustomUpdateResponse> {
+    const { account_id, jurisdiction, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/r2/buckets/${bucketName}/domains/custom/${domainName}`, {
+        body,
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: CustomUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Gets a list of all custom domains registered with an existing R2 bucket.
+   */
+  list(
+    bucketName: string,
+    params: CustomListParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CustomListResponse> {
+    const { account_id, jurisdiction } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/r2/buckets/${bucketName}/domains/custom`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: CustomListResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Remove custom domain registration from an existing R2 bucket
+   */
+  delete(
+    bucketName: string,
+    domainName: string,
+    params: CustomDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CustomDeleteResponse> {
+    const { account_id, jurisdiction } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}/r2/buckets/${bucketName}/domains/custom/${domainName}`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: CustomDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get the configuration for a custom domain on an existing R2 bucket.
+   */
+  get(
+    bucketName: string,
+    domainName: string,
+    params: CustomGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CustomGetResponse> {
+    const { account_id, jurisdiction } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/r2/buckets/${bucketName}/domains/custom/${domainName}`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: CustomGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface CustomCreateResponse {
+  /**
+   * Domain name of the affected custom domain
+   */
+  domain: string;
+
+  /**
+   * Whether this bucket is publicly accessible at the specified custom domain
+   */
+  enabled: boolean;
+
+  /**
+   * Minimum TLS Version the custom domain will accept for incoming connections. If
+   * not set, defaults to 1.0.
+   */
+  minTLS?: '1.0' | '1.1' | '1.2' | '1.3';
+}
+
+export interface CustomUpdateResponse {
+  /**
+   * Domain name of the affected custom domain
+   */
+  domain: string;
+
+  /**
+   * Whether this bucket is publicly accessible at the specified custom domain
+   */
+  enabled?: boolean;
+
+  /**
+   * Minimum TLS Version the custom domain will accept for incoming connections. If
+   * not set, defaults to 1.0.
+   */
+  minTLS?: '1.0' | '1.1' | '1.2' | '1.3';
+}
+
+export interface CustomListResponse {
+  domains: Array<CustomListResponse.Domain>;
+}
+
+export namespace CustomListResponse {
+  export interface Domain {
+    /**
+     * Domain name of the custom domain to be added
+     */
+    domain: string;
+
+    /**
+     * Whether this bucket is publicly accessible at the specified custom domain
+     */
+    enabled: boolean;
+
+    status: Domain.Status;
+
+    /**
+     * Minimum TLS Version the custom domain will accept for incoming connections. If
+     * not set, defaults to 1.0.
+     */
+    minTLS?: '1.0' | '1.1' | '1.2' | '1.3';
+
+    /**
+     * Zone ID of the custom domain resides in
+     */
+    zoneId?: string;
+
+    /**
+     * Zone that the custom domain resides in
+     */
+    zoneName?: string;
+  }
+
+  export namespace Domain {
+    export interface Status {
+      /**
+       * Ownership status of the domain
+       */
+      ownership: 'pending' | 'active' | 'deactivated' | 'blocked' | 'error' | 'unknown';
+
+      /**
+       * SSL certificate status
+       */
+      ssl: 'initializing' | 'pending' | 'active' | 'deactivated' | 'error' | 'unknown';
+    }
+  }
+}
+
+export interface CustomDeleteResponse {
+  /**
+   * Name of the removed custom domain
+   */
+  domain: string;
+}
+
+export interface CustomGetResponse {
+  /**
+   * Domain name of the custom domain to be added
+   */
+  domain: string;
+
+  /**
+   * Whether this bucket is publicly accessible at the specified custom domain
+   */
+  enabled: boolean;
+
+  status: CustomGetResponse.Status;
+
+  /**
+   * Minimum TLS Version the custom domain will accept for incoming connections. If
+   * not set, defaults to 1.0.
+   */
+  minTLS?: '1.0' | '1.1' | '1.2' | '1.3';
+
+  /**
+   * Zone ID of the custom domain resides in
+   */
+  zoneId?: string;
+
+  /**
+   * Zone that the custom domain resides in
+   */
+  zoneName?: string;
+}
+
+export namespace CustomGetResponse {
+  export interface Status {
+    /**
+     * Ownership status of the domain
+     */
+    ownership: 'pending' | 'active' | 'deactivated' | 'blocked' | 'error' | 'unknown';
+
+    /**
+     * SSL certificate status
+     */
+    ssl: 'initializing' | 'pending' | 'active' | 'deactivated' | 'error' | 'unknown';
+  }
+}
+
+export interface CustomCreateParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Body param: Name of the custom domain to be added
+   */
+  domain: string;
+
+  /**
+   * Body param: Whether to enable public bucket access at the custom domain. If
+   * undefined, the domain will be enabled.
+   */
+  enabled: boolean;
+
+  /**
+   * Body param: Zone ID of the custom domain
+   */
+  zoneId: string;
+
+  /**
+   * Body param: Minimum TLS Version the custom domain will accept for incoming
+   * connections. If not set, defaults to 1.0.
+   */
+  minTLS?: '1.0' | '1.1' | '1.2' | '1.3';
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export interface CustomUpdateParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Body param: Whether to enable public bucket access at the specified custom
+   * domain
+   */
+  enabled?: boolean;
+
+  /**
+   * Body param: Minimum TLS Version the custom domain will accept for incoming
+   * connections. If not set, defaults to previous value.
+   */
+  minTLS?: '1.0' | '1.1' | '1.2' | '1.3';
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export interface CustomListParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export interface CustomDeleteParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export interface CustomGetParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export declare namespace Custom {
+  export {
+    type CustomCreateResponse as CustomCreateResponse,
+    type CustomUpdateResponse as CustomUpdateResponse,
+    type CustomListResponse as CustomListResponse,
+    type CustomDeleteResponse as CustomDeleteResponse,
+    type CustomGetResponse as CustomGetResponse,
+    type CustomCreateParams as CustomCreateParams,
+    type CustomUpdateParams as CustomUpdateParams,
+    type CustomListParams as CustomListParams,
+    type CustomDeleteParams as CustomDeleteParams,
+    type CustomGetParams as CustomGetParams,
+  };
+}
diff --git a/src/resources/r2/buckets/domains/domains.ts b/src/resources/r2/buckets/domains/domains.ts
new file mode 100644
index 0000000000..ba63e09fc2
--- /dev/null
+++ b/src/resources/r2/buckets/domains/domains.ts
@@ -0,0 +1,57 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as CustomAPI from './custom';
+import {
+  Custom,
+  CustomCreateParams,
+  CustomCreateResponse,
+  CustomDeleteParams,
+  CustomDeleteResponse,
+  CustomGetParams,
+  CustomGetResponse,
+  CustomListParams,
+  CustomListResponse,
+  CustomUpdateParams,
+  CustomUpdateResponse,
+} from './custom';
+import * as ManagedAPI from './managed';
+import {
+  Managed,
+  ManagedListParams,
+  ManagedListResponse,
+  ManagedUpdateParams,
+  ManagedUpdateResponse,
+} from './managed';
+
+export class Domains extends APIResource {
+  custom: CustomAPI.Custom = new CustomAPI.Custom(this._client);
+  managed: ManagedAPI.Managed = new ManagedAPI.Managed(this._client);
+}
+
+Domains.Custom = Custom;
+Domains.Managed = Managed;
+
+export declare namespace Domains {
+  export {
+    Custom as Custom,
+    type CustomCreateResponse as CustomCreateResponse,
+    type CustomUpdateResponse as CustomUpdateResponse,
+    type CustomListResponse as CustomListResponse,
+    type CustomDeleteResponse as CustomDeleteResponse,
+    type CustomGetResponse as CustomGetResponse,
+    type CustomCreateParams as CustomCreateParams,
+    type CustomUpdateParams as CustomUpdateParams,
+    type CustomListParams as CustomListParams,
+    type CustomDeleteParams as CustomDeleteParams,
+    type CustomGetParams as CustomGetParams,
+  };
+
+  export {
+    Managed as Managed,
+    type ManagedUpdateResponse as ManagedUpdateResponse,
+    type ManagedListResponse as ManagedListResponse,
+    type ManagedUpdateParams as ManagedUpdateParams,
+    type ManagedListParams as ManagedListParams,
+  };
+}
diff --git a/src/resources/r2/buckets/domains/index.ts b/src/resources/r2/buckets/domains/index.ts
new file mode 100644
index 0000000000..e92ade95a2
--- /dev/null
+++ b/src/resources/r2/buckets/domains/index.ts
@@ -0,0 +1,23 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  Custom,
+  type CustomCreateResponse,
+  type CustomUpdateResponse,
+  type CustomListResponse,
+  type CustomDeleteResponse,
+  type CustomGetResponse,
+  type CustomCreateParams,
+  type CustomUpdateParams,
+  type CustomListParams,
+  type CustomDeleteParams,
+  type CustomGetParams,
+} from './custom';
+export { Domains } from './domains';
+export {
+  Managed,
+  type ManagedUpdateResponse,
+  type ManagedListResponse,
+  type ManagedUpdateParams,
+  type ManagedListParams,
+} from './managed';
diff --git a/src/resources/r2/buckets/domains/managed.ts b/src/resources/r2/buckets/domains/managed.ts
new file mode 100644
index 0000000000..94b9942bda
--- /dev/null
+++ b/src/resources/r2/buckets/domains/managed.ts
@@ -0,0 +1,123 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+
+export class Managed extends APIResource {
+  /**
+   * Updates state of public access over the bucket's R2-managed (r2.dev) domain.
+   */
+  update(
+    bucketName: string,
+    params: ManagedUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ManagedUpdateResponse> {
+    const { account_id, jurisdiction, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/r2/buckets/${bucketName}/domains/managed`, {
+        body,
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: ManagedUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Gets state of public access over the bucket's R2-managed (r2.dev) domain.
+   */
+  list(
+    bucketName: string,
+    params: ManagedListParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ManagedListResponse> {
+    const { account_id, jurisdiction } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/r2/buckets/${bucketName}/domains/managed`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: ManagedListResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface ManagedUpdateResponse {
+  /**
+   * Bucket ID
+   */
+  bucketId: string;
+
+  /**
+   * Domain name of the bucket's r2.dev domain
+   */
+  domain: string;
+
+  /**
+   * Whether this bucket is publicly accessible at the r2.dev domain
+   */
+  enabled: boolean;
+}
+
+export interface ManagedListResponse {
+  /**
+   * Bucket ID
+   */
+  bucketId: string;
+
+  /**
+   * Domain name of the bucket's r2.dev domain
+   */
+  domain: string;
+
+  /**
+   * Whether this bucket is publicly accessible at the r2.dev domain
+   */
+  enabled: boolean;
+}
+
+export interface ManagedUpdateParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Body param: Whether to enable public bucket access at the r2.dev domain
+   */
+  enabled: boolean;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export interface ManagedListParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export declare namespace Managed {
+  export {
+    type ManagedUpdateResponse as ManagedUpdateResponse,
+    type ManagedListResponse as ManagedListResponse,
+    type ManagedUpdateParams as ManagedUpdateParams,
+    type ManagedListParams as ManagedListParams,
+  };
+}
diff --git a/src/resources/r2/buckets/event-notifications/configuration/configuration.ts b/src/resources/r2/buckets/event-notifications/configuration/configuration.ts
new file mode 100644
index 0000000000..6d465fe3f2
--- /dev/null
+++ b/src/resources/r2/buckets/event-notifications/configuration/configuration.ts
@@ -0,0 +1,132 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+import * as QueuesAPI from './queues';
+import {
+  QueueDeleteParams,
+  QueueDeleteResponse,
+  QueueUpdateParams,
+  QueueUpdateResponse,
+  Queues,
+} from './queues';
+
+export class Configuration extends APIResource {
+  queues: QueuesAPI.Queues = new QueuesAPI.Queues(this._client);
+
+  /**
+   * List all event notification rules for a bucket.
+   */
+  get(
+    bucketName: string,
+    params: ConfigurationGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ConfigurationGetResponse> {
+    const { account_id, jurisdiction } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/event_notifications/r2/${bucketName}/configuration`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: ConfigurationGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface ConfigurationGetResponse {
+  /**
+   * Name of the bucket.
+   */
+  bucketName?: string;
+
+  /**
+   * List of queues associated with the bucket.
+   */
+  queues?: Array<ConfigurationGetResponse.Queue>;
+}
+
+export namespace ConfigurationGetResponse {
+  export interface Queue {
+    /**
+     * Queue ID
+     */
+    queueId?: string;
+
+    /**
+     * Name of the queue
+     */
+    queueName?: string;
+
+    rules?: Array<Queue.Rule>;
+  }
+
+  export namespace Queue {
+    export interface Rule {
+      /**
+       * Array of R2 object actions that will trigger notifications
+       */
+      actions: Array<
+        'PutObject' | 'CopyObject' | 'DeleteObject' | 'CompleteMultipartUpload' | 'LifecycleDeletion'
+      >;
+
+      /**
+       * Timestamp when the rule was created
+       */
+      createdAt?: string;
+
+      /**
+       * A description that can be used to identify the event notification rule after
+       * creation
+       */
+      description?: string;
+
+      /**
+       * Notifications will be sent only for objects with this prefix
+       */
+      prefix?: string;
+
+      /**
+       * Rule ID
+       */
+      ruleId?: string;
+
+      /**
+       * Notifications will be sent only for objects with this suffix
+       */
+      suffix?: string;
+    }
+  }
+}
+
+export interface ConfigurationGetParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+Configuration.Queues = Queues;
+
+export declare namespace Configuration {
+  export {
+    type ConfigurationGetResponse as ConfigurationGetResponse,
+    type ConfigurationGetParams as ConfigurationGetParams,
+  };
+
+  export {
+    Queues as Queues,
+    type QueueUpdateResponse as QueueUpdateResponse,
+    type QueueDeleteResponse as QueueDeleteResponse,
+    type QueueUpdateParams as QueueUpdateParams,
+    type QueueDeleteParams as QueueDeleteParams,
+  };
+}
diff --git a/src/resources/r2/buckets/event-notifications/configuration/index.ts b/src/resources/r2/buckets/event-notifications/configuration/index.ts
new file mode 100644
index 0000000000..2196710c84
--- /dev/null
+++ b/src/resources/r2/buckets/event-notifications/configuration/index.ts
@@ -0,0 +1,10 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Configuration, type ConfigurationGetResponse, type ConfigurationGetParams } from './configuration';
+export {
+  Queues,
+  type QueueUpdateResponse,
+  type QueueDeleteResponse,
+  type QueueUpdateParams,
+  type QueueDeleteParams,
+} from './queues';
diff --git a/src/resources/event-notifications/r2/configuration/queues.ts b/src/resources/r2/buckets/event-notifications/configuration/queues.ts
similarity index 50%
rename from src/resources/event-notifications/r2/configuration/queues.ts
rename to src/resources/r2/buckets/event-notifications/configuration/queues.ts
index db0a7091a1..7aa632d8fb 100644
--- a/src/resources/event-notifications/r2/configuration/queues.ts
+++ b/src/resources/r2/buckets/event-notifications/configuration/queues.ts
@@ -1,13 +1,11 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../../resource';
-import * as Core from '../../../../core';
-import * as QueuesAPI from './queues';
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
 
 export class Queues extends APIResource {
   /**
-   * Define the rules for a given queue which will determine event notification
-   * production.
+   * Create event notification rule.
    */
   update(
     bucketName: string,
@@ -15,18 +13,27 @@ export class Queues extends APIResource {
     params: QueueUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<QueueUpdateResponse> {
-    const { account_id, ...body } = params;
+    const { account_id, jurisdiction, ...body } = params;
     return (
       this._client.put(
         `/accounts/${account_id}/event_notifications/r2/${bucketName}/configuration/queues/${queueId}`,
-        { body, ...options },
+        {
+          body,
+          ...options,
+          headers: {
+            ...(jurisdiction?.toString() != null ?
+              { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+            : undefined),
+            ...options?.headers,
+          },
+        },
       ) as Core.APIPromise<{ result: QueueUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Turn off all event notifications configured for delivery to a given queue. No
-   * further notifications will be produced for the queue once complete.
+   * Delete an event notification rule. **If no body is provided, all rules for
+   * specified queue will be deleted**.
    */
   delete(
     bucketName: string,
@@ -34,25 +41,31 @@ export class Queues extends APIResource {
     params: QueueDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<QueueDeleteResponse> {
-    const { account_id } = params;
+    const { account_id, jurisdiction } = params;
     return (
       this._client.delete(
         `/accounts/${account_id}/event_notifications/r2/${bucketName}/configuration/queues/${queueId}`,
-        options,
+        {
+          ...options,
+          headers: {
+            ...(jurisdiction?.toString() != null ?
+              { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+            : undefined),
+            ...options?.headers,
+          },
+        },
       ) as Core.APIPromise<{ result: QueueDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export interface QueueUpdateResponse {
-  event_notification_detail_id?: string;
-}
+export type QueueUpdateResponse = unknown;
 
-export type QueueDeleteResponse = unknown | Array<unknown> | string;
+export type QueueDeleteResponse = unknown;
 
 export interface QueueUpdateParams {
   /**
-   * Path param: Identifier
+   * Path param: Account ID
    */
   account_id: string;
 
@@ -60,6 +73,11 @@ export interface QueueUpdateParams {
    * Body param: Array of rules to drive notifications
    */
   rules?: Array<QueueUpdateParams.Rule>;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
 }
 
 export namespace QueueUpdateParams {
@@ -68,9 +86,15 @@ export namespace QueueUpdateParams {
      * Array of R2 object actions that will trigger notifications
      */
     actions: Array<
-      'PutObject' | 'CopyObject' | 'DeleteObject' | 'CompleteMultipartUpload' | 'AbortMultipartUpload'
+      'PutObject' | 'CopyObject' | 'DeleteObject' | 'CompleteMultipartUpload' | 'LifecycleDeletion'
     >;
 
+    /**
+     * A description that can be used to identify the event notification rule after
+     * creation
+     */
+    description?: string;
+
     /**
      * Notifications will be sent only for objects with this prefix
      */
@@ -85,14 +109,21 @@ export namespace QueueUpdateParams {
 
 export interface QueueDeleteParams {
   /**
-   * Identifier
+   * Path param: Account ID
    */
   account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
 }
 
-export namespace Queues {
-  export import QueueUpdateResponse = QueuesAPI.QueueUpdateResponse;
-  export import QueueDeleteResponse = QueuesAPI.QueueDeleteResponse;
-  export import QueueUpdateParams = QueuesAPI.QueueUpdateParams;
-  export import QueueDeleteParams = QueuesAPI.QueueDeleteParams;
+export declare namespace Queues {
+  export {
+    type QueueUpdateResponse as QueueUpdateResponse,
+    type QueueDeleteResponse as QueueDeleteResponse,
+    type QueueUpdateParams as QueueUpdateParams,
+    type QueueDeleteParams as QueueDeleteParams,
+  };
 }
diff --git a/src/resources/r2/buckets/event-notifications/event-notifications.ts b/src/resources/r2/buckets/event-notifications/event-notifications.ts
new file mode 100644
index 0000000000..e1c7cb46f7
--- /dev/null
+++ b/src/resources/r2/buckets/event-notifications/event-notifications.ts
@@ -0,0 +1,23 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as ConfigurationAPI from './configuration/configuration';
+import {
+  Configuration,
+  ConfigurationGetParams,
+  ConfigurationGetResponse,
+} from './configuration/configuration';
+
+export class EventNotifications extends APIResource {
+  configuration: ConfigurationAPI.Configuration = new ConfigurationAPI.Configuration(this._client);
+}
+
+EventNotifications.Configuration = Configuration;
+
+export declare namespace EventNotifications {
+  export {
+    Configuration as Configuration,
+    type ConfigurationGetResponse as ConfigurationGetResponse,
+    type ConfigurationGetParams as ConfigurationGetParams,
+  };
+}
diff --git a/src/resources/event-notifications/index.ts b/src/resources/r2/buckets/event-notifications/index.ts
similarity index 54%
rename from src/resources/event-notifications/index.ts
rename to src/resources/r2/buckets/event-notifications/index.ts
index 656e57f2d2..275552048d 100644
--- a/src/resources/event-notifications/index.ts
+++ b/src/resources/r2/buckets/event-notifications/index.ts
@@ -1,4 +1,8 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export {
+  Configuration,
+  type ConfigurationGetResponse,
+  type ConfigurationGetParams,
+} from './configuration/index';
 export { EventNotifications } from './event-notifications';
-export { R2 } from './r2/index';
diff --git a/src/resources/r2/buckets/index.ts b/src/resources/r2/buckets/index.ts
new file mode 100644
index 0000000000..6ce4fe1860
--- /dev/null
+++ b/src/resources/r2/buckets/index.ts
@@ -0,0 +1,39 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  Buckets,
+  type Bucket,
+  type BucketListResponse,
+  type BucketDeleteResponse,
+  type BucketCreateParams,
+  type BucketListParams,
+  type BucketDeleteParams,
+  type BucketGetParams,
+} from './buckets';
+export {
+  CORS,
+  type CORSUpdateResponse,
+  type CORSDeleteResponse,
+  type CORSGetResponse,
+  type CORSUpdateParams,
+  type CORSDeleteParams,
+  type CORSGetParams,
+} from './cors';
+export { Domains } from './domains/index';
+export { EventNotifications } from './event-notifications/index';
+export {
+  Lifecycle,
+  type LifecycleUpdateResponse,
+  type LifecycleGetResponse,
+  type LifecycleUpdateParams,
+  type LifecycleGetParams,
+} from './lifecycle';
+export {
+  SippyResource,
+  type Provider,
+  type Sippy,
+  type SippyDeleteResponse,
+  type SippyUpdateParams,
+  type SippyDeleteParams,
+  type SippyGetParams,
+} from './sippy';
diff --git a/src/resources/r2/buckets/lifecycle.ts b/src/resources/r2/buckets/lifecycle.ts
new file mode 100644
index 0000000000..d18db68abf
--- /dev/null
+++ b/src/resources/r2/buckets/lifecycle.ts
@@ -0,0 +1,371 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Lifecycle extends APIResource {
+  /**
+   * Set the object lifecycle rules for a bucket
+   */
+  update(
+    bucketName: string,
+    params: LifecycleUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<LifecycleUpdateResponse> {
+    const { account_id, jurisdiction, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/r2/buckets/${bucketName}/lifecycle`, {
+        body,
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: LifecycleUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get object lifecycle rules for a bucket
+   */
+  get(
+    bucketName: string,
+    params: LifecycleGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<LifecycleGetResponse> {
+    const { account_id, jurisdiction } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/r2/buckets/${bucketName}/lifecycle`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: LifecycleGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type LifecycleUpdateResponse = unknown;
+
+export interface LifecycleGetResponse {
+  rules?: Array<LifecycleGetResponse.Rule>;
+}
+
+export namespace LifecycleGetResponse {
+  export interface Rule {
+    /**
+     * Unique identifier for this rule
+     */
+    id: string;
+
+    /**
+     * Conditions that apply to all transitions of this rule
+     */
+    conditions: Rule.Conditions;
+
+    /**
+     * Whether or not this rule is in effect
+     */
+    enabled: boolean;
+
+    /**
+     * Transition to abort ongoing multipart uploads
+     */
+    abortMultipartUploadsTransition?: Rule.AbortMultipartUploadsTransition;
+
+    /**
+     * Transition to delete objects
+     */
+    deleteObjectsTransition?: Rule.DeleteObjectsTransition;
+
+    /**
+     * Transitions to change the storage class of objects
+     */
+    storageClassTransitions?: Array<Rule.StorageClassTransition>;
+  }
+
+  export namespace Rule {
+    /**
+     * Conditions that apply to all transitions of this rule
+     */
+    export interface Conditions {
+      /**
+       * Transitions will only apply to objects/uploads in the bucket that start with the
+       * given prefix, an empty prefix can be provided to scope rule to all
+       * objects/uploads
+       */
+      prefix: string;
+    }
+
+    /**
+     * Transition to abort ongoing multipart uploads
+     */
+    export interface AbortMultipartUploadsTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      condition?: AbortMultipartUploadsTransition.Condition;
+    }
+
+    export namespace AbortMultipartUploadsTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      export interface Condition {
+        maxAge: number;
+
+        type: 'Age';
+      }
+    }
+
+    /**
+     * Transition to delete objects
+     */
+    export interface DeleteObjectsTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      condition?:
+        | DeleteObjectsTransition.R2LifecycleAgeCondition
+        | DeleteObjectsTransition.R2LifecycleDateCondition;
+    }
+
+    export namespace DeleteObjectsTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      export interface R2LifecycleAgeCondition {
+        maxAge: number;
+
+        type: 'Age';
+      }
+
+      /**
+       * Condition for lifecycle transitions to apply on a specific date
+       */
+      export interface R2LifecycleDateCondition {
+        date: string;
+
+        type: 'Date';
+      }
+    }
+
+    export interface StorageClassTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      condition:
+        | StorageClassTransition.R2LifecycleAgeCondition
+        | StorageClassTransition.R2LifecycleDateCondition;
+
+      storageClass: 'InfrequentAccess';
+    }
+
+    export namespace StorageClassTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      export interface R2LifecycleAgeCondition {
+        maxAge: number;
+
+        type: 'Age';
+      }
+
+      /**
+       * Condition for lifecycle transitions to apply on a specific date
+       */
+      export interface R2LifecycleDateCondition {
+        date: string;
+
+        type: 'Date';
+      }
+    }
+  }
+}
+
+export interface LifecycleUpdateParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  rules?: Array<LifecycleUpdateParams.Rule>;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export namespace LifecycleUpdateParams {
+  export interface Rule {
+    /**
+     * Unique identifier for this rule
+     */
+    id: string;
+
+    /**
+     * Conditions that apply to all transitions of this rule
+     */
+    conditions: Rule.Conditions;
+
+    /**
+     * Whether or not this rule is in effect
+     */
+    enabled: boolean;
+
+    /**
+     * Transition to abort ongoing multipart uploads
+     */
+    abortMultipartUploadsTransition?: Rule.AbortMultipartUploadsTransition;
+
+    /**
+     * Transition to delete objects
+     */
+    deleteObjectsTransition?: Rule.DeleteObjectsTransition;
+
+    /**
+     * Transitions to change the storage class of objects
+     */
+    storageClassTransitions?: Array<Rule.StorageClassTransition>;
+  }
+
+  export namespace Rule {
+    /**
+     * Conditions that apply to all transitions of this rule
+     */
+    export interface Conditions {
+      /**
+       * Transitions will only apply to objects/uploads in the bucket that start with the
+       * given prefix, an empty prefix can be provided to scope rule to all
+       * objects/uploads
+       */
+      prefix: string;
+    }
+
+    /**
+     * Transition to abort ongoing multipart uploads
+     */
+    export interface AbortMultipartUploadsTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      condition?: AbortMultipartUploadsTransition.Condition;
+    }
+
+    export namespace AbortMultipartUploadsTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      export interface Condition {
+        maxAge: number;
+
+        type: 'Age';
+      }
+    }
+
+    /**
+     * Transition to delete objects
+     */
+    export interface DeleteObjectsTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      condition?:
+        | DeleteObjectsTransition.R2LifecycleAgeCondition
+        | DeleteObjectsTransition.R2LifecycleDateCondition;
+    }
+
+    export namespace DeleteObjectsTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      export interface R2LifecycleAgeCondition {
+        maxAge: number;
+
+        type: 'Age';
+      }
+
+      /**
+       * Condition for lifecycle transitions to apply on a specific date
+       */
+      export interface R2LifecycleDateCondition {
+        date: string;
+
+        type: 'Date';
+      }
+    }
+
+    export interface StorageClassTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      condition:
+        | StorageClassTransition.R2LifecycleAgeCondition
+        | StorageClassTransition.R2LifecycleDateCondition;
+
+      storageClass: 'InfrequentAccess';
+    }
+
+    export namespace StorageClassTransition {
+      /**
+       * Condition for lifecycle transitions to apply after an object reaches an age in
+       * seconds
+       */
+      export interface R2LifecycleAgeCondition {
+        maxAge: number;
+
+        type: 'Age';
+      }
+
+      /**
+       * Condition for lifecycle transitions to apply on a specific date
+       */
+      export interface R2LifecycleDateCondition {
+        date: string;
+
+        type: 'Date';
+      }
+    }
+  }
+}
+
+export interface LifecycleGetParams {
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
+}
+
+export declare namespace Lifecycle {
+  export {
+    type LifecycleUpdateResponse as LifecycleUpdateResponse,
+    type LifecycleGetResponse as LifecycleGetResponse,
+    type LifecycleUpdateParams as LifecycleUpdateParams,
+    type LifecycleGetParams as LifecycleGetParams,
+  };
+}
diff --git a/src/resources/r2/sippy.ts b/src/resources/r2/buckets/sippy.ts
similarity index 76%
rename from src/resources/r2/sippy.ts
rename to src/resources/r2/buckets/sippy.ts
index 2924e8c7de..46d185c7fd 100644
--- a/src/resources/r2/sippy.ts
+++ b/src/resources/r2/buckets/sippy.ts
@@ -1,7 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
 import * as SippyAPI from './sippy';
 
 export class SippyResource extends APIResource {
@@ -13,11 +13,17 @@ export class SippyResource extends APIResource {
     params: SippyUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<Sippy> {
-    const { account_id, ...body } = params;
+    const { account_id, jurisdiction, ...body } = params;
     return (
       this._client.put(`/accounts/${account_id}/r2/buckets/${bucketName}/sippy`, {
         body,
         ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
       }) as Core.APIPromise<{ result: Sippy }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -30,12 +36,17 @@ export class SippyResource extends APIResource {
     params: SippyDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<SippyDeleteResponse> {
-    const { account_id } = params;
+    const { account_id, jurisdiction } = params;
     return (
-      this._client.delete(
-        `/accounts/${account_id}/r2/buckets/${bucketName}/sippy`,
-        options,
-      ) as Core.APIPromise<{ result: SippyDeleteResponse }>
+      this._client.delete(`/accounts/${account_id}/r2/buckets/${bucketName}/sippy`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: SippyDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -43,11 +54,17 @@ export class SippyResource extends APIResource {
    * Gets configuration for Sippy for an existing R2 bucket.
    */
   get(bucketName: string, params: SippyGetParams, options?: Core.RequestOptions): Core.APIPromise<Sippy> {
-    const { account_id } = params;
+    const { account_id, jurisdiction } = params;
     return (
-      this._client.get(`/accounts/${account_id}/r2/buckets/${bucketName}/sippy`, options) as Core.APIPromise<{
-        result: Sippy;
-      }>
+      this._client.get(`/accounts/${account_id}/r2/buckets/${bucketName}/sippy`, {
+        ...options,
+        headers: {
+          ...(jurisdiction?.toString() != null ?
+            { 'cf-r2-jurisdiction': jurisdiction?.toString() }
+          : undefined),
+          ...options?.headers,
+        },
+      }) as Core.APIPromise<{ result: Sippy }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -117,7 +134,7 @@ export interface SippyDeleteResponse {
 
 export type SippyUpdateParams = SippyUpdateParams.R2EnableSippyAws | SippyUpdateParams.R2EnableSippyGcs;
 
-export namespace SippyUpdateParams {
+export declare namespace SippyUpdateParams {
   export interface R2EnableSippyAws {
     /**
      * Path param: Account ID
@@ -133,6 +150,11 @@ export namespace SippyUpdateParams {
      * Body param: AWS S3 bucket to copy objects from
      */
     source?: SippyUpdateParams.R2EnableSippyAws.Source;
+
+    /**
+     * Header param: The bucket jurisdiction
+     */
+    jurisdiction?: 'default' | 'eu' | 'fedramp';
   }
 
   export namespace R2EnableSippyAws {
@@ -206,6 +228,11 @@ export namespace SippyUpdateParams {
      * Body param: GCS bucket to copy objects from
      */
     source?: SippyUpdateParams.R2EnableSippyGcs.Source;
+
+    /**
+     * Header param: The bucket jurisdiction
+     */
+    jurisdiction?: 'default' | 'eu' | 'fedramp';
   }
 
   export namespace R2EnableSippyGcs {
@@ -262,23 +289,35 @@ export namespace SippyUpdateParams {
 
 export interface SippyDeleteParams {
   /**
-   * Account ID
+   * Path param: Account ID
    */
   account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
 }
 
 export interface SippyGetParams {
   /**
-   * Account ID
+   * Path param: Account ID
    */
   account_id: string;
+
+  /**
+   * Header param: The bucket jurisdiction
+   */
+  jurisdiction?: 'default' | 'eu' | 'fedramp';
 }
 
-export namespace SippyResource {
-  export import Provider = SippyAPI.Provider;
-  export import Sippy = SippyAPI.Sippy;
-  export import SippyDeleteResponse = SippyAPI.SippyDeleteResponse;
-  export import SippyUpdateParams = SippyAPI.SippyUpdateParams;
-  export import SippyDeleteParams = SippyAPI.SippyDeleteParams;
-  export import SippyGetParams = SippyAPI.SippyGetParams;
+export declare namespace SippyResource {
+  export {
+    type Provider as Provider,
+    type Sippy as Sippy,
+    type SippyDeleteResponse as SippyDeleteResponse,
+    type SippyUpdateParams as SippyUpdateParams,
+    type SippyDeleteParams as SippyDeleteParams,
+    type SippyGetParams as SippyGetParams,
+  };
 }
diff --git a/src/resources/r2/index.ts b/src/resources/r2/index.ts
index 724fbdfd2e..788ae8bc61 100644
--- a/src/resources/r2/index.ts
+++ b/src/resources/r2/index.ts
@@ -1,28 +1,19 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Bucket,
-  BucketDeleteResponse,
-  BucketCreateParams,
-  BucketListParams,
-  BucketDeleteParams,
-  BucketGetParams,
-  BucketsCursorPagination,
   Buckets,
-} from './buckets';
-export {
-  Provider,
-  Sippy,
-  SippyDeleteResponse,
-  SippyUpdateParams,
-  SippyDeleteParams,
-  SippyGetParams,
-  SippyResource,
-} from './sippy';
+  type Bucket,
+  type BucketListResponse,
+  type BucketDeleteResponse,
+  type BucketCreateParams,
+  type BucketListParams,
+  type BucketDeleteParams,
+  type BucketGetParams,
+} from './buckets/index';
 export { R2 } from './r2';
 export {
-  TemporaryCredential,
-  TemporaryCredentialCreateResponse,
-  TemporaryCredentialCreateParams,
   TemporaryCredentials,
+  type TemporaryCredential,
+  type TemporaryCredentialCreateResponse,
+  type TemporaryCredentialCreateParams,
 } from './temporary-credentials';
diff --git a/src/resources/r2/r2.ts b/src/resources/r2/r2.ts
index 1765a725d6..01c40db57c 100644
--- a/src/resources/r2/r2.ts
+++ b/src/resources/r2/r2.ts
@@ -1,35 +1,50 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
-import * as BucketsAPI from './buckets';
-import * as SippyAPI from './sippy';
 import * as TemporaryCredentialsAPI from './temporary-credentials';
+import {
+  TemporaryCredential,
+  TemporaryCredentialCreateParams,
+  TemporaryCredentialCreateResponse,
+  TemporaryCredentials,
+} from './temporary-credentials';
+import * as BucketsAPI from './buckets/buckets';
+import {
+  Bucket,
+  BucketCreateParams,
+  BucketDeleteParams,
+  BucketDeleteResponse,
+  BucketGetParams,
+  BucketListParams,
+  BucketListResponse,
+  Buckets,
+} from './buckets/buckets';
 
 export class R2 extends APIResource {
   buckets: BucketsAPI.Buckets = new BucketsAPI.Buckets(this._client);
-  sippy: SippyAPI.SippyResource = new SippyAPI.SippyResource(this._client);
   temporaryCredentials: TemporaryCredentialsAPI.TemporaryCredentials =
     new TemporaryCredentialsAPI.TemporaryCredentials(this._client);
 }
 
-export namespace R2 {
-  export import Buckets = BucketsAPI.Buckets;
-  export import Bucket = BucketsAPI.Bucket;
-  export import BucketDeleteResponse = BucketsAPI.BucketDeleteResponse;
-  export import BucketsCursorPagination = BucketsAPI.BucketsCursorPagination;
-  export import BucketCreateParams = BucketsAPI.BucketCreateParams;
-  export import BucketListParams = BucketsAPI.BucketListParams;
-  export import BucketDeleteParams = BucketsAPI.BucketDeleteParams;
-  export import BucketGetParams = BucketsAPI.BucketGetParams;
-  export import SippyResource = SippyAPI.SippyResource;
-  export import Provider = SippyAPI.Provider;
-  export import Sippy = SippyAPI.Sippy;
-  export import SippyDeleteResponse = SippyAPI.SippyDeleteResponse;
-  export import SippyUpdateParams = SippyAPI.SippyUpdateParams;
-  export import SippyDeleteParams = SippyAPI.SippyDeleteParams;
-  export import SippyGetParams = SippyAPI.SippyGetParams;
-  export import TemporaryCredentials = TemporaryCredentialsAPI.TemporaryCredentials;
-  export import TemporaryCredential = TemporaryCredentialsAPI.TemporaryCredential;
-  export import TemporaryCredentialCreateResponse = TemporaryCredentialsAPI.TemporaryCredentialCreateResponse;
-  export import TemporaryCredentialCreateParams = TemporaryCredentialsAPI.TemporaryCredentialCreateParams;
+R2.Buckets = Buckets;
+R2.TemporaryCredentials = TemporaryCredentials;
+
+export declare namespace R2 {
+  export {
+    Buckets as Buckets,
+    type Bucket as Bucket,
+    type BucketListResponse as BucketListResponse,
+    type BucketDeleteResponse as BucketDeleteResponse,
+    type BucketCreateParams as BucketCreateParams,
+    type BucketListParams as BucketListParams,
+    type BucketDeleteParams as BucketDeleteParams,
+    type BucketGetParams as BucketGetParams,
+  };
+
+  export {
+    TemporaryCredentials as TemporaryCredentials,
+    type TemporaryCredential as TemporaryCredential,
+    type TemporaryCredentialCreateResponse as TemporaryCredentialCreateResponse,
+    type TemporaryCredentialCreateParams as TemporaryCredentialCreateParams,
+  };
 }
diff --git a/src/resources/r2/temporary-credentials.ts b/src/resources/r2/temporary-credentials.ts
index 1e5788f4ca..930fe9af04 100644
--- a/src/resources/r2/temporary-credentials.ts
+++ b/src/resources/r2/temporary-credentials.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as TemporaryCredentialsAPI from './temporary-credentials';
 
 export class TemporaryCredentials extends APIResource {
   /**
@@ -109,8 +108,10 @@ export interface TemporaryCredentialCreateParams {
   prefixes?: Array<string>;
 }
 
-export namespace TemporaryCredentials {
-  export import TemporaryCredential = TemporaryCredentialsAPI.TemporaryCredential;
-  export import TemporaryCredentialCreateResponse = TemporaryCredentialsAPI.TemporaryCredentialCreateResponse;
-  export import TemporaryCredentialCreateParams = TemporaryCredentialsAPI.TemporaryCredentialCreateParams;
+export declare namespace TemporaryCredentials {
+  export {
+    type TemporaryCredential as TemporaryCredential,
+    type TemporaryCredentialCreateResponse as TemporaryCredentialCreateResponse,
+    type TemporaryCredentialCreateParams as TemporaryCredentialCreateParams,
+  };
 }
diff --git a/src/resources/radar/ai/ai.ts b/src/resources/radar/ai/ai.ts
new file mode 100755
index 0000000000..6d753eb5f7
--- /dev/null
+++ b/src/resources/radar/ai/ai.ts
@@ -0,0 +1,31 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as TimeseriesGroupsAPI from './timeseries-groups';
+import {
+  TimeseriesGroupUserAgentParams,
+  TimeseriesGroupUserAgentResponse,
+  TimeseriesGroups,
+} from './timeseries-groups';
+import * as BotsAPI from './bots/bots';
+import { Bots } from './bots/bots';
+
+export class AI extends APIResource {
+  bots: BotsAPI.Bots = new BotsAPI.Bots(this._client);
+  timeseriesGroups: TimeseriesGroupsAPI.TimeseriesGroups = new TimeseriesGroupsAPI.TimeseriesGroups(
+    this._client,
+  );
+}
+
+AI.Bots = Bots;
+AI.TimeseriesGroups = TimeseriesGroups;
+
+export declare namespace AI {
+  export { Bots as Bots };
+
+  export {
+    TimeseriesGroups as TimeseriesGroups,
+    type TimeseriesGroupUserAgentResponse as TimeseriesGroupUserAgentResponse,
+    type TimeseriesGroupUserAgentParams as TimeseriesGroupUserAgentParams,
+  };
+}
diff --git a/src/resources/radar/ai/bots/bots.ts b/src/resources/radar/ai/bots/bots.ts
new file mode 100644
index 0000000000..865665cba6
--- /dev/null
+++ b/src/resources/radar/ai/bots/bots.ts
@@ -0,0 +1,19 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as SummaryAPI from './summary';
+import { Summary, SummaryUserAgentParams, SummaryUserAgentResponse } from './summary';
+
+export class Bots extends APIResource {
+  summary: SummaryAPI.Summary = new SummaryAPI.Summary(this._client);
+}
+
+Bots.Summary = Summary;
+
+export declare namespace Bots {
+  export {
+    Summary as Summary,
+    type SummaryUserAgentResponse as SummaryUserAgentResponse,
+    type SummaryUserAgentParams as SummaryUserAgentParams,
+  };
+}
diff --git a/src/resources/radar/ai/bots/index.ts b/src/resources/radar/ai/bots/index.ts
new file mode 100644
index 0000000000..c94177cbcd
--- /dev/null
+++ b/src/resources/radar/ai/bots/index.ts
@@ -0,0 +1,4 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Bots } from './bots';
+export { Summary, type SummaryUserAgentResponse, type SummaryUserAgentParams } from './summary';
diff --git a/src/resources/radar/ai/bots/summary.ts b/src/resources/radar/ai/bots/summary.ts
new file mode 100644
index 0000000000..faedaabb00
--- /dev/null
+++ b/src/resources/radar/ai/bots/summary.ts
@@ -0,0 +1,149 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import { isRequestOptions } from '../../../../core';
+import * as Core from '../../../../core';
+
+export class Summary extends APIResource {
+  /**
+   * Percentage of Internet traffic generated by AI user agents, over a given time
+   * period.
+   */
+  userAgent(
+    query?: SummaryUserAgentParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SummaryUserAgentResponse>;
+  userAgent(options?: Core.RequestOptions): Core.APIPromise<SummaryUserAgentResponse>;
+  userAgent(
+    query: SummaryUserAgentParams | Core.RequestOptions = {},
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SummaryUserAgentResponse> {
+    if (isRequestOptions(query)) {
+      return this.userAgent({}, query);
+    }
+    return (
+      this._client.get('/radar/ai/bots/summary/user_agent', { query, ...options }) as Core.APIPromise<{
+        result: SummaryUserAgentResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface SummaryUserAgentResponse {
+  meta: SummaryUserAgentResponse.Meta;
+
+  summary_0: Record<string, string>;
+}
+
+export namespace SummaryUserAgentResponse {
+  export interface Meta {
+    dateRange: Array<Meta.DateRange>;
+
+    lastUpdated: string;
+
+    normalization: string;
+
+    confidenceInfo?: Meta.ConfidenceInfo;
+  }
+
+  export namespace Meta {
+    export interface DateRange {
+      /**
+       * Adjusted end of date range.
+       */
+      endTime: string;
+
+      /**
+       * Adjusted start of date range.
+       */
+      startTime: string;
+    }
+
+    export interface ConfidenceInfo {
+      annotations?: Array<ConfidenceInfo.Annotation>;
+
+      level?: number;
+    }
+
+    export namespace ConfidenceInfo {
+      export interface Annotation {
+        dataSource: string;
+
+        description: string;
+
+        eventType: string;
+
+        isInstantaneous: boolean;
+
+        endTime?: string;
+
+        linkedUrl?: string;
+
+        startTime?: string;
+      }
+    }
+  }
+}
+
+export interface SummaryUserAgentParams {
+  /**
+   * Array of comma separated list of ASNs, start with `-` to exclude from results.
+   * For example, `-174, 3356` excludes results from AS174, but includes results from
+   * AS3356.
+   */
+  asn?: Array<string>;
+
+  /**
+   * Array of comma separated list of continents (alpha-2 continent codes). Start
+   * with `-` to exclude from results. For example, `-EU,NA` excludes results from
+   * Europe, but includes results from North America.
+   */
+  continent?: Array<string>;
+
+  /**
+   * End of the date range (inclusive).
+   */
+  dateEnd?: Array<string>;
+
+  /**
+   * For example, use `7d` and `7dControl` to compare this week with the previous
+   * week. Use this parameter or set specific start and end dates (`dateStart` and
+   * `dateEnd` parameters).
+   */
+  dateRange?: Array<string>;
+
+  /**
+   * Array of datetimes to filter the start of a series.
+   */
+  dateStart?: Array<string>;
+
+  /**
+   * Format results are returned in.
+   */
+  format?: 'JSON' | 'CSV';
+
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
+  /**
+   * Array of comma separated list of locations (alpha-2 country codes). Start with
+   * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
+   * but includes results from PT.
+   */
+  location?: Array<string>;
+
+  /**
+   * Array of names that will be used to name the series in responses.
+   */
+  name?: Array<string>;
+}
+
+export declare namespace Summary {
+  export {
+    type SummaryUserAgentResponse as SummaryUserAgentResponse,
+    type SummaryUserAgentParams as SummaryUserAgentParams,
+  };
+}
diff --git a/src/resources/radar/ai/index.ts b/src/resources/radar/ai/index.ts
new file mode 100755
index 0000000000..e13383ec41
--- /dev/null
+++ b/src/resources/radar/ai/index.ts
@@ -0,0 +1,9 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { AI } from './ai';
+export { Bots } from './bots/index';
+export {
+  TimeseriesGroups,
+  type TimeseriesGroupUserAgentResponse,
+  type TimeseriesGroupUserAgentParams,
+} from './timeseries-groups';
diff --git a/src/resources/radar/ai/timeseries-groups.ts b/src/resources/radar/ai/timeseries-groups.ts
new file mode 100644
index 0000000000..fc950832b7
--- /dev/null
+++ b/src/resources/radar/ai/timeseries-groups.ts
@@ -0,0 +1,113 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import { isRequestOptions } from '../../../core';
+import * as Core from '../../../core';
+
+export class TimeseriesGroups extends APIResource {
+  /**
+   * Percentage distribution of traffic per AI user agent over time.
+   */
+  userAgent(
+    query?: TimeseriesGroupUserAgentParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TimeseriesGroupUserAgentResponse>;
+  userAgent(options?: Core.RequestOptions): Core.APIPromise<TimeseriesGroupUserAgentResponse>;
+  userAgent(
+    query: TimeseriesGroupUserAgentParams | Core.RequestOptions = {},
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TimeseriesGroupUserAgentResponse> {
+    if (isRequestOptions(query)) {
+      return this.userAgent({}, query);
+    }
+    return (
+      this._client.get('/radar/ai/bots/timeseries_groups/user_agent', {
+        query,
+        ...options,
+      }) as Core.APIPromise<{ result: TimeseriesGroupUserAgentResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface TimeseriesGroupUserAgentResponse {
+  meta: unknown;
+
+  serie_0: TimeseriesGroupUserAgentResponse.Serie0;
+}
+
+export namespace TimeseriesGroupUserAgentResponse {
+  export interface Serie0 {
+    timestamps: Array<string>;
+    [k: string]: Array<string> | undefined;
+  }
+}
+
+export interface TimeseriesGroupUserAgentParams {
+  /**
+   * Aggregation interval results should be returned in (for example, in 15 minutes
+   * or 1 hour intervals). Refer to
+   * [Aggregation intervals](https://developers.cloudflare.com/radar/concepts/aggregation-intervals/).
+   */
+  aggInterval?: '15m' | '1h' | '1d' | '1w';
+
+  /**
+   * Array of comma separated list of ASNs, start with `-` to exclude from results.
+   * For example, `-174, 3356` excludes results from AS174, but includes results from
+   * AS3356.
+   */
+  asn?: Array<string>;
+
+  /**
+   * Array of comma separated list of continents (alpha-2 continent codes). Start
+   * with `-` to exclude from results. For example, `-EU,NA` excludes results from
+   * Europe, but includes results from North America.
+   */
+  continent?: Array<string>;
+
+  /**
+   * End of the date range (inclusive).
+   */
+  dateEnd?: Array<string>;
+
+  /**
+   * For example, use `7d` and `7dControl` to compare this week with the previous
+   * week. Use this parameter or set specific start and end dates (`dateStart` and
+   * `dateEnd` parameters).
+   */
+  dateRange?: Array<string>;
+
+  /**
+   * Array of datetimes to filter the start of a series.
+   */
+  dateStart?: Array<string>;
+
+  /**
+   * Format results are returned in.
+   */
+  format?: 'JSON' | 'CSV';
+
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
+  /**
+   * Array of comma separated list of locations (alpha-2 country codes). Start with
+   * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
+   * but includes results from PT.
+   */
+  location?: Array<string>;
+
+  /**
+   * Array of names that will be used to name the series in responses.
+   */
+  name?: Array<string>;
+}
+
+export declare namespace TimeseriesGroups {
+  export {
+    type TimeseriesGroupUserAgentResponse as TimeseriesGroupUserAgentResponse,
+    type TimeseriesGroupUserAgentParams as TimeseriesGroupUserAgentParams,
+  };
+}
diff --git a/src/resources/radar/annotations/annotations.ts b/src/resources/radar/annotations/annotations.ts
index ea0d8ea2bc..1a28d6692a 100644
--- a/src/resources/radar/annotations/annotations.ts
+++ b/src/resources/radar/annotations/annotations.ts
@@ -1,16 +1,160 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../resource';
+import { isRequestOptions } from '../../../core';
+import * as Core from '../../../core';
 import * as OutagesAPI from './outages';
+import {
+  OutageGetParams,
+  OutageGetResponse,
+  OutageLocationsParams,
+  OutageLocationsResponse,
+  Outages,
+} from './outages';
 
 export class Annotations extends APIResource {
   outages: OutagesAPI.Outages = new OutagesAPI.Outages(this._client);
+
+  /**
+   * Get the latest annotations.
+   */
+  list(query?: AnnotationListParams, options?: Core.RequestOptions): Core.APIPromise<AnnotationListResponse>;
+  list(options?: Core.RequestOptions): Core.APIPromise<AnnotationListResponse>;
+  list(
+    query: AnnotationListParams | Core.RequestOptions = {},
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AnnotationListResponse> {
+    if (isRequestOptions(query)) {
+      return this.list({}, query);
+    }
+    return (
+      this._client.get('/radar/annotations', { query, ...options }) as Core.APIPromise<{
+        result: AnnotationListResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface AnnotationListResponse {
+  annotations: Array<AnnotationListResponse.Annotation>;
 }
 
-export namespace Annotations {
-  export import Outages = OutagesAPI.Outages;
-  export import OutageGetResponse = OutagesAPI.OutageGetResponse;
-  export import OutageLocationsResponse = OutagesAPI.OutageLocationsResponse;
-  export import OutageGetParams = OutagesAPI.OutageGetParams;
-  export import OutageLocationsParams = OutagesAPI.OutageLocationsParams;
+export namespace AnnotationListResponse {
+  export interface Annotation {
+    id: string;
+
+    asns: Array<number>;
+
+    asnsDetails: Array<Annotation.ASNsDetail>;
+
+    dataSource: string;
+
+    eventType: string;
+
+    locations: Array<string>;
+
+    locationsDetails: Array<Annotation.LocationsDetail>;
+
+    outage: Annotation.Outage;
+
+    startDate: string;
+
+    description?: string;
+
+    endDate?: string;
+
+    linkedUrl?: string;
+
+    scope?: string;
+  }
+
+  export namespace Annotation {
+    export interface ASNsDetail {
+      asn: string;
+
+      name: string;
+
+      locations?: ASNsDetail.Locations;
+    }
+
+    export namespace ASNsDetail {
+      export interface Locations {
+        code: string;
+
+        name: string;
+      }
+    }
+
+    export interface LocationsDetail {
+      code: string;
+
+      name: string;
+    }
+
+    export interface Outage {
+      outageCause: string;
+
+      outageType: string;
+    }
+  }
+}
+
+export interface AnnotationListParams {
+  /**
+   * Single ASN as integer.
+   */
+  asn?: number;
+
+  /**
+   * End of the date range (inclusive).
+   */
+  dateEnd?: string;
+
+  /**
+   * Shorthand date ranges for the last X days - use when you don't need specific
+   * start and end dates.
+   */
+  dateRange?: string;
+
+  /**
+   * Start of the date range (inclusive).
+   */
+  dateStart?: string;
+
+  /**
+   * Format results are returned in.
+   */
+  format?: 'JSON' | 'CSV';
+
+  /**
+   * Limit the number of objects in the response.
+   */
+  limit?: number;
+
+  /**
+   * Location Alpha2 code.
+   */
+  location?: string;
+
+  /**
+   * Number of objects to skip before grabbing results.
+   */
+  offset?: number;
+}
+
+Annotations.Outages = Outages;
+
+export declare namespace Annotations {
+  export {
+    type AnnotationListResponse as AnnotationListResponse,
+    type AnnotationListParams as AnnotationListParams,
+  };
+
+  export {
+    Outages as Outages,
+    type OutageGetResponse as OutageGetResponse,
+    type OutageLocationsResponse as OutageLocationsResponse,
+    type OutageGetParams as OutageGetParams,
+    type OutageLocationsParams as OutageLocationsParams,
+  };
 }
diff --git a/src/resources/radar/annotations/index.ts b/src/resources/radar/annotations/index.ts
index c51c25efc5..08229e49b6 100644
--- a/src/resources/radar/annotations/index.ts
+++ b/src/resources/radar/annotations/index.ts
@@ -1,10 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { Annotations } from './annotations';
+export { Annotations, type AnnotationListResponse, type AnnotationListParams } from './annotations';
 export {
-  OutageGetResponse,
-  OutageLocationsResponse,
-  OutageGetParams,
-  OutageLocationsParams,
   Outages,
+  type OutageGetResponse,
+  type OutageLocationsResponse,
+  type OutageGetParams,
+  type OutageLocationsParams,
 } from './outages';
diff --git a/src/resources/radar/annotations/outages.ts b/src/resources/radar/annotations/outages.ts
index 5d486e6f79..62a5da540b 100644
--- a/src/resources/radar/annotations/outages.ts
+++ b/src/resources/radar/annotations/outages.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as OutagesAPI from './outages';
 
 export class Outages extends APIResource {
   /**
@@ -26,7 +25,7 @@ export class Outages extends APIResource {
   }
 
   /**
-   * Get the number of outages for locations.
+   * Get the number of outages by location.
    */
   locations(
     query?: OutageLocationsParams,
@@ -197,9 +196,11 @@ export interface OutageLocationsParams {
   limit?: number;
 }
 
-export namespace Outages {
-  export import OutageGetResponse = OutagesAPI.OutageGetResponse;
-  export import OutageLocationsResponse = OutagesAPI.OutageLocationsResponse;
-  export import OutageGetParams = OutagesAPI.OutageGetParams;
-  export import OutageLocationsParams = OutagesAPI.OutageLocationsParams;
+export declare namespace Outages {
+  export {
+    type OutageGetResponse as OutageGetResponse,
+    type OutageLocationsResponse as OutageLocationsResponse,
+    type OutageGetParams as OutageGetParams,
+    type OutageLocationsParams as OutageLocationsParams,
+  };
 }
diff --git a/src/resources/radar/as112/as112.ts b/src/resources/radar/as112/as112.ts
index 206b612239..676d248f7a 100644
--- a/src/resources/radar/as112/as112.ts
+++ b/src/resources/radar/as112/as112.ts
@@ -3,10 +3,50 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as AS112API from './as112';
 import * as SummaryAPI from './summary';
+import {
+  Summary,
+  SummaryDNSSECParams,
+  SummaryDNSSECResponse,
+  SummaryEdnsParams,
+  SummaryEdnsResponse,
+  SummaryIPVersionParams,
+  SummaryIPVersionResponse,
+  SummaryProtocolParams,
+  SummaryProtocolResponse,
+  SummaryQueryTypeParams,
+  SummaryQueryTypeResponse,
+  SummaryResponseCodesParams,
+  SummaryResponseCodesResponse,
+} from './summary';
 import * as TimeseriesGroupsAPI from './timeseries-groups';
+import {
+  TimeseriesGroupDNSSECParams,
+  TimeseriesGroupDNSSECResponse,
+  TimeseriesGroupEdnsParams,
+  TimeseriesGroupEdnsResponse,
+  TimeseriesGroupIPVersionParams,
+  TimeseriesGroupIPVersionResponse,
+  TimeseriesGroupProtocolParams,
+  TimeseriesGroupProtocolResponse,
+  TimeseriesGroupQueryTypeParams,
+  TimeseriesGroupQueryTypeResponse,
+  TimeseriesGroupResponseCodesParams,
+  TimeseriesGroupResponseCodesResponse,
+  TimeseriesGroups,
+} from './timeseries-groups';
 import * as TopAPI from './top';
+import {
+  Top,
+  TopDNSSECParams,
+  TopDNSSECResponse,
+  TopEdnsParams,
+  TopEdnsResponse,
+  TopIPVersionParams,
+  TopIPVersionResponse,
+  TopLocationsParams,
+  TopLocationsResponse,
+} from './top';
 
 export class AS112 extends APIResource {
   summary: SummaryAPI.Summary = new SummaryAPI.Summary(this._client);
@@ -157,42 +197,57 @@ export interface AS112TimeseriesParams {
   name?: Array<string>;
 }
 
-export namespace AS112 {
-  export import AS112TimeseriesResponse = AS112API.AS112TimeseriesResponse;
-  export import AS112TimeseriesParams = AS112API.AS112TimeseriesParams;
-  export import Summary = SummaryAPI.Summary;
-  export import SummaryDNSSECResponse = SummaryAPI.SummaryDNSSECResponse;
-  export import SummaryEdnsResponse = SummaryAPI.SummaryEdnsResponse;
-  export import SummaryIPVersionResponse = SummaryAPI.SummaryIPVersionResponse;
-  export import SummaryProtocolResponse = SummaryAPI.SummaryProtocolResponse;
-  export import SummaryQueryTypeResponse = SummaryAPI.SummaryQueryTypeResponse;
-  export import SummaryResponseCodesResponse = SummaryAPI.SummaryResponseCodesResponse;
-  export import SummaryDNSSECParams = SummaryAPI.SummaryDNSSECParams;
-  export import SummaryEdnsParams = SummaryAPI.SummaryEdnsParams;
-  export import SummaryIPVersionParams = SummaryAPI.SummaryIPVersionParams;
-  export import SummaryProtocolParams = SummaryAPI.SummaryProtocolParams;
-  export import SummaryQueryTypeParams = SummaryAPI.SummaryQueryTypeParams;
-  export import SummaryResponseCodesParams = SummaryAPI.SummaryResponseCodesParams;
-  export import TimeseriesGroups = TimeseriesGroupsAPI.TimeseriesGroups;
-  export import TimeseriesGroupDNSSECResponse = TimeseriesGroupsAPI.TimeseriesGroupDNSSECResponse;
-  export import TimeseriesGroupEdnsResponse = TimeseriesGroupsAPI.TimeseriesGroupEdnsResponse;
-  export import TimeseriesGroupIPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupIPVersionResponse;
-  export import TimeseriesGroupProtocolResponse = TimeseriesGroupsAPI.TimeseriesGroupProtocolResponse;
-  export import TimeseriesGroupQueryTypeResponse = TimeseriesGroupsAPI.TimeseriesGroupQueryTypeResponse;
-  export import TimeseriesGroupResponseCodesResponse = TimeseriesGroupsAPI.TimeseriesGroupResponseCodesResponse;
-  export import TimeseriesGroupDNSSECParams = TimeseriesGroupsAPI.TimeseriesGroupDNSSECParams;
-  export import TimeseriesGroupEdnsParams = TimeseriesGroupsAPI.TimeseriesGroupEdnsParams;
-  export import TimeseriesGroupIPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupIPVersionParams;
-  export import TimeseriesGroupProtocolParams = TimeseriesGroupsAPI.TimeseriesGroupProtocolParams;
-  export import TimeseriesGroupQueryTypeParams = TimeseriesGroupsAPI.TimeseriesGroupQueryTypeParams;
-  export import TimeseriesGroupResponseCodesParams = TimeseriesGroupsAPI.TimeseriesGroupResponseCodesParams;
-  export import Top = TopAPI.Top;
-  export import TopDNSSECResponse = TopAPI.TopDNSSECResponse;
-  export import TopEdnsResponse = TopAPI.TopEdnsResponse;
-  export import TopIPVersionResponse = TopAPI.TopIPVersionResponse;
-  export import TopLocationsResponse = TopAPI.TopLocationsResponse;
-  export import TopDNSSECParams = TopAPI.TopDNSSECParams;
-  export import TopEdnsParams = TopAPI.TopEdnsParams;
-  export import TopIPVersionParams = TopAPI.TopIPVersionParams;
-  export import TopLocationsParams = TopAPI.TopLocationsParams;
+AS112.Summary = Summary;
+AS112.TimeseriesGroups = TimeseriesGroups;
+AS112.Top = Top;
+
+export declare namespace AS112 {
+  export {
+    type AS112TimeseriesResponse as AS112TimeseriesResponse,
+    type AS112TimeseriesParams as AS112TimeseriesParams,
+  };
+
+  export {
+    Summary as Summary,
+    type SummaryDNSSECResponse as SummaryDNSSECResponse,
+    type SummaryEdnsResponse as SummaryEdnsResponse,
+    type SummaryIPVersionResponse as SummaryIPVersionResponse,
+    type SummaryProtocolResponse as SummaryProtocolResponse,
+    type SummaryQueryTypeResponse as SummaryQueryTypeResponse,
+    type SummaryResponseCodesResponse as SummaryResponseCodesResponse,
+    type SummaryDNSSECParams as SummaryDNSSECParams,
+    type SummaryEdnsParams as SummaryEdnsParams,
+    type SummaryIPVersionParams as SummaryIPVersionParams,
+    type SummaryProtocolParams as SummaryProtocolParams,
+    type SummaryQueryTypeParams as SummaryQueryTypeParams,
+    type SummaryResponseCodesParams as SummaryResponseCodesParams,
+  };
+
+  export {
+    TimeseriesGroups as TimeseriesGroups,
+    type TimeseriesGroupDNSSECResponse as TimeseriesGroupDNSSECResponse,
+    type TimeseriesGroupEdnsResponse as TimeseriesGroupEdnsResponse,
+    type TimeseriesGroupIPVersionResponse as TimeseriesGroupIPVersionResponse,
+    type TimeseriesGroupProtocolResponse as TimeseriesGroupProtocolResponse,
+    type TimeseriesGroupQueryTypeResponse as TimeseriesGroupQueryTypeResponse,
+    type TimeseriesGroupResponseCodesResponse as TimeseriesGroupResponseCodesResponse,
+    type TimeseriesGroupDNSSECParams as TimeseriesGroupDNSSECParams,
+    type TimeseriesGroupEdnsParams as TimeseriesGroupEdnsParams,
+    type TimeseriesGroupIPVersionParams as TimeseriesGroupIPVersionParams,
+    type TimeseriesGroupProtocolParams as TimeseriesGroupProtocolParams,
+    type TimeseriesGroupQueryTypeParams as TimeseriesGroupQueryTypeParams,
+    type TimeseriesGroupResponseCodesParams as TimeseriesGroupResponseCodesParams,
+  };
+
+  export {
+    Top as Top,
+    type TopDNSSECResponse as TopDNSSECResponse,
+    type TopEdnsResponse as TopEdnsResponse,
+    type TopIPVersionResponse as TopIPVersionResponse,
+    type TopLocationsResponse as TopLocationsResponse,
+    type TopDNSSECParams as TopDNSSECParams,
+    type TopEdnsParams as TopEdnsParams,
+    type TopIPVersionParams as TopIPVersionParams,
+    type TopLocationsParams as TopLocationsParams,
+  };
 }
diff --git a/src/resources/radar/as112/index.ts b/src/resources/radar/as112/index.ts
index 2285c358a4..7b5e4752cb 100644
--- a/src/resources/radar/as112/index.ts
+++ b/src/resources/radar/as112/index.ts
@@ -1,44 +1,44 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { AS112TimeseriesResponse, AS112TimeseriesParams, AS112 } from './as112';
+export { AS112, type AS112TimeseriesResponse, type AS112TimeseriesParams } from './as112';
 export {
-  SummaryDNSSECResponse,
-  SummaryEdnsResponse,
-  SummaryIPVersionResponse,
-  SummaryProtocolResponse,
-  SummaryQueryTypeResponse,
-  SummaryResponseCodesResponse,
-  SummaryDNSSECParams,
-  SummaryEdnsParams,
-  SummaryIPVersionParams,
-  SummaryProtocolParams,
-  SummaryQueryTypeParams,
-  SummaryResponseCodesParams,
   Summary,
+  type SummaryDNSSECResponse,
+  type SummaryEdnsResponse,
+  type SummaryIPVersionResponse,
+  type SummaryProtocolResponse,
+  type SummaryQueryTypeResponse,
+  type SummaryResponseCodesResponse,
+  type SummaryDNSSECParams,
+  type SummaryEdnsParams,
+  type SummaryIPVersionParams,
+  type SummaryProtocolParams,
+  type SummaryQueryTypeParams,
+  type SummaryResponseCodesParams,
 } from './summary';
 export {
-  TimeseriesGroupDNSSECResponse,
-  TimeseriesGroupEdnsResponse,
-  TimeseriesGroupIPVersionResponse,
-  TimeseriesGroupProtocolResponse,
-  TimeseriesGroupQueryTypeResponse,
-  TimeseriesGroupResponseCodesResponse,
-  TimeseriesGroupDNSSECParams,
-  TimeseriesGroupEdnsParams,
-  TimeseriesGroupIPVersionParams,
-  TimeseriesGroupProtocolParams,
-  TimeseriesGroupQueryTypeParams,
-  TimeseriesGroupResponseCodesParams,
   TimeseriesGroups,
+  type TimeseriesGroupDNSSECResponse,
+  type TimeseriesGroupEdnsResponse,
+  type TimeseriesGroupIPVersionResponse,
+  type TimeseriesGroupProtocolResponse,
+  type TimeseriesGroupQueryTypeResponse,
+  type TimeseriesGroupResponseCodesResponse,
+  type TimeseriesGroupDNSSECParams,
+  type TimeseriesGroupEdnsParams,
+  type TimeseriesGroupIPVersionParams,
+  type TimeseriesGroupProtocolParams,
+  type TimeseriesGroupQueryTypeParams,
+  type TimeseriesGroupResponseCodesParams,
 } from './timeseries-groups';
 export {
-  TopDNSSECResponse,
-  TopEdnsResponse,
-  TopIPVersionResponse,
-  TopLocationsResponse,
-  TopDNSSECParams,
-  TopEdnsParams,
-  TopIPVersionParams,
-  TopLocationsParams,
   Top,
+  type TopDNSSECResponse,
+  type TopEdnsResponse,
+  type TopIPVersionResponse,
+  type TopLocationsResponse,
+  type TopDNSSECParams,
+  type TopEdnsParams,
+  type TopIPVersionParams,
+  type TopLocationsParams,
 } from './top';
diff --git a/src/resources/radar/as112/summary.ts b/src/resources/radar/as112/summary.ts
index 2b7b567086..5c56fb5e58 100644
--- a/src/resources/radar/as112/summary.ts
+++ b/src/resources/radar/as112/summary.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as SummaryAPI from './summary';
 
 export class Summary extends APIResource {
   /**
@@ -26,7 +25,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of DNS queries, to AS112, by EDNS support.
+   * Percentage distribution of DNS queries to AS112 by EDNS support.
    */
   edns(query?: SummaryEdnsParams, options?: Core.RequestOptions): Core.APIPromise<SummaryEdnsResponse>;
   edns(options?: Core.RequestOptions): Core.APIPromise<SummaryEdnsResponse>;
@@ -89,7 +88,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of DNS queries to AS112 by Query Type.
+   * Percentage distribution of DNS queries to AS112 by query type.
    */
   queryType(
     query?: SummaryQueryTypeParams,
@@ -111,7 +110,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of AS112 dns requests classified per Response Codes.
+   * Percentage distribution of AS112 DNS requests classified by response code.
    */
   responseCodes(
     query?: SummaryResponseCodesParams,
@@ -384,7 +383,7 @@ export namespace SummaryProtocolResponse {
 export interface SummaryQueryTypeResponse {
   meta: SummaryQueryTypeResponse.Meta;
 
-  summary_0: SummaryQueryTypeResponse.Summary0;
+  summary_0: Record<string, string>;
 }
 
 export namespace SummaryQueryTypeResponse {
@@ -435,24 +434,12 @@ export namespace SummaryQueryTypeResponse {
       }
     }
   }
-
-  export interface Summary0 {
-    A: string;
-
-    AAAA: string;
-
-    PTR: string;
-
-    SOA: string;
-
-    SRV: string;
-  }
 }
 
 export interface SummaryResponseCodesResponse {
   meta: SummaryResponseCodesResponse.Meta;
 
-  summary_0: SummaryResponseCodesResponse.Summary0;
+  summary_0: Record<string, string>;
 }
 
 export namespace SummaryResponseCodesResponse {
@@ -503,12 +490,6 @@ export namespace SummaryResponseCodesResponse {
       }
     }
   }
-
-  export interface Summary0 {
-    NOERROR: string;
-
-    NXDOMAIN: string;
-  }
 }
 
 export interface SummaryDNSSECParams {
@@ -748,6 +729,12 @@ export interface SummaryQueryTypeParams {
    */
   format?: 'JSON' | 'CSV';
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -798,6 +785,12 @@ export interface SummaryResponseCodesParams {
    */
   format?: 'JSON' | 'CSV';
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -811,17 +804,19 @@ export interface SummaryResponseCodesParams {
   name?: Array<string>;
 }
 
-export namespace Summary {
-  export import SummaryDNSSECResponse = SummaryAPI.SummaryDNSSECResponse;
-  export import SummaryEdnsResponse = SummaryAPI.SummaryEdnsResponse;
-  export import SummaryIPVersionResponse = SummaryAPI.SummaryIPVersionResponse;
-  export import SummaryProtocolResponse = SummaryAPI.SummaryProtocolResponse;
-  export import SummaryQueryTypeResponse = SummaryAPI.SummaryQueryTypeResponse;
-  export import SummaryResponseCodesResponse = SummaryAPI.SummaryResponseCodesResponse;
-  export import SummaryDNSSECParams = SummaryAPI.SummaryDNSSECParams;
-  export import SummaryEdnsParams = SummaryAPI.SummaryEdnsParams;
-  export import SummaryIPVersionParams = SummaryAPI.SummaryIPVersionParams;
-  export import SummaryProtocolParams = SummaryAPI.SummaryProtocolParams;
-  export import SummaryQueryTypeParams = SummaryAPI.SummaryQueryTypeParams;
-  export import SummaryResponseCodesParams = SummaryAPI.SummaryResponseCodesParams;
+export declare namespace Summary {
+  export {
+    type SummaryDNSSECResponse as SummaryDNSSECResponse,
+    type SummaryEdnsResponse as SummaryEdnsResponse,
+    type SummaryIPVersionResponse as SummaryIPVersionResponse,
+    type SummaryProtocolResponse as SummaryProtocolResponse,
+    type SummaryQueryTypeResponse as SummaryQueryTypeResponse,
+    type SummaryResponseCodesResponse as SummaryResponseCodesResponse,
+    type SummaryDNSSECParams as SummaryDNSSECParams,
+    type SummaryEdnsParams as SummaryEdnsParams,
+    type SummaryIPVersionParams as SummaryIPVersionParams,
+    type SummaryProtocolParams as SummaryProtocolParams,
+    type SummaryQueryTypeParams as SummaryQueryTypeParams,
+    type SummaryResponseCodesParams as SummaryResponseCodesParams,
+  };
 }
diff --git a/src/resources/radar/as112/timeseries-groups.ts b/src/resources/radar/as112/timeseries-groups.ts
index 852a124579..4663a288ae 100644
--- a/src/resources/radar/as112/timeseries-groups.ts
+++ b/src/resources/radar/as112/timeseries-groups.ts
@@ -3,11 +3,10 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as TimeseriesGroupsAPI from './timeseries-groups';
 
 export class TimeseriesGroups extends APIResource {
   /**
-   * Percentage distribution of DNS AS112 queries by DNSSEC support over time.
+   * Percentage distribution of AS112 DNS queries by DNSSEC support over time.
    */
   dnssec(
     query?: TimeseriesGroupDNSSECParams,
@@ -51,7 +50,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of AS112 DNS queries by IP Version over time.
+   * Percentage distribution of AS112 DNS queries by IP version over time.
    */
   ipVersion(
     query?: TimeseriesGroupIPVersionParams,
@@ -74,7 +73,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of AS112 dns requests classified per Protocol over time.
+   * Percentage distribution of AS112 DNS requests classified by protocol over time.
    */
   protocol(
     query?: TimeseriesGroupProtocolParams,
@@ -96,7 +95,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of AS112 DNS queries by Query Type over time.
+   * Percentage distribution of AS112 DNS queries by query type over time.
    */
   queryType(
     query?: TimeseriesGroupQueryTypeParams,
@@ -119,7 +118,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of AS112 dns requests classified per Response Codes over
+   * Percentage distribution of AS112 DNS requests classified by response code over
    * time.
    */
   responseCodes(
@@ -505,6 +504,12 @@ export interface TimeseriesGroupQueryTypeParams {
    */
   format?: 'JSON' | 'CSV';
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -562,6 +567,12 @@ export interface TimeseriesGroupResponseCodesParams {
    */
   format?: 'JSON' | 'CSV';
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -575,17 +586,19 @@ export interface TimeseriesGroupResponseCodesParams {
   name?: Array<string>;
 }
 
-export namespace TimeseriesGroups {
-  export import TimeseriesGroupDNSSECResponse = TimeseriesGroupsAPI.TimeseriesGroupDNSSECResponse;
-  export import TimeseriesGroupEdnsResponse = TimeseriesGroupsAPI.TimeseriesGroupEdnsResponse;
-  export import TimeseriesGroupIPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupIPVersionResponse;
-  export import TimeseriesGroupProtocolResponse = TimeseriesGroupsAPI.TimeseriesGroupProtocolResponse;
-  export import TimeseriesGroupQueryTypeResponse = TimeseriesGroupsAPI.TimeseriesGroupQueryTypeResponse;
-  export import TimeseriesGroupResponseCodesResponse = TimeseriesGroupsAPI.TimeseriesGroupResponseCodesResponse;
-  export import TimeseriesGroupDNSSECParams = TimeseriesGroupsAPI.TimeseriesGroupDNSSECParams;
-  export import TimeseriesGroupEdnsParams = TimeseriesGroupsAPI.TimeseriesGroupEdnsParams;
-  export import TimeseriesGroupIPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupIPVersionParams;
-  export import TimeseriesGroupProtocolParams = TimeseriesGroupsAPI.TimeseriesGroupProtocolParams;
-  export import TimeseriesGroupQueryTypeParams = TimeseriesGroupsAPI.TimeseriesGroupQueryTypeParams;
-  export import TimeseriesGroupResponseCodesParams = TimeseriesGroupsAPI.TimeseriesGroupResponseCodesParams;
+export declare namespace TimeseriesGroups {
+  export {
+    type TimeseriesGroupDNSSECResponse as TimeseriesGroupDNSSECResponse,
+    type TimeseriesGroupEdnsResponse as TimeseriesGroupEdnsResponse,
+    type TimeseriesGroupIPVersionResponse as TimeseriesGroupIPVersionResponse,
+    type TimeseriesGroupProtocolResponse as TimeseriesGroupProtocolResponse,
+    type TimeseriesGroupQueryTypeResponse as TimeseriesGroupQueryTypeResponse,
+    type TimeseriesGroupResponseCodesResponse as TimeseriesGroupResponseCodesResponse,
+    type TimeseriesGroupDNSSECParams as TimeseriesGroupDNSSECParams,
+    type TimeseriesGroupEdnsParams as TimeseriesGroupEdnsParams,
+    type TimeseriesGroupIPVersionParams as TimeseriesGroupIPVersionParams,
+    type TimeseriesGroupProtocolParams as TimeseriesGroupProtocolParams,
+    type TimeseriesGroupQueryTypeParams as TimeseriesGroupQueryTypeParams,
+    type TimeseriesGroupResponseCodesParams as TimeseriesGroupResponseCodesParams,
+  };
 }
diff --git a/src/resources/radar/as112/top.ts b/src/resources/radar/as112/top.ts
index 66fc5d4d65..5fd3b38ee9 100644
--- a/src/resources/radar/as112/top.ts
+++ b/src/resources/radar/as112/top.ts
@@ -3,11 +3,10 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as TopAPI from './top';
 
 export class Top extends APIResource {
   /**
-   * Get the top locations by DNS queries DNSSEC support to AS112.
+   * Get the top locations of DNS queries to AS112 with DNSSEC.
    */
   dnssec(
     dnssec: 'SUPPORTED' | 'NOT_SUPPORTED',
@@ -35,7 +34,7 @@ export class Top extends APIResource {
   }
 
   /**
-   * Get the top locations, by DNS queries EDNS support to AS112.
+   * Get the top locations of DNS queries to AS112 with EDNS support.
    */
   edns(
     edns: 'SUPPORTED' | 'NOT_SUPPORTED',
@@ -59,7 +58,7 @@ export class Top extends APIResource {
   }
 
   /**
-   * Get the top locations by DNS queries IP version to AS112.
+   * Get the top locations of DNS queries to AS112 by IP version.
    */
   ipVersion(
     ipVersion: 'IPv4' | 'IPv6',
@@ -572,13 +571,15 @@ export interface TopLocationsParams {
   name?: Array<string>;
 }
 
-export namespace Top {
-  export import TopDNSSECResponse = TopAPI.TopDNSSECResponse;
-  export import TopEdnsResponse = TopAPI.TopEdnsResponse;
-  export import TopIPVersionResponse = TopAPI.TopIPVersionResponse;
-  export import TopLocationsResponse = TopAPI.TopLocationsResponse;
-  export import TopDNSSECParams = TopAPI.TopDNSSECParams;
-  export import TopEdnsParams = TopAPI.TopEdnsParams;
-  export import TopIPVersionParams = TopAPI.TopIPVersionParams;
-  export import TopLocationsParams = TopAPI.TopLocationsParams;
+export declare namespace Top {
+  export {
+    type TopDNSSECResponse as TopDNSSECResponse,
+    type TopEdnsResponse as TopEdnsResponse,
+    type TopIPVersionResponse as TopIPVersionResponse,
+    type TopLocationsResponse as TopLocationsResponse,
+    type TopDNSSECParams as TopDNSSECParams,
+    type TopEdnsParams as TopEdnsParams,
+    type TopIPVersionParams as TopIPVersionParams,
+    type TopLocationsParams as TopLocationsParams,
+  };
 }
diff --git a/src/resources/radar/attacks/attacks.ts b/src/resources/radar/attacks/attacks.ts
index 3f54faf8cf..9d3c9c4aef 100644
--- a/src/resources/radar/attacks/attacks.ts
+++ b/src/resources/radar/attacks/attacks.ts
@@ -2,18 +2,28 @@
 
 import { APIResource } from '../../../resource';
 import * as Layer3API from './layer3/layer3';
+import { Layer3, Layer3TimeseriesParams, Layer3TimeseriesResponse } from './layer3/layer3';
 import * as Layer7API from './layer7/layer7';
+import { Layer7, Layer7TimeseriesParams, Layer7TimeseriesResponse } from './layer7/layer7';
 
 export class Attacks extends APIResource {
   layer3: Layer3API.Layer3 = new Layer3API.Layer3(this._client);
   layer7: Layer7API.Layer7 = new Layer7API.Layer7(this._client);
 }
 
-export namespace Attacks {
-  export import Layer3 = Layer3API.Layer3;
-  export import Layer3TimeseriesResponse = Layer3API.Layer3TimeseriesResponse;
-  export import Layer3TimeseriesParams = Layer3API.Layer3TimeseriesParams;
-  export import Layer7 = Layer7API.Layer7;
-  export import Layer7TimeseriesResponse = Layer7API.Layer7TimeseriesResponse;
-  export import Layer7TimeseriesParams = Layer7API.Layer7TimeseriesParams;
+Attacks.Layer3 = Layer3;
+Attacks.Layer7 = Layer7;
+
+export declare namespace Attacks {
+  export {
+    Layer3 as Layer3,
+    type Layer3TimeseriesResponse as Layer3TimeseriesResponse,
+    type Layer3TimeseriesParams as Layer3TimeseriesParams,
+  };
+
+  export {
+    Layer7 as Layer7,
+    type Layer7TimeseriesResponse as Layer7TimeseriesResponse,
+    type Layer7TimeseriesParams as Layer7TimeseriesParams,
+  };
 }
diff --git a/src/resources/radar/attacks/index.ts b/src/resources/radar/attacks/index.ts
index 674f60a25e..28216f9bd4 100644
--- a/src/resources/radar/attacks/index.ts
+++ b/src/resources/radar/attacks/index.ts
@@ -1,5 +1,5 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Attacks } from './attacks';
-export { Layer3TimeseriesResponse, Layer3TimeseriesParams, Layer3 } from './layer3/index';
-export { Layer7TimeseriesResponse, Layer7TimeseriesParams, Layer7 } from './layer7/index';
+export { Layer3, type Layer3TimeseriesResponse, type Layer3TimeseriesParams } from './layer3/index';
+export { Layer7, type Layer7TimeseriesResponse, type Layer7TimeseriesParams } from './layer7/index';
diff --git a/src/resources/radar/attacks/layer3/index.ts b/src/resources/radar/attacks/layer3/index.ts
index a0ea3207fc..11bf63c011 100644
--- a/src/resources/radar/attacks/layer3/index.ts
+++ b/src/resources/radar/attacks/layer3/index.ts
@@ -1,46 +1,46 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { Layer3TimeseriesResponse, Layer3TimeseriesParams, Layer3 } from './layer3';
+export { Layer3, type Layer3TimeseriesResponse, type Layer3TimeseriesParams } from './layer3';
 export {
-  SummaryBitrateResponse,
-  SummaryDurationResponse,
-  SummaryGetResponse,
-  SummaryIPVersionResponse,
-  SummaryProtocolResponse,
-  SummaryVectorResponse,
-  SummaryBitrateParams,
-  SummaryDurationParams,
-  SummaryGetParams,
-  SummaryIPVersionParams,
-  SummaryProtocolParams,
-  SummaryVectorParams,
   Summary,
+  type SummaryBitrateResponse,
+  type SummaryDurationResponse,
+  type SummaryGetResponse,
+  type SummaryIPVersionResponse,
+  type SummaryProtocolResponse,
+  type SummaryVectorResponse,
+  type SummaryBitrateParams,
+  type SummaryDurationParams,
+  type SummaryGetParams,
+  type SummaryIPVersionParams,
+  type SummaryProtocolParams,
+  type SummaryVectorParams,
 } from './summary';
 export {
-  TimeseriesGroupBitrateResponse,
-  TimeseriesGroupDurationResponse,
-  TimeseriesGroupGetResponse,
-  TimeseriesGroupIndustryResponse,
-  TimeseriesGroupIPVersionResponse,
-  TimeseriesGroupProtocolResponse,
-  TimeseriesGroupVectorResponse,
-  TimeseriesGroupVerticalResponse,
-  TimeseriesGroupBitrateParams,
-  TimeseriesGroupDurationParams,
-  TimeseriesGroupGetParams,
-  TimeseriesGroupIndustryParams,
-  TimeseriesGroupIPVersionParams,
-  TimeseriesGroupProtocolParams,
-  TimeseriesGroupVectorParams,
-  TimeseriesGroupVerticalParams,
   TimeseriesGroups,
+  type TimeseriesGroupBitrateResponse,
+  type TimeseriesGroupDurationResponse,
+  type TimeseriesGroupGetResponse,
+  type TimeseriesGroupIndustryResponse,
+  type TimeseriesGroupIPVersionResponse,
+  type TimeseriesGroupProtocolResponse,
+  type TimeseriesGroupVectorResponse,
+  type TimeseriesGroupVerticalResponse,
+  type TimeseriesGroupBitrateParams,
+  type TimeseriesGroupDurationParams,
+  type TimeseriesGroupGetParams,
+  type TimeseriesGroupIndustryParams,
+  type TimeseriesGroupIPVersionParams,
+  type TimeseriesGroupProtocolParams,
+  type TimeseriesGroupVectorParams,
+  type TimeseriesGroupVerticalParams,
 } from './timeseries-groups';
 export {
-  TopAttacksResponse,
-  TopIndustryResponse,
-  TopVerticalResponse,
-  TopAttacksParams,
-  TopIndustryParams,
-  TopVerticalParams,
   Top,
+  type TopAttacksResponse,
+  type TopIndustryResponse,
+  type TopVerticalResponse,
+  type TopAttacksParams,
+  type TopIndustryParams,
+  type TopVerticalParams,
 } from './top/index';
diff --git a/src/resources/radar/attacks/layer3/layer3.ts b/src/resources/radar/attacks/layer3/layer3.ts
index 4ef00064b7..86350a6fc5 100644
--- a/src/resources/radar/attacks/layer3/layer3.ts
+++ b/src/resources/radar/attacks/layer3/layer3.ts
@@ -3,10 +3,52 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as Layer3API from './layer3';
 import * as SummaryAPI from './summary';
+import {
+  Summary,
+  SummaryBitrateParams,
+  SummaryBitrateResponse,
+  SummaryDurationParams,
+  SummaryDurationResponse,
+  SummaryGetParams,
+  SummaryGetResponse,
+  SummaryIPVersionParams,
+  SummaryIPVersionResponse,
+  SummaryProtocolParams,
+  SummaryProtocolResponse,
+  SummaryVectorParams,
+  SummaryVectorResponse,
+} from './summary';
 import * as TimeseriesGroupsAPI from './timeseries-groups';
+import {
+  TimeseriesGroupBitrateParams,
+  TimeseriesGroupBitrateResponse,
+  TimeseriesGroupDurationParams,
+  TimeseriesGroupDurationResponse,
+  TimeseriesGroupGetParams,
+  TimeseriesGroupGetResponse,
+  TimeseriesGroupIPVersionParams,
+  TimeseriesGroupIPVersionResponse,
+  TimeseriesGroupIndustryParams,
+  TimeseriesGroupIndustryResponse,
+  TimeseriesGroupProtocolParams,
+  TimeseriesGroupProtocolResponse,
+  TimeseriesGroupVectorParams,
+  TimeseriesGroupVectorResponse,
+  TimeseriesGroupVerticalParams,
+  TimeseriesGroupVerticalResponse,
+  TimeseriesGroups,
+} from './timeseries-groups';
 import * as TopAPI from './top/top';
+import {
+  Top,
+  TopAttacksParams,
+  TopAttacksResponse,
+  TopIndustryParams,
+  TopIndustryResponse,
+  TopVerticalParams,
+  TopVerticalResponse,
+} from './top/top';
 
 export class Layer3 extends APIResource {
   summary: SummaryAPI.Summary = new SummaryAPI.Summary(this._client);
@@ -136,44 +178,59 @@ export interface Layer3TimeseriesParams {
   protocol?: Array<'UDP' | 'TCP' | 'ICMP' | 'GRE'>;
 }
 
-export namespace Layer3 {
-  export import Layer3TimeseriesResponse = Layer3API.Layer3TimeseriesResponse;
-  export import Layer3TimeseriesParams = Layer3API.Layer3TimeseriesParams;
-  export import Summary = SummaryAPI.Summary;
-  export import SummaryBitrateResponse = SummaryAPI.SummaryBitrateResponse;
-  export import SummaryDurationResponse = SummaryAPI.SummaryDurationResponse;
-  export import SummaryGetResponse = SummaryAPI.SummaryGetResponse;
-  export import SummaryIPVersionResponse = SummaryAPI.SummaryIPVersionResponse;
-  export import SummaryProtocolResponse = SummaryAPI.SummaryProtocolResponse;
-  export import SummaryVectorResponse = SummaryAPI.SummaryVectorResponse;
-  export import SummaryBitrateParams = SummaryAPI.SummaryBitrateParams;
-  export import SummaryDurationParams = SummaryAPI.SummaryDurationParams;
-  export import SummaryGetParams = SummaryAPI.SummaryGetParams;
-  export import SummaryIPVersionParams = SummaryAPI.SummaryIPVersionParams;
-  export import SummaryProtocolParams = SummaryAPI.SummaryProtocolParams;
-  export import SummaryVectorParams = SummaryAPI.SummaryVectorParams;
-  export import TimeseriesGroups = TimeseriesGroupsAPI.TimeseriesGroups;
-  export import TimeseriesGroupBitrateResponse = TimeseriesGroupsAPI.TimeseriesGroupBitrateResponse;
-  export import TimeseriesGroupDurationResponse = TimeseriesGroupsAPI.TimeseriesGroupDurationResponse;
-  export import TimeseriesGroupGetResponse = TimeseriesGroupsAPI.TimeseriesGroupGetResponse;
-  export import TimeseriesGroupIndustryResponse = TimeseriesGroupsAPI.TimeseriesGroupIndustryResponse;
-  export import TimeseriesGroupIPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupIPVersionResponse;
-  export import TimeseriesGroupProtocolResponse = TimeseriesGroupsAPI.TimeseriesGroupProtocolResponse;
-  export import TimeseriesGroupVectorResponse = TimeseriesGroupsAPI.TimeseriesGroupVectorResponse;
-  export import TimeseriesGroupVerticalResponse = TimeseriesGroupsAPI.TimeseriesGroupVerticalResponse;
-  export import TimeseriesGroupBitrateParams = TimeseriesGroupsAPI.TimeseriesGroupBitrateParams;
-  export import TimeseriesGroupDurationParams = TimeseriesGroupsAPI.TimeseriesGroupDurationParams;
-  export import TimeseriesGroupGetParams = TimeseriesGroupsAPI.TimeseriesGroupGetParams;
-  export import TimeseriesGroupIndustryParams = TimeseriesGroupsAPI.TimeseriesGroupIndustryParams;
-  export import TimeseriesGroupIPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupIPVersionParams;
-  export import TimeseriesGroupProtocolParams = TimeseriesGroupsAPI.TimeseriesGroupProtocolParams;
-  export import TimeseriesGroupVectorParams = TimeseriesGroupsAPI.TimeseriesGroupVectorParams;
-  export import TimeseriesGroupVerticalParams = TimeseriesGroupsAPI.TimeseriesGroupVerticalParams;
-  export import Top = TopAPI.Top;
-  export import TopAttacksResponse = TopAPI.TopAttacksResponse;
-  export import TopIndustryResponse = TopAPI.TopIndustryResponse;
-  export import TopVerticalResponse = TopAPI.TopVerticalResponse;
-  export import TopAttacksParams = TopAPI.TopAttacksParams;
-  export import TopIndustryParams = TopAPI.TopIndustryParams;
-  export import TopVerticalParams = TopAPI.TopVerticalParams;
+Layer3.Summary = Summary;
+Layer3.TimeseriesGroups = TimeseriesGroups;
+Layer3.Top = Top;
+
+export declare namespace Layer3 {
+  export {
+    type Layer3TimeseriesResponse as Layer3TimeseriesResponse,
+    type Layer3TimeseriesParams as Layer3TimeseriesParams,
+  };
+
+  export {
+    Summary as Summary,
+    type SummaryBitrateResponse as SummaryBitrateResponse,
+    type SummaryDurationResponse as SummaryDurationResponse,
+    type SummaryGetResponse as SummaryGetResponse,
+    type SummaryIPVersionResponse as SummaryIPVersionResponse,
+    type SummaryProtocolResponse as SummaryProtocolResponse,
+    type SummaryVectorResponse as SummaryVectorResponse,
+    type SummaryBitrateParams as SummaryBitrateParams,
+    type SummaryDurationParams as SummaryDurationParams,
+    type SummaryGetParams as SummaryGetParams,
+    type SummaryIPVersionParams as SummaryIPVersionParams,
+    type SummaryProtocolParams as SummaryProtocolParams,
+    type SummaryVectorParams as SummaryVectorParams,
+  };
+
+  export {
+    TimeseriesGroups as TimeseriesGroups,
+    type TimeseriesGroupBitrateResponse as TimeseriesGroupBitrateResponse,
+    type TimeseriesGroupDurationResponse as TimeseriesGroupDurationResponse,
+    type TimeseriesGroupGetResponse as TimeseriesGroupGetResponse,
+    type TimeseriesGroupIndustryResponse as TimeseriesGroupIndustryResponse,
+    type TimeseriesGroupIPVersionResponse as TimeseriesGroupIPVersionResponse,
+    type TimeseriesGroupProtocolResponse as TimeseriesGroupProtocolResponse,
+    type TimeseriesGroupVectorResponse as TimeseriesGroupVectorResponse,
+    type TimeseriesGroupVerticalResponse as TimeseriesGroupVerticalResponse,
+    type TimeseriesGroupBitrateParams as TimeseriesGroupBitrateParams,
+    type TimeseriesGroupDurationParams as TimeseriesGroupDurationParams,
+    type TimeseriesGroupGetParams as TimeseriesGroupGetParams,
+    type TimeseriesGroupIndustryParams as TimeseriesGroupIndustryParams,
+    type TimeseriesGroupIPVersionParams as TimeseriesGroupIPVersionParams,
+    type TimeseriesGroupProtocolParams as TimeseriesGroupProtocolParams,
+    type TimeseriesGroupVectorParams as TimeseriesGroupVectorParams,
+    type TimeseriesGroupVerticalParams as TimeseriesGroupVerticalParams,
+  };
+
+  export {
+    Top as Top,
+    type TopAttacksResponse as TopAttacksResponse,
+    type TopIndustryResponse as TopIndustryResponse,
+    type TopVerticalResponse as TopVerticalResponse,
+    type TopAttacksParams as TopAttacksParams,
+    type TopIndustryParams as TopIndustryParams,
+    type TopVerticalParams as TopVerticalParams,
+  };
 }
diff --git a/src/resources/radar/attacks/layer3/summary.ts b/src/resources/radar/attacks/layer3/summary.ts
index d3d2863023..faa203e519 100644
--- a/src/resources/radar/attacks/layer3/summary.ts
+++ b/src/resources/radar/attacks/layer3/summary.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as SummaryAPI from './summary';
 
 export class Summary extends APIResource {
   /**
@@ -51,7 +50,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of network protocols in layer 3/4 attacks over a given
+   * Percentage distribution of network protocols in Layer 3/4 attacks over a given
    * time period.
    */
   get(query?: SummaryGetParams, options?: Core.RequestOptions): Core.APIPromise<SummaryGetResponse>;
@@ -465,7 +464,7 @@ export namespace SummaryProtocolResponse {
 export interface SummaryVectorResponse {
   meta: SummaryVectorResponse.Meta;
 
-  summary_0: Record<string, Array<string>>;
+  summary_0: Record<string, string>;
 }
 
 export namespace SummaryVectorResponse {
@@ -835,6 +834,12 @@ export interface SummaryVectorParams {
    */
   ipVersion?: Array<'IPv4' | 'IPv6'>;
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -853,17 +858,19 @@ export interface SummaryVectorParams {
   protocol?: Array<'UDP' | 'TCP' | 'ICMP' | 'GRE'>;
 }
 
-export namespace Summary {
-  export import SummaryBitrateResponse = SummaryAPI.SummaryBitrateResponse;
-  export import SummaryDurationResponse = SummaryAPI.SummaryDurationResponse;
-  export import SummaryGetResponse = SummaryAPI.SummaryGetResponse;
-  export import SummaryIPVersionResponse = SummaryAPI.SummaryIPVersionResponse;
-  export import SummaryProtocolResponse = SummaryAPI.SummaryProtocolResponse;
-  export import SummaryVectorResponse = SummaryAPI.SummaryVectorResponse;
-  export import SummaryBitrateParams = SummaryAPI.SummaryBitrateParams;
-  export import SummaryDurationParams = SummaryAPI.SummaryDurationParams;
-  export import SummaryGetParams = SummaryAPI.SummaryGetParams;
-  export import SummaryIPVersionParams = SummaryAPI.SummaryIPVersionParams;
-  export import SummaryProtocolParams = SummaryAPI.SummaryProtocolParams;
-  export import SummaryVectorParams = SummaryAPI.SummaryVectorParams;
+export declare namespace Summary {
+  export {
+    type SummaryBitrateResponse as SummaryBitrateResponse,
+    type SummaryDurationResponse as SummaryDurationResponse,
+    type SummaryGetResponse as SummaryGetResponse,
+    type SummaryIPVersionResponse as SummaryIPVersionResponse,
+    type SummaryProtocolResponse as SummaryProtocolResponse,
+    type SummaryVectorResponse as SummaryVectorResponse,
+    type SummaryBitrateParams as SummaryBitrateParams,
+    type SummaryDurationParams as SummaryDurationParams,
+    type SummaryGetParams as SummaryGetParams,
+    type SummaryIPVersionParams as SummaryIPVersionParams,
+    type SummaryProtocolParams as SummaryProtocolParams,
+    type SummaryVectorParams as SummaryVectorParams,
+  };
 }
diff --git a/src/resources/radar/attacks/layer3/timeseries-groups.ts b/src/resources/radar/attacks/layer3/timeseries-groups.ts
index 71a89d3b4a..a424d9143d 100644
--- a/src/resources/radar/attacks/layer3/timeseries-groups.ts
+++ b/src/resources/radar/attacks/layer3/timeseries-groups.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as TimeseriesGroupsAPI from './timeseries-groups';
 
 export class TimeseriesGroups extends APIResource {
   /**
@@ -53,7 +52,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Get a timeseries of the percentage distribution of network protocols in Layer
+   * Get a time series of the percentage distribution of network protocols in Layer
    * 3/4 attacks.
    */
   get(
@@ -76,7 +75,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of attacks by industry used over time.
+   * Percentage distribution of attacks by industry targeted over time.
    */
   industry(
     query?: TimeseriesGroupIndustryParams,
@@ -168,7 +167,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of attacks by vertical used over time.
+   * Percentage distribution of attacks by vertical targeted over time.
    */
   vertical(
     query?: TimeseriesGroupVerticalParams,
@@ -949,21 +948,23 @@ export interface TimeseriesGroupVerticalParams {
   protocol?: Array<'UDP' | 'TCP' | 'ICMP' | 'GRE'>;
 }
 
-export namespace TimeseriesGroups {
-  export import TimeseriesGroupBitrateResponse = TimeseriesGroupsAPI.TimeseriesGroupBitrateResponse;
-  export import TimeseriesGroupDurationResponse = TimeseriesGroupsAPI.TimeseriesGroupDurationResponse;
-  export import TimeseriesGroupGetResponse = TimeseriesGroupsAPI.TimeseriesGroupGetResponse;
-  export import TimeseriesGroupIndustryResponse = TimeseriesGroupsAPI.TimeseriesGroupIndustryResponse;
-  export import TimeseriesGroupIPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupIPVersionResponse;
-  export import TimeseriesGroupProtocolResponse = TimeseriesGroupsAPI.TimeseriesGroupProtocolResponse;
-  export import TimeseriesGroupVectorResponse = TimeseriesGroupsAPI.TimeseriesGroupVectorResponse;
-  export import TimeseriesGroupVerticalResponse = TimeseriesGroupsAPI.TimeseriesGroupVerticalResponse;
-  export import TimeseriesGroupBitrateParams = TimeseriesGroupsAPI.TimeseriesGroupBitrateParams;
-  export import TimeseriesGroupDurationParams = TimeseriesGroupsAPI.TimeseriesGroupDurationParams;
-  export import TimeseriesGroupGetParams = TimeseriesGroupsAPI.TimeseriesGroupGetParams;
-  export import TimeseriesGroupIndustryParams = TimeseriesGroupsAPI.TimeseriesGroupIndustryParams;
-  export import TimeseriesGroupIPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupIPVersionParams;
-  export import TimeseriesGroupProtocolParams = TimeseriesGroupsAPI.TimeseriesGroupProtocolParams;
-  export import TimeseriesGroupVectorParams = TimeseriesGroupsAPI.TimeseriesGroupVectorParams;
-  export import TimeseriesGroupVerticalParams = TimeseriesGroupsAPI.TimeseriesGroupVerticalParams;
+export declare namespace TimeseriesGroups {
+  export {
+    type TimeseriesGroupBitrateResponse as TimeseriesGroupBitrateResponse,
+    type TimeseriesGroupDurationResponse as TimeseriesGroupDurationResponse,
+    type TimeseriesGroupGetResponse as TimeseriesGroupGetResponse,
+    type TimeseriesGroupIndustryResponse as TimeseriesGroupIndustryResponse,
+    type TimeseriesGroupIPVersionResponse as TimeseriesGroupIPVersionResponse,
+    type TimeseriesGroupProtocolResponse as TimeseriesGroupProtocolResponse,
+    type TimeseriesGroupVectorResponse as TimeseriesGroupVectorResponse,
+    type TimeseriesGroupVerticalResponse as TimeseriesGroupVerticalResponse,
+    type TimeseriesGroupBitrateParams as TimeseriesGroupBitrateParams,
+    type TimeseriesGroupDurationParams as TimeseriesGroupDurationParams,
+    type TimeseriesGroupGetParams as TimeseriesGroupGetParams,
+    type TimeseriesGroupIndustryParams as TimeseriesGroupIndustryParams,
+    type TimeseriesGroupIPVersionParams as TimeseriesGroupIPVersionParams,
+    type TimeseriesGroupProtocolParams as TimeseriesGroupProtocolParams,
+    type TimeseriesGroupVectorParams as TimeseriesGroupVectorParams,
+    type TimeseriesGroupVerticalParams as TimeseriesGroupVerticalParams,
+  };
 }
diff --git a/src/resources/radar/attacks/layer3/top/index.ts b/src/resources/radar/attacks/layer3/top/index.ts
index e3eb8eadd2..60846d1072 100644
--- a/src/resources/radar/attacks/layer3/top/index.ts
+++ b/src/resources/radar/attacks/layer3/top/index.ts
@@ -1,18 +1,18 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  LocationOriginResponse,
-  LocationTargetResponse,
-  LocationOriginParams,
-  LocationTargetParams,
   Locations,
+  type LocationOriginResponse,
+  type LocationTargetResponse,
+  type LocationOriginParams,
+  type LocationTargetParams,
 } from './locations';
 export {
-  TopAttacksResponse,
-  TopIndustryResponse,
-  TopVerticalResponse,
-  TopAttacksParams,
-  TopIndustryParams,
-  TopVerticalParams,
   Top,
+  type TopAttacksResponse,
+  type TopIndustryResponse,
+  type TopVerticalResponse,
+  type TopAttacksParams,
+  type TopIndustryParams,
+  type TopVerticalParams,
 } from './top';
diff --git a/src/resources/radar/attacks/layer3/top/locations.ts b/src/resources/radar/attacks/layer3/top/locations.ts
index e956ddf0ec..6f1b72a1f6 100644
--- a/src/resources/radar/attacks/layer3/top/locations.ts
+++ b/src/resources/radar/attacks/layer3/top/locations.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../../resource';
 import { isRequestOptions } from '../../../../../core';
 import * as Core from '../../../../../core';
-import * as LocationsAPI from './locations';
 
 export class Locations extends APIResource {
   /**
@@ -297,9 +296,11 @@ export interface LocationTargetParams {
   protocol?: Array<'UDP' | 'TCP' | 'ICMP' | 'GRE'>;
 }
 
-export namespace Locations {
-  export import LocationOriginResponse = LocationsAPI.LocationOriginResponse;
-  export import LocationTargetResponse = LocationsAPI.LocationTargetResponse;
-  export import LocationOriginParams = LocationsAPI.LocationOriginParams;
-  export import LocationTargetParams = LocationsAPI.LocationTargetParams;
+export declare namespace Locations {
+  export {
+    type LocationOriginResponse as LocationOriginResponse,
+    type LocationTargetResponse as LocationTargetResponse,
+    type LocationOriginParams as LocationOriginParams,
+    type LocationTargetParams as LocationTargetParams,
+  };
 }
diff --git a/src/resources/radar/attacks/layer3/top/top.ts b/src/resources/radar/attacks/layer3/top/top.ts
index f7a4e88d2a..ca1611304c 100644
--- a/src/resources/radar/attacks/layer3/top/top.ts
+++ b/src/resources/radar/attacks/layer3/top/top.ts
@@ -3,9 +3,14 @@
 import { APIResource } from '../../../../../resource';
 import { isRequestOptions } from '../../../../../core';
 import * as Core from '../../../../../core';
-import * as TopTopAPI from './top';
-import * as TopAPI from '../../../http/top';
 import * as LocationsAPI from './locations';
+import {
+  LocationOriginParams,
+  LocationOriginResponse,
+  LocationTargetParams,
+  LocationTargetResponse,
+  Locations,
+} from './locations';
 
 export class Top extends APIResource {
   locations: LocationsAPI.Locations = new LocationsAPI.Locations(this._client);
@@ -33,7 +38,7 @@ export class Top extends APIResource {
   }
 
   /**
-   * Get the Industry of attacks.
+   * Get the industries targeted by attacks.
    */
   industry(query?: TopIndustryParams, options?: Core.RequestOptions): Core.APIPromise<TopIndustryResponse>;
   industry(options?: Core.RequestOptions): Core.APIPromise<TopIndustryResponse>;
@@ -52,7 +57,7 @@ export class Top extends APIResource {
   }
 
   /**
-   * Get the Verticals of attacks.
+   * Get the verticals targeted by attacks.
    */
   vertical(query?: TopVerticalParams, options?: Core.RequestOptions): Core.APIPromise<TopVerticalResponse>;
   vertical(options?: Core.RequestOptions): Core.APIPromise<TopVerticalResponse>;
@@ -136,7 +141,7 @@ export namespace TopAttacksResponse {
 export interface TopIndustryResponse {
   meta: TopIndustryResponse.Meta;
 
-  top_0: Array<TopAPI.Browser>;
+  top_0: Array<TopIndustryResponse.Top0>;
 }
 
 export namespace TopIndustryResponse {
@@ -185,12 +190,18 @@ export namespace TopIndustryResponse {
       }
     }
   }
+
+  export interface Top0 {
+    name: string;
+
+    value: string;
+  }
 }
 
 export interface TopVerticalResponse {
   meta: TopVerticalResponse.Meta;
 
-  top_0: Array<TopAPI.Browser>;
+  top_0: Array<TopVerticalResponse.Top0>;
 }
 
 export namespace TopVerticalResponse {
@@ -239,6 +250,12 @@ export namespace TopVerticalResponse {
       }
     }
   }
+
+  export interface Top0 {
+    name: string;
+
+    value: string;
+  }
 }
 
 export interface TopAttacksParams {
@@ -434,16 +451,23 @@ export interface TopVerticalParams {
   protocol?: Array<'UDP' | 'TCP' | 'ICMP' | 'GRE'>;
 }
 
-export namespace Top {
-  export import TopAttacksResponse = TopTopAPI.TopAttacksResponse;
-  export import TopIndustryResponse = TopTopAPI.TopIndustryResponse;
-  export import TopVerticalResponse = TopTopAPI.TopVerticalResponse;
-  export import TopAttacksParams = TopTopAPI.TopAttacksParams;
-  export import TopIndustryParams = TopTopAPI.TopIndustryParams;
-  export import TopVerticalParams = TopTopAPI.TopVerticalParams;
-  export import Locations = LocationsAPI.Locations;
-  export import LocationOriginResponse = LocationsAPI.LocationOriginResponse;
-  export import LocationTargetResponse = LocationsAPI.LocationTargetResponse;
-  export import LocationOriginParams = LocationsAPI.LocationOriginParams;
-  export import LocationTargetParams = LocationsAPI.LocationTargetParams;
+Top.Locations = Locations;
+
+export declare namespace Top {
+  export {
+    type TopAttacksResponse as TopAttacksResponse,
+    type TopIndustryResponse as TopIndustryResponse,
+    type TopVerticalResponse as TopVerticalResponse,
+    type TopAttacksParams as TopAttacksParams,
+    type TopIndustryParams as TopIndustryParams,
+    type TopVerticalParams as TopVerticalParams,
+  };
+
+  export {
+    Locations as Locations,
+    type LocationOriginResponse as LocationOriginResponse,
+    type LocationTargetResponse as LocationTargetResponse,
+    type LocationOriginParams as LocationOriginParams,
+    type LocationTargetParams as LocationTargetParams,
+  };
 }
diff --git a/src/resources/radar/attacks/layer7/index.ts b/src/resources/radar/attacks/layer7/index.ts
index c296bee251..2328d6f344 100644
--- a/src/resources/radar/attacks/layer7/index.ts
+++ b/src/resources/radar/attacks/layer7/index.ts
@@ -1,46 +1,46 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { Layer7TimeseriesResponse, Layer7TimeseriesParams, Layer7 } from './layer7';
+export { Layer7, type Layer7TimeseriesResponse, type Layer7TimeseriesParams } from './layer7';
 export {
-  SummaryGetResponse,
-  SummaryHTTPMethodResponse,
-  SummaryHTTPVersionResponse,
-  SummaryIPVersionResponse,
-  SummaryManagedRulesResponse,
-  SummaryMitigationProductResponse,
-  SummaryGetParams,
-  SummaryHTTPMethodParams,
-  SummaryHTTPVersionParams,
-  SummaryIPVersionParams,
-  SummaryManagedRulesParams,
-  SummaryMitigationProductParams,
   Summary,
+  type SummaryGetResponse,
+  type SummaryHTTPMethodResponse,
+  type SummaryHTTPVersionResponse,
+  type SummaryIPVersionResponse,
+  type SummaryManagedRulesResponse,
+  type SummaryMitigationProductResponse,
+  type SummaryGetParams,
+  type SummaryHTTPMethodParams,
+  type SummaryHTTPVersionParams,
+  type SummaryIPVersionParams,
+  type SummaryManagedRulesParams,
+  type SummaryMitigationProductParams,
 } from './summary';
 export {
-  TimeseriesGroupGetResponse,
-  TimeseriesGroupHTTPMethodResponse,
-  TimeseriesGroupHTTPVersionResponse,
-  TimeseriesGroupIndustryResponse,
-  TimeseriesGroupIPVersionResponse,
-  TimeseriesGroupManagedRulesResponse,
-  TimeseriesGroupMitigationProductResponse,
-  TimeseriesGroupVerticalResponse,
-  TimeseriesGroupGetParams,
-  TimeseriesGroupHTTPMethodParams,
-  TimeseriesGroupHTTPVersionParams,
-  TimeseriesGroupIndustryParams,
-  TimeseriesGroupIPVersionParams,
-  TimeseriesGroupManagedRulesParams,
-  TimeseriesGroupMitigationProductParams,
-  TimeseriesGroupVerticalParams,
   TimeseriesGroups,
+  type TimeseriesGroupGetResponse,
+  type TimeseriesGroupHTTPMethodResponse,
+  type TimeseriesGroupHTTPVersionResponse,
+  type TimeseriesGroupIndustryResponse,
+  type TimeseriesGroupIPVersionResponse,
+  type TimeseriesGroupManagedRulesResponse,
+  type TimeseriesGroupMitigationProductResponse,
+  type TimeseriesGroupVerticalResponse,
+  type TimeseriesGroupGetParams,
+  type TimeseriesGroupHTTPMethodParams,
+  type TimeseriesGroupHTTPVersionParams,
+  type TimeseriesGroupIndustryParams,
+  type TimeseriesGroupIPVersionParams,
+  type TimeseriesGroupManagedRulesParams,
+  type TimeseriesGroupMitigationProductParams,
+  type TimeseriesGroupVerticalParams,
 } from './timeseries-groups';
 export {
-  TopAttacksResponse,
-  TopIndustryResponse,
-  TopVerticalResponse,
-  TopAttacksParams,
-  TopIndustryParams,
-  TopVerticalParams,
   Top,
+  type TopAttacksResponse,
+  type TopIndustryResponse,
+  type TopVerticalResponse,
+  type TopAttacksParams,
+  type TopIndustryParams,
+  type TopVerticalParams,
 } from './top/index';
diff --git a/src/resources/radar/attacks/layer7/layer7.ts b/src/resources/radar/attacks/layer7/layer7.ts
index 607ad786f2..122b6bb732 100644
--- a/src/resources/radar/attacks/layer7/layer7.ts
+++ b/src/resources/radar/attacks/layer7/layer7.ts
@@ -3,10 +3,52 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as Layer7API from './layer7';
 import * as SummaryAPI from './summary';
+import {
+  Summary,
+  SummaryGetParams,
+  SummaryGetResponse,
+  SummaryHTTPMethodParams,
+  SummaryHTTPMethodResponse,
+  SummaryHTTPVersionParams,
+  SummaryHTTPVersionResponse,
+  SummaryIPVersionParams,
+  SummaryIPVersionResponse,
+  SummaryManagedRulesParams,
+  SummaryManagedRulesResponse,
+  SummaryMitigationProductParams,
+  SummaryMitigationProductResponse,
+} from './summary';
 import * as TimeseriesGroupsAPI from './timeseries-groups';
+import {
+  TimeseriesGroupGetParams,
+  TimeseriesGroupGetResponse,
+  TimeseriesGroupHTTPMethodParams,
+  TimeseriesGroupHTTPMethodResponse,
+  TimeseriesGroupHTTPVersionParams,
+  TimeseriesGroupHTTPVersionResponse,
+  TimeseriesGroupIPVersionParams,
+  TimeseriesGroupIPVersionResponse,
+  TimeseriesGroupIndustryParams,
+  TimeseriesGroupIndustryResponse,
+  TimeseriesGroupManagedRulesParams,
+  TimeseriesGroupManagedRulesResponse,
+  TimeseriesGroupMitigationProductParams,
+  TimeseriesGroupMitigationProductResponse,
+  TimeseriesGroupVerticalParams,
+  TimeseriesGroupVerticalResponse,
+  TimeseriesGroups,
+} from './timeseries-groups';
 import * as TopAPI from './top/top';
+import {
+  Top,
+  TopAttacksParams,
+  TopAttacksResponse,
+  TopIndustryParams,
+  TopIndustryResponse,
+  TopVerticalParams,
+  TopVerticalResponse,
+} from './top/top';
 
 export class Layer7 extends APIResource {
   summary: SummaryAPI.Summary = new SummaryAPI.Summary(this._client);
@@ -252,44 +294,59 @@ export interface Layer7TimeseriesParams {
   normalization?: 'PERCENTAGE_CHANGE' | 'MIN0_MAX';
 }
 
-export namespace Layer7 {
-  export import Layer7TimeseriesResponse = Layer7API.Layer7TimeseriesResponse;
-  export import Layer7TimeseriesParams = Layer7API.Layer7TimeseriesParams;
-  export import Summary = SummaryAPI.Summary;
-  export import SummaryGetResponse = SummaryAPI.SummaryGetResponse;
-  export import SummaryHTTPMethodResponse = SummaryAPI.SummaryHTTPMethodResponse;
-  export import SummaryHTTPVersionResponse = SummaryAPI.SummaryHTTPVersionResponse;
-  export import SummaryIPVersionResponse = SummaryAPI.SummaryIPVersionResponse;
-  export import SummaryManagedRulesResponse = SummaryAPI.SummaryManagedRulesResponse;
-  export import SummaryMitigationProductResponse = SummaryAPI.SummaryMitigationProductResponse;
-  export import SummaryGetParams = SummaryAPI.SummaryGetParams;
-  export import SummaryHTTPMethodParams = SummaryAPI.SummaryHTTPMethodParams;
-  export import SummaryHTTPVersionParams = SummaryAPI.SummaryHTTPVersionParams;
-  export import SummaryIPVersionParams = SummaryAPI.SummaryIPVersionParams;
-  export import SummaryManagedRulesParams = SummaryAPI.SummaryManagedRulesParams;
-  export import SummaryMitigationProductParams = SummaryAPI.SummaryMitigationProductParams;
-  export import TimeseriesGroups = TimeseriesGroupsAPI.TimeseriesGroups;
-  export import TimeseriesGroupGetResponse = TimeseriesGroupsAPI.TimeseriesGroupGetResponse;
-  export import TimeseriesGroupHTTPMethodResponse = TimeseriesGroupsAPI.TimeseriesGroupHTTPMethodResponse;
-  export import TimeseriesGroupHTTPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupHTTPVersionResponse;
-  export import TimeseriesGroupIndustryResponse = TimeseriesGroupsAPI.TimeseriesGroupIndustryResponse;
-  export import TimeseriesGroupIPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupIPVersionResponse;
-  export import TimeseriesGroupManagedRulesResponse = TimeseriesGroupsAPI.TimeseriesGroupManagedRulesResponse;
-  export import TimeseriesGroupMitigationProductResponse = TimeseriesGroupsAPI.TimeseriesGroupMitigationProductResponse;
-  export import TimeseriesGroupVerticalResponse = TimeseriesGroupsAPI.TimeseriesGroupVerticalResponse;
-  export import TimeseriesGroupGetParams = TimeseriesGroupsAPI.TimeseriesGroupGetParams;
-  export import TimeseriesGroupHTTPMethodParams = TimeseriesGroupsAPI.TimeseriesGroupHTTPMethodParams;
-  export import TimeseriesGroupHTTPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupHTTPVersionParams;
-  export import TimeseriesGroupIndustryParams = TimeseriesGroupsAPI.TimeseriesGroupIndustryParams;
-  export import TimeseriesGroupIPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupIPVersionParams;
-  export import TimeseriesGroupManagedRulesParams = TimeseriesGroupsAPI.TimeseriesGroupManagedRulesParams;
-  export import TimeseriesGroupMitigationProductParams = TimeseriesGroupsAPI.TimeseriesGroupMitigationProductParams;
-  export import TimeseriesGroupVerticalParams = TimeseriesGroupsAPI.TimeseriesGroupVerticalParams;
-  export import Top = TopAPI.Top;
-  export import TopAttacksResponse = TopAPI.TopAttacksResponse;
-  export import TopIndustryResponse = TopAPI.TopIndustryResponse;
-  export import TopVerticalResponse = TopAPI.TopVerticalResponse;
-  export import TopAttacksParams = TopAPI.TopAttacksParams;
-  export import TopIndustryParams = TopAPI.TopIndustryParams;
-  export import TopVerticalParams = TopAPI.TopVerticalParams;
+Layer7.Summary = Summary;
+Layer7.TimeseriesGroups = TimeseriesGroups;
+Layer7.Top = Top;
+
+export declare namespace Layer7 {
+  export {
+    type Layer7TimeseriesResponse as Layer7TimeseriesResponse,
+    type Layer7TimeseriesParams as Layer7TimeseriesParams,
+  };
+
+  export {
+    Summary as Summary,
+    type SummaryGetResponse as SummaryGetResponse,
+    type SummaryHTTPMethodResponse as SummaryHTTPMethodResponse,
+    type SummaryHTTPVersionResponse as SummaryHTTPVersionResponse,
+    type SummaryIPVersionResponse as SummaryIPVersionResponse,
+    type SummaryManagedRulesResponse as SummaryManagedRulesResponse,
+    type SummaryMitigationProductResponse as SummaryMitigationProductResponse,
+    type SummaryGetParams as SummaryGetParams,
+    type SummaryHTTPMethodParams as SummaryHTTPMethodParams,
+    type SummaryHTTPVersionParams as SummaryHTTPVersionParams,
+    type SummaryIPVersionParams as SummaryIPVersionParams,
+    type SummaryManagedRulesParams as SummaryManagedRulesParams,
+    type SummaryMitigationProductParams as SummaryMitigationProductParams,
+  };
+
+  export {
+    TimeseriesGroups as TimeseriesGroups,
+    type TimeseriesGroupGetResponse as TimeseriesGroupGetResponse,
+    type TimeseriesGroupHTTPMethodResponse as TimeseriesGroupHTTPMethodResponse,
+    type TimeseriesGroupHTTPVersionResponse as TimeseriesGroupHTTPVersionResponse,
+    type TimeseriesGroupIndustryResponse as TimeseriesGroupIndustryResponse,
+    type TimeseriesGroupIPVersionResponse as TimeseriesGroupIPVersionResponse,
+    type TimeseriesGroupManagedRulesResponse as TimeseriesGroupManagedRulesResponse,
+    type TimeseriesGroupMitigationProductResponse as TimeseriesGroupMitigationProductResponse,
+    type TimeseriesGroupVerticalResponse as TimeseriesGroupVerticalResponse,
+    type TimeseriesGroupGetParams as TimeseriesGroupGetParams,
+    type TimeseriesGroupHTTPMethodParams as TimeseriesGroupHTTPMethodParams,
+    type TimeseriesGroupHTTPVersionParams as TimeseriesGroupHTTPVersionParams,
+    type TimeseriesGroupIndustryParams as TimeseriesGroupIndustryParams,
+    type TimeseriesGroupIPVersionParams as TimeseriesGroupIPVersionParams,
+    type TimeseriesGroupManagedRulesParams as TimeseriesGroupManagedRulesParams,
+    type TimeseriesGroupMitigationProductParams as TimeseriesGroupMitigationProductParams,
+    type TimeseriesGroupVerticalParams as TimeseriesGroupVerticalParams,
+  };
+
+  export {
+    Top as Top,
+    type TopAttacksResponse as TopAttacksResponse,
+    type TopIndustryResponse as TopIndustryResponse,
+    type TopVerticalResponse as TopVerticalResponse,
+    type TopAttacksParams as TopAttacksParams,
+    type TopIndustryParams as TopIndustryParams,
+    type TopVerticalParams as TopVerticalParams,
+  };
 }
diff --git a/src/resources/radar/attacks/layer7/summary.ts b/src/resources/radar/attacks/layer7/summary.ts
index fdbae9395f..8749084adf 100644
--- a/src/resources/radar/attacks/layer7/summary.ts
+++ b/src/resources/radar/attacks/layer7/summary.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as SummaryAPI from './summary';
 
 export class Summary extends APIResource {
   /**
@@ -211,7 +210,7 @@ export namespace SummaryGetResponse {
 export interface SummaryHTTPMethodResponse {
   meta: SummaryHTTPMethodResponse.Meta;
 
-  summary_0: SummaryHTTPMethodResponse.Summary0;
+  summary_0: Record<string, string>;
 }
 
 export namespace SummaryHTTPMethodResponse {
@@ -262,12 +261,6 @@ export namespace SummaryHTTPMethodResponse {
       }
     }
   }
-
-  export interface Summary0 {
-    GET: string;
-
-    POST: string;
-  }
 }
 
 export interface SummaryHTTPVersionResponse {
@@ -399,7 +392,7 @@ export namespace SummaryIPVersionResponse {
 export interface SummaryManagedRulesResponse {
   meta: SummaryManagedRulesResponse.Meta;
 
-  summary_0: SummaryManagedRulesResponse.Summary0;
+  summary_0: Record<string, string>;
 }
 
 export namespace SummaryManagedRulesResponse {
@@ -450,18 +443,12 @@ export namespace SummaryManagedRulesResponse {
       }
     }
   }
-
-  export interface Summary0 {
-    Bot: string;
-
-    'HTTP Anomaly': string;
-  }
 }
 
 export interface SummaryMitigationProductResponse {
   meta: SummaryMitigationProductResponse.Meta;
 
-  summary_0: SummaryMitigationProductResponse.Summary0;
+  summary_0: Record<string, string>;
 }
 
 export namespace SummaryMitigationProductResponse {
@@ -512,12 +499,6 @@ export namespace SummaryMitigationProductResponse {
       }
     }
   }
-
-  export interface Summary0 {
-    DDOS: string;
-
-    WAF: string;
-  }
 }
 
 export interface SummaryGetParams {
@@ -617,6 +598,12 @@ export interface SummaryHTTPMethodParams {
    */
   ipVersion?: Array<'IPv4' | 'IPv6'>;
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -982,6 +969,12 @@ export interface SummaryManagedRulesParams {
    */
   ipVersion?: Array<'IPv4' | 'IPv6'>;
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -1107,6 +1100,12 @@ export interface SummaryMitigationProductParams {
    */
   ipVersion?: Array<'IPv4' | 'IPv6'>;
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -1120,17 +1119,19 @@ export interface SummaryMitigationProductParams {
   name?: Array<string>;
 }
 
-export namespace Summary {
-  export import SummaryGetResponse = SummaryAPI.SummaryGetResponse;
-  export import SummaryHTTPMethodResponse = SummaryAPI.SummaryHTTPMethodResponse;
-  export import SummaryHTTPVersionResponse = SummaryAPI.SummaryHTTPVersionResponse;
-  export import SummaryIPVersionResponse = SummaryAPI.SummaryIPVersionResponse;
-  export import SummaryManagedRulesResponse = SummaryAPI.SummaryManagedRulesResponse;
-  export import SummaryMitigationProductResponse = SummaryAPI.SummaryMitigationProductResponse;
-  export import SummaryGetParams = SummaryAPI.SummaryGetParams;
-  export import SummaryHTTPMethodParams = SummaryAPI.SummaryHTTPMethodParams;
-  export import SummaryHTTPVersionParams = SummaryAPI.SummaryHTTPVersionParams;
-  export import SummaryIPVersionParams = SummaryAPI.SummaryIPVersionParams;
-  export import SummaryManagedRulesParams = SummaryAPI.SummaryManagedRulesParams;
-  export import SummaryMitigationProductParams = SummaryAPI.SummaryMitigationProductParams;
+export declare namespace Summary {
+  export {
+    type SummaryGetResponse as SummaryGetResponse,
+    type SummaryHTTPMethodResponse as SummaryHTTPMethodResponse,
+    type SummaryHTTPVersionResponse as SummaryHTTPVersionResponse,
+    type SummaryIPVersionResponse as SummaryIPVersionResponse,
+    type SummaryManagedRulesResponse as SummaryManagedRulesResponse,
+    type SummaryMitigationProductResponse as SummaryMitigationProductResponse,
+    type SummaryGetParams as SummaryGetParams,
+    type SummaryHTTPMethodParams as SummaryHTTPMethodParams,
+    type SummaryHTTPVersionParams as SummaryHTTPVersionParams,
+    type SummaryIPVersionParams as SummaryIPVersionParams,
+    type SummaryManagedRulesParams as SummaryManagedRulesParams,
+    type SummaryMitigationProductParams as SummaryMitigationProductParams,
+  };
 }
diff --git a/src/resources/radar/attacks/layer7/timeseries-groups.ts b/src/resources/radar/attacks/layer7/timeseries-groups.ts
index 7386034497..1dc0811522 100644
--- a/src/resources/radar/attacks/layer7/timeseries-groups.ts
+++ b/src/resources/radar/attacks/layer7/timeseries-groups.ts
@@ -3,12 +3,10 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as TimeseriesGroupsAPI from './timeseries-groups';
 
 export class TimeseriesGroups extends APIResource {
   /**
-   * Get a time series of the percentual distribution of mitigation techniques, over
-   * time.
+   * Get a time series of the distribution of mitigation techniques over time.
    */
   get(
     query?: TimeseriesGroupGetParams,
@@ -76,7 +74,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of attacks by industry used over time.
+   * Percentage distribution of attacks by targeted industry over time.
    */
   industry(
     query?: TimeseriesGroupIndustryParams,
@@ -168,7 +166,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of attacks by vertical used over time.
+   * Percentage distribution of attacks by targeted vertical over time.
    */
   vertical(
     query?: TimeseriesGroupVerticalParams,
@@ -273,9 +271,8 @@ export interface TimeseriesGroupHTTPMethodResponse {
 
 export namespace TimeseriesGroupHTTPMethodResponse {
   export interface Serie0 {
-    GET: Array<string>;
-
     timestamps: Array<string>;
+    [k: string]: Array<string> | undefined;
   }
 }
 
@@ -289,6 +286,10 @@ export namespace TimeseriesGroupHTTPVersionResponse {
   export interface Serie0 {
     'HTTP/1.x': Array<string>;
 
+    'HTTP/2': Array<string>;
+
+    'HTTP/3': Array<string>;
+
     timestamps: Array<string>;
   }
 }
@@ -330,9 +331,8 @@ export interface TimeseriesGroupManagedRulesResponse {
 
 export namespace TimeseriesGroupManagedRulesResponse {
   export interface Serie0 {
-    Bot: Array<string>;
-
     timestamps: Array<string>;
+    [k: string]: Array<string> | undefined;
   }
 }
 
@@ -344,9 +344,8 @@ export interface TimeseriesGroupMitigationProductResponse {
 
 export namespace TimeseriesGroupMitigationProductResponse {
   export interface Serie0 {
-    DDOS: Array<string>;
-
     timestamps: Array<string>;
+    [k: string]: Array<string> | undefined;
   }
 }
 
@@ -474,6 +473,12 @@ export interface TimeseriesGroupHTTPMethodParams {
    */
   ipVersion?: Array<'IPv4' | 'IPv6'>;
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -1022,6 +1027,12 @@ export interface TimeseriesGroupManagedRulesParams {
    */
   ipVersion?: Array<'IPv4' | 'IPv6'>;
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -1160,6 +1171,12 @@ export interface TimeseriesGroupMitigationProductParams {
    */
   ipVersion?: Array<'IPv4' | 'IPv6'>;
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -1323,21 +1340,23 @@ export interface TimeseriesGroupVerticalParams {
   normalization?: 'PERCENTAGE' | 'MIN0_MAX';
 }
 
-export namespace TimeseriesGroups {
-  export import TimeseriesGroupGetResponse = TimeseriesGroupsAPI.TimeseriesGroupGetResponse;
-  export import TimeseriesGroupHTTPMethodResponse = TimeseriesGroupsAPI.TimeseriesGroupHTTPMethodResponse;
-  export import TimeseriesGroupHTTPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupHTTPVersionResponse;
-  export import TimeseriesGroupIndustryResponse = TimeseriesGroupsAPI.TimeseriesGroupIndustryResponse;
-  export import TimeseriesGroupIPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupIPVersionResponse;
-  export import TimeseriesGroupManagedRulesResponse = TimeseriesGroupsAPI.TimeseriesGroupManagedRulesResponse;
-  export import TimeseriesGroupMitigationProductResponse = TimeseriesGroupsAPI.TimeseriesGroupMitigationProductResponse;
-  export import TimeseriesGroupVerticalResponse = TimeseriesGroupsAPI.TimeseriesGroupVerticalResponse;
-  export import TimeseriesGroupGetParams = TimeseriesGroupsAPI.TimeseriesGroupGetParams;
-  export import TimeseriesGroupHTTPMethodParams = TimeseriesGroupsAPI.TimeseriesGroupHTTPMethodParams;
-  export import TimeseriesGroupHTTPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupHTTPVersionParams;
-  export import TimeseriesGroupIndustryParams = TimeseriesGroupsAPI.TimeseriesGroupIndustryParams;
-  export import TimeseriesGroupIPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupIPVersionParams;
-  export import TimeseriesGroupManagedRulesParams = TimeseriesGroupsAPI.TimeseriesGroupManagedRulesParams;
-  export import TimeseriesGroupMitigationProductParams = TimeseriesGroupsAPI.TimeseriesGroupMitigationProductParams;
-  export import TimeseriesGroupVerticalParams = TimeseriesGroupsAPI.TimeseriesGroupVerticalParams;
+export declare namespace TimeseriesGroups {
+  export {
+    type TimeseriesGroupGetResponse as TimeseriesGroupGetResponse,
+    type TimeseriesGroupHTTPMethodResponse as TimeseriesGroupHTTPMethodResponse,
+    type TimeseriesGroupHTTPVersionResponse as TimeseriesGroupHTTPVersionResponse,
+    type TimeseriesGroupIndustryResponse as TimeseriesGroupIndustryResponse,
+    type TimeseriesGroupIPVersionResponse as TimeseriesGroupIPVersionResponse,
+    type TimeseriesGroupManagedRulesResponse as TimeseriesGroupManagedRulesResponse,
+    type TimeseriesGroupMitigationProductResponse as TimeseriesGroupMitigationProductResponse,
+    type TimeseriesGroupVerticalResponse as TimeseriesGroupVerticalResponse,
+    type TimeseriesGroupGetParams as TimeseriesGroupGetParams,
+    type TimeseriesGroupHTTPMethodParams as TimeseriesGroupHTTPMethodParams,
+    type TimeseriesGroupHTTPVersionParams as TimeseriesGroupHTTPVersionParams,
+    type TimeseriesGroupIndustryParams as TimeseriesGroupIndustryParams,
+    type TimeseriesGroupIPVersionParams as TimeseriesGroupIPVersionParams,
+    type TimeseriesGroupManagedRulesParams as TimeseriesGroupManagedRulesParams,
+    type TimeseriesGroupMitigationProductParams as TimeseriesGroupMitigationProductParams,
+    type TimeseriesGroupVerticalParams as TimeseriesGroupVerticalParams,
+  };
 }
diff --git a/src/resources/radar/attacks/layer7/top/ases.ts b/src/resources/radar/attacks/layer7/top/ases.ts
index 97b63cde5d..b490056d58 100644
--- a/src/resources/radar/attacks/layer7/top/ases.ts
+++ b/src/resources/radar/attacks/layer7/top/ases.ts
@@ -3,13 +3,12 @@
 import { APIResource } from '../../../../../resource';
 import { isRequestOptions } from '../../../../../core';
 import * as Core from '../../../../../core';
-import * as AsesAPI from './ases';
 
 export class Ases extends APIResource {
   /**
-   * Get the top origin Autonomous Systems of and by layer 7 attacks. Values are a
-   * percentage out of the total layer 7 attacks. The origin Autonomous Systems is
-   * determined by the client IP.
+   * Get the top origin Autonomous Systems of and by Layer 7 attacks. Values are a
+   * percentage out of the total Layer 7 attacks. The origin Autonomous Systems is
+   * determined by the client IP address.
    */
   origin(query?: AseOriginParams, options?: Core.RequestOptions): Core.APIPromise<AseOriginResponse>;
   origin(options?: Core.RequestOptions): Core.APIPromise<AseOriginResponse>;
@@ -215,7 +214,6 @@ export interface AseOriginParams {
   name?: Array<string>;
 }
 
-export namespace Ases {
-  export import AseOriginResponse = AsesAPI.AseOriginResponse;
-  export import AseOriginParams = AsesAPI.AseOriginParams;
+export declare namespace Ases {
+  export { type AseOriginResponse as AseOriginResponse, type AseOriginParams as AseOriginParams };
 }
diff --git a/src/resources/radar/attacks/layer7/top/index.ts b/src/resources/radar/attacks/layer7/top/index.ts
index cae9bb4a54..9ec7ec505e 100644
--- a/src/resources/radar/attacks/layer7/top/index.ts
+++ b/src/resources/radar/attacks/layer7/top/index.ts
@@ -1,19 +1,19 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { AseOriginResponse, AseOriginParams, Ases } from './ases';
+export { Ases, type AseOriginResponse, type AseOriginParams } from './ases';
 export {
-  LocationOriginResponse,
-  LocationTargetResponse,
-  LocationOriginParams,
-  LocationTargetParams,
   Locations,
+  type LocationOriginResponse,
+  type LocationTargetResponse,
+  type LocationOriginParams,
+  type LocationTargetParams,
 } from './locations';
 export {
-  TopAttacksResponse,
-  TopIndustryResponse,
-  TopVerticalResponse,
-  TopAttacksParams,
-  TopIndustryParams,
-  TopVerticalParams,
   Top,
+  type TopAttacksResponse,
+  type TopIndustryResponse,
+  type TopVerticalResponse,
+  type TopAttacksParams,
+  type TopIndustryParams,
+  type TopVerticalParams,
 } from './top';
diff --git a/src/resources/radar/attacks/layer7/top/locations.ts b/src/resources/radar/attacks/layer7/top/locations.ts
index 5e34e10919..21c6e7d757 100644
--- a/src/resources/radar/attacks/layer7/top/locations.ts
+++ b/src/resources/radar/attacks/layer7/top/locations.ts
@@ -3,13 +3,12 @@
 import { APIResource } from '../../../../../resource';
 import { isRequestOptions } from '../../../../../core';
 import * as Core from '../../../../../core';
-import * as LocationsAPI from './locations';
 
 export class Locations extends APIResource {
   /**
-   * Get the top origin locations of and by layer 7 attacks. Values are a percentage
-   * out of the total layer 7 attacks. The origin location is determined by the
-   * client IP.
+   * Get the top origin locations of and by Layer 7 attacks. Values are a percentage
+   * out of the total Layer 7 attacks. The origin location is determined by the
+   * client IP address.
    */
   origin(
     query?: LocationOriginParams,
@@ -424,9 +423,11 @@ export interface LocationTargetParams {
   name?: Array<string>;
 }
 
-export namespace Locations {
-  export import LocationOriginResponse = LocationsAPI.LocationOriginResponse;
-  export import LocationTargetResponse = LocationsAPI.LocationTargetResponse;
-  export import LocationOriginParams = LocationsAPI.LocationOriginParams;
-  export import LocationTargetParams = LocationsAPI.LocationTargetParams;
+export declare namespace Locations {
+  export {
+    type LocationOriginResponse as LocationOriginResponse,
+    type LocationTargetResponse as LocationTargetResponse,
+    type LocationOriginParams as LocationOriginParams,
+    type LocationTargetParams as LocationTargetParams,
+  };
 }
diff --git a/src/resources/radar/attacks/layer7/top/top.ts b/src/resources/radar/attacks/layer7/top/top.ts
index caa53eaebc..ac8c0f2f1e 100644
--- a/src/resources/radar/attacks/layer7/top/top.ts
+++ b/src/resources/radar/attacks/layer7/top/top.ts
@@ -3,10 +3,16 @@
 import { APIResource } from '../../../../../resource';
 import { isRequestOptions } from '../../../../../core';
 import * as Core from '../../../../../core';
-import * as TopTopAPI from './top';
-import * as TopAPI from '../../../http/top';
 import * as AsesAPI from './ases';
+import { AseOriginParams, AseOriginResponse, Ases } from './ases';
 import * as LocationsAPI from './locations';
+import {
+  LocationOriginParams,
+  LocationOriginResponse,
+  LocationTargetParams,
+  LocationTargetResponse,
+  Locations,
+} from './locations';
 
 export class Top extends APIResource {
   locations: LocationsAPI.Locations = new LocationsAPI.Locations(this._client);
@@ -14,10 +20,10 @@ export class Top extends APIResource {
 
   /**
    * Get the top attacks from origin to target location. Values are a percentage out
-   * of the total layer 7 attacks (with billing country). The attack magnitude can be
+   * of the total Layer 7 attacks (with billing country). The attack magnitude can be
    * defined by the number of mitigated requests or by the number of zones affected.
-   * You can optionally limit the number of attacks per origin/target location
-   * (useful if all the top attacks are from or to the same location).
+   * You can optionally limit the number of attacks by origin/target location (useful
+   * if all the top attacks are from or to the same location).
    */
   attacks(query?: TopAttacksParams, options?: Core.RequestOptions): Core.APIPromise<TopAttacksResponse>;
   attacks(options?: Core.RequestOptions): Core.APIPromise<TopAttacksResponse>;
@@ -36,7 +42,7 @@ export class Top extends APIResource {
   }
 
   /**
-   * Get the Industry of attacks.
+   * Get the industries targeted by attacks.
    */
   industry(query?: TopIndustryParams, options?: Core.RequestOptions): Core.APIPromise<TopIndustryResponse>;
   industry(options?: Core.RequestOptions): Core.APIPromise<TopIndustryResponse>;
@@ -55,7 +61,7 @@ export class Top extends APIResource {
   }
 
   /**
-   * Get the Verticals of attacks.
+   * Get the verticals targeted by attacks.
    */
   vertical(query?: TopVerticalParams, options?: Core.RequestOptions): Core.APIPromise<TopVerticalResponse>;
   vertical(options?: Core.RequestOptions): Core.APIPromise<TopVerticalResponse>;
@@ -143,7 +149,7 @@ export namespace TopAttacksResponse {
 export interface TopIndustryResponse {
   meta: TopIndustryResponse.Meta;
 
-  top_0: Array<TopAPI.Browser>;
+  top_0: Array<TopIndustryResponse.Top0>;
 }
 
 export namespace TopIndustryResponse {
@@ -192,12 +198,18 @@ export namespace TopIndustryResponse {
       }
     }
   }
+
+  export interface Top0 {
+    name: string;
+
+    value: string;
+  }
 }
 
 export interface TopVerticalResponse {
   meta: TopVerticalResponse.Meta;
 
-  top_0: Array<TopAPI.Browser>;
+  top_0: Array<TopVerticalResponse.Top0>;
 }
 
 export namespace TopVerticalResponse {
@@ -246,6 +258,12 @@ export namespace TopVerticalResponse {
       }
     }
   }
+
+  export interface Top0 {
+    name: string;
+
+    value: string;
+  }
 }
 
 export interface TopAttacksParams {
@@ -663,19 +681,30 @@ export interface TopVerticalParams {
   name?: Array<string>;
 }
 
-export namespace Top {
-  export import TopAttacksResponse = TopTopAPI.TopAttacksResponse;
-  export import TopIndustryResponse = TopTopAPI.TopIndustryResponse;
-  export import TopVerticalResponse = TopTopAPI.TopVerticalResponse;
-  export import TopAttacksParams = TopTopAPI.TopAttacksParams;
-  export import TopIndustryParams = TopTopAPI.TopIndustryParams;
-  export import TopVerticalParams = TopTopAPI.TopVerticalParams;
-  export import Locations = LocationsAPI.Locations;
-  export import LocationOriginResponse = LocationsAPI.LocationOriginResponse;
-  export import LocationTargetResponse = LocationsAPI.LocationTargetResponse;
-  export import LocationOriginParams = LocationsAPI.LocationOriginParams;
-  export import LocationTargetParams = LocationsAPI.LocationTargetParams;
-  export import Ases = AsesAPI.Ases;
-  export import AseOriginResponse = AsesAPI.AseOriginResponse;
-  export import AseOriginParams = AsesAPI.AseOriginParams;
+Top.Locations = Locations;
+Top.Ases = Ases;
+
+export declare namespace Top {
+  export {
+    type TopAttacksResponse as TopAttacksResponse,
+    type TopIndustryResponse as TopIndustryResponse,
+    type TopVerticalResponse as TopVerticalResponse,
+    type TopAttacksParams as TopAttacksParams,
+    type TopIndustryParams as TopIndustryParams,
+    type TopVerticalParams as TopVerticalParams,
+  };
+
+  export {
+    Locations as Locations,
+    type LocationOriginResponse as LocationOriginResponse,
+    type LocationTargetResponse as LocationTargetResponse,
+    type LocationOriginParams as LocationOriginParams,
+    type LocationTargetParams as LocationTargetParams,
+  };
+
+  export {
+    Ases as Ases,
+    type AseOriginResponse as AseOriginResponse,
+    type AseOriginParams as AseOriginParams,
+  };
 }
diff --git a/src/resources/radar/bgp/bgp.ts b/src/resources/radar/bgp/bgp.ts
index 3288308e33..fabc096689 100644
--- a/src/resources/radar/bgp/bgp.ts
+++ b/src/resources/radar/bgp/bgp.ts
@@ -3,12 +3,26 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as BGPAPI from './bgp';
 import * as IPsAPI from './ips';
+import { IPTimeseriesParams, IPTimeseriesResponse, IPs } from './ips';
 import * as RoutesAPI from './routes';
+import {
+  RouteAsesParams,
+  RouteAsesResponse,
+  RouteMoasParams,
+  RouteMoasResponse,
+  RoutePfx2asParams,
+  RoutePfx2asResponse,
+  RouteStatsParams,
+  RouteStatsResponse,
+  Routes,
+} from './routes';
 import * as HijacksAPI from './hijacks/hijacks';
+import { Hijacks } from './hijacks/hijacks';
 import * as LeaksAPI from './leaks/leaks';
+import { Leaks } from './leaks/leaks';
 import * as TopAPI from './top/top';
+import { Top, TopPrefixesParams, TopPrefixesResponse } from './top/top';
 
 export class BGP extends APIResource {
   leaks: LeaksAPI.Leaks = new LeaksAPI.Leaks(this._client);
@@ -18,8 +32,8 @@ export class BGP extends APIResource {
   ips: IPsAPI.IPs = new IPsAPI.IPs(this._client);
 
   /**
-   * Gets BGP updates change over time. Raw values are returned. When requesting
-   * updates of an autonomous system (AS), only BGP updates of type announcement are
+   * Get BGP updates change over time. Raw values are returned. When requesting
+   * updates for an autonomous system (AS), only BGP updates of type announcement are
    * returned.
    */
   timeseries(
@@ -149,7 +163,7 @@ export interface BGPTimeseriesParams {
   /**
    * Array of BGP network prefixes.
    */
-  prefix?: Array<BGPTimeseriesParams.Prefix>;
+  prefix?: Array<string>;
 
   /**
    * Array of BGP update types.
@@ -157,39 +171,43 @@ export interface BGPTimeseriesParams {
   updateType?: Array<'ANNOUNCEMENT' | 'WITHDRAWAL'>;
 }
 
-export namespace BGPTimeseriesParams {
-  export interface Prefix {
-    in: string;
-
-    name: string;
-
-    test: number;
-
-    /**
-     * Network prefix, IPv4 or IPv6.
-     */
-    type?: string;
-  }
-}
-
-export namespace BGP {
-  export import BGPTimeseriesResponse = BGPAPI.BGPTimeseriesResponse;
-  export import BGPTimeseriesParams = BGPAPI.BGPTimeseriesParams;
-  export import Leaks = LeaksAPI.Leaks;
-  export import Top = TopAPI.Top;
-  export import TopPrefixesResponse = TopAPI.TopPrefixesResponse;
-  export import TopPrefixesParams = TopAPI.TopPrefixesParams;
-  export import Hijacks = HijacksAPI.Hijacks;
-  export import Routes = RoutesAPI.Routes;
-  export import RouteAsesResponse = RoutesAPI.RouteAsesResponse;
-  export import RouteMoasResponse = RoutesAPI.RouteMoasResponse;
-  export import RoutePfx2asResponse = RoutesAPI.RoutePfx2asResponse;
-  export import RouteStatsResponse = RoutesAPI.RouteStatsResponse;
-  export import RouteAsesParams = RoutesAPI.RouteAsesParams;
-  export import RouteMoasParams = RoutesAPI.RouteMoasParams;
-  export import RoutePfx2asParams = RoutesAPI.RoutePfx2asParams;
-  export import RouteStatsParams = RoutesAPI.RouteStatsParams;
-  export import IPs = IPsAPI.IPs;
-  export import IPTimeseriesResponse = IPsAPI.IPTimeseriesResponse;
-  export import IPTimeseriesParams = IPsAPI.IPTimeseriesParams;
+BGP.Leaks = Leaks;
+BGP.Top = Top;
+BGP.Hijacks = Hijacks;
+BGP.Routes = Routes;
+BGP.IPs = IPs;
+
+export declare namespace BGP {
+  export {
+    type BGPTimeseriesResponse as BGPTimeseriesResponse,
+    type BGPTimeseriesParams as BGPTimeseriesParams,
+  };
+
+  export { Leaks as Leaks };
+
+  export {
+    Top as Top,
+    type TopPrefixesResponse as TopPrefixesResponse,
+    type TopPrefixesParams as TopPrefixesParams,
+  };
+
+  export { Hijacks as Hijacks };
+
+  export {
+    Routes as Routes,
+    type RouteAsesResponse as RouteAsesResponse,
+    type RouteMoasResponse as RouteMoasResponse,
+    type RoutePfx2asResponse as RoutePfx2asResponse,
+    type RouteStatsResponse as RouteStatsResponse,
+    type RouteAsesParams as RouteAsesParams,
+    type RouteMoasParams as RouteMoasParams,
+    type RoutePfx2asParams as RoutePfx2asParams,
+    type RouteStatsParams as RouteStatsParams,
+  };
+
+  export {
+    IPs as IPs,
+    type IPTimeseriesResponse as IPTimeseriesResponse,
+    type IPTimeseriesParams as IPTimeseriesParams,
+  };
 }
diff --git a/src/resources/radar/bgp/hijacks/events.ts b/src/resources/radar/bgp/hijacks/events.ts
index 06e3b95c89..dcb39e8b5c 100644
--- a/src/resources/radar/bgp/hijacks/events.ts
+++ b/src/resources/radar/bgp/hijacks/events.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as EventsAPI from './events';
 import { V4PagePagination, type V4PagePaginationParams } from '../../../../pagination';
 
 export class Events extends APIResource {
@@ -34,86 +33,66 @@ export class Events extends APIResource {
 export class EventListResponsesV4PagePagination extends V4PagePagination<EventListResponse> {}
 
 export interface EventListResponse {
-  result: EventListResponse.Result;
+  asn_info: Array<EventListResponse.ASNInfo>;
 
-  result_info: EventListResponse.ResultInfo;
+  events: Array<EventListResponse.Event>;
 
-  success: boolean;
+  total_monitors: number;
 }
 
 export namespace EventListResponse {
-  export interface Result {
-    asn_info: Array<Result.ASNInfo>;
+  export interface ASNInfo {
+    asn: number;
 
-    events: Array<Result.Event>;
+    country_code: string;
 
-    total_monitors: number;
+    org_name: string;
   }
 
-  export namespace Result {
-    export interface ASNInfo {
-      asn: number;
+  export interface Event {
+    id: number;
 
-      country_code: string;
+    confidence_score: number;
 
-      org_name: string;
-    }
-
-    export interface Event {
-      id: number;
-
-      confidence_score: number;
-
-      duration: number;
-
-      event_type: number;
-
-      hijack_msgs_count: number;
+    duration: number;
 
-      hijacker_asn: number;
+    event_type: number;
 
-      hijacker_country: string;
+    hijack_msgs_count: number;
 
-      is_stale: boolean;
+    hijacker_asn: number;
 
-      max_hijack_ts: string;
+    hijacker_country: string;
 
-      max_msg_ts: string;
+    is_stale: boolean;
 
-      min_hijack_ts: string;
+    max_hijack_ts: string;
 
-      on_going_count: number;
+    max_msg_ts: string;
 
-      peer_asns: Array<number>;
+    min_hijack_ts: string;
 
-      peer_ip_count: number;
+    on_going_count: number;
 
-      prefixes: Array<string>;
+    peer_asns: Array<number>;
 
-      tags: Array<Event.Tag>;
+    peer_ip_count: number;
 
-      victim_asns: Array<number>;
+    prefixes: Array<string>;
 
-      victim_countries: Array<string>;
-    }
+    tags: Array<Event.Tag>;
 
-    export namespace Event {
-      export interface Tag {
-        name: string;
+    victim_asns: Array<number>;
 
-        score: number;
-      }
-    }
+    victim_countries: Array<string>;
   }
 
-  export interface ResultInfo {
-    count: number;
-
-    page: number;
+  export namespace Event {
+    export interface Tag {
+      name: string;
 
-    per_page: number;
-
-    total_count: number;
+      score: number;
+    }
   }
 }
 
@@ -190,8 +169,12 @@ export interface EventListParams extends V4PagePaginationParams {
   victimAsn?: number;
 }
 
-export namespace Events {
-  export import EventListResponse = EventsAPI.EventListResponse;
-  export import EventListResponsesV4PagePagination = EventsAPI.EventListResponsesV4PagePagination;
-  export import EventListParams = EventsAPI.EventListParams;
+Events.EventListResponsesV4PagePagination = EventListResponsesV4PagePagination;
+
+export declare namespace Events {
+  export {
+    type EventListResponse as EventListResponse,
+    EventListResponsesV4PagePagination as EventListResponsesV4PagePagination,
+    type EventListParams as EventListParams,
+  };
 }
diff --git a/src/resources/radar/bgp/hijacks/hijacks.ts b/src/resources/radar/bgp/hijacks/hijacks.ts
index 17f01e0a56..d935975781 100644
--- a/src/resources/radar/bgp/hijacks/hijacks.ts
+++ b/src/resources/radar/bgp/hijacks/hijacks.ts
@@ -2,14 +2,20 @@
 
 import { APIResource } from '../../../../resource';
 import * as EventsAPI from './events';
+import { EventListParams, EventListResponse, EventListResponsesV4PagePagination, Events } from './events';
 
 export class Hijacks extends APIResource {
   events: EventsAPI.Events = new EventsAPI.Events(this._client);
 }
 
-export namespace Hijacks {
-  export import Events = EventsAPI.Events;
-  export import EventListResponse = EventsAPI.EventListResponse;
-  export import EventListResponsesV4PagePagination = EventsAPI.EventListResponsesV4PagePagination;
-  export import EventListParams = EventsAPI.EventListParams;
+Hijacks.Events = Events;
+Hijacks.EventListResponsesV4PagePagination = EventListResponsesV4PagePagination;
+
+export declare namespace Hijacks {
+  export {
+    Events as Events,
+    type EventListResponse as EventListResponse,
+    EventListResponsesV4PagePagination as EventListResponsesV4PagePagination,
+    type EventListParams as EventListParams,
+  };
 }
diff --git a/src/resources/radar/bgp/hijacks/index.ts b/src/resources/radar/bgp/hijacks/index.ts
index 779802cd8a..fbf7468fda 100644
--- a/src/resources/radar/bgp/hijacks/index.ts
+++ b/src/resources/radar/bgp/hijacks/index.ts
@@ -1,4 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { EventListResponse, EventListParams, EventListResponsesV4PagePagination, Events } from './events';
+export {
+  EventListResponsesV4PagePagination,
+  Events,
+  type EventListResponse,
+  type EventListParams,
+} from './events';
 export { Hijacks } from './hijacks';
diff --git a/src/resources/radar/bgp/index.ts b/src/resources/radar/bgp/index.ts
index f977cdd137..812c29b78a 100644
--- a/src/resources/radar/bgp/index.ts
+++ b/src/resources/radar/bgp/index.ts
@@ -1,18 +1,18 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { BGPTimeseriesResponse, BGPTimeseriesParams, BGP } from './bgp';
+export { BGP, type BGPTimeseriesResponse, type BGPTimeseriesParams } from './bgp';
 export { Hijacks } from './hijacks/index';
-export { IPTimeseriesResponse, IPTimeseriesParams, IPs } from './ips';
+export { IPs, type IPTimeseriesResponse, type IPTimeseriesParams } from './ips';
 export { Leaks } from './leaks/index';
 export {
-  RouteAsesResponse,
-  RouteMoasResponse,
-  RoutePfx2asResponse,
-  RouteStatsResponse,
-  RouteAsesParams,
-  RouteMoasParams,
-  RoutePfx2asParams,
-  RouteStatsParams,
   Routes,
+  type RouteAsesResponse,
+  type RouteMoasResponse,
+  type RoutePfx2asResponse,
+  type RouteStatsResponse,
+  type RouteAsesParams,
+  type RouteMoasParams,
+  type RoutePfx2asParams,
+  type RouteStatsParams,
 } from './routes';
-export { TopPrefixesResponse, TopPrefixesParams, Top } from './top/index';
+export { Top, type TopPrefixesResponse, type TopPrefixesParams } from './top/index';
diff --git a/src/resources/radar/bgp/ips.ts b/src/resources/radar/bgp/ips.ts
index 250e63b09f..5901f529de 100644
--- a/src/resources/radar/bgp/ips.ts
+++ b/src/resources/radar/bgp/ips.ts
@@ -3,12 +3,11 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as IPsAPI from './ips';
 
 export class IPs extends APIResource {
   /**
-   * Gets time-series data for the announced IP space count, represented as the
-   * number of IPv4 /24s and IPv6 /48s, for a given ASN.
+   * Get time series data for the announced IP space count, represented as the number
+   * of IPv4 /24s and IPv6 /48s, for a given ASN.
    */
   timeseries(
     query?: IPTimeseriesParams,
@@ -34,38 +33,30 @@ export interface IPTimeseriesResponse {
   meta: IPTimeseriesResponse.Meta;
 
   serie_174: IPTimeseriesResponse.Serie174;
-
-  serie_cn: IPTimeseriesResponse.SerieCn;
 }
 
 export namespace IPTimeseriesResponse {
   export interface Meta {
-    dateRange: Array<Meta.DateRange>;
+    queries: Array<Meta.Query>;
   }
 
   export namespace Meta {
-    export interface DateRange {
-      /**
-       * Adjusted end of date range.
-       */
-      endTime: string;
-
-      /**
-       * Adjusted start of date range.
-       */
-      startTime: string;
-    }
-  }
+    export interface Query {
+      dateRange: Query.DateRange;
 
-  export interface Serie174 {
-    ipv4: Array<string>;
+      entity: string;
+    }
 
-    ipv6: Array<string>;
+    export namespace Query {
+      export interface DateRange {
+        endTime: string;
 
-    timestamps: Array<string>;
+        startTime: string;
+      }
+    }
   }
 
-  export interface SerieCn {
+  export interface Serie174 {
     ipv4: Array<string>;
 
     ipv6: Array<string>;
@@ -76,25 +67,28 @@ export namespace IPTimeseriesResponse {
 
 export interface IPTimeseriesParams {
   /**
-   * Comma separated list of ASNs.
+   * Array of comma separated list of ASNs, start with `-` to exclude from results.
+   * For example, `-174, 3356` excludes results from AS174, but includes results from
+   * AS3356.
    */
-  asn?: string;
+  asn?: Array<string>;
 
   /**
    * End of the date range (inclusive).
    */
-  dateEnd?: string;
+  dateEnd?: Array<string>;
 
   /**
-   * Shorthand date ranges for the last X days - use when you don't need specific
-   * start and end dates.
+   * For example, use `7d` and `7dControl` to compare this week with the previous
+   * week. Use this parameter or set specific start and end dates (`dateStart` and
+   * `dateEnd` parameters).
    */
-  dateRange?: string;
+  dateRange?: Array<string>;
 
   /**
-   * Start of the date range (inclusive).
+   * Array of datetimes to filter the start of a series.
    */
-  dateStart?: string;
+  dateStart?: Array<string>;
 
   /**
    * Format results are returned in.
@@ -107,9 +101,14 @@ export interface IPTimeseriesParams {
   includeDelay?: boolean;
 
   /**
-   * Comma separated list of locations.
+   * Filter for ip version.
+   */
+  ipVersion?: Array<'IPv4' | 'IPv6'>;
+
+  /**
+   * Array of locations (alpha-2 country codes).
    */
-  location?: string;
+  location?: Array<string>;
 
   /**
    * Array of names that will be used to name the series in responses.
@@ -117,7 +116,6 @@ export interface IPTimeseriesParams {
   name?: Array<string>;
 }
 
-export namespace IPs {
-  export import IPTimeseriesResponse = IPsAPI.IPTimeseriesResponse;
-  export import IPTimeseriesParams = IPsAPI.IPTimeseriesParams;
+export declare namespace IPs {
+  export { type IPTimeseriesResponse as IPTimeseriesResponse, type IPTimeseriesParams as IPTimeseriesParams };
 }
diff --git a/src/resources/radar/bgp/leaks/events.ts b/src/resources/radar/bgp/leaks/events.ts
index 1dfb59df09..d8d7f29740 100644
--- a/src/resources/radar/bgp/leaks/events.ts
+++ b/src/resources/radar/bgp/leaks/events.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as EventsAPI from './events';
 import { V4PagePagination, type V4PagePaginationParams } from '../../../../pagination';
 
 export class Events extends APIResource {
@@ -34,66 +33,46 @@ export class Events extends APIResource {
 export class EventListResponsesV4PagePagination extends V4PagePagination<EventListResponse> {}
 
 export interface EventListResponse {
-  result: EventListResponse.Result;
+  asn_info: Array<EventListResponse.ASNInfo>;
 
-  result_info: EventListResponse.ResultInfo;
-
-  success: boolean;
+  events: Array<EventListResponse.Event>;
 }
 
 export namespace EventListResponse {
-  export interface Result {
-    asn_info: Array<Result.ASNInfo>;
-
-    events: Array<Result.Event>;
-  }
-
-  export namespace Result {
-    export interface ASNInfo {
-      asn: number;
-
-      country_code: string;
-
-      org_name: string;
-    }
+  export interface ASNInfo {
+    asn: number;
 
-    export interface Event {
-      id: number;
+    country_code: string;
 
-      countries: Array<string>;
-
-      detected_ts: string;
-
-      finished: boolean;
+    org_name: string;
+  }
 
-      leak_asn: number;
+  export interface Event {
+    id: number;
 
-      leak_count: number;
+    countries: Array<string>;
 
-      leak_seg: Array<number>;
+    detected_ts: string;
 
-      leak_type: number;
+    finished: boolean;
 
-      max_ts: string;
+    leak_asn: number;
 
-      min_ts: string;
+    leak_count: number;
 
-      origin_count: number;
+    leak_seg: Array<number>;
 
-      peer_count: number;
+    leak_type: number;
 
-      prefix_count: number;
-    }
-  }
+    max_ts: string;
 
-  export interface ResultInfo {
-    count: number;
+    min_ts: string;
 
-    page: number;
+    origin_count: number;
 
-    per_page: number;
+    peer_count: number;
 
-    total_count: number;
+    prefix_count: number;
   }
 }
 
@@ -150,8 +129,12 @@ export interface EventListParams extends V4PagePaginationParams {
   sortOrder?: 'ASC' | 'DESC';
 }
 
-export namespace Events {
-  export import EventListResponse = EventsAPI.EventListResponse;
-  export import EventListResponsesV4PagePagination = EventsAPI.EventListResponsesV4PagePagination;
-  export import EventListParams = EventsAPI.EventListParams;
+Events.EventListResponsesV4PagePagination = EventListResponsesV4PagePagination;
+
+export declare namespace Events {
+  export {
+    type EventListResponse as EventListResponse,
+    EventListResponsesV4PagePagination as EventListResponsesV4PagePagination,
+    type EventListParams as EventListParams,
+  };
 }
diff --git a/src/resources/radar/bgp/leaks/index.ts b/src/resources/radar/bgp/leaks/index.ts
index e860583180..61267b9408 100644
--- a/src/resources/radar/bgp/leaks/index.ts
+++ b/src/resources/radar/bgp/leaks/index.ts
@@ -1,4 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { EventListResponse, EventListParams, EventListResponsesV4PagePagination, Events } from './events';
+export {
+  EventListResponsesV4PagePagination,
+  Events,
+  type EventListResponse,
+  type EventListParams,
+} from './events';
 export { Leaks } from './leaks';
diff --git a/src/resources/radar/bgp/leaks/leaks.ts b/src/resources/radar/bgp/leaks/leaks.ts
index 7f58990b1f..aba88dc1af 100644
--- a/src/resources/radar/bgp/leaks/leaks.ts
+++ b/src/resources/radar/bgp/leaks/leaks.ts
@@ -2,14 +2,20 @@
 
 import { APIResource } from '../../../../resource';
 import * as EventsAPI from './events';
+import { EventListParams, EventListResponse, EventListResponsesV4PagePagination, Events } from './events';
 
 export class Leaks extends APIResource {
   events: EventsAPI.Events = new EventsAPI.Events(this._client);
 }
 
-export namespace Leaks {
-  export import Events = EventsAPI.Events;
-  export import EventListResponse = EventsAPI.EventListResponse;
-  export import EventListResponsesV4PagePagination = EventsAPI.EventListResponsesV4PagePagination;
-  export import EventListParams = EventsAPI.EventListParams;
+Leaks.Events = Events;
+Leaks.EventListResponsesV4PagePagination = EventListResponsesV4PagePagination;
+
+export declare namespace Leaks {
+  export {
+    Events as Events,
+    type EventListResponse as EventListResponse,
+    EventListResponsesV4PagePagination as EventListResponsesV4PagePagination,
+    type EventListParams as EventListParams,
+  };
 }
diff --git a/src/resources/radar/bgp/routes.ts b/src/resources/radar/bgp/routes.ts
index c86f53d312..140b741062 100644
--- a/src/resources/radar/bgp/routes.ts
+++ b/src/resources/radar/bgp/routes.ts
@@ -3,11 +3,10 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as RoutesAPI from './routes';
 
 export class Routes extends APIResource {
   /**
-   * List all ASes on current global routing tables with routing statistics
+   * List all ASes in current global routing tables with routing statistics
    */
   ases(query?: RouteAsesParams, options?: Core.RequestOptions): Core.APIPromise<RouteAsesResponse>;
   ases(options?: Core.RequestOptions): Core.APIPromise<RouteAsesResponse>;
@@ -26,7 +25,7 @@ export class Routes extends APIResource {
   }
 
   /**
-   * List all Multi-origin AS (MOAS) prefixes on the global routing tables.
+   * List all Multi-Origin AS (MOAS) prefixes on the global routing tables.
    */
   moas(query?: RouteMoasParams, options?: Core.RequestOptions): Core.APIPromise<RouteMoasResponse>;
   moas(options?: Core.RequestOptions): Core.APIPromise<RouteMoasResponse>;
@@ -363,13 +362,15 @@ export interface RouteStatsParams {
   location?: string;
 }
 
-export namespace Routes {
-  export import RouteAsesResponse = RoutesAPI.RouteAsesResponse;
-  export import RouteMoasResponse = RoutesAPI.RouteMoasResponse;
-  export import RoutePfx2asResponse = RoutesAPI.RoutePfx2asResponse;
-  export import RouteStatsResponse = RoutesAPI.RouteStatsResponse;
-  export import RouteAsesParams = RoutesAPI.RouteAsesParams;
-  export import RouteMoasParams = RoutesAPI.RouteMoasParams;
-  export import RoutePfx2asParams = RoutesAPI.RoutePfx2asParams;
-  export import RouteStatsParams = RoutesAPI.RouteStatsParams;
+export declare namespace Routes {
+  export {
+    type RouteAsesResponse as RouteAsesResponse,
+    type RouteMoasResponse as RouteMoasResponse,
+    type RoutePfx2asResponse as RoutePfx2asResponse,
+    type RouteStatsResponse as RouteStatsResponse,
+    type RouteAsesParams as RouteAsesParams,
+    type RouteMoasParams as RouteMoasParams,
+    type RoutePfx2asParams as RoutePfx2asParams,
+    type RouteStatsParams as RouteStatsParams,
+  };
 }
diff --git a/src/resources/radar/bgp/top/ases.ts b/src/resources/radar/bgp/top/ases.ts
index d8c734785e..42fa8d3b7f 100644
--- a/src/resources/radar/bgp/top/ases.ts
+++ b/src/resources/radar/bgp/top/ases.ts
@@ -3,12 +3,11 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as AsesAPI from './ases';
 
 export class Ases extends APIResource {
   /**
-   * Get the top autonomous systems (AS) by BGP updates (announcements only). Values
-   * are a percentage out of the total updates.
+   * Get the top autonomous systems (ASes) by BGP updates (announcements only).
+   * Values are a percentage out of the total updates.
    */
   get(query?: AseGetParams, options?: Core.RequestOptions): Core.APIPromise<AseGetResponse>;
   get(options?: Core.RequestOptions): Core.APIPromise<AseGetResponse>;
@@ -155,7 +154,7 @@ export interface AseGetParams {
   /**
    * Array of BGP network prefixes.
    */
-  prefix?: Array<AseGetParams.Prefix>;
+  prefix?: Array<string>;
 
   /**
    * Array of BGP update types.
@@ -163,21 +162,6 @@ export interface AseGetParams {
   updateType?: Array<'ANNOUNCEMENT' | 'WITHDRAWAL'>;
 }
 
-export namespace AseGetParams {
-  export interface Prefix {
-    in: string;
-
-    name: string;
-
-    test: number;
-
-    /**
-     * Network prefix, IPv4 or IPv6.
-     */
-    type?: string;
-  }
-}
-
 export interface AsePrefixesParams {
   /**
    * Alpha-2 country code.
@@ -195,9 +179,11 @@ export interface AsePrefixesParams {
   limit?: number;
 }
 
-export namespace Ases {
-  export import AseGetResponse = AsesAPI.AseGetResponse;
-  export import AsePrefixesResponse = AsesAPI.AsePrefixesResponse;
-  export import AseGetParams = AsesAPI.AseGetParams;
-  export import AsePrefixesParams = AsesAPI.AsePrefixesParams;
+export declare namespace Ases {
+  export {
+    type AseGetResponse as AseGetResponse,
+    type AsePrefixesResponse as AsePrefixesResponse,
+    type AseGetParams as AseGetParams,
+    type AsePrefixesParams as AsePrefixesParams,
+  };
 }
diff --git a/src/resources/radar/bgp/top/index.ts b/src/resources/radar/bgp/top/index.ts
index 2e4d816971..7969bb325e 100644
--- a/src/resources/radar/bgp/top/index.ts
+++ b/src/resources/radar/bgp/top/index.ts
@@ -1,4 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { AseGetResponse, AsePrefixesResponse, AseGetParams, AsePrefixesParams, Ases } from './ases';
-export { TopPrefixesResponse, TopPrefixesParams, Top } from './top';
+export {
+  Ases,
+  type AseGetResponse,
+  type AsePrefixesResponse,
+  type AseGetParams,
+  type AsePrefixesParams,
+} from './ases';
+export { Top, type TopPrefixesResponse, type TopPrefixesParams } from './top';
diff --git a/src/resources/radar/bgp/top/top.ts b/src/resources/radar/bgp/top/top.ts
index d238fdd052..6a65717460 100644
--- a/src/resources/radar/bgp/top/top.ts
+++ b/src/resources/radar/bgp/top/top.ts
@@ -3,8 +3,8 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as TopAPI from './top';
 import * as AsesAPI from './ases';
+import { AseGetParams, AseGetResponse, AsePrefixesParams, AsePrefixesResponse, Ases } from './ases';
 
 export class Top extends APIResource {
   ases: AsesAPI.Ases = new AsesAPI.Ases(this._client);
@@ -108,12 +108,16 @@ export interface TopPrefixesParams {
   updateType?: Array<'ANNOUNCEMENT' | 'WITHDRAWAL'>;
 }
 
-export namespace Top {
-  export import TopPrefixesResponse = TopAPI.TopPrefixesResponse;
-  export import TopPrefixesParams = TopAPI.TopPrefixesParams;
-  export import Ases = AsesAPI.Ases;
-  export import AseGetResponse = AsesAPI.AseGetResponse;
-  export import AsePrefixesResponse = AsesAPI.AsePrefixesResponse;
-  export import AseGetParams = AsesAPI.AseGetParams;
-  export import AsePrefixesParams = AsesAPI.AsePrefixesParams;
+Top.Ases = Ases;
+
+export declare namespace Top {
+  export { type TopPrefixesResponse as TopPrefixesResponse, type TopPrefixesParams as TopPrefixesParams };
+
+  export {
+    Ases as Ases,
+    type AseGetResponse as AseGetResponse,
+    type AsePrefixesResponse as AsePrefixesResponse,
+    type AseGetParams as AseGetParams,
+    type AsePrefixesParams as AsePrefixesParams,
+  };
 }
diff --git a/src/resources/radar/datasets.ts b/src/resources/radar/datasets.ts
index c88034e95d..ffd616edc2 100644
--- a/src/resources/radar/datasets.ts
+++ b/src/resources/radar/datasets.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as DatasetsAPI from './datasets';
 
 export class Datasets extends APIResource {
   /**
@@ -43,7 +42,7 @@ export class Datasets extends APIResource {
   }
 
   /**
-   * Get the csv content of a given dataset by alias or id. When getting the content
+   * Get the CSV content of a given dataset by alias or ID. When getting the content
    * by alias the latest dataset is returned, optionally filtered by the latest
    * available at a given date.
    */
@@ -121,10 +120,12 @@ export interface DatasetDownloadParams {
   format?: 'JSON' | 'CSV';
 }
 
-export namespace Datasets {
-  export import DatasetListResponse = DatasetsAPI.DatasetListResponse;
-  export import DatasetDownloadResponse = DatasetsAPI.DatasetDownloadResponse;
-  export import DatasetGetResponse = DatasetsAPI.DatasetGetResponse;
-  export import DatasetListParams = DatasetsAPI.DatasetListParams;
-  export import DatasetDownloadParams = DatasetsAPI.DatasetDownloadParams;
+export declare namespace Datasets {
+  export {
+    type DatasetListResponse as DatasetListResponse,
+    type DatasetDownloadResponse as DatasetDownloadResponse,
+    type DatasetGetResponse as DatasetGetResponse,
+    type DatasetListParams as DatasetListParams,
+    type DatasetDownloadParams as DatasetDownloadParams,
+  };
 }
diff --git a/src/resources/radar/dns/dns.ts b/src/resources/radar/dns/dns.ts
index f9a56b8302..d12569d779 100644
--- a/src/resources/radar/dns/dns.ts
+++ b/src/resources/radar/dns/dns.ts
@@ -2,15 +2,20 @@
 
 import { APIResource } from '../../../resource';
 import * as TopAPI from './top';
+import { Top, TopAsesParams, TopAsesResponse, TopLocationsParams, TopLocationsResponse } from './top';
 
 export class DNS extends APIResource {
   top: TopAPI.Top = new TopAPI.Top(this._client);
 }
 
-export namespace DNS {
-  export import Top = TopAPI.Top;
-  export import TopAsesResponse = TopAPI.TopAsesResponse;
-  export import TopLocationsResponse = TopAPI.TopLocationsResponse;
-  export import TopAsesParams = TopAPI.TopAsesParams;
-  export import TopLocationsParams = TopAPI.TopLocationsParams;
+DNS.Top = Top;
+
+export declare namespace DNS {
+  export {
+    Top as Top,
+    type TopAsesResponse as TopAsesResponse,
+    type TopLocationsResponse as TopLocationsResponse,
+    type TopAsesParams as TopAsesParams,
+    type TopLocationsParams as TopLocationsParams,
+  };
 }
diff --git a/src/resources/radar/dns/index.ts b/src/resources/radar/dns/index.ts
index 7e3ef59511..2178145608 100644
--- a/src/resources/radar/dns/index.ts
+++ b/src/resources/radar/dns/index.ts
@@ -1,4 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { DNS } from './dns';
-export { TopAsesResponse, TopLocationsResponse, TopAsesParams, TopLocationsParams, Top } from './top';
+export {
+  Top,
+  type TopAsesResponse,
+  type TopLocationsResponse,
+  type TopAsesParams,
+  type TopLocationsParams,
+} from './top';
diff --git a/src/resources/radar/dns/top.ts b/src/resources/radar/dns/top.ts
index e9c45b11d6..d6f13b87f7 100644
--- a/src/resources/radar/dns/top.ts
+++ b/src/resources/radar/dns/top.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as TopAPI from './top';
 
 export class Top extends APIResource {
   /**
@@ -269,9 +268,11 @@ export interface TopLocationsParams {
   name?: Array<string>;
 }
 
-export namespace Top {
-  export import TopAsesResponse = TopAPI.TopAsesResponse;
-  export import TopLocationsResponse = TopAPI.TopLocationsResponse;
-  export import TopAsesParams = TopAPI.TopAsesParams;
-  export import TopLocationsParams = TopAPI.TopLocationsParams;
+export declare namespace Top {
+  export {
+    type TopAsesResponse as TopAsesResponse,
+    type TopLocationsResponse as TopLocationsResponse,
+    type TopAsesParams as TopAsesParams,
+    type TopLocationsParams as TopLocationsParams,
+  };
 }
diff --git a/src/resources/radar/email/email.ts b/src/resources/radar/email/email.ts
index 57ef0faae4..d6f3265d42 100644
--- a/src/resources/radar/email/email.ts
+++ b/src/resources/radar/email/email.ts
@@ -1,9 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../resource';
-import * as EmailAPI from './email';
 import * as RoutingAPI from './routing/routing';
+import { Routing } from './routing/routing';
 import * as SecurityAPI from './security/security';
+import { Security } from './security/security';
 
 export class Email extends APIResource {
   routing: RoutingAPI.Routing = new RoutingAPI.Routing(this._client);
@@ -26,9 +27,13 @@ export interface RadarEmailSummary {
   PASS: string;
 }
 
-export namespace Email {
-  export import RadarEmailSeries = EmailAPI.RadarEmailSeries;
-  export import RadarEmailSummary = EmailAPI.RadarEmailSummary;
-  export import Routing = RoutingAPI.Routing;
-  export import Security = SecurityAPI.Security;
+Email.Routing = Routing;
+Email.Security = Security;
+
+export declare namespace Email {
+  export { type RadarEmailSeries as RadarEmailSeries, type RadarEmailSummary as RadarEmailSummary };
+
+  export { Routing as Routing };
+
+  export { Security as Security };
 }
diff --git a/src/resources/radar/email/index.ts b/src/resources/radar/email/index.ts
index 678d7437b3..0e113c2250 100644
--- a/src/resources/radar/email/index.ts
+++ b/src/resources/radar/email/index.ts
@@ -1,5 +1,5 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { RadarEmailSeries, RadarEmailSummary, Email } from './email';
+export { Email, type RadarEmailSeries, type RadarEmailSummary } from './email';
 export { Routing } from './routing/index';
 export { Security } from './security/index';
diff --git a/src/resources/radar/email/routing/index.ts b/src/resources/radar/email/routing/index.ts
index cca91bb818..a7447f6d0f 100644
--- a/src/resources/radar/email/routing/index.ts
+++ b/src/resources/radar/email/routing/index.ts
@@ -2,32 +2,32 @@
 
 export { Routing } from './routing';
 export {
-  SummaryARCResponse,
-  SummaryDKIMResponse,
-  SummaryDMARCResponse,
-  SummaryEncryptedResponse,
-  SummaryIPVersionResponse,
-  SummarySPFResponse,
-  SummaryARCParams,
-  SummaryDKIMParams,
-  SummaryDMARCParams,
-  SummaryEncryptedParams,
-  SummaryIPVersionParams,
-  SummarySPFParams,
   Summary,
+  type SummaryARCResponse,
+  type SummaryDKIMResponse,
+  type SummaryDMARCResponse,
+  type SummaryEncryptedResponse,
+  type SummaryIPVersionResponse,
+  type SummarySPFResponse,
+  type SummaryARCParams,
+  type SummaryDKIMParams,
+  type SummaryDMARCParams,
+  type SummaryEncryptedParams,
+  type SummaryIPVersionParams,
+  type SummarySPFParams,
 } from './summary';
 export {
-  TimeseriesGroupARCResponse,
-  TimeseriesGroupDKIMResponse,
-  TimeseriesGroupDMARCResponse,
-  TimeseriesGroupEncryptedResponse,
-  TimeseriesGroupIPVersionResponse,
-  TimeseriesGroupSPFResponse,
-  TimeseriesGroupARCParams,
-  TimeseriesGroupDKIMParams,
-  TimeseriesGroupDMARCParams,
-  TimeseriesGroupEncryptedParams,
-  TimeseriesGroupIPVersionParams,
-  TimeseriesGroupSPFParams,
   TimeseriesGroups,
+  type TimeseriesGroupARCResponse,
+  type TimeseriesGroupDKIMResponse,
+  type TimeseriesGroupDMARCResponse,
+  type TimeseriesGroupEncryptedResponse,
+  type TimeseriesGroupIPVersionResponse,
+  type TimeseriesGroupSPFResponse,
+  type TimeseriesGroupARCParams,
+  type TimeseriesGroupDKIMParams,
+  type TimeseriesGroupDMARCParams,
+  type TimeseriesGroupEncryptedParams,
+  type TimeseriesGroupIPVersionParams,
+  type TimeseriesGroupSPFParams,
 } from './timeseries-groups';
diff --git a/src/resources/radar/email/routing/routing.ts b/src/resources/radar/email/routing/routing.ts
index 7ed68db170..f4c5d68359 100644
--- a/src/resources/radar/email/routing/routing.ts
+++ b/src/resources/radar/email/routing/routing.ts
@@ -2,7 +2,37 @@
 
 import { APIResource } from '../../../../resource';
 import * as SummaryAPI from './summary';
+import {
+  Summary,
+  SummaryARCParams,
+  SummaryARCResponse,
+  SummaryDKIMParams,
+  SummaryDKIMResponse,
+  SummaryDMARCParams,
+  SummaryDMARCResponse,
+  SummaryEncryptedParams,
+  SummaryEncryptedResponse,
+  SummaryIPVersionParams,
+  SummaryIPVersionResponse,
+  SummarySPFParams,
+  SummarySPFResponse,
+} from './summary';
 import * as TimeseriesGroupsAPI from './timeseries-groups';
+import {
+  TimeseriesGroupARCParams,
+  TimeseriesGroupARCResponse,
+  TimeseriesGroupDKIMParams,
+  TimeseriesGroupDKIMResponse,
+  TimeseriesGroupDMARCParams,
+  TimeseriesGroupDMARCResponse,
+  TimeseriesGroupEncryptedParams,
+  TimeseriesGroupEncryptedResponse,
+  TimeseriesGroupIPVersionParams,
+  TimeseriesGroupIPVersionResponse,
+  TimeseriesGroupSPFParams,
+  TimeseriesGroupSPFResponse,
+  TimeseriesGroups,
+} from './timeseries-groups';
 
 export class Routing extends APIResource {
   summary: SummaryAPI.Summary = new SummaryAPI.Summary(this._client);
@@ -11,31 +41,39 @@ export class Routing extends APIResource {
   );
 }
 
-export namespace Routing {
-  export import Summary = SummaryAPI.Summary;
-  export import SummaryARCResponse = SummaryAPI.SummaryARCResponse;
-  export import SummaryDKIMResponse = SummaryAPI.SummaryDKIMResponse;
-  export import SummaryDMARCResponse = SummaryAPI.SummaryDMARCResponse;
-  export import SummaryEncryptedResponse = SummaryAPI.SummaryEncryptedResponse;
-  export import SummaryIPVersionResponse = SummaryAPI.SummaryIPVersionResponse;
-  export import SummarySPFResponse = SummaryAPI.SummarySPFResponse;
-  export import SummaryARCParams = SummaryAPI.SummaryARCParams;
-  export import SummaryDKIMParams = SummaryAPI.SummaryDKIMParams;
-  export import SummaryDMARCParams = SummaryAPI.SummaryDMARCParams;
-  export import SummaryEncryptedParams = SummaryAPI.SummaryEncryptedParams;
-  export import SummaryIPVersionParams = SummaryAPI.SummaryIPVersionParams;
-  export import SummarySPFParams = SummaryAPI.SummarySPFParams;
-  export import TimeseriesGroups = TimeseriesGroupsAPI.TimeseriesGroups;
-  export import TimeseriesGroupARCResponse = TimeseriesGroupsAPI.TimeseriesGroupARCResponse;
-  export import TimeseriesGroupDKIMResponse = TimeseriesGroupsAPI.TimeseriesGroupDKIMResponse;
-  export import TimeseriesGroupDMARCResponse = TimeseriesGroupsAPI.TimeseriesGroupDMARCResponse;
-  export import TimeseriesGroupEncryptedResponse = TimeseriesGroupsAPI.TimeseriesGroupEncryptedResponse;
-  export import TimeseriesGroupIPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupIPVersionResponse;
-  export import TimeseriesGroupSPFResponse = TimeseriesGroupsAPI.TimeseriesGroupSPFResponse;
-  export import TimeseriesGroupARCParams = TimeseriesGroupsAPI.TimeseriesGroupARCParams;
-  export import TimeseriesGroupDKIMParams = TimeseriesGroupsAPI.TimeseriesGroupDKIMParams;
-  export import TimeseriesGroupDMARCParams = TimeseriesGroupsAPI.TimeseriesGroupDMARCParams;
-  export import TimeseriesGroupEncryptedParams = TimeseriesGroupsAPI.TimeseriesGroupEncryptedParams;
-  export import TimeseriesGroupIPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupIPVersionParams;
-  export import TimeseriesGroupSPFParams = TimeseriesGroupsAPI.TimeseriesGroupSPFParams;
+Routing.Summary = Summary;
+Routing.TimeseriesGroups = TimeseriesGroups;
+
+export declare namespace Routing {
+  export {
+    Summary as Summary,
+    type SummaryARCResponse as SummaryARCResponse,
+    type SummaryDKIMResponse as SummaryDKIMResponse,
+    type SummaryDMARCResponse as SummaryDMARCResponse,
+    type SummaryEncryptedResponse as SummaryEncryptedResponse,
+    type SummaryIPVersionResponse as SummaryIPVersionResponse,
+    type SummarySPFResponse as SummarySPFResponse,
+    type SummaryARCParams as SummaryARCParams,
+    type SummaryDKIMParams as SummaryDKIMParams,
+    type SummaryDMARCParams as SummaryDMARCParams,
+    type SummaryEncryptedParams as SummaryEncryptedParams,
+    type SummaryIPVersionParams as SummaryIPVersionParams,
+    type SummarySPFParams as SummarySPFParams,
+  };
+
+  export {
+    TimeseriesGroups as TimeseriesGroups,
+    type TimeseriesGroupARCResponse as TimeseriesGroupARCResponse,
+    type TimeseriesGroupDKIMResponse as TimeseriesGroupDKIMResponse,
+    type TimeseriesGroupDMARCResponse as TimeseriesGroupDMARCResponse,
+    type TimeseriesGroupEncryptedResponse as TimeseriesGroupEncryptedResponse,
+    type TimeseriesGroupIPVersionResponse as TimeseriesGroupIPVersionResponse,
+    type TimeseriesGroupSPFResponse as TimeseriesGroupSPFResponse,
+    type TimeseriesGroupARCParams as TimeseriesGroupARCParams,
+    type TimeseriesGroupDKIMParams as TimeseriesGroupDKIMParams,
+    type TimeseriesGroupDMARCParams as TimeseriesGroupDMARCParams,
+    type TimeseriesGroupEncryptedParams as TimeseriesGroupEncryptedParams,
+    type TimeseriesGroupIPVersionParams as TimeseriesGroupIPVersionParams,
+    type TimeseriesGroupSPFParams as TimeseriesGroupSPFParams,
+  };
 }
diff --git a/src/resources/radar/email/routing/summary.ts b/src/resources/radar/email/routing/summary.ts
index da866977b2..4de0f24ad1 100644
--- a/src/resources/radar/email/routing/summary.ts
+++ b/src/resources/radar/email/routing/summary.ts
@@ -3,12 +3,11 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as SummaryAPI from './summary';
 import * as EmailAPI from '../email';
 
 export class Summary extends APIResource {
   /**
-   * Percentage distribution of emails classified per ARC validation.
+   * Percentage distribution of emails classified by ARC validation.
    */
   arc(query?: SummaryARCParams, options?: Core.RequestOptions): Core.APIPromise<SummaryARCResponse>;
   arc(options?: Core.RequestOptions): Core.APIPromise<SummaryARCResponse>;
@@ -27,7 +26,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per DKIM validation.
+   * Percentage distribution of emails classified by DKIM validation.
    */
   dkim(query?: SummaryDKIMParams, options?: Core.RequestOptions): Core.APIPromise<SummaryDKIMResponse>;
   dkim(options?: Core.RequestOptions): Core.APIPromise<SummaryDKIMResponse>;
@@ -46,7 +45,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per DMARC validation.
+   * Percentage distribution of emails classified by DMARC validation.
    */
   dmarc(query?: SummaryDMARCParams, options?: Core.RequestOptions): Core.APIPromise<SummaryDMARCResponse>;
   dmarc(options?: Core.RequestOptions): Core.APIPromise<SummaryDMARCResponse>;
@@ -65,7 +64,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails by Encrypted
+   * Percentage distribution of emails by encryption status.
    */
   encrypted(
     query?: SummaryEncryptedParams,
@@ -87,7 +86,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails by Ip Version.
+   * Percentage distribution of emails by IP version.
    */
   ipVersion(
     query?: SummaryIPVersionParams,
@@ -109,7 +108,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per SPF validation.
+   * Percentage distribution of emails classified by SPF validation.
    */
   spf(query?: SummarySPFParams, options?: Core.RequestOptions): Core.APIPromise<SummarySPFResponse>;
   spf(options?: Core.RequestOptions): Core.APIPromise<SummarySPFResponse>;
@@ -800,17 +799,19 @@ export interface SummarySPFParams {
   name?: Array<string>;
 }
 
-export namespace Summary {
-  export import SummaryARCResponse = SummaryAPI.SummaryARCResponse;
-  export import SummaryDKIMResponse = SummaryAPI.SummaryDKIMResponse;
-  export import SummaryDMARCResponse = SummaryAPI.SummaryDMARCResponse;
-  export import SummaryEncryptedResponse = SummaryAPI.SummaryEncryptedResponse;
-  export import SummaryIPVersionResponse = SummaryAPI.SummaryIPVersionResponse;
-  export import SummarySPFResponse = SummaryAPI.SummarySPFResponse;
-  export import SummaryARCParams = SummaryAPI.SummaryARCParams;
-  export import SummaryDKIMParams = SummaryAPI.SummaryDKIMParams;
-  export import SummaryDMARCParams = SummaryAPI.SummaryDMARCParams;
-  export import SummaryEncryptedParams = SummaryAPI.SummaryEncryptedParams;
-  export import SummaryIPVersionParams = SummaryAPI.SummaryIPVersionParams;
-  export import SummarySPFParams = SummaryAPI.SummarySPFParams;
+export declare namespace Summary {
+  export {
+    type SummaryARCResponse as SummaryARCResponse,
+    type SummaryDKIMResponse as SummaryDKIMResponse,
+    type SummaryDMARCResponse as SummaryDMARCResponse,
+    type SummaryEncryptedResponse as SummaryEncryptedResponse,
+    type SummaryIPVersionResponse as SummaryIPVersionResponse,
+    type SummarySPFResponse as SummarySPFResponse,
+    type SummaryARCParams as SummaryARCParams,
+    type SummaryDKIMParams as SummaryDKIMParams,
+    type SummaryDMARCParams as SummaryDMARCParams,
+    type SummaryEncryptedParams as SummaryEncryptedParams,
+    type SummaryIPVersionParams as SummaryIPVersionParams,
+    type SummarySPFParams as SummarySPFParams,
+  };
 }
diff --git a/src/resources/radar/email/routing/timeseries-groups.ts b/src/resources/radar/email/routing/timeseries-groups.ts
index 4f50e19810..da3d75efdf 100644
--- a/src/resources/radar/email/routing/timeseries-groups.ts
+++ b/src/resources/radar/email/routing/timeseries-groups.ts
@@ -3,12 +3,11 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as TimeseriesGroupsAPI from './timeseries-groups';
 import * as EmailAPI from '../email';
 
 export class TimeseriesGroups extends APIResource {
   /**
-   * Percentage distribution of emails classified per Arc validation over time.
+   * Percentage distribution of emails classified by ARC validation over time.
    */
   arc(
     query?: TimeseriesGroupARCParams,
@@ -31,7 +30,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per DKIM validation over time.
+   * Percentage distribution of emails classified by DKIM validation over time.
    */
   dkim(
     query?: TimeseriesGroupDKIMParams,
@@ -54,7 +53,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per DMARC validation over time.
+   * Percentage distribution of emails classified by DMARC validation over time.
    */
   dmarc(
     query?: TimeseriesGroupDMARCParams,
@@ -77,7 +76,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails by Encrypted over time.
+   * Percentage distribution of emails by encryption status over time.
    */
   encrypted(
     query?: TimeseriesGroupEncryptedParams,
@@ -100,7 +99,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails by Ip Version over time.
+   * Percentage distribution of emails by IP version over time.
    */
   ipVersion(
     query?: TimeseriesGroupIPVersionParams,
@@ -123,7 +122,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per SPF validation over time.
+   * Percentage distribution of emails classified by SPF validation over time.
    */
   spf(
     query?: TimeseriesGroupSPFParams,
@@ -564,17 +563,19 @@ export interface TimeseriesGroupSPFParams {
   name?: Array<string>;
 }
 
-export namespace TimeseriesGroups {
-  export import TimeseriesGroupARCResponse = TimeseriesGroupsAPI.TimeseriesGroupARCResponse;
-  export import TimeseriesGroupDKIMResponse = TimeseriesGroupsAPI.TimeseriesGroupDKIMResponse;
-  export import TimeseriesGroupDMARCResponse = TimeseriesGroupsAPI.TimeseriesGroupDMARCResponse;
-  export import TimeseriesGroupEncryptedResponse = TimeseriesGroupsAPI.TimeseriesGroupEncryptedResponse;
-  export import TimeseriesGroupIPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupIPVersionResponse;
-  export import TimeseriesGroupSPFResponse = TimeseriesGroupsAPI.TimeseriesGroupSPFResponse;
-  export import TimeseriesGroupARCParams = TimeseriesGroupsAPI.TimeseriesGroupARCParams;
-  export import TimeseriesGroupDKIMParams = TimeseriesGroupsAPI.TimeseriesGroupDKIMParams;
-  export import TimeseriesGroupDMARCParams = TimeseriesGroupsAPI.TimeseriesGroupDMARCParams;
-  export import TimeseriesGroupEncryptedParams = TimeseriesGroupsAPI.TimeseriesGroupEncryptedParams;
-  export import TimeseriesGroupIPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupIPVersionParams;
-  export import TimeseriesGroupSPFParams = TimeseriesGroupsAPI.TimeseriesGroupSPFParams;
+export declare namespace TimeseriesGroups {
+  export {
+    type TimeseriesGroupARCResponse as TimeseriesGroupARCResponse,
+    type TimeseriesGroupDKIMResponse as TimeseriesGroupDKIMResponse,
+    type TimeseriesGroupDMARCResponse as TimeseriesGroupDMARCResponse,
+    type TimeseriesGroupEncryptedResponse as TimeseriesGroupEncryptedResponse,
+    type TimeseriesGroupIPVersionResponse as TimeseriesGroupIPVersionResponse,
+    type TimeseriesGroupSPFResponse as TimeseriesGroupSPFResponse,
+    type TimeseriesGroupARCParams as TimeseriesGroupARCParams,
+    type TimeseriesGroupDKIMParams as TimeseriesGroupDKIMParams,
+    type TimeseriesGroupDMARCParams as TimeseriesGroupDMARCParams,
+    type TimeseriesGroupEncryptedParams as TimeseriesGroupEncryptedParams,
+    type TimeseriesGroupIPVersionParams as TimeseriesGroupIPVersionParams,
+    type TimeseriesGroupSPFParams as TimeseriesGroupSPFParams,
+  };
 }
diff --git a/src/resources/radar/email/security/index.ts b/src/resources/radar/email/security/index.ts
index d7ff8eb85e..b48f43fb39 100644
--- a/src/resources/radar/email/security/index.ts
+++ b/src/resources/radar/email/security/index.ts
@@ -2,45 +2,45 @@
 
 export { Security } from './security';
 export {
-  SummaryARCResponse,
-  SummaryDKIMResponse,
-  SummaryDMARCResponse,
-  SummaryMaliciousResponse,
-  SummarySpamResponse,
-  SummarySPFResponse,
-  SummarySpoofResponse,
-  SummaryThreatCategoryResponse,
-  SummaryTLSVersionResponse,
-  SummaryARCParams,
-  SummaryDKIMParams,
-  SummaryDMARCParams,
-  SummaryMaliciousParams,
-  SummarySpamParams,
-  SummarySPFParams,
-  SummarySpoofParams,
-  SummaryThreatCategoryParams,
-  SummaryTLSVersionParams,
   Summary,
+  type SummaryARCResponse,
+  type SummaryDKIMResponse,
+  type SummaryDMARCResponse,
+  type SummaryMaliciousResponse,
+  type SummarySpamResponse,
+  type SummarySPFResponse,
+  type SummarySpoofResponse,
+  type SummaryThreatCategoryResponse,
+  type SummaryTLSVersionResponse,
+  type SummaryARCParams,
+  type SummaryDKIMParams,
+  type SummaryDMARCParams,
+  type SummaryMaliciousParams,
+  type SummarySpamParams,
+  type SummarySPFParams,
+  type SummarySpoofParams,
+  type SummaryThreatCategoryParams,
+  type SummaryTLSVersionParams,
 } from './summary';
 export {
-  TimeseriesGroupARCResponse,
-  TimeseriesGroupDKIMResponse,
-  TimeseriesGroupDMARCResponse,
-  TimeseriesGroupMaliciousResponse,
-  TimeseriesGroupSpamResponse,
-  TimeseriesGroupSPFResponse,
-  TimeseriesGroupSpoofResponse,
-  TimeseriesGroupThreatCategoryResponse,
-  TimeseriesGroupTLSVersionResponse,
-  TimeseriesGroupARCParams,
-  TimeseriesGroupDKIMParams,
-  TimeseriesGroupDMARCParams,
-  TimeseriesGroupMaliciousParams,
-  TimeseriesGroupSpamParams,
-  TimeseriesGroupSPFParams,
-  TimeseriesGroupSpoofParams,
-  TimeseriesGroupThreatCategoryParams,
-  TimeseriesGroupTLSVersionParams,
   TimeseriesGroups,
+  type TimeseriesGroupARCResponse,
+  type TimeseriesGroupDKIMResponse,
+  type TimeseriesGroupDMARCResponse,
+  type TimeseriesGroupMaliciousResponse,
+  type TimeseriesGroupSpamResponse,
+  type TimeseriesGroupSPFResponse,
+  type TimeseriesGroupSpoofResponse,
+  type TimeseriesGroupThreatCategoryResponse,
+  type TimeseriesGroupTLSVersionResponse,
+  type TimeseriesGroupARCParams,
+  type TimeseriesGroupDKIMParams,
+  type TimeseriesGroupDMARCParams,
+  type TimeseriesGroupMaliciousParams,
+  type TimeseriesGroupSpamParams,
+  type TimeseriesGroupSPFParams,
+  type TimeseriesGroupSpoofParams,
+  type TimeseriesGroupThreatCategoryParams,
+  type TimeseriesGroupTLSVersionParams,
 } from './timeseries-groups';
 export { Top } from './top/index';
diff --git a/src/resources/radar/email/security/security.ts b/src/resources/radar/email/security/security.ts
index bb2ff1ce6f..c1c1c5f337 100644
--- a/src/resources/radar/email/security/security.ts
+++ b/src/resources/radar/email/security/security.ts
@@ -2,8 +2,51 @@
 
 import { APIResource } from '../../../../resource';
 import * as SummaryAPI from './summary';
+import {
+  Summary,
+  SummaryARCParams,
+  SummaryARCResponse,
+  SummaryDKIMParams,
+  SummaryDKIMResponse,
+  SummaryDMARCParams,
+  SummaryDMARCResponse,
+  SummaryMaliciousParams,
+  SummaryMaliciousResponse,
+  SummarySPFParams,
+  SummarySPFResponse,
+  SummarySpamParams,
+  SummarySpamResponse,
+  SummarySpoofParams,
+  SummarySpoofResponse,
+  SummaryTLSVersionParams,
+  SummaryTLSVersionResponse,
+  SummaryThreatCategoryParams,
+  SummaryThreatCategoryResponse,
+} from './summary';
 import * as TimeseriesGroupsAPI from './timeseries-groups';
+import {
+  TimeseriesGroupARCParams,
+  TimeseriesGroupARCResponse,
+  TimeseriesGroupDKIMParams,
+  TimeseriesGroupDKIMResponse,
+  TimeseriesGroupDMARCParams,
+  TimeseriesGroupDMARCResponse,
+  TimeseriesGroupMaliciousParams,
+  TimeseriesGroupMaliciousResponse,
+  TimeseriesGroupSPFParams,
+  TimeseriesGroupSPFResponse,
+  TimeseriesGroupSpamParams,
+  TimeseriesGroupSpamResponse,
+  TimeseriesGroupSpoofParams,
+  TimeseriesGroupSpoofResponse,
+  TimeseriesGroupTLSVersionParams,
+  TimeseriesGroupTLSVersionResponse,
+  TimeseriesGroupThreatCategoryParams,
+  TimeseriesGroupThreatCategoryResponse,
+  TimeseriesGroups,
+} from './timeseries-groups';
 import * as TopAPI from './top/top';
+import { Top } from './top/top';
 
 export class Security extends APIResource {
   top: TopAPI.Top = new TopAPI.Top(this._client);
@@ -13,44 +56,54 @@ export class Security extends APIResource {
   );
 }
 
-export namespace Security {
-  export import Top = TopAPI.Top;
-  export import Summary = SummaryAPI.Summary;
-  export import SummaryARCResponse = SummaryAPI.SummaryARCResponse;
-  export import SummaryDKIMResponse = SummaryAPI.SummaryDKIMResponse;
-  export import SummaryDMARCResponse = SummaryAPI.SummaryDMARCResponse;
-  export import SummaryMaliciousResponse = SummaryAPI.SummaryMaliciousResponse;
-  export import SummarySpamResponse = SummaryAPI.SummarySpamResponse;
-  export import SummarySPFResponse = SummaryAPI.SummarySPFResponse;
-  export import SummarySpoofResponse = SummaryAPI.SummarySpoofResponse;
-  export import SummaryThreatCategoryResponse = SummaryAPI.SummaryThreatCategoryResponse;
-  export import SummaryTLSVersionResponse = SummaryAPI.SummaryTLSVersionResponse;
-  export import SummaryARCParams = SummaryAPI.SummaryARCParams;
-  export import SummaryDKIMParams = SummaryAPI.SummaryDKIMParams;
-  export import SummaryDMARCParams = SummaryAPI.SummaryDMARCParams;
-  export import SummaryMaliciousParams = SummaryAPI.SummaryMaliciousParams;
-  export import SummarySpamParams = SummaryAPI.SummarySpamParams;
-  export import SummarySPFParams = SummaryAPI.SummarySPFParams;
-  export import SummarySpoofParams = SummaryAPI.SummarySpoofParams;
-  export import SummaryThreatCategoryParams = SummaryAPI.SummaryThreatCategoryParams;
-  export import SummaryTLSVersionParams = SummaryAPI.SummaryTLSVersionParams;
-  export import TimeseriesGroups = TimeseriesGroupsAPI.TimeseriesGroups;
-  export import TimeseriesGroupARCResponse = TimeseriesGroupsAPI.TimeseriesGroupARCResponse;
-  export import TimeseriesGroupDKIMResponse = TimeseriesGroupsAPI.TimeseriesGroupDKIMResponse;
-  export import TimeseriesGroupDMARCResponse = TimeseriesGroupsAPI.TimeseriesGroupDMARCResponse;
-  export import TimeseriesGroupMaliciousResponse = TimeseriesGroupsAPI.TimeseriesGroupMaliciousResponse;
-  export import TimeseriesGroupSpamResponse = TimeseriesGroupsAPI.TimeseriesGroupSpamResponse;
-  export import TimeseriesGroupSPFResponse = TimeseriesGroupsAPI.TimeseriesGroupSPFResponse;
-  export import TimeseriesGroupSpoofResponse = TimeseriesGroupsAPI.TimeseriesGroupSpoofResponse;
-  export import TimeseriesGroupThreatCategoryResponse = TimeseriesGroupsAPI.TimeseriesGroupThreatCategoryResponse;
-  export import TimeseriesGroupTLSVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupTLSVersionResponse;
-  export import TimeseriesGroupARCParams = TimeseriesGroupsAPI.TimeseriesGroupARCParams;
-  export import TimeseriesGroupDKIMParams = TimeseriesGroupsAPI.TimeseriesGroupDKIMParams;
-  export import TimeseriesGroupDMARCParams = TimeseriesGroupsAPI.TimeseriesGroupDMARCParams;
-  export import TimeseriesGroupMaliciousParams = TimeseriesGroupsAPI.TimeseriesGroupMaliciousParams;
-  export import TimeseriesGroupSpamParams = TimeseriesGroupsAPI.TimeseriesGroupSpamParams;
-  export import TimeseriesGroupSPFParams = TimeseriesGroupsAPI.TimeseriesGroupSPFParams;
-  export import TimeseriesGroupSpoofParams = TimeseriesGroupsAPI.TimeseriesGroupSpoofParams;
-  export import TimeseriesGroupThreatCategoryParams = TimeseriesGroupsAPI.TimeseriesGroupThreatCategoryParams;
-  export import TimeseriesGroupTLSVersionParams = TimeseriesGroupsAPI.TimeseriesGroupTLSVersionParams;
+Security.Top = Top;
+Security.Summary = Summary;
+Security.TimeseriesGroups = TimeseriesGroups;
+
+export declare namespace Security {
+  export { Top as Top };
+
+  export {
+    Summary as Summary,
+    type SummaryARCResponse as SummaryARCResponse,
+    type SummaryDKIMResponse as SummaryDKIMResponse,
+    type SummaryDMARCResponse as SummaryDMARCResponse,
+    type SummaryMaliciousResponse as SummaryMaliciousResponse,
+    type SummarySpamResponse as SummarySpamResponse,
+    type SummarySPFResponse as SummarySPFResponse,
+    type SummarySpoofResponse as SummarySpoofResponse,
+    type SummaryThreatCategoryResponse as SummaryThreatCategoryResponse,
+    type SummaryTLSVersionResponse as SummaryTLSVersionResponse,
+    type SummaryARCParams as SummaryARCParams,
+    type SummaryDKIMParams as SummaryDKIMParams,
+    type SummaryDMARCParams as SummaryDMARCParams,
+    type SummaryMaliciousParams as SummaryMaliciousParams,
+    type SummarySpamParams as SummarySpamParams,
+    type SummarySPFParams as SummarySPFParams,
+    type SummarySpoofParams as SummarySpoofParams,
+    type SummaryThreatCategoryParams as SummaryThreatCategoryParams,
+    type SummaryTLSVersionParams as SummaryTLSVersionParams,
+  };
+
+  export {
+    TimeseriesGroups as TimeseriesGroups,
+    type TimeseriesGroupARCResponse as TimeseriesGroupARCResponse,
+    type TimeseriesGroupDKIMResponse as TimeseriesGroupDKIMResponse,
+    type TimeseriesGroupDMARCResponse as TimeseriesGroupDMARCResponse,
+    type TimeseriesGroupMaliciousResponse as TimeseriesGroupMaliciousResponse,
+    type TimeseriesGroupSpamResponse as TimeseriesGroupSpamResponse,
+    type TimeseriesGroupSPFResponse as TimeseriesGroupSPFResponse,
+    type TimeseriesGroupSpoofResponse as TimeseriesGroupSpoofResponse,
+    type TimeseriesGroupThreatCategoryResponse as TimeseriesGroupThreatCategoryResponse,
+    type TimeseriesGroupTLSVersionResponse as TimeseriesGroupTLSVersionResponse,
+    type TimeseriesGroupARCParams as TimeseriesGroupARCParams,
+    type TimeseriesGroupDKIMParams as TimeseriesGroupDKIMParams,
+    type TimeseriesGroupDMARCParams as TimeseriesGroupDMARCParams,
+    type TimeseriesGroupMaliciousParams as TimeseriesGroupMaliciousParams,
+    type TimeseriesGroupSpamParams as TimeseriesGroupSpamParams,
+    type TimeseriesGroupSPFParams as TimeseriesGroupSPFParams,
+    type TimeseriesGroupSpoofParams as TimeseriesGroupSpoofParams,
+    type TimeseriesGroupThreatCategoryParams as TimeseriesGroupThreatCategoryParams,
+    type TimeseriesGroupTLSVersionParams as TimeseriesGroupTLSVersionParams,
+  };
 }
diff --git a/src/resources/radar/email/security/summary.ts b/src/resources/radar/email/security/summary.ts
index bc1dbb1f18..c00c830bdc 100644
--- a/src/resources/radar/email/security/summary.ts
+++ b/src/resources/radar/email/security/summary.ts
@@ -3,12 +3,11 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as SummaryAPI from './summary';
 import * as EmailAPI from '../email';
 
 export class Summary extends APIResource {
   /**
-   * Percentage distribution of emails classified per ARC validation.
+   * Percentage distribution of emails classified by ARC validation.
    */
   arc(query?: SummaryARCParams, options?: Core.RequestOptions): Core.APIPromise<SummaryARCResponse>;
   arc(options?: Core.RequestOptions): Core.APIPromise<SummaryARCResponse>;
@@ -27,7 +26,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per DKIM validation.
+   * Percentage distribution of emails classified by DKIM validation.
    */
   dkim(query?: SummaryDKIMParams, options?: Core.RequestOptions): Core.APIPromise<SummaryDKIMResponse>;
   dkim(options?: Core.RequestOptions): Core.APIPromise<SummaryDKIMResponse>;
@@ -46,7 +45,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per DMARC validation.
+   * Percentage distribution of emails classified by DMARC validation.
    */
   dmarc(query?: SummaryDMARCParams, options?: Core.RequestOptions): Core.APIPromise<SummaryDMARCResponse>;
   dmarc(options?: Core.RequestOptions): Core.APIPromise<SummaryDMARCResponse>;
@@ -106,7 +105,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per SPF validation.
+   * Percentage distribution of emails classified by SPF validation.
    */
   spf(query?: SummarySPFParams, options?: Core.RequestOptions): Core.APIPromise<SummarySPFResponse>;
   spf(options?: Core.RequestOptions): Core.APIPromise<SummarySPFResponse>;
@@ -167,7 +166,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per TLS Version.
+   * Percentage distribution of emails classified by TLS version.
    */
   tlsVersion(
     query?: SummaryTLSVersionParams,
@@ -1193,23 +1192,25 @@ export interface SummaryTLSVersionParams {
   spf?: Array<'PASS' | 'NONE' | 'FAIL'>;
 }
 
-export namespace Summary {
-  export import SummaryARCResponse = SummaryAPI.SummaryARCResponse;
-  export import SummaryDKIMResponse = SummaryAPI.SummaryDKIMResponse;
-  export import SummaryDMARCResponse = SummaryAPI.SummaryDMARCResponse;
-  export import SummaryMaliciousResponse = SummaryAPI.SummaryMaliciousResponse;
-  export import SummarySpamResponse = SummaryAPI.SummarySpamResponse;
-  export import SummarySPFResponse = SummaryAPI.SummarySPFResponse;
-  export import SummarySpoofResponse = SummaryAPI.SummarySpoofResponse;
-  export import SummaryThreatCategoryResponse = SummaryAPI.SummaryThreatCategoryResponse;
-  export import SummaryTLSVersionResponse = SummaryAPI.SummaryTLSVersionResponse;
-  export import SummaryARCParams = SummaryAPI.SummaryARCParams;
-  export import SummaryDKIMParams = SummaryAPI.SummaryDKIMParams;
-  export import SummaryDMARCParams = SummaryAPI.SummaryDMARCParams;
-  export import SummaryMaliciousParams = SummaryAPI.SummaryMaliciousParams;
-  export import SummarySpamParams = SummaryAPI.SummarySpamParams;
-  export import SummarySPFParams = SummaryAPI.SummarySPFParams;
-  export import SummarySpoofParams = SummaryAPI.SummarySpoofParams;
-  export import SummaryThreatCategoryParams = SummaryAPI.SummaryThreatCategoryParams;
-  export import SummaryTLSVersionParams = SummaryAPI.SummaryTLSVersionParams;
+export declare namespace Summary {
+  export {
+    type SummaryARCResponse as SummaryARCResponse,
+    type SummaryDKIMResponse as SummaryDKIMResponse,
+    type SummaryDMARCResponse as SummaryDMARCResponse,
+    type SummaryMaliciousResponse as SummaryMaliciousResponse,
+    type SummarySpamResponse as SummarySpamResponse,
+    type SummarySPFResponse as SummarySPFResponse,
+    type SummarySpoofResponse as SummarySpoofResponse,
+    type SummaryThreatCategoryResponse as SummaryThreatCategoryResponse,
+    type SummaryTLSVersionResponse as SummaryTLSVersionResponse,
+    type SummaryARCParams as SummaryARCParams,
+    type SummaryDKIMParams as SummaryDKIMParams,
+    type SummaryDMARCParams as SummaryDMARCParams,
+    type SummaryMaliciousParams as SummaryMaliciousParams,
+    type SummarySpamParams as SummarySpamParams,
+    type SummarySPFParams as SummarySPFParams,
+    type SummarySpoofParams as SummarySpoofParams,
+    type SummaryThreatCategoryParams as SummaryThreatCategoryParams,
+    type SummaryTLSVersionParams as SummaryTLSVersionParams,
+  };
 }
diff --git a/src/resources/radar/email/security/timeseries-groups.ts b/src/resources/radar/email/security/timeseries-groups.ts
index 194b1cac64..ba4865b003 100644
--- a/src/resources/radar/email/security/timeseries-groups.ts
+++ b/src/resources/radar/email/security/timeseries-groups.ts
@@ -3,12 +3,11 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as TimeseriesGroupsAPI from './timeseries-groups';
 import * as EmailAPI from '../email';
 
 export class TimeseriesGroups extends APIResource {
   /**
-   * Percentage distribution of emails classified per Arc validation over time.
+   * Percentage distribution of emails classified by ARC validation over time.
    */
   arc(
     query?: TimeseriesGroupARCParams,
@@ -31,7 +30,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per DKIM validation over time.
+   * Percentage distribution of emails classified by DKIM validation over time.
    */
   dkim(
     query?: TimeseriesGroupDKIMParams,
@@ -54,7 +53,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per DMARC validation over time.
+   * Percentage distribution of emails classified by DMARC validation over time.
    */
   dmarc(
     query?: TimeseriesGroupDMARCParams,
@@ -123,7 +122,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per SPF validation over time.
+   * Percentage distribution of emails classified by SPF validation over time.
    */
   spf(
     query?: TimeseriesGroupSPFParams,
@@ -169,7 +168,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified in Threat Categories over time.
+   * Percentage distribution of emails classified by threat category over time.
    */
   threatCategory(
     query?: TimeseriesGroupThreatCategoryParams,
@@ -192,7 +191,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Percentage distribution of emails classified per TLS Version over time.
+   * Percentage distribution of emails classified by TLS version over time.
    */
   tlsVersion(
     query?: TimeseriesGroupTLSVersionParams,
@@ -841,23 +840,25 @@ export interface TimeseriesGroupTLSVersionParams {
   spf?: Array<'PASS' | 'NONE' | 'FAIL'>;
 }
 
-export namespace TimeseriesGroups {
-  export import TimeseriesGroupARCResponse = TimeseriesGroupsAPI.TimeseriesGroupARCResponse;
-  export import TimeseriesGroupDKIMResponse = TimeseriesGroupsAPI.TimeseriesGroupDKIMResponse;
-  export import TimeseriesGroupDMARCResponse = TimeseriesGroupsAPI.TimeseriesGroupDMARCResponse;
-  export import TimeseriesGroupMaliciousResponse = TimeseriesGroupsAPI.TimeseriesGroupMaliciousResponse;
-  export import TimeseriesGroupSpamResponse = TimeseriesGroupsAPI.TimeseriesGroupSpamResponse;
-  export import TimeseriesGroupSPFResponse = TimeseriesGroupsAPI.TimeseriesGroupSPFResponse;
-  export import TimeseriesGroupSpoofResponse = TimeseriesGroupsAPI.TimeseriesGroupSpoofResponse;
-  export import TimeseriesGroupThreatCategoryResponse = TimeseriesGroupsAPI.TimeseriesGroupThreatCategoryResponse;
-  export import TimeseriesGroupTLSVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupTLSVersionResponse;
-  export import TimeseriesGroupARCParams = TimeseriesGroupsAPI.TimeseriesGroupARCParams;
-  export import TimeseriesGroupDKIMParams = TimeseriesGroupsAPI.TimeseriesGroupDKIMParams;
-  export import TimeseriesGroupDMARCParams = TimeseriesGroupsAPI.TimeseriesGroupDMARCParams;
-  export import TimeseriesGroupMaliciousParams = TimeseriesGroupsAPI.TimeseriesGroupMaliciousParams;
-  export import TimeseriesGroupSpamParams = TimeseriesGroupsAPI.TimeseriesGroupSpamParams;
-  export import TimeseriesGroupSPFParams = TimeseriesGroupsAPI.TimeseriesGroupSPFParams;
-  export import TimeseriesGroupSpoofParams = TimeseriesGroupsAPI.TimeseriesGroupSpoofParams;
-  export import TimeseriesGroupThreatCategoryParams = TimeseriesGroupsAPI.TimeseriesGroupThreatCategoryParams;
-  export import TimeseriesGroupTLSVersionParams = TimeseriesGroupsAPI.TimeseriesGroupTLSVersionParams;
+export declare namespace TimeseriesGroups {
+  export {
+    type TimeseriesGroupARCResponse as TimeseriesGroupARCResponse,
+    type TimeseriesGroupDKIMResponse as TimeseriesGroupDKIMResponse,
+    type TimeseriesGroupDMARCResponse as TimeseriesGroupDMARCResponse,
+    type TimeseriesGroupMaliciousResponse as TimeseriesGroupMaliciousResponse,
+    type TimeseriesGroupSpamResponse as TimeseriesGroupSpamResponse,
+    type TimeseriesGroupSPFResponse as TimeseriesGroupSPFResponse,
+    type TimeseriesGroupSpoofResponse as TimeseriesGroupSpoofResponse,
+    type TimeseriesGroupThreatCategoryResponse as TimeseriesGroupThreatCategoryResponse,
+    type TimeseriesGroupTLSVersionResponse as TimeseriesGroupTLSVersionResponse,
+    type TimeseriesGroupARCParams as TimeseriesGroupARCParams,
+    type TimeseriesGroupDKIMParams as TimeseriesGroupDKIMParams,
+    type TimeseriesGroupDMARCParams as TimeseriesGroupDMARCParams,
+    type TimeseriesGroupMaliciousParams as TimeseriesGroupMaliciousParams,
+    type TimeseriesGroupSpamParams as TimeseriesGroupSpamParams,
+    type TimeseriesGroupSPFParams as TimeseriesGroupSPFParams,
+    type TimeseriesGroupSpoofParams as TimeseriesGroupSpoofParams,
+    type TimeseriesGroupThreatCategoryParams as TimeseriesGroupThreatCategoryParams,
+    type TimeseriesGroupTLSVersionParams as TimeseriesGroupTLSVersionParams,
+  };
 }
diff --git a/src/resources/radar/email/security/top/index.ts b/src/resources/radar/email/security/top/index.ts
index 39006854a9..b3c3ac212f 100644
--- a/src/resources/radar/email/security/top/index.ts
+++ b/src/resources/radar/email/security/top/index.ts
@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { TldGetResponse, TldGetParams, Tlds } from './tlds/index';
+export { Tlds, type TldGetResponse, type TldGetParams } from './tlds/index';
 export { Top } from './top';
diff --git a/src/resources/radar/email/security/top/tlds/index.ts b/src/resources/radar/email/security/top/tlds/index.ts
index ca5e990ca0..3db5c6c624 100644
--- a/src/resources/radar/email/security/top/tlds/index.ts
+++ b/src/resources/radar/email/security/top/tlds/index.ts
@@ -1,6 +1,6 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { MaliciousGetResponse, MaliciousGetParams, Malicious } from './malicious';
-export { SpamGetResponse, SpamGetParams, Spam } from './spam';
-export { SpoofGetResponse, SpoofGetParams, Spoof } from './spoof';
-export { TldGetResponse, TldGetParams, Tlds } from './tlds';
+export { Malicious, type MaliciousGetResponse, type MaliciousGetParams } from './malicious';
+export { Spam, type SpamGetResponse, type SpamGetParams } from './spam';
+export { Spoof, type SpoofGetResponse, type SpoofGetParams } from './spoof';
+export { Tlds, type TldGetResponse, type TldGetParams } from './tlds';
diff --git a/src/resources/radar/email/security/top/tlds/malicious.ts b/src/resources/radar/email/security/top/tlds/malicious.ts
index 0b71dddc1b..9b88d6fbbd 100644
--- a/src/resources/radar/email/security/top/tlds/malicious.ts
+++ b/src/resources/radar/email/security/top/tlds/malicious.ts
@@ -3,8 +3,6 @@
 import { APIResource } from '../../../../../../resource';
 import { isRequestOptions } from '../../../../../../core';
 import * as Core from '../../../../../../core';
-import * as MaliciousAPI from './malicious';
-import * as TopAPI from '../../../../http/top';
 
 export class Malicious extends APIResource {
   /**
@@ -39,7 +37,7 @@ export class Malicious extends APIResource {
 export interface MaliciousGetResponse {
   meta: MaliciousGetResponse.Meta;
 
-  top_0: Array<TopAPI.Browser>;
+  top_0: Array<MaliciousGetResponse.Top0>;
 }
 
 export namespace MaliciousGetResponse {
@@ -88,6 +86,12 @@ export namespace MaliciousGetResponse {
       }
     }
   }
+
+  export interface Top0 {
+    name: string;
+
+    value: string;
+  }
 }
 
 export interface MaliciousGetParams {
@@ -154,7 +158,6 @@ export interface MaliciousGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3'>;
 }
 
-export namespace Malicious {
-  export import MaliciousGetResponse = MaliciousAPI.MaliciousGetResponse;
-  export import MaliciousGetParams = MaliciousAPI.MaliciousGetParams;
+export declare namespace Malicious {
+  export { type MaliciousGetResponse as MaliciousGetResponse, type MaliciousGetParams as MaliciousGetParams };
 }
diff --git a/src/resources/radar/email/security/top/tlds/spam.ts b/src/resources/radar/email/security/top/tlds/spam.ts
index 0f4b92bb75..06035fa47d 100644
--- a/src/resources/radar/email/security/top/tlds/spam.ts
+++ b/src/resources/radar/email/security/top/tlds/spam.ts
@@ -3,12 +3,10 @@
 import { APIResource } from '../../../../../../resource';
 import { isRequestOptions } from '../../../../../../core';
 import * as Core from '../../../../../../core';
-import * as SpamAPI from './spam';
-import * as TopAPI from '../../../../http/top';
 
 export class Spam extends APIResource {
   /**
-   * Get the top TLDs by emails classified as Spam or not.
+   * Get the top TLDs by emails classified as spam or not.
    */
   get(
     spam: 'SPAM' | 'NOT_SPAM',
@@ -36,7 +34,7 @@ export class Spam extends APIResource {
 export interface SpamGetResponse {
   meta: SpamGetResponse.Meta;
 
-  top_0: Array<TopAPI.Browser>;
+  top_0: Array<SpamGetResponse.Top0>;
 }
 
 export namespace SpamGetResponse {
@@ -85,6 +83,12 @@ export namespace SpamGetResponse {
       }
     }
   }
+
+  export interface Top0 {
+    name: string;
+
+    value: string;
+  }
 }
 
 export interface SpamGetParams {
@@ -151,7 +155,6 @@ export interface SpamGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3'>;
 }
 
-export namespace Spam {
-  export import SpamGetResponse = SpamAPI.SpamGetResponse;
-  export import SpamGetParams = SpamAPI.SpamGetParams;
+export declare namespace Spam {
+  export { type SpamGetResponse as SpamGetResponse, type SpamGetParams as SpamGetParams };
 }
diff --git a/src/resources/radar/email/security/top/tlds/spoof.ts b/src/resources/radar/email/security/top/tlds/spoof.ts
index d20b8ddb28..5451d5c102 100644
--- a/src/resources/radar/email/security/top/tlds/spoof.ts
+++ b/src/resources/radar/email/security/top/tlds/spoof.ts
@@ -3,8 +3,6 @@
 import { APIResource } from '../../../../../../resource';
 import { isRequestOptions } from '../../../../../../core';
 import * as Core from '../../../../../../core';
-import * as SpoofAPI from './spoof';
-import * as TopAPI from '../../../../http/top';
 
 export class Spoof extends APIResource {
   /**
@@ -36,7 +34,7 @@ export class Spoof extends APIResource {
 export interface SpoofGetResponse {
   meta: SpoofGetResponse.Meta;
 
-  top_0: Array<TopAPI.Browser>;
+  top_0: Array<SpoofGetResponse.Top0>;
 }
 
 export namespace SpoofGetResponse {
@@ -85,6 +83,12 @@ export namespace SpoofGetResponse {
       }
     }
   }
+
+  export interface Top0 {
+    name: string;
+
+    value: string;
+  }
 }
 
 export interface SpoofGetParams {
@@ -151,7 +155,6 @@ export interface SpoofGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3'>;
 }
 
-export namespace Spoof {
-  export import SpoofGetResponse = SpoofAPI.SpoofGetResponse;
-  export import SpoofGetParams = SpoofAPI.SpoofGetParams;
+export declare namespace Spoof {
+  export { type SpoofGetResponse as SpoofGetResponse, type SpoofGetParams as SpoofGetParams };
 }
diff --git a/src/resources/radar/email/security/top/tlds/tlds.ts b/src/resources/radar/email/security/top/tlds/tlds.ts
index f14636b382..3968a4f3cb 100644
--- a/src/resources/radar/email/security/top/tlds/tlds.ts
+++ b/src/resources/radar/email/security/top/tlds/tlds.ts
@@ -3,11 +3,12 @@
 import { APIResource } from '../../../../../../resource';
 import { isRequestOptions } from '../../../../../../core';
 import * as Core from '../../../../../../core';
-import * as TldsAPI from './tlds';
-import * as TopAPI from '../../../../http/top';
 import * as MaliciousAPI from './malicious';
+import { Malicious, MaliciousGetParams, MaliciousGetResponse } from './malicious';
 import * as SpamAPI from './spam';
+import { Spam, SpamGetParams, SpamGetResponse } from './spam';
 import * as SpoofAPI from './spoof';
+import { Spoof, SpoofGetParams, SpoofGetResponse } from './spoof';
 
 export class Tlds extends APIResource {
   malicious: MaliciousAPI.Malicious = new MaliciousAPI.Malicious(this._client);
@@ -15,8 +16,8 @@ export class Tlds extends APIResource {
   spoof: SpoofAPI.Spoof = new SpoofAPI.Spoof(this._client);
 
   /**
-   * Get the top TLDs by email messages. Values are a percentage out of the total
-   * emails.
+   * Get the top TLDs by email messages. Values are a percentage out of total email
+   * volume.
    */
   get(query?: TldGetParams, options?: Core.RequestOptions): Core.APIPromise<TldGetResponse>;
   get(options?: Core.RequestOptions): Core.APIPromise<TldGetResponse>;
@@ -38,7 +39,7 @@ export class Tlds extends APIResource {
 export interface TldGetResponse {
   meta: TldGetResponse.Meta;
 
-  top_0: Array<TopAPI.Browser>;
+  top_0: Array<TldGetResponse.Top0>;
 }
 
 export namespace TldGetResponse {
@@ -87,6 +88,12 @@ export namespace TldGetResponse {
       }
     }
   }
+
+  export interface Top0 {
+    name: string;
+
+    value: string;
+  }
 }
 
 export interface TldGetParams {
@@ -153,16 +160,20 @@ export interface TldGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3'>;
 }
 
-export namespace Tlds {
-  export import TldGetResponse = TldsAPI.TldGetResponse;
-  export import TldGetParams = TldsAPI.TldGetParams;
-  export import Malicious = MaliciousAPI.Malicious;
-  export import MaliciousGetResponse = MaliciousAPI.MaliciousGetResponse;
-  export import MaliciousGetParams = MaliciousAPI.MaliciousGetParams;
-  export import Spam = SpamAPI.Spam;
-  export import SpamGetResponse = SpamAPI.SpamGetResponse;
-  export import SpamGetParams = SpamAPI.SpamGetParams;
-  export import Spoof = SpoofAPI.Spoof;
-  export import SpoofGetResponse = SpoofAPI.SpoofGetResponse;
-  export import SpoofGetParams = SpoofAPI.SpoofGetParams;
+Tlds.Malicious = Malicious;
+Tlds.Spam = Spam;
+Tlds.Spoof = Spoof;
+
+export declare namespace Tlds {
+  export { type TldGetResponse as TldGetResponse, type TldGetParams as TldGetParams };
+
+  export {
+    Malicious as Malicious,
+    type MaliciousGetResponse as MaliciousGetResponse,
+    type MaliciousGetParams as MaliciousGetParams,
+  };
+
+  export { Spam as Spam, type SpamGetResponse as SpamGetResponse, type SpamGetParams as SpamGetParams };
+
+  export { Spoof as Spoof, type SpoofGetResponse as SpoofGetResponse, type SpoofGetParams as SpoofGetParams };
 }
diff --git a/src/resources/radar/email/security/top/top.ts b/src/resources/radar/email/security/top/top.ts
index 1ef8c26ab4..3d3814a796 100644
--- a/src/resources/radar/email/security/top/top.ts
+++ b/src/resources/radar/email/security/top/top.ts
@@ -2,13 +2,14 @@
 
 import { APIResource } from '../../../../../resource';
 import * as TldsAPI from './tlds/tlds';
+import { TldGetParams, TldGetResponse, Tlds } from './tlds/tlds';
 
 export class Top extends APIResource {
   tlds: TldsAPI.Tlds = new TldsAPI.Tlds(this._client);
 }
 
-export namespace Top {
-  export import Tlds = TldsAPI.Tlds;
-  export import TldGetResponse = TldsAPI.TldGetResponse;
-  export import TldGetParams = TldsAPI.TldGetParams;
+Top.Tlds = Tlds;
+
+export declare namespace Top {
+  export { Tlds as Tlds, type TldGetResponse as TldGetResponse, type TldGetParams as TldGetParams };
 }
diff --git a/src/resources/radar/entities/asns.ts b/src/resources/radar/entities/asns.ts
index 312e73da02..5585bae01b 100644
--- a/src/resources/radar/entities/asns.ts
+++ b/src/resources/radar/entities/asns.ts
@@ -3,11 +3,10 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as ASNsAPI from './asns';
 
 export class ASNs extends APIResource {
   /**
-   * Gets a list of autonomous systems (AS).
+   * Get a list of autonomous systems (ASes).
    */
   list(query?: ASNListParams, options?: Core.RequestOptions): Core.APIPromise<ASNListResponse>;
   list(options?: Core.RequestOptions): Core.APIPromise<ASNListResponse>;
@@ -26,7 +25,7 @@ export class ASNs extends APIResource {
   }
 
   /**
-   * Get the requested autonomous system information. A confidence level below `5`
+   * Get the requested autonomous system information. (A confidence level below `5`
    * indicates a low level of confidence in the traffic data - normally this happens
    * because Cloudflare has a small amount of traffic from/to this AS). Population
    * estimates come from APNIC (refer to https://labs.apnic.net/?p=526).
@@ -351,13 +350,15 @@ export interface ASNRelParams {
   format?: 'JSON' | 'CSV';
 }
 
-export namespace ASNs {
-  export import ASNListResponse = ASNsAPI.ASNListResponse;
-  export import ASNGetResponse = ASNsAPI.ASNGetResponse;
-  export import ASNIPResponse = ASNsAPI.ASNIPResponse;
-  export import ASNRelResponse = ASNsAPI.ASNRelResponse;
-  export import ASNListParams = ASNsAPI.ASNListParams;
-  export import ASNGetParams = ASNsAPI.ASNGetParams;
-  export import ASNIPParams = ASNsAPI.ASNIPParams;
-  export import ASNRelParams = ASNsAPI.ASNRelParams;
+export declare namespace ASNs {
+  export {
+    type ASNListResponse as ASNListResponse,
+    type ASNGetResponse as ASNGetResponse,
+    type ASNIPResponse as ASNIPResponse,
+    type ASNRelResponse as ASNRelResponse,
+    type ASNListParams as ASNListParams,
+    type ASNGetParams as ASNGetParams,
+    type ASNIPParams as ASNIPParams,
+    type ASNRelParams as ASNRelParams,
+  };
 }
diff --git a/src/resources/radar/entities/entities.ts b/src/resources/radar/entities/entities.ts
index 10f0c0cf40..474754c159 100644
--- a/src/resources/radar/entities/entities.ts
+++ b/src/resources/radar/entities/entities.ts
@@ -2,9 +2,26 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as EntitiesAPI from './entities';
 import * as ASNsAPI from './asns';
+import {
+  ASNGetParams,
+  ASNGetResponse,
+  ASNIPParams,
+  ASNIPResponse,
+  ASNListParams,
+  ASNListResponse,
+  ASNRelParams,
+  ASNRelResponse,
+  ASNs,
+} from './asns';
 import * as LocationsAPI from './locations';
+import {
+  LocationGetParams,
+  LocationGetResponse,
+  LocationListParams,
+  LocationListResponse,
+  Locations,
+} from './locations';
 
 export class Entities extends APIResource {
   asns: ASNsAPI.ASNs = new ASNsAPI.ASNs(this._client);
@@ -58,21 +75,29 @@ export interface EntityGetParams {
   format?: 'JSON' | 'CSV';
 }
 
-export namespace Entities {
-  export import EntityGetResponse = EntitiesAPI.EntityGetResponse;
-  export import EntityGetParams = EntitiesAPI.EntityGetParams;
-  export import ASNs = ASNsAPI.ASNs;
-  export import ASNListResponse = ASNsAPI.ASNListResponse;
-  export import ASNGetResponse = ASNsAPI.ASNGetResponse;
-  export import ASNIPResponse = ASNsAPI.ASNIPResponse;
-  export import ASNRelResponse = ASNsAPI.ASNRelResponse;
-  export import ASNListParams = ASNsAPI.ASNListParams;
-  export import ASNGetParams = ASNsAPI.ASNGetParams;
-  export import ASNIPParams = ASNsAPI.ASNIPParams;
-  export import ASNRelParams = ASNsAPI.ASNRelParams;
-  export import Locations = LocationsAPI.Locations;
-  export import LocationListResponse = LocationsAPI.LocationListResponse;
-  export import LocationGetResponse = LocationsAPI.LocationGetResponse;
-  export import LocationListParams = LocationsAPI.LocationListParams;
-  export import LocationGetParams = LocationsAPI.LocationGetParams;
+Entities.ASNs = ASNs;
+Entities.Locations = Locations;
+
+export declare namespace Entities {
+  export { type EntityGetResponse as EntityGetResponse, type EntityGetParams as EntityGetParams };
+
+  export {
+    ASNs as ASNs,
+    type ASNListResponse as ASNListResponse,
+    type ASNGetResponse as ASNGetResponse,
+    type ASNIPResponse as ASNIPResponse,
+    type ASNRelResponse as ASNRelResponse,
+    type ASNListParams as ASNListParams,
+    type ASNGetParams as ASNGetParams,
+    type ASNIPParams as ASNIPParams,
+    type ASNRelParams as ASNRelParams,
+  };
+
+  export {
+    Locations as Locations,
+    type LocationListResponse as LocationListResponse,
+    type LocationGetResponse as LocationGetResponse,
+    type LocationListParams as LocationListParams,
+    type LocationGetParams as LocationGetParams,
+  };
 }
diff --git a/src/resources/radar/entities/index.ts b/src/resources/radar/entities/index.ts
index 2f29351748..2039fc458d 100644
--- a/src/resources/radar/entities/index.ts
+++ b/src/resources/radar/entities/index.ts
@@ -1,21 +1,21 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  ASNListResponse,
-  ASNGetResponse,
-  ASNIPResponse,
-  ASNRelResponse,
-  ASNListParams,
-  ASNGetParams,
-  ASNIPParams,
-  ASNRelParams,
   ASNs,
+  type ASNListResponse,
+  type ASNGetResponse,
+  type ASNIPResponse,
+  type ASNRelResponse,
+  type ASNListParams,
+  type ASNGetParams,
+  type ASNIPParams,
+  type ASNRelParams,
 } from './asns';
-export { EntityGetResponse, EntityGetParams, Entities } from './entities';
+export { Entities, type EntityGetResponse, type EntityGetParams } from './entities';
 export {
-  LocationListResponse,
-  LocationGetResponse,
-  LocationListParams,
-  LocationGetParams,
   Locations,
+  type LocationListResponse,
+  type LocationGetResponse,
+  type LocationListParams,
+  type LocationGetParams,
 } from './locations';
diff --git a/src/resources/radar/entities/locations.ts b/src/resources/radar/entities/locations.ts
index bec8eb9910..4077aa11ee 100644
--- a/src/resources/radar/entities/locations.ts
+++ b/src/resources/radar/entities/locations.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as LocationsAPI from './locations';
 
 export class Locations extends APIResource {
   /**
@@ -26,8 +25,8 @@ export class Locations extends APIResource {
   }
 
   /**
-   * Get the requested location information. A confidence level below `5` indicates a
-   * low level of confidence in the traffic data - normally this happens because
+   * Get the requested location information. (A confidence level below `5` indicates
+   * a low level of confidence in the traffic data - normally this happens because
    * Cloudflare has a small amount of traffic from/to this location).
    */
   get(
@@ -119,9 +118,11 @@ export interface LocationGetParams {
   format?: 'JSON' | 'CSV';
 }
 
-export namespace Locations {
-  export import LocationListResponse = LocationsAPI.LocationListResponse;
-  export import LocationGetResponse = LocationsAPI.LocationGetResponse;
-  export import LocationListParams = LocationsAPI.LocationListParams;
-  export import LocationGetParams = LocationsAPI.LocationGetParams;
+export declare namespace Locations {
+  export {
+    type LocationListResponse as LocationListResponse,
+    type LocationGetResponse as LocationGetResponse,
+    type LocationListParams as LocationListParams,
+    type LocationGetParams as LocationGetParams,
+  };
 }
diff --git a/src/resources/radar/http/ases/ases.ts b/src/resources/radar/http/ases/ases.ts
index 30a61e3c04..acfad7ee67 100644
--- a/src/resources/radar/http/ases/ases.ts
+++ b/src/resources/radar/http/ases/ases.ts
@@ -3,15 +3,22 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as AsesAPI from './ases';
 import * as BotClassAPI from './bot-class';
+import { BotClass, BotClassGetParams, BotClassGetResponse } from './bot-class';
 import * as BrowserFamilyAPI from './browser-family';
+import { BrowserFamily, BrowserFamilyGetParams, BrowserFamilyGetResponse } from './browser-family';
 import * as DeviceTypeAPI from './device-type';
+import { DeviceType, DeviceTypeGetParams, DeviceTypeGetResponse } from './device-type';
 import * as HTTPMethodAPI from './http-method';
+import { HTTPMethod, HTTPMethodGetParams, HTTPMethodGetResponse } from './http-method';
 import * as HTTPProtocolAPI from './http-protocol';
+import { HTTPProtocol, HTTPProtocolGetParams, HTTPProtocolGetResponse } from './http-protocol';
 import * as IPVersionAPI from './ip-version';
+import { IPVersion, IPVersionGetParams, IPVersionGetResponse } from './ip-version';
 import * as OSAPI from './os';
+import { OS, OSGetParams, OSGetResponse } from './os';
 import * as TLSVersionAPI from './tls-version';
+import { TLSVersion, TLSVersionGetParams, TLSVersionGetResponse } from './tls-version';
 
 export class Ases extends APIResource {
   botClass: BotClassAPI.BotClass = new BotClassAPI.BotClass(this._client);
@@ -202,31 +209,59 @@ export interface AseGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace Ases {
-  export import AseGetResponse = AsesAPI.AseGetResponse;
-  export import AseGetParams = AsesAPI.AseGetParams;
-  export import BotClass = BotClassAPI.BotClass;
-  export import BotClassGetResponse = BotClassAPI.BotClassGetResponse;
-  export import BotClassGetParams = BotClassAPI.BotClassGetParams;
-  export import DeviceType = DeviceTypeAPI.DeviceType;
-  export import DeviceTypeGetResponse = DeviceTypeAPI.DeviceTypeGetResponse;
-  export import DeviceTypeGetParams = DeviceTypeAPI.DeviceTypeGetParams;
-  export import HTTPProtocol = HTTPProtocolAPI.HTTPProtocol;
-  export import HTTPProtocolGetResponse = HTTPProtocolAPI.HTTPProtocolGetResponse;
-  export import HTTPProtocolGetParams = HTTPProtocolAPI.HTTPProtocolGetParams;
-  export import HTTPMethod = HTTPMethodAPI.HTTPMethod;
-  export import HTTPMethodGetResponse = HTTPMethodAPI.HTTPMethodGetResponse;
-  export import HTTPMethodGetParams = HTTPMethodAPI.HTTPMethodGetParams;
-  export import IPVersion = IPVersionAPI.IPVersion;
-  export import IPVersionGetResponse = IPVersionAPI.IPVersionGetResponse;
-  export import IPVersionGetParams = IPVersionAPI.IPVersionGetParams;
-  export import OS = OSAPI.OS;
-  export import OSGetResponse = OSAPI.OSGetResponse;
-  export import OSGetParams = OSAPI.OSGetParams;
-  export import TLSVersion = TLSVersionAPI.TLSVersion;
-  export import TLSVersionGetResponse = TLSVersionAPI.TLSVersionGetResponse;
-  export import TLSVersionGetParams = TLSVersionAPI.TLSVersionGetParams;
-  export import BrowserFamily = BrowserFamilyAPI.BrowserFamily;
-  export import BrowserFamilyGetResponse = BrowserFamilyAPI.BrowserFamilyGetResponse;
-  export import BrowserFamilyGetParams = BrowserFamilyAPI.BrowserFamilyGetParams;
+Ases.BotClass = BotClass;
+Ases.DeviceType = DeviceType;
+Ases.HTTPProtocol = HTTPProtocol;
+Ases.HTTPMethod = HTTPMethod;
+Ases.IPVersion = IPVersion;
+Ases.OS = OS;
+Ases.TLSVersion = TLSVersion;
+Ases.BrowserFamily = BrowserFamily;
+
+export declare namespace Ases {
+  export { type AseGetResponse as AseGetResponse, type AseGetParams as AseGetParams };
+
+  export {
+    BotClass as BotClass,
+    type BotClassGetResponse as BotClassGetResponse,
+    type BotClassGetParams as BotClassGetParams,
+  };
+
+  export {
+    DeviceType as DeviceType,
+    type DeviceTypeGetResponse as DeviceTypeGetResponse,
+    type DeviceTypeGetParams as DeviceTypeGetParams,
+  };
+
+  export {
+    HTTPProtocol as HTTPProtocol,
+    type HTTPProtocolGetResponse as HTTPProtocolGetResponse,
+    type HTTPProtocolGetParams as HTTPProtocolGetParams,
+  };
+
+  export {
+    HTTPMethod as HTTPMethod,
+    type HTTPMethodGetResponse as HTTPMethodGetResponse,
+    type HTTPMethodGetParams as HTTPMethodGetParams,
+  };
+
+  export {
+    IPVersion as IPVersion,
+    type IPVersionGetResponse as IPVersionGetResponse,
+    type IPVersionGetParams as IPVersionGetParams,
+  };
+
+  export { OS as OS, type OSGetResponse as OSGetResponse, type OSGetParams as OSGetParams };
+
+  export {
+    TLSVersion as TLSVersion,
+    type TLSVersionGetResponse as TLSVersionGetResponse,
+    type TLSVersionGetParams as TLSVersionGetParams,
+  };
+
+  export {
+    BrowserFamily as BrowserFamily,
+    type BrowserFamilyGetResponse as BrowserFamilyGetResponse,
+    type BrowserFamilyGetParams as BrowserFamilyGetParams,
+  };
 }
diff --git a/src/resources/radar/http/ases/bot-class.ts b/src/resources/radar/http/ases/bot-class.ts
index 6f0b6d84b7..acf4060d1d 100644
--- a/src/resources/radar/http/ases/bot-class.ts
+++ b/src/resources/radar/http/ases/bot-class.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as BotClassAPI from './bot-class';
 
 export class BotClass extends APIResource {
   /**
@@ -190,7 +189,6 @@ export interface BotClassGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace BotClass {
-  export import BotClassGetResponse = BotClassAPI.BotClassGetResponse;
-  export import BotClassGetParams = BotClassAPI.BotClassGetParams;
+export declare namespace BotClass {
+  export { type BotClassGetResponse as BotClassGetResponse, type BotClassGetParams as BotClassGetParams };
 }
diff --git a/src/resources/radar/http/ases/browser-family.ts b/src/resources/radar/http/ases/browser-family.ts
index 61f6177eaa..0db19926e3 100644
--- a/src/resources/radar/http/ases/browser-family.ts
+++ b/src/resources/radar/http/ases/browser-family.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as BrowserFamilyAPI from './browser-family';
 
 export class BrowserFamily extends APIResource {
   /**
@@ -189,7 +188,9 @@ export interface BrowserFamilyGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace BrowserFamily {
-  export import BrowserFamilyGetResponse = BrowserFamilyAPI.BrowserFamilyGetResponse;
-  export import BrowserFamilyGetParams = BrowserFamilyAPI.BrowserFamilyGetParams;
+export declare namespace BrowserFamily {
+  export {
+    type BrowserFamilyGetResponse as BrowserFamilyGetResponse,
+    type BrowserFamilyGetParams as BrowserFamilyGetParams,
+  };
 }
diff --git a/src/resources/radar/http/ases/device-type.ts b/src/resources/radar/http/ases/device-type.ts
index 07395dd5ee..e8a0b9864c 100644
--- a/src/resources/radar/http/ases/device-type.ts
+++ b/src/resources/radar/http/ases/device-type.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as DeviceTypeAPI from './device-type';
 
 export class DeviceType extends APIResource {
   /**
@@ -189,7 +188,9 @@ export interface DeviceTypeGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace DeviceType {
-  export import DeviceTypeGetResponse = DeviceTypeAPI.DeviceTypeGetResponse;
-  export import DeviceTypeGetParams = DeviceTypeAPI.DeviceTypeGetParams;
+export declare namespace DeviceType {
+  export {
+    type DeviceTypeGetResponse as DeviceTypeGetResponse,
+    type DeviceTypeGetParams as DeviceTypeGetParams,
+  };
 }
diff --git a/src/resources/radar/http/ases/http-method.ts b/src/resources/radar/http/ases/http-method.ts
index b6e6efb3d0..9d59cc389f 100644
--- a/src/resources/radar/http/ases/http-method.ts
+++ b/src/resources/radar/http/ases/http-method.ts
@@ -3,12 +3,11 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as HTTPMethodAPI from './http-method';
 
 export class HTTPMethod extends APIResource {
   /**
    * Get the top autonomous systems (AS), by HTTP traffic, of the requested HTTP
-   * protocol version. Values are a percentage out of the total traffic.
+   * version. Values are a percentage out of the total traffic.
    */
   get(
     httpVersion: 'HTTPv1' | 'HTTPv2' | 'HTTPv3',
@@ -189,7 +188,9 @@ export interface HTTPMethodGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace HTTPMethod {
-  export import HTTPMethodGetResponse = HTTPMethodAPI.HTTPMethodGetResponse;
-  export import HTTPMethodGetParams = HTTPMethodAPI.HTTPMethodGetParams;
+export declare namespace HTTPMethod {
+  export {
+    type HTTPMethodGetResponse as HTTPMethodGetResponse,
+    type HTTPMethodGetParams as HTTPMethodGetParams,
+  };
 }
diff --git a/src/resources/radar/http/ases/http-protocol.ts b/src/resources/radar/http/ases/http-protocol.ts
index fb2c9cb92b..1cae581232 100644
--- a/src/resources/radar/http/ases/http-protocol.ts
+++ b/src/resources/radar/http/ases/http-protocol.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as HTTPProtocolAPI from './http-protocol';
 
 export class HTTPProtocol extends APIResource {
   /**
@@ -184,7 +183,9 @@ export interface HTTPProtocolGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace HTTPProtocol {
-  export import HTTPProtocolGetResponse = HTTPProtocolAPI.HTTPProtocolGetResponse;
-  export import HTTPProtocolGetParams = HTTPProtocolAPI.HTTPProtocolGetParams;
+export declare namespace HTTPProtocol {
+  export {
+    type HTTPProtocolGetResponse as HTTPProtocolGetResponse,
+    type HTTPProtocolGetParams as HTTPProtocolGetParams,
+  };
 }
diff --git a/src/resources/radar/http/ases/index.ts b/src/resources/radar/http/ases/index.ts
index badc76c9e0..ebcde47505 100644
--- a/src/resources/radar/http/ases/index.ts
+++ b/src/resources/radar/http/ases/index.ts
@@ -1,11 +1,11 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { AseGetResponse, AseGetParams, Ases } from './ases';
-export { BotClassGetResponse, BotClassGetParams, BotClass } from './bot-class';
-export { BrowserFamilyGetResponse, BrowserFamilyGetParams, BrowserFamily } from './browser-family';
-export { DeviceTypeGetResponse, DeviceTypeGetParams, DeviceType } from './device-type';
-export { HTTPMethodGetResponse, HTTPMethodGetParams, HTTPMethod } from './http-method';
-export { HTTPProtocolGetResponse, HTTPProtocolGetParams, HTTPProtocol } from './http-protocol';
-export { IPVersionGetResponse, IPVersionGetParams, IPVersion } from './ip-version';
-export { OSGetResponse, OSGetParams, OS } from './os';
-export { TLSVersionGetResponse, TLSVersionGetParams, TLSVersion } from './tls-version';
+export { Ases, type AseGetResponse, type AseGetParams } from './ases';
+export { BotClass, type BotClassGetResponse, type BotClassGetParams } from './bot-class';
+export { BrowserFamily, type BrowserFamilyGetResponse, type BrowserFamilyGetParams } from './browser-family';
+export { DeviceType, type DeviceTypeGetResponse, type DeviceTypeGetParams } from './device-type';
+export { HTTPMethod, type HTTPMethodGetResponse, type HTTPMethodGetParams } from './http-method';
+export { HTTPProtocol, type HTTPProtocolGetResponse, type HTTPProtocolGetParams } from './http-protocol';
+export { IPVersion, type IPVersionGetResponse, type IPVersionGetParams } from './ip-version';
+export { OS, type OSGetResponse, type OSGetParams } from './os';
+export { TLSVersion, type TLSVersionGetResponse, type TLSVersionGetParams } from './tls-version';
diff --git a/src/resources/radar/http/ases/ip-version.ts b/src/resources/radar/http/ases/ip-version.ts
index 6a897f7bb0..d956a1eef6 100644
--- a/src/resources/radar/http/ases/ip-version.ts
+++ b/src/resources/radar/http/ases/ip-version.ts
@@ -3,12 +3,11 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as IPVersionAPI from './ip-version';
 
 export class IPVersion extends APIResource {
   /**
-   * Get the top autonomous systems, by HTTP traffic, of the requested IP protocol
-   * version. Values are a percentage out of the total traffic.
+   * Get the top autonomous systems, by HTTP traffic, of the requested IP version.
+   * Values are a percentage out of the total traffic.
    */
   get(
     ipVersion: 'IPv4' | 'IPv6',
@@ -186,7 +185,6 @@ export interface IPVersionGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace IPVersion {
-  export import IPVersionGetResponse = IPVersionAPI.IPVersionGetResponse;
-  export import IPVersionGetParams = IPVersionAPI.IPVersionGetParams;
+export declare namespace IPVersion {
+  export { type IPVersionGetResponse as IPVersionGetResponse, type IPVersionGetParams as IPVersionGetParams };
 }
diff --git a/src/resources/radar/http/ases/os.ts b/src/resources/radar/http/ases/os.ts
index 8000c8924a..68154baf46 100644
--- a/src/resources/radar/http/ases/os.ts
+++ b/src/resources/radar/http/ases/os.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as OSAPI from './os';
 
 export class OS extends APIResource {
   /**
@@ -188,7 +187,6 @@ export interface OSGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace OS {
-  export import OSGetResponse = OSAPI.OSGetResponse;
-  export import OSGetParams = OSAPI.OSGetParams;
+export declare namespace OS {
+  export { type OSGetResponse as OSGetResponse, type OSGetParams as OSGetParams };
 }
diff --git a/src/resources/radar/http/ases/tls-version.ts b/src/resources/radar/http/ases/tls-version.ts
index ba737df4b7..a7e2ea72db 100644
--- a/src/resources/radar/http/ases/tls-version.ts
+++ b/src/resources/radar/http/ases/tls-version.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as TLSVersionAPI from './tls-version';
 
 export class TLSVersion extends APIResource {
   /**
@@ -189,7 +188,9 @@ export interface TLSVersionGetParams {
   os?: Array<'WINDOWS' | 'MACOSX' | 'IOS' | 'ANDROID' | 'CHROMEOS' | 'LINUX' | 'SMART_TV'>;
 }
 
-export namespace TLSVersion {
-  export import TLSVersionGetResponse = TLSVersionAPI.TLSVersionGetResponse;
-  export import TLSVersionGetParams = TLSVersionAPI.TLSVersionGetParams;
+export declare namespace TLSVersion {
+  export {
+    type TLSVersionGetResponse as TLSVersionGetResponse,
+    type TLSVersionGetParams as TLSVersionGetParams,
+  };
 }
diff --git a/src/resources/radar/http/http.ts b/src/resources/radar/http/http.ts
index e5d5e7cfd1..8a69086c20 100644
--- a/src/resources/radar/http/http.ts
+++ b/src/resources/radar/http/http.ts
@@ -3,21 +3,71 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as HTTPAPI from './http';
 import * as SummaryAPI from './summary';
+import {
+  Summary,
+  SummaryBotClassParams,
+  SummaryBotClassResponse,
+  SummaryDeviceTypeParams,
+  SummaryDeviceTypeResponse,
+  SummaryHTTPProtocolParams,
+  SummaryHTTPProtocolResponse,
+  SummaryHTTPVersionParams,
+  SummaryHTTPVersionResponse,
+  SummaryIPVersionParams,
+  SummaryIPVersionResponse,
+  SummaryOSParams,
+  SummaryOSResponse,
+  SummaryPostQuantumParams,
+  SummaryPostQuantumResponse,
+  SummaryTLSVersionParams,
+  SummaryTLSVersionResponse,
+} from './summary';
 import * as TimeseriesGroupsAPI from './timeseries-groups';
+import {
+  TimeseriesGroupBotClassParams,
+  TimeseriesGroupBotClassResponse,
+  TimeseriesGroupBrowserFamilyParams,
+  TimeseriesGroupBrowserFamilyResponse,
+  TimeseriesGroupBrowserParams,
+  TimeseriesGroupBrowserResponse,
+  TimeseriesGroupDeviceTypeParams,
+  TimeseriesGroupDeviceTypeResponse,
+  TimeseriesGroupHTTPProtocolParams,
+  TimeseriesGroupHTTPProtocolResponse,
+  TimeseriesGroupHTTPVersionParams,
+  TimeseriesGroupHTTPVersionResponse,
+  TimeseriesGroupIPVersionParams,
+  TimeseriesGroupIPVersionResponse,
+  TimeseriesGroupOSParams,
+  TimeseriesGroupOSResponse,
+  TimeseriesGroupPostQuantumParams,
+  TimeseriesGroupPostQuantumResponse,
+  TimeseriesGroupTLSVersionParams,
+  TimeseriesGroupTLSVersionResponse,
+  TimeseriesGroups,
+} from './timeseries-groups';
 import * as TopAPI from './top';
+import {
+  Top,
+  TopBrowserFamilyParams,
+  TopBrowserFamilyResponse,
+  TopBrowserParams,
+  TopBrowserResponse,
+} from './top';
 import * as AsesAPI from './ases/ases';
+import { AseGetParams, AseGetResponse, Ases } from './ases/ases';
 import * as LocationsAPI from './locations/locations';
+import { LocationGetParams, LocationGetResponse, Locations } from './locations/locations';
 
 export class HTTP extends APIResource {
-  top: TopAPI.Top = new TopAPI.Top(this._client);
   locations: LocationsAPI.Locations = new LocationsAPI.Locations(this._client);
   ases: AsesAPI.Ases = new AsesAPI.Ases(this._client);
   summary: SummaryAPI.Summary = new SummaryAPI.Summary(this._client);
   timeseriesGroups: TimeseriesGroupsAPI.TimeseriesGroups = new TimeseriesGroupsAPI.TimeseriesGroups(
     this._client,
   );
+  top: TopAPI.Top = new TopAPI.Top(this._client);
 
   /**
    * Get HTTP requests over time.
@@ -119,6 +169,12 @@ export interface HTTPTimeseriesParams {
    */
   asn?: Array<string>;
 
+  /**
+   * Filter for bot class. Refer to
+   * [Bot classes](https://developers.cloudflare.com/radar/concepts/bot-classes/).
+   */
+  botClass?: Array<'LIKELY_AUTOMATED' | 'LIKELY_HUMAN'>;
+
   /**
    * Array of comma separated list of continents (alpha-2 continent codes). Start
    * with `-` to exclude from results. For example, `-EU,NA` excludes results from
@@ -143,11 +199,31 @@ export interface HTTPTimeseriesParams {
    */
   dateStart?: Array<string>;
 
+  /**
+   * Filter for device type.
+   */
+  deviceType?: Array<'DESKTOP' | 'MOBILE' | 'OTHER'>;
+
   /**
    * Format results are returned in.
    */
   format?: 'JSON' | 'CSV';
 
+  /**
+   * Filter for http protocol.
+   */
+  httpProtocol?: Array<'HTTP' | 'HTTPS'>;
+
+  /**
+   * Filter for http version.
+   */
+  httpVersion?: Array<'HTTPv1' | 'HTTPv2' | 'HTTPv3'>;
+
+  /**
+   * Filter for ip version.
+   */
+  ipVersion?: Array<'IPv4' | 'IPv6'>;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -159,59 +235,93 @@ export interface HTTPTimeseriesParams {
    * Array of names that will be used to name the series in responses.
    */
   name?: Array<string>;
+
+  /**
+   * Normalization method applied. Refer to
+   * [Normalization methods](https://developers.cloudflare.com/radar/concepts/normalization/).
+   */
+  normalization?: 'PERCENTAGE_CHANGE' | 'MIN0_MAX';
+
+  /**
+   * Filter for os name.
+   */
+  os?: Array<'WINDOWS' | 'MACOSX' | 'IOS' | 'ANDROID' | 'CHROMEOS' | 'LINUX' | 'SMART_TV'>;
+
+  /**
+   * Filter for tls version.
+   */
+  tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace HTTP {
-  export import HTTPTimeseriesResponse = HTTPAPI.HTTPTimeseriesResponse;
-  export import HTTPTimeseriesParams = HTTPAPI.HTTPTimeseriesParams;
-  export import Top = TopAPI.Top;
-  export import Browser = TopAPI.Browser;
-  export import TopBrowserFamiliesResponse = TopAPI.TopBrowserFamiliesResponse;
-  export import TopBrowsersResponse = TopAPI.TopBrowsersResponse;
-  export import TopBrowserFamiliesParams = TopAPI.TopBrowserFamiliesParams;
-  export import TopBrowsersParams = TopAPI.TopBrowsersParams;
-  export import Locations = LocationsAPI.Locations;
-  export import LocationGetResponse = LocationsAPI.LocationGetResponse;
-  export import LocationGetParams = LocationsAPI.LocationGetParams;
-  export import Ases = AsesAPI.Ases;
-  export import AseGetResponse = AsesAPI.AseGetResponse;
-  export import AseGetParams = AsesAPI.AseGetParams;
-  export import Summary = SummaryAPI.Summary;
-  export import SummaryBotClassResponse = SummaryAPI.SummaryBotClassResponse;
-  export import SummaryDeviceTypeResponse = SummaryAPI.SummaryDeviceTypeResponse;
-  export import SummaryHTTPProtocolResponse = SummaryAPI.SummaryHTTPProtocolResponse;
-  export import SummaryHTTPVersionResponse = SummaryAPI.SummaryHTTPVersionResponse;
-  export import SummaryIPVersionResponse = SummaryAPI.SummaryIPVersionResponse;
-  export import SummaryOSResponse = SummaryAPI.SummaryOSResponse;
-  export import SummaryPostQuantumResponse = SummaryAPI.SummaryPostQuantumResponse;
-  export import SummaryTLSVersionResponse = SummaryAPI.SummaryTLSVersionResponse;
-  export import SummaryBotClassParams = SummaryAPI.SummaryBotClassParams;
-  export import SummaryDeviceTypeParams = SummaryAPI.SummaryDeviceTypeParams;
-  export import SummaryHTTPProtocolParams = SummaryAPI.SummaryHTTPProtocolParams;
-  export import SummaryHTTPVersionParams = SummaryAPI.SummaryHTTPVersionParams;
-  export import SummaryIPVersionParams = SummaryAPI.SummaryIPVersionParams;
-  export import SummaryOSParams = SummaryAPI.SummaryOSParams;
-  export import SummaryPostQuantumParams = SummaryAPI.SummaryPostQuantumParams;
-  export import SummaryTLSVersionParams = SummaryAPI.SummaryTLSVersionParams;
-  export import TimeseriesGroups = TimeseriesGroupsAPI.TimeseriesGroups;
-  export import TimeseriesGroupBotClassResponse = TimeseriesGroupsAPI.TimeseriesGroupBotClassResponse;
-  export import TimeseriesGroupBrowserResponse = TimeseriesGroupsAPI.TimeseriesGroupBrowserResponse;
-  export import TimeseriesGroupBrowserFamilyResponse = TimeseriesGroupsAPI.TimeseriesGroupBrowserFamilyResponse;
-  export import TimeseriesGroupDeviceTypeResponse = TimeseriesGroupsAPI.TimeseriesGroupDeviceTypeResponse;
-  export import TimeseriesGroupHTTPProtocolResponse = TimeseriesGroupsAPI.TimeseriesGroupHTTPProtocolResponse;
-  export import TimeseriesGroupHTTPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupHTTPVersionResponse;
-  export import TimeseriesGroupIPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupIPVersionResponse;
-  export import TimeseriesGroupOSResponse = TimeseriesGroupsAPI.TimeseriesGroupOSResponse;
-  export import TimeseriesGroupPostQuantumResponse = TimeseriesGroupsAPI.TimeseriesGroupPostQuantumResponse;
-  export import TimeseriesGroupTLSVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupTLSVersionResponse;
-  export import TimeseriesGroupBotClassParams = TimeseriesGroupsAPI.TimeseriesGroupBotClassParams;
-  export import TimeseriesGroupBrowserParams = TimeseriesGroupsAPI.TimeseriesGroupBrowserParams;
-  export import TimeseriesGroupBrowserFamilyParams = TimeseriesGroupsAPI.TimeseriesGroupBrowserFamilyParams;
-  export import TimeseriesGroupDeviceTypeParams = TimeseriesGroupsAPI.TimeseriesGroupDeviceTypeParams;
-  export import TimeseriesGroupHTTPProtocolParams = TimeseriesGroupsAPI.TimeseriesGroupHTTPProtocolParams;
-  export import TimeseriesGroupHTTPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupHTTPVersionParams;
-  export import TimeseriesGroupIPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupIPVersionParams;
-  export import TimeseriesGroupOSParams = TimeseriesGroupsAPI.TimeseriesGroupOSParams;
-  export import TimeseriesGroupPostQuantumParams = TimeseriesGroupsAPI.TimeseriesGroupPostQuantumParams;
-  export import TimeseriesGroupTLSVersionParams = TimeseriesGroupsAPI.TimeseriesGroupTLSVersionParams;
+HTTP.Locations = Locations;
+HTTP.Ases = Ases;
+HTTP.Summary = Summary;
+HTTP.TimeseriesGroups = TimeseriesGroups;
+HTTP.Top = Top;
+
+export declare namespace HTTP {
+  export {
+    type HTTPTimeseriesResponse as HTTPTimeseriesResponse,
+    type HTTPTimeseriesParams as HTTPTimeseriesParams,
+  };
+
+  export {
+    Locations as Locations,
+    type LocationGetResponse as LocationGetResponse,
+    type LocationGetParams as LocationGetParams,
+  };
+
+  export { Ases as Ases, type AseGetResponse as AseGetResponse, type AseGetParams as AseGetParams };
+
+  export {
+    Summary as Summary,
+    type SummaryBotClassResponse as SummaryBotClassResponse,
+    type SummaryDeviceTypeResponse as SummaryDeviceTypeResponse,
+    type SummaryHTTPProtocolResponse as SummaryHTTPProtocolResponse,
+    type SummaryHTTPVersionResponse as SummaryHTTPVersionResponse,
+    type SummaryIPVersionResponse as SummaryIPVersionResponse,
+    type SummaryOSResponse as SummaryOSResponse,
+    type SummaryPostQuantumResponse as SummaryPostQuantumResponse,
+    type SummaryTLSVersionResponse as SummaryTLSVersionResponse,
+    type SummaryBotClassParams as SummaryBotClassParams,
+    type SummaryDeviceTypeParams as SummaryDeviceTypeParams,
+    type SummaryHTTPProtocolParams as SummaryHTTPProtocolParams,
+    type SummaryHTTPVersionParams as SummaryHTTPVersionParams,
+    type SummaryIPVersionParams as SummaryIPVersionParams,
+    type SummaryOSParams as SummaryOSParams,
+    type SummaryPostQuantumParams as SummaryPostQuantumParams,
+    type SummaryTLSVersionParams as SummaryTLSVersionParams,
+  };
+
+  export {
+    TimeseriesGroups as TimeseriesGroups,
+    type TimeseriesGroupBotClassResponse as TimeseriesGroupBotClassResponse,
+    type TimeseriesGroupBrowserResponse as TimeseriesGroupBrowserResponse,
+    type TimeseriesGroupBrowserFamilyResponse as TimeseriesGroupBrowserFamilyResponse,
+    type TimeseriesGroupDeviceTypeResponse as TimeseriesGroupDeviceTypeResponse,
+    type TimeseriesGroupHTTPProtocolResponse as TimeseriesGroupHTTPProtocolResponse,
+    type TimeseriesGroupHTTPVersionResponse as TimeseriesGroupHTTPVersionResponse,
+    type TimeseriesGroupIPVersionResponse as TimeseriesGroupIPVersionResponse,
+    type TimeseriesGroupOSResponse as TimeseriesGroupOSResponse,
+    type TimeseriesGroupPostQuantumResponse as TimeseriesGroupPostQuantumResponse,
+    type TimeseriesGroupTLSVersionResponse as TimeseriesGroupTLSVersionResponse,
+    type TimeseriesGroupBotClassParams as TimeseriesGroupBotClassParams,
+    type TimeseriesGroupBrowserParams as TimeseriesGroupBrowserParams,
+    type TimeseriesGroupBrowserFamilyParams as TimeseriesGroupBrowserFamilyParams,
+    type TimeseriesGroupDeviceTypeParams as TimeseriesGroupDeviceTypeParams,
+    type TimeseriesGroupHTTPProtocolParams as TimeseriesGroupHTTPProtocolParams,
+    type TimeseriesGroupHTTPVersionParams as TimeseriesGroupHTTPVersionParams,
+    type TimeseriesGroupIPVersionParams as TimeseriesGroupIPVersionParams,
+    type TimeseriesGroupOSParams as TimeseriesGroupOSParams,
+    type TimeseriesGroupPostQuantumParams as TimeseriesGroupPostQuantumParams,
+    type TimeseriesGroupTLSVersionParams as TimeseriesGroupTLSVersionParams,
+  };
+
+  export {
+    Top as Top,
+    type TopBrowserResponse as TopBrowserResponse,
+    type TopBrowserFamilyResponse as TopBrowserFamilyResponse,
+    type TopBrowserParams as TopBrowserParams,
+    type TopBrowserFamilyParams as TopBrowserFamilyParams,
+  };
 }
diff --git a/src/resources/radar/http/index.ts b/src/resources/radar/http/index.ts
index 5771a8ead1..cd20232224 100644
--- a/src/resources/radar/http/index.ts
+++ b/src/resources/radar/http/index.ts
@@ -1,55 +1,54 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { AseGetResponse, AseGetParams, Ases } from './ases/index';
+export { Ases, type AseGetResponse, type AseGetParams } from './ases/index';
+export { HTTP, type HTTPTimeseriesResponse, type HTTPTimeseriesParams } from './http';
+export { Locations, type LocationGetResponse, type LocationGetParams } from './locations/index';
 export {
-  Browser,
-  TopBrowserFamiliesResponse,
-  TopBrowsersResponse,
-  TopBrowserFamiliesParams,
-  TopBrowsersParams,
-  Top,
-} from './top';
-export { HTTPTimeseriesResponse, HTTPTimeseriesParams, HTTP } from './http';
-export { LocationGetResponse, LocationGetParams, Locations } from './locations/index';
-export {
-  SummaryBotClassResponse,
-  SummaryDeviceTypeResponse,
-  SummaryHTTPProtocolResponse,
-  SummaryHTTPVersionResponse,
-  SummaryIPVersionResponse,
-  SummaryOSResponse,
-  SummaryPostQuantumResponse,
-  SummaryTLSVersionResponse,
-  SummaryBotClassParams,
-  SummaryDeviceTypeParams,
-  SummaryHTTPProtocolParams,
-  SummaryHTTPVersionParams,
-  SummaryIPVersionParams,
-  SummaryOSParams,
-  SummaryPostQuantumParams,
-  SummaryTLSVersionParams,
   Summary,
+  type SummaryBotClassResponse,
+  type SummaryDeviceTypeResponse,
+  type SummaryHTTPProtocolResponse,
+  type SummaryHTTPVersionResponse,
+  type SummaryIPVersionResponse,
+  type SummaryOSResponse,
+  type SummaryPostQuantumResponse,
+  type SummaryTLSVersionResponse,
+  type SummaryBotClassParams,
+  type SummaryDeviceTypeParams,
+  type SummaryHTTPProtocolParams,
+  type SummaryHTTPVersionParams,
+  type SummaryIPVersionParams,
+  type SummaryOSParams,
+  type SummaryPostQuantumParams,
+  type SummaryTLSVersionParams,
 } from './summary';
 export {
-  TimeseriesGroupBotClassResponse,
-  TimeseriesGroupBrowserResponse,
-  TimeseriesGroupBrowserFamilyResponse,
-  TimeseriesGroupDeviceTypeResponse,
-  TimeseriesGroupHTTPProtocolResponse,
-  TimeseriesGroupHTTPVersionResponse,
-  TimeseriesGroupIPVersionResponse,
-  TimeseriesGroupOSResponse,
-  TimeseriesGroupPostQuantumResponse,
-  TimeseriesGroupTLSVersionResponse,
-  TimeseriesGroupBotClassParams,
-  TimeseriesGroupBrowserParams,
-  TimeseriesGroupBrowserFamilyParams,
-  TimeseriesGroupDeviceTypeParams,
-  TimeseriesGroupHTTPProtocolParams,
-  TimeseriesGroupHTTPVersionParams,
-  TimeseriesGroupIPVersionParams,
-  TimeseriesGroupOSParams,
-  TimeseriesGroupPostQuantumParams,
-  TimeseriesGroupTLSVersionParams,
   TimeseriesGroups,
+  type TimeseriesGroupBotClassResponse,
+  type TimeseriesGroupBrowserResponse,
+  type TimeseriesGroupBrowserFamilyResponse,
+  type TimeseriesGroupDeviceTypeResponse,
+  type TimeseriesGroupHTTPProtocolResponse,
+  type TimeseriesGroupHTTPVersionResponse,
+  type TimeseriesGroupIPVersionResponse,
+  type TimeseriesGroupOSResponse,
+  type TimeseriesGroupPostQuantumResponse,
+  type TimeseriesGroupTLSVersionResponse,
+  type TimeseriesGroupBotClassParams,
+  type TimeseriesGroupBrowserParams,
+  type TimeseriesGroupBrowserFamilyParams,
+  type TimeseriesGroupDeviceTypeParams,
+  type TimeseriesGroupHTTPProtocolParams,
+  type TimeseriesGroupHTTPVersionParams,
+  type TimeseriesGroupIPVersionParams,
+  type TimeseriesGroupOSParams,
+  type TimeseriesGroupPostQuantumParams,
+  type TimeseriesGroupTLSVersionParams,
 } from './timeseries-groups';
+export {
+  Top,
+  type TopBrowserResponse,
+  type TopBrowserFamilyResponse,
+  type TopBrowserParams,
+  type TopBrowserFamilyParams,
+} from './top';
diff --git a/src/resources/radar/http/locations/bot-class.ts b/src/resources/radar/http/locations/bot-class.ts
index 4c31289d5a..862368003c 100644
--- a/src/resources/radar/http/locations/bot-class.ts
+++ b/src/resources/radar/http/locations/bot-class.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as BotClassAPI from './bot-class';
 
 export class BotClass extends APIResource {
   /**
@@ -190,7 +189,6 @@ export interface BotClassGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace BotClass {
-  export import BotClassGetResponse = BotClassAPI.BotClassGetResponse;
-  export import BotClassGetParams = BotClassAPI.BotClassGetParams;
+export declare namespace BotClass {
+  export { type BotClassGetResponse as BotClassGetResponse, type BotClassGetParams as BotClassGetParams };
 }
diff --git a/src/resources/radar/http/locations/browser-family.ts b/src/resources/radar/http/locations/browser-family.ts
index 37d36ef603..4f852e9f1e 100644
--- a/src/resources/radar/http/locations/browser-family.ts
+++ b/src/resources/radar/http/locations/browser-family.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as BrowserFamilyAPI from './browser-family';
 
 export class BrowserFamily extends APIResource {
   /**
@@ -189,7 +188,9 @@ export interface BrowserFamilyGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace BrowserFamily {
-  export import BrowserFamilyGetResponse = BrowserFamilyAPI.BrowserFamilyGetResponse;
-  export import BrowserFamilyGetParams = BrowserFamilyAPI.BrowserFamilyGetParams;
+export declare namespace BrowserFamily {
+  export {
+    type BrowserFamilyGetResponse as BrowserFamilyGetResponse,
+    type BrowserFamilyGetParams as BrowserFamilyGetParams,
+  };
 }
diff --git a/src/resources/radar/http/locations/device-type.ts b/src/resources/radar/http/locations/device-type.ts
index 509bee7038..f772e35ec0 100644
--- a/src/resources/radar/http/locations/device-type.ts
+++ b/src/resources/radar/http/locations/device-type.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as DeviceTypeAPI from './device-type';
 
 export class DeviceType extends APIResource {
   /**
@@ -189,7 +188,9 @@ export interface DeviceTypeGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace DeviceType {
-  export import DeviceTypeGetResponse = DeviceTypeAPI.DeviceTypeGetResponse;
-  export import DeviceTypeGetParams = DeviceTypeAPI.DeviceTypeGetParams;
+export declare namespace DeviceType {
+  export {
+    type DeviceTypeGetResponse as DeviceTypeGetResponse,
+    type DeviceTypeGetParams as DeviceTypeGetParams,
+  };
 }
diff --git a/src/resources/radar/http/locations/http-method.ts b/src/resources/radar/http/locations/http-method.ts
index 27add60ece..480fa7b076 100644
--- a/src/resources/radar/http/locations/http-method.ts
+++ b/src/resources/radar/http/locations/http-method.ts
@@ -3,11 +3,10 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as HTTPMethodAPI from './http-method';
 
 export class HTTPMethod extends APIResource {
   /**
-   * Get the top locations, by HTTP traffic, of the requested HTTP protocol. Values
+   * Get the top locations, by HTTP traffic, of the requested HTTP version. Values
    * are a percentage out of the total traffic.
    */
   get(
@@ -189,7 +188,9 @@ export interface HTTPMethodGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace HTTPMethod {
-  export import HTTPMethodGetResponse = HTTPMethodAPI.HTTPMethodGetResponse;
-  export import HTTPMethodGetParams = HTTPMethodAPI.HTTPMethodGetParams;
+export declare namespace HTTPMethod {
+  export {
+    type HTTPMethodGetResponse as HTTPMethodGetResponse,
+    type HTTPMethodGetParams as HTTPMethodGetParams,
+  };
 }
diff --git a/src/resources/radar/http/locations/http-protocol.ts b/src/resources/radar/http/locations/http-protocol.ts
index 10ae2ee392..92af13c25a 100644
--- a/src/resources/radar/http/locations/http-protocol.ts
+++ b/src/resources/radar/http/locations/http-protocol.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as HTTPProtocolAPI from './http-protocol';
 
 export class HTTPProtocol extends APIResource {
   /**
@@ -184,7 +183,9 @@ export interface HTTPProtocolGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace HTTPProtocol {
-  export import HTTPProtocolGetResponse = HTTPProtocolAPI.HTTPProtocolGetResponse;
-  export import HTTPProtocolGetParams = HTTPProtocolAPI.HTTPProtocolGetParams;
+export declare namespace HTTPProtocol {
+  export {
+    type HTTPProtocolGetResponse as HTTPProtocolGetResponse,
+    type HTTPProtocolGetParams as HTTPProtocolGetParams,
+  };
 }
diff --git a/src/resources/radar/http/locations/index.ts b/src/resources/radar/http/locations/index.ts
index c1bf9e23b8..4af7184433 100644
--- a/src/resources/radar/http/locations/index.ts
+++ b/src/resources/radar/http/locations/index.ts
@@ -1,11 +1,11 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { BotClassGetResponse, BotClassGetParams, BotClass } from './bot-class';
-export { BrowserFamilyGetResponse, BrowserFamilyGetParams, BrowserFamily } from './browser-family';
-export { DeviceTypeGetResponse, DeviceTypeGetParams, DeviceType } from './device-type';
-export { HTTPMethodGetResponse, HTTPMethodGetParams, HTTPMethod } from './http-method';
-export { HTTPProtocolGetResponse, HTTPProtocolGetParams, HTTPProtocol } from './http-protocol';
-export { IPVersionGetResponse, IPVersionGetParams, IPVersion } from './ip-version';
-export { LocationGetResponse, LocationGetParams, Locations } from './locations';
-export { OSGetResponse, OSGetParams, OS } from './os';
-export { TLSVersionGetResponse, TLSVersionGetParams, TLSVersion } from './tls-version';
+export { BotClass, type BotClassGetResponse, type BotClassGetParams } from './bot-class';
+export { BrowserFamily, type BrowserFamilyGetResponse, type BrowserFamilyGetParams } from './browser-family';
+export { DeviceType, type DeviceTypeGetResponse, type DeviceTypeGetParams } from './device-type';
+export { HTTPMethod, type HTTPMethodGetResponse, type HTTPMethodGetParams } from './http-method';
+export { HTTPProtocol, type HTTPProtocolGetResponse, type HTTPProtocolGetParams } from './http-protocol';
+export { IPVersion, type IPVersionGetResponse, type IPVersionGetParams } from './ip-version';
+export { Locations, type LocationGetResponse, type LocationGetParams } from './locations';
+export { OS, type OSGetResponse, type OSGetParams } from './os';
+export { TLSVersion, type TLSVersionGetResponse, type TLSVersionGetParams } from './tls-version';
diff --git a/src/resources/radar/http/locations/ip-version.ts b/src/resources/radar/http/locations/ip-version.ts
index bedb0719e9..bd3cbcd97b 100644
--- a/src/resources/radar/http/locations/ip-version.ts
+++ b/src/resources/radar/http/locations/ip-version.ts
@@ -3,12 +3,11 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as IPVersionAPI from './ip-version';
 
 export class IPVersion extends APIResource {
   /**
-   * Get the top locations, by HTTP traffic, of the requested IP protocol version.
-   * Values are a percentage out of the total traffic.
+   * Get the top locations, by HTTP traffic, of the requested IP version. Values are
+   * a percentage out of the total traffic.
    */
   get(
     ipVersion: 'IPv4' | 'IPv6',
@@ -186,7 +185,6 @@ export interface IPVersionGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace IPVersion {
-  export import IPVersionGetResponse = IPVersionAPI.IPVersionGetResponse;
-  export import IPVersionGetParams = IPVersionAPI.IPVersionGetParams;
+export declare namespace IPVersion {
+  export { type IPVersionGetResponse as IPVersionGetResponse, type IPVersionGetParams as IPVersionGetParams };
 }
diff --git a/src/resources/radar/http/locations/locations.ts b/src/resources/radar/http/locations/locations.ts
index adb4f5788f..aa69ce07e3 100644
--- a/src/resources/radar/http/locations/locations.ts
+++ b/src/resources/radar/http/locations/locations.ts
@@ -3,15 +3,22 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as LocationsAPI from './locations';
 import * as BotClassAPI from './bot-class';
+import { BotClass, BotClassGetParams, BotClassGetResponse } from './bot-class';
 import * as BrowserFamilyAPI from './browser-family';
+import { BrowserFamily, BrowserFamilyGetParams, BrowserFamilyGetResponse } from './browser-family';
 import * as DeviceTypeAPI from './device-type';
+import { DeviceType, DeviceTypeGetParams, DeviceTypeGetResponse } from './device-type';
 import * as HTTPMethodAPI from './http-method';
+import { HTTPMethod, HTTPMethodGetParams, HTTPMethodGetResponse } from './http-method';
 import * as HTTPProtocolAPI from './http-protocol';
+import { HTTPProtocol, HTTPProtocolGetParams, HTTPProtocolGetResponse } from './http-protocol';
 import * as IPVersionAPI from './ip-version';
+import { IPVersion, IPVersionGetParams, IPVersionGetResponse } from './ip-version';
 import * as OSAPI from './os';
+import { OS, OSGetParams, OSGetResponse } from './os';
 import * as TLSVersionAPI from './tls-version';
+import { TLSVersion, TLSVersionGetParams, TLSVersionGetResponse } from './tls-version';
 
 export class Locations extends APIResource {
   botClass: BotClassAPI.BotClass = new BotClassAPI.BotClass(this._client);
@@ -202,31 +209,59 @@ export interface LocationGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace Locations {
-  export import LocationGetResponse = LocationsAPI.LocationGetResponse;
-  export import LocationGetParams = LocationsAPI.LocationGetParams;
-  export import BotClass = BotClassAPI.BotClass;
-  export import BotClassGetResponse = BotClassAPI.BotClassGetResponse;
-  export import BotClassGetParams = BotClassAPI.BotClassGetParams;
-  export import DeviceType = DeviceTypeAPI.DeviceType;
-  export import DeviceTypeGetResponse = DeviceTypeAPI.DeviceTypeGetResponse;
-  export import DeviceTypeGetParams = DeviceTypeAPI.DeviceTypeGetParams;
-  export import HTTPProtocol = HTTPProtocolAPI.HTTPProtocol;
-  export import HTTPProtocolGetResponse = HTTPProtocolAPI.HTTPProtocolGetResponse;
-  export import HTTPProtocolGetParams = HTTPProtocolAPI.HTTPProtocolGetParams;
-  export import HTTPMethod = HTTPMethodAPI.HTTPMethod;
-  export import HTTPMethodGetResponse = HTTPMethodAPI.HTTPMethodGetResponse;
-  export import HTTPMethodGetParams = HTTPMethodAPI.HTTPMethodGetParams;
-  export import IPVersion = IPVersionAPI.IPVersion;
-  export import IPVersionGetResponse = IPVersionAPI.IPVersionGetResponse;
-  export import IPVersionGetParams = IPVersionAPI.IPVersionGetParams;
-  export import OS = OSAPI.OS;
-  export import OSGetResponse = OSAPI.OSGetResponse;
-  export import OSGetParams = OSAPI.OSGetParams;
-  export import TLSVersion = TLSVersionAPI.TLSVersion;
-  export import TLSVersionGetResponse = TLSVersionAPI.TLSVersionGetResponse;
-  export import TLSVersionGetParams = TLSVersionAPI.TLSVersionGetParams;
-  export import BrowserFamily = BrowserFamilyAPI.BrowserFamily;
-  export import BrowserFamilyGetResponse = BrowserFamilyAPI.BrowserFamilyGetResponse;
-  export import BrowserFamilyGetParams = BrowserFamilyAPI.BrowserFamilyGetParams;
+Locations.BotClass = BotClass;
+Locations.DeviceType = DeviceType;
+Locations.HTTPProtocol = HTTPProtocol;
+Locations.HTTPMethod = HTTPMethod;
+Locations.IPVersion = IPVersion;
+Locations.OS = OS;
+Locations.TLSVersion = TLSVersion;
+Locations.BrowserFamily = BrowserFamily;
+
+export declare namespace Locations {
+  export { type LocationGetResponse as LocationGetResponse, type LocationGetParams as LocationGetParams };
+
+  export {
+    BotClass as BotClass,
+    type BotClassGetResponse as BotClassGetResponse,
+    type BotClassGetParams as BotClassGetParams,
+  };
+
+  export {
+    DeviceType as DeviceType,
+    type DeviceTypeGetResponse as DeviceTypeGetResponse,
+    type DeviceTypeGetParams as DeviceTypeGetParams,
+  };
+
+  export {
+    HTTPProtocol as HTTPProtocol,
+    type HTTPProtocolGetResponse as HTTPProtocolGetResponse,
+    type HTTPProtocolGetParams as HTTPProtocolGetParams,
+  };
+
+  export {
+    HTTPMethod as HTTPMethod,
+    type HTTPMethodGetResponse as HTTPMethodGetResponse,
+    type HTTPMethodGetParams as HTTPMethodGetParams,
+  };
+
+  export {
+    IPVersion as IPVersion,
+    type IPVersionGetResponse as IPVersionGetResponse,
+    type IPVersionGetParams as IPVersionGetParams,
+  };
+
+  export { OS as OS, type OSGetResponse as OSGetResponse, type OSGetParams as OSGetParams };
+
+  export {
+    TLSVersion as TLSVersion,
+    type TLSVersionGetResponse as TLSVersionGetResponse,
+    type TLSVersionGetParams as TLSVersionGetParams,
+  };
+
+  export {
+    BrowserFamily as BrowserFamily,
+    type BrowserFamilyGetResponse as BrowserFamilyGetResponse,
+    type BrowserFamilyGetParams as BrowserFamilyGetParams,
+  };
 }
diff --git a/src/resources/radar/http/locations/os.ts b/src/resources/radar/http/locations/os.ts
index fc42106a10..b73f727137 100644
--- a/src/resources/radar/http/locations/os.ts
+++ b/src/resources/radar/http/locations/os.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as OSAPI from './os';
 
 export class OS extends APIResource {
   /**
@@ -188,7 +187,6 @@ export interface OSGetParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace OS {
-  export import OSGetResponse = OSAPI.OSGetResponse;
-  export import OSGetParams = OSAPI.OSGetParams;
+export declare namespace OS {
+  export { type OSGetResponse as OSGetResponse, type OSGetParams as OSGetParams };
 }
diff --git a/src/resources/radar/http/locations/tls-version.ts b/src/resources/radar/http/locations/tls-version.ts
index 84e38f4ae3..0642feb239 100644
--- a/src/resources/radar/http/locations/tls-version.ts
+++ b/src/resources/radar/http/locations/tls-version.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as TLSVersionAPI from './tls-version';
 
 export class TLSVersion extends APIResource {
   /**
@@ -189,7 +188,9 @@ export interface TLSVersionGetParams {
   os?: Array<'WINDOWS' | 'MACOSX' | 'IOS' | 'ANDROID' | 'CHROMEOS' | 'LINUX' | 'SMART_TV'>;
 }
 
-export namespace TLSVersion {
-  export import TLSVersionGetResponse = TLSVersionAPI.TLSVersionGetResponse;
-  export import TLSVersionGetParams = TLSVersionAPI.TLSVersionGetParams;
+export declare namespace TLSVersion {
+  export {
+    type TLSVersionGetResponse as TLSVersionGetResponse,
+    type TLSVersionGetParams as TLSVersionGetParams,
+  };
 }
diff --git a/src/resources/radar/http/summary.ts b/src/resources/radar/http/summary.ts
index 246143509c..23d48b2c45 100644
--- a/src/resources/radar/http/summary.ts
+++ b/src/resources/radar/http/summary.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as SummaryAPI from './summary';
 
 export class Summary extends APIResource {
   /**
@@ -33,7 +32,7 @@ export class Summary extends APIResource {
 
   /**
    * Percentage of Internet traffic generated by mobile, desktop, and other types of
-   * devices, over a given time period.
+   * devices over a given time period.
    */
   deviceType(
     query?: SummaryDeviceTypeParams,
@@ -55,7 +54,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of traffic per HTTP protocol over a given time period.
+   * Percentage distribution of traffic by HTTP protocol over a given time period.
    */
   httpProtocol(
     query?: SummaryHTTPProtocolParams,
@@ -77,8 +76,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of traffic per HTTP protocol version over a given time
-   * period.
+   * Percentage distribution of traffic by HTTP version over a given time period.
    */
   httpVersion(
     query?: SummaryHTTPVersionParams,
@@ -100,8 +98,8 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of Internet traffic based on IP protocol versions, such
-   * as IPv4 and IPv6, over a given time period.
+   * Percentage distribution of Internet traffic based on IP versions (IPv4 and IPv6)
+   * over a given time period.
    */
   ipVersion(
     query?: SummaryIPVersionParams,
@@ -143,7 +141,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of traffic per Post Quantum support over a given time
+   * Percentage distribution of traffic by post-quantum support over a given time
    * period.
    */
   postQuantum(
@@ -166,7 +164,7 @@ export class Summary extends APIResource {
   }
 
   /**
-   * Percentage distribution of traffic per TLS protocol version, over a given time
+   * Percentage distribution of traffic by TLS protocol version, over a given time
    * period.
    */
   tlsVersion(
@@ -1347,21 +1345,23 @@ export interface SummaryTLSVersionParams {
   os?: Array<'WINDOWS' | 'MACOSX' | 'IOS' | 'ANDROID' | 'CHROMEOS' | 'LINUX' | 'SMART_TV'>;
 }
 
-export namespace Summary {
-  export import SummaryBotClassResponse = SummaryAPI.SummaryBotClassResponse;
-  export import SummaryDeviceTypeResponse = SummaryAPI.SummaryDeviceTypeResponse;
-  export import SummaryHTTPProtocolResponse = SummaryAPI.SummaryHTTPProtocolResponse;
-  export import SummaryHTTPVersionResponse = SummaryAPI.SummaryHTTPVersionResponse;
-  export import SummaryIPVersionResponse = SummaryAPI.SummaryIPVersionResponse;
-  export import SummaryOSResponse = SummaryAPI.SummaryOSResponse;
-  export import SummaryPostQuantumResponse = SummaryAPI.SummaryPostQuantumResponse;
-  export import SummaryTLSVersionResponse = SummaryAPI.SummaryTLSVersionResponse;
-  export import SummaryBotClassParams = SummaryAPI.SummaryBotClassParams;
-  export import SummaryDeviceTypeParams = SummaryAPI.SummaryDeviceTypeParams;
-  export import SummaryHTTPProtocolParams = SummaryAPI.SummaryHTTPProtocolParams;
-  export import SummaryHTTPVersionParams = SummaryAPI.SummaryHTTPVersionParams;
-  export import SummaryIPVersionParams = SummaryAPI.SummaryIPVersionParams;
-  export import SummaryOSParams = SummaryAPI.SummaryOSParams;
-  export import SummaryPostQuantumParams = SummaryAPI.SummaryPostQuantumParams;
-  export import SummaryTLSVersionParams = SummaryAPI.SummaryTLSVersionParams;
+export declare namespace Summary {
+  export {
+    type SummaryBotClassResponse as SummaryBotClassResponse,
+    type SummaryDeviceTypeResponse as SummaryDeviceTypeResponse,
+    type SummaryHTTPProtocolResponse as SummaryHTTPProtocolResponse,
+    type SummaryHTTPVersionResponse as SummaryHTTPVersionResponse,
+    type SummaryIPVersionResponse as SummaryIPVersionResponse,
+    type SummaryOSResponse as SummaryOSResponse,
+    type SummaryPostQuantumResponse as SummaryPostQuantumResponse,
+    type SummaryTLSVersionResponse as SummaryTLSVersionResponse,
+    type SummaryBotClassParams as SummaryBotClassParams,
+    type SummaryDeviceTypeParams as SummaryDeviceTypeParams,
+    type SummaryHTTPProtocolParams as SummaryHTTPProtocolParams,
+    type SummaryHTTPVersionParams as SummaryHTTPVersionParams,
+    type SummaryIPVersionParams as SummaryIPVersionParams,
+    type SummaryOSParams as SummaryOSParams,
+    type SummaryPostQuantumParams as SummaryPostQuantumParams,
+    type SummaryTLSVersionParams as SummaryTLSVersionParams,
+  };
 }
diff --git a/src/resources/radar/http/timeseries-groups.ts b/src/resources/radar/http/timeseries-groups.ts
index fe8a78cd19..8477127b16 100644
--- a/src/resources/radar/http/timeseries-groups.ts
+++ b/src/resources/radar/http/timeseries-groups.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as TimeseriesGroupsAPI from './timeseries-groups';
 
 export class TimeseriesGroups extends APIResource {
   /**
@@ -79,7 +78,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Get a time series of the percentage distribution of traffic per device type.
+   * Get a time series of the percentage distribution of traffic by device type.
    */
   deviceType(
     query?: TimeseriesGroupDeviceTypeParams,
@@ -102,7 +101,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Get a time series of the percentage distribution of traffic per HTTP protocol.
+   * Get a time series of the percentage distribution of traffic by HTTP protocol.
    */
   httpProtocol(
     query?: TimeseriesGroupHTTPProtocolParams,
@@ -125,8 +124,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Get a time series of the percentage distribution of traffic per HTTP protocol
-   * version.
+   * Get a time series of the percentage distribution of traffic by HTTP version.
    */
   httpVersion(
     query?: TimeseriesGroupHTTPVersionParams,
@@ -149,8 +147,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Get a time series of the percentage distribution of traffic per IP protocol
-   * version.
+   * Get a time series of the percentage distribution of traffic by IP version.
    */
   ipVersion(
     query?: TimeseriesGroupIPVersionParams,
@@ -195,7 +192,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Get a time series of the percentage distribution of traffic per Post Quantum
+   * Get a time series of the percentage distribution of traffic by post-quantum
    * suport.
    */
   postQuantum(
@@ -219,7 +216,7 @@ export class TimeseriesGroups extends APIResource {
   }
 
   /**
-   * Get a time series of the percentage distribution of traffic per TLS protocol
+   * Get a time series of the percentage distribution of traffic by TLS protocol
    * version.
    */
   tlsVersion(
@@ -660,6 +657,12 @@ export interface TimeseriesGroupBrowserFamilyParams {
    */
   ipVersion?: Array<'IPv4' | 'IPv6'>;
 
+  /**
+   * Limit the number of objects (eg browsers, verticals, etc) to the top items over
+   * the time range.
+   */
+  limitPerGroup?: number;
+
   /**
    * Array of comma separated list of locations (alpha-2 country codes). Start with
    * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
@@ -1304,25 +1307,27 @@ export interface TimeseriesGroupTLSVersionParams {
   os?: Array<'WINDOWS' | 'MACOSX' | 'IOS' | 'ANDROID' | 'CHROMEOS' | 'LINUX' | 'SMART_TV'>;
 }
 
-export namespace TimeseriesGroups {
-  export import TimeseriesGroupBotClassResponse = TimeseriesGroupsAPI.TimeseriesGroupBotClassResponse;
-  export import TimeseriesGroupBrowserResponse = TimeseriesGroupsAPI.TimeseriesGroupBrowserResponse;
-  export import TimeseriesGroupBrowserFamilyResponse = TimeseriesGroupsAPI.TimeseriesGroupBrowserFamilyResponse;
-  export import TimeseriesGroupDeviceTypeResponse = TimeseriesGroupsAPI.TimeseriesGroupDeviceTypeResponse;
-  export import TimeseriesGroupHTTPProtocolResponse = TimeseriesGroupsAPI.TimeseriesGroupHTTPProtocolResponse;
-  export import TimeseriesGroupHTTPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupHTTPVersionResponse;
-  export import TimeseriesGroupIPVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupIPVersionResponse;
-  export import TimeseriesGroupOSResponse = TimeseriesGroupsAPI.TimeseriesGroupOSResponse;
-  export import TimeseriesGroupPostQuantumResponse = TimeseriesGroupsAPI.TimeseriesGroupPostQuantumResponse;
-  export import TimeseriesGroupTLSVersionResponse = TimeseriesGroupsAPI.TimeseriesGroupTLSVersionResponse;
-  export import TimeseriesGroupBotClassParams = TimeseriesGroupsAPI.TimeseriesGroupBotClassParams;
-  export import TimeseriesGroupBrowserParams = TimeseriesGroupsAPI.TimeseriesGroupBrowserParams;
-  export import TimeseriesGroupBrowserFamilyParams = TimeseriesGroupsAPI.TimeseriesGroupBrowserFamilyParams;
-  export import TimeseriesGroupDeviceTypeParams = TimeseriesGroupsAPI.TimeseriesGroupDeviceTypeParams;
-  export import TimeseriesGroupHTTPProtocolParams = TimeseriesGroupsAPI.TimeseriesGroupHTTPProtocolParams;
-  export import TimeseriesGroupHTTPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupHTTPVersionParams;
-  export import TimeseriesGroupIPVersionParams = TimeseriesGroupsAPI.TimeseriesGroupIPVersionParams;
-  export import TimeseriesGroupOSParams = TimeseriesGroupsAPI.TimeseriesGroupOSParams;
-  export import TimeseriesGroupPostQuantumParams = TimeseriesGroupsAPI.TimeseriesGroupPostQuantumParams;
-  export import TimeseriesGroupTLSVersionParams = TimeseriesGroupsAPI.TimeseriesGroupTLSVersionParams;
+export declare namespace TimeseriesGroups {
+  export {
+    type TimeseriesGroupBotClassResponse as TimeseriesGroupBotClassResponse,
+    type TimeseriesGroupBrowserResponse as TimeseriesGroupBrowserResponse,
+    type TimeseriesGroupBrowserFamilyResponse as TimeseriesGroupBrowserFamilyResponse,
+    type TimeseriesGroupDeviceTypeResponse as TimeseriesGroupDeviceTypeResponse,
+    type TimeseriesGroupHTTPProtocolResponse as TimeseriesGroupHTTPProtocolResponse,
+    type TimeseriesGroupHTTPVersionResponse as TimeseriesGroupHTTPVersionResponse,
+    type TimeseriesGroupIPVersionResponse as TimeseriesGroupIPVersionResponse,
+    type TimeseriesGroupOSResponse as TimeseriesGroupOSResponse,
+    type TimeseriesGroupPostQuantumResponse as TimeseriesGroupPostQuantumResponse,
+    type TimeseriesGroupTLSVersionResponse as TimeseriesGroupTLSVersionResponse,
+    type TimeseriesGroupBotClassParams as TimeseriesGroupBotClassParams,
+    type TimeseriesGroupBrowserParams as TimeseriesGroupBrowserParams,
+    type TimeseriesGroupBrowserFamilyParams as TimeseriesGroupBrowserFamilyParams,
+    type TimeseriesGroupDeviceTypeParams as TimeseriesGroupDeviceTypeParams,
+    type TimeseriesGroupHTTPProtocolParams as TimeseriesGroupHTTPProtocolParams,
+    type TimeseriesGroupHTTPVersionParams as TimeseriesGroupHTTPVersionParams,
+    type TimeseriesGroupIPVersionParams as TimeseriesGroupIPVersionParams,
+    type TimeseriesGroupOSParams as TimeseriesGroupOSParams,
+    type TimeseriesGroupPostQuantumParams as TimeseriesGroupPostQuantumParams,
+    type TimeseriesGroupTLSVersionParams as TimeseriesGroupTLSVersionParams,
+  };
 }
diff --git a/src/resources/radar/http/top.ts b/src/resources/radar/http/top.ts
index 160d6abd27..b1c8f5506b 100644
--- a/src/resources/radar/http/top.ts
+++ b/src/resources/radar/http/top.ts
@@ -3,66 +3,59 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as TopAPI from './top';
 
 export class Top extends APIResource {
   /**
-   * Get the top user agents aggregated in families by HTTP traffic. Values are a
-   * percentage out of the total traffic.
+   * Get the top user agents by HTTP traffic. Values are a percentage out of the
+   * total traffic.
    */
-  browserFamilies(
-    query?: TopBrowserFamiliesParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<TopBrowserFamiliesResponse>;
-  browserFamilies(options?: Core.RequestOptions): Core.APIPromise<TopBrowserFamiliesResponse>;
-  browserFamilies(
-    query: TopBrowserFamiliesParams | Core.RequestOptions = {},
+  browser(query?: TopBrowserParams, options?: Core.RequestOptions): Core.APIPromise<TopBrowserResponse>;
+  browser(options?: Core.RequestOptions): Core.APIPromise<TopBrowserResponse>;
+  browser(
+    query: TopBrowserParams | Core.RequestOptions = {},
     options?: Core.RequestOptions,
-  ): Core.APIPromise<TopBrowserFamiliesResponse> {
+  ): Core.APIPromise<TopBrowserResponse> {
     if (isRequestOptions(query)) {
-      return this.browserFamilies({}, query);
+      return this.browser({}, query);
     }
     return (
-      this._client.get('/radar/http/top/browser_families', { query, ...options }) as Core.APIPromise<{
-        result: TopBrowserFamiliesResponse;
+      this._client.get('/radar/http/top/browser', { query, ...options }) as Core.APIPromise<{
+        result: TopBrowserResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Get the top user agents by HTTP traffic. Values are a percentage out of the
-   * total traffic.
+   * Get the top user agents aggregated in families by HTTP traffic. Values are a
+   * percentage out of the total traffic.
    */
-  browsers(query?: TopBrowsersParams, options?: Core.RequestOptions): Core.APIPromise<TopBrowsersResponse>;
-  browsers(options?: Core.RequestOptions): Core.APIPromise<TopBrowsersResponse>;
-  browsers(
-    query: TopBrowsersParams | Core.RequestOptions = {},
+  browserFamily(
+    query?: TopBrowserFamilyParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TopBrowserFamilyResponse>;
+  browserFamily(options?: Core.RequestOptions): Core.APIPromise<TopBrowserFamilyResponse>;
+  browserFamily(
+    query: TopBrowserFamilyParams | Core.RequestOptions = {},
     options?: Core.RequestOptions,
-  ): Core.APIPromise<TopBrowsersResponse> {
+  ): Core.APIPromise<TopBrowserFamilyResponse> {
     if (isRequestOptions(query)) {
-      return this.browsers({}, query);
+      return this.browserFamily({}, query);
     }
     return (
-      this._client.get('/radar/http/top/browsers', { query, ...options }) as Core.APIPromise<{
-        result: TopBrowsersResponse;
+      this._client.get('/radar/http/top/browser_family', { query, ...options }) as Core.APIPromise<{
+        result: TopBrowserFamilyResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export interface Browser {
-  name: string;
+export interface TopBrowserResponse {
+  meta: TopBrowserResponse.Meta;
 
-  value: string;
+  top_0: Array<TopBrowserResponse.Top0>;
 }
 
-export interface TopBrowserFamiliesResponse {
-  meta: TopBrowserFamiliesResponse.Meta;
-
-  top_0: Array<Browser>;
-}
-
-export namespace TopBrowserFamiliesResponse {
+export namespace TopBrowserResponse {
   export interface Meta {
     dateRange: Array<Meta.DateRange>;
 
@@ -108,15 +101,21 @@ export namespace TopBrowserFamiliesResponse {
       }
     }
   }
+
+  export interface Top0 {
+    name: string;
+
+    value: string;
+  }
 }
 
-export interface TopBrowsersResponse {
-  meta: TopBrowsersResponse.Meta;
+export interface TopBrowserFamilyResponse {
+  meta: TopBrowserFamilyResponse.Meta;
 
-  top_0: Array<Browser>;
+  top_0: Array<TopBrowserFamilyResponse.Top0>;
 }
 
-export namespace TopBrowsersResponse {
+export namespace TopBrowserFamilyResponse {
   export interface Meta {
     dateRange: Array<Meta.DateRange>;
 
@@ -162,9 +161,15 @@ export namespace TopBrowsersResponse {
       }
     }
   }
+
+  export interface Top0 {
+    name: string;
+
+    value: string;
+  }
 }
 
-export interface TopBrowserFamiliesParams {
+export interface TopBrowserParams {
   /**
    * Array of comma separated list of ASNs, start with `-` to exclude from results.
    * For example, `-174, 3356` excludes results from AS174, but includes results from
@@ -260,7 +265,7 @@ export interface TopBrowserFamiliesParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export interface TopBrowsersParams {
+export interface TopBrowserFamilyParams {
   /**
    * Array of comma separated list of ASNs, start with `-` to exclude from results.
    * For example, `-174, 3356` excludes results from AS174, but includes results from
@@ -356,10 +361,11 @@ export interface TopBrowsersParams {
   tlsVersion?: Array<'TLSv1_0' | 'TLSv1_1' | 'TLSv1_2' | 'TLSv1_3' | 'TLSvQUIC'>;
 }
 
-export namespace Top {
-  export import Browser = TopAPI.Browser;
-  export import TopBrowserFamiliesResponse = TopAPI.TopBrowserFamiliesResponse;
-  export import TopBrowsersResponse = TopAPI.TopBrowsersResponse;
-  export import TopBrowserFamiliesParams = TopAPI.TopBrowserFamiliesParams;
-  export import TopBrowsersParams = TopAPI.TopBrowsersParams;
+export declare namespace Top {
+  export {
+    type TopBrowserResponse as TopBrowserResponse,
+    type TopBrowserFamilyResponse as TopBrowserFamilyResponse,
+    type TopBrowserParams as TopBrowserParams,
+    type TopBrowserFamilyParams as TopBrowserFamilyParams,
+  };
 }
diff --git a/src/resources/radar/index.ts b/src/resources/radar/index.ts
index c76b32f68d..d121093d06 100644
--- a/src/resources/radar/index.ts
+++ b/src/resources/radar/index.ts
@@ -1,42 +1,49 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { AS112TimeseriesResponse, AS112TimeseriesParams, AS112 } from './as112/index';
-export { Annotations } from './annotations/index';
+export { AI } from './ai/index';
+export { AS112, type AS112TimeseriesResponse, type AS112TimeseriesParams } from './as112/index';
+export { Annotations, type AnnotationListResponse, type AnnotationListParams } from './annotations/index';
 export { Attacks } from './attacks/index';
-export { BGPTimeseriesResponse, BGPTimeseriesParams, BGP } from './bgp/index';
+export { BGP, type BGPTimeseriesResponse, type BGPTimeseriesParams } from './bgp/index';
 export { DNS } from './dns/index';
 export {
-  DatasetListResponse,
-  DatasetDownloadResponse,
-  DatasetGetResponse,
-  DatasetListParams,
-  DatasetDownloadParams,
   Datasets,
+  type DatasetListResponse,
+  type DatasetDownloadResponse,
+  type DatasetGetResponse,
+  type DatasetListParams,
+  type DatasetDownloadParams,
 } from './datasets';
-export { EntityGetResponse, EntityGetParams, Entities } from './entities/index';
-export { HTTPTimeseriesResponse, HTTPTimeseriesParams, HTTP } from './http/index';
-export { NetflowTimeseriesResponse, NetflowTimeseriesParams, Netflows } from './netflows/index';
+export { Email, type RadarEmailSeries, type RadarEmailSummary } from './email/index';
+export { Entities, type EntityGetResponse, type EntityGetParams } from './entities/index';
+export { HTTP, type HTTPTimeseriesResponse, type HTTPTimeseriesParams } from './http/index';
+export {
+  Netflows,
+  type NetflowSummaryResponse,
+  type NetflowTimeseriesResponse,
+  type NetflowSummaryParams,
+  type NetflowTimeseriesParams,
+} from './netflows/index';
 export { Quality } from './quality/index';
 export { Radar } from './radar';
-export { RadarEmailSeries, RadarEmailSummary, Email } from './email/index';
 export {
-  RankingTimeseriesGroupsResponse,
-  RankingTopResponse,
-  RankingTimeseriesGroupsParams,
-  RankingTopParams,
   Ranking,
+  type RankingTimeseriesGroupsResponse,
+  type RankingTopResponse,
+  type RankingTimeseriesGroupsParams,
+  type RankingTopParams,
 } from './ranking/index';
-export { SearchGlobalResponse, SearchGlobalParams, Search } from './search';
+export { Search, type SearchGlobalResponse, type SearchGlobalParams } from './search';
 export {
-  TCPResetsTimeoutSummaryResponse,
-  TCPResetsTimeoutTimeseriesGroupsResponse,
-  TCPResetsTimeoutSummaryParams,
-  TCPResetsTimeoutTimeseriesGroupsParams,
   TCPResetsTimeouts,
+  type TCPResetsTimeoutSummaryResponse,
+  type TCPResetsTimeoutTimeseriesGroupsResponse,
+  type TCPResetsTimeoutSummaryParams,
+  type TCPResetsTimeoutTimeseriesGroupsParams,
 } from './tcp-resets-timeouts';
 export {
-  TrafficAnomalyGetResponse,
-  TrafficAnomalyGetParams,
   TrafficAnomalies,
+  type TrafficAnomalyGetResponse,
+  type TrafficAnomalyGetParams,
 } from './traffic-anomalies/index';
 export { VerifiedBots } from './verified-bots/index';
diff --git a/src/resources/radar/netflows/index.ts b/src/resources/radar/netflows/index.ts
index 4bd2c40b2d..cceee75f9d 100644
--- a/src/resources/radar/netflows/index.ts
+++ b/src/resources/radar/netflows/index.ts
@@ -1,4 +1,16 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { NetflowTimeseriesResponse, NetflowTimeseriesParams, Netflows } from './netflows';
-export { TopAsesResponse, TopLocationsResponse, TopAsesParams, TopLocationsParams, Top } from './top';
+export {
+  Netflows,
+  type NetflowSummaryResponse,
+  type NetflowTimeseriesResponse,
+  type NetflowSummaryParams,
+  type NetflowTimeseriesParams,
+} from './netflows';
+export {
+  Top,
+  type TopAsesResponse,
+  type TopLocationsResponse,
+  type TopAsesParams,
+  type TopLocationsParams,
+} from './top';
diff --git a/src/resources/radar/netflows/netflows.ts b/src/resources/radar/netflows/netflows.ts
index 95ea7403b7..a73c6ad75b 100644
--- a/src/resources/radar/netflows/netflows.ts
+++ b/src/resources/radar/netflows/netflows.ts
@@ -3,12 +3,35 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as NetflowsAPI from './netflows';
 import * as TopAPI from './top';
+import { Top, TopAsesParams, TopAsesResponse, TopLocationsParams, TopLocationsResponse } from './top';
 
 export class Netflows extends APIResource {
   top: TopAPI.Top = new TopAPI.Top(this._client);
 
+  /**
+   * Percentage distribution of HTTP vs other protocols traffic over a given time
+   * period.
+   */
+  summary(
+    query?: NetflowSummaryParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<NetflowSummaryResponse>;
+  summary(options?: Core.RequestOptions): Core.APIPromise<NetflowSummaryResponse>;
+  summary(
+    query: NetflowSummaryParams | Core.RequestOptions = {},
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<NetflowSummaryResponse> {
+    if (isRequestOptions(query)) {
+      return this.summary({}, query);
+    }
+    return (
+      this._client.get('/radar/netflows/summary', { query, ...options }) as Core.APIPromise<{
+        result: NetflowSummaryResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Get network traffic change over time. Visit
    * https://en.wikipedia.org/wiki/NetFlow for more information on NetFlows.
@@ -33,6 +56,64 @@ export class Netflows extends APIResource {
   }
 }
 
+export interface NetflowSummaryResponse {
+  meta: NetflowSummaryResponse.Meta;
+
+  summary_0: NetflowSummaryResponse.Summary0;
+}
+
+export namespace NetflowSummaryResponse {
+  export interface Meta {
+    dateRange: Array<Meta.DateRange>;
+
+    confidenceInfo?: Meta.ConfidenceInfo;
+  }
+
+  export namespace Meta {
+    export interface DateRange {
+      /**
+       * Adjusted end of date range.
+       */
+      endTime: string;
+
+      /**
+       * Adjusted start of date range.
+       */
+      startTime: string;
+    }
+
+    export interface ConfidenceInfo {
+      annotations?: Array<ConfidenceInfo.Annotation>;
+
+      level?: number;
+    }
+
+    export namespace ConfidenceInfo {
+      export interface Annotation {
+        dataSource: string;
+
+        description: string;
+
+        eventType: string;
+
+        isInstantaneous: boolean;
+
+        endTime?: string;
+
+        linkedUrl?: string;
+
+        startTime?: string;
+      }
+    }
+  }
+
+  export interface Summary0 {
+    HTTP: string;
+
+    OTHER: string;
+  }
+}
+
 export interface NetflowTimeseriesResponse {
   meta: NetflowTimeseriesResponse.Meta;
 
@@ -95,6 +176,56 @@ export namespace NetflowTimeseriesResponse {
   }
 }
 
+export interface NetflowSummaryParams {
+  /**
+   * Array of comma separated list of ASNs, start with `-` to exclude from results.
+   * For example, `-174, 3356` excludes results from AS174, but includes results from
+   * AS3356.
+   */
+  asn?: Array<string>;
+
+  /**
+   * Array of comma separated list of continents (alpha-2 continent codes). Start
+   * with `-` to exclude from results. For example, `-EU,NA` excludes results from
+   * Europe, but includes results from North America.
+   */
+  continent?: Array<string>;
+
+  /**
+   * End of the date range (inclusive).
+   */
+  dateEnd?: Array<string>;
+
+  /**
+   * For example, use `7d` and `7dControl` to compare this week with the previous
+   * week. Use this parameter or set specific start and end dates (`dateStart` and
+   * `dateEnd` parameters).
+   */
+  dateRange?: Array<string>;
+
+  /**
+   * Array of datetimes to filter the start of a series.
+   */
+  dateStart?: Array<string>;
+
+  /**
+   * Format results are returned in.
+   */
+  format?: 'JSON' | 'CSV';
+
+  /**
+   * Array of comma separated list of locations (alpha-2 country codes). Start with
+   * `-` to exclude from results. For example, `-US,PT` excludes results from the US,
+   * but includes results from PT.
+   */
+  location?: Array<string>;
+
+  /**
+   * Array of names that will be used to name the series in responses.
+   */
+  name?: Array<string>;
+}
+
 export interface NetflowTimeseriesParams {
   /**
    * Aggregation interval results should be returned in (for example, in 15 minutes
@@ -163,12 +294,21 @@ export interface NetflowTimeseriesParams {
   product?: Array<'HTTP' | 'ALL'>;
 }
 
-export namespace Netflows {
-  export import NetflowTimeseriesResponse = NetflowsAPI.NetflowTimeseriesResponse;
-  export import NetflowTimeseriesParams = NetflowsAPI.NetflowTimeseriesParams;
-  export import Top = TopAPI.Top;
-  export import TopAsesResponse = TopAPI.TopAsesResponse;
-  export import TopLocationsResponse = TopAPI.TopLocationsResponse;
-  export import TopAsesParams = TopAPI.TopAsesParams;
-  export import TopLocationsParams = TopAPI.TopLocationsParams;
+Netflows.Top = Top;
+
+export declare namespace Netflows {
+  export {
+    type NetflowSummaryResponse as NetflowSummaryResponse,
+    type NetflowTimeseriesResponse as NetflowTimeseriesResponse,
+    type NetflowSummaryParams as NetflowSummaryParams,
+    type NetflowTimeseriesParams as NetflowTimeseriesParams,
+  };
+
+  export {
+    Top as Top,
+    type TopAsesResponse as TopAsesResponse,
+    type TopLocationsResponse as TopLocationsResponse,
+    type TopAsesParams as TopAsesParams,
+    type TopLocationsParams as TopLocationsParams,
+  };
 }
diff --git a/src/resources/radar/netflows/top.ts b/src/resources/radar/netflows/top.ts
index fa6cdd037f..ada69f9272 100644
--- a/src/resources/radar/netflows/top.ts
+++ b/src/resources/radar/netflows/top.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as TopAPI from './top';
 
 export class Top extends APIResource {
   /**
@@ -185,9 +184,11 @@ export interface TopLocationsParams {
   name?: Array<string>;
 }
 
-export namespace Top {
-  export import TopAsesResponse = TopAPI.TopAsesResponse;
-  export import TopLocationsResponse = TopAPI.TopLocationsResponse;
-  export import TopAsesParams = TopAPI.TopAsesParams;
-  export import TopLocationsParams = TopAPI.TopLocationsParams;
+export declare namespace Top {
+  export {
+    type TopAsesResponse as TopAsesResponse,
+    type TopLocationsResponse as TopLocationsResponse,
+    type TopAsesParams as TopAsesParams,
+    type TopLocationsParams as TopLocationsParams,
+  };
 }
diff --git a/src/resources/radar/quality/index.ts b/src/resources/radar/quality/index.ts
index 91a4c8f82a..9a5330e30a 100644
--- a/src/resources/radar/quality/index.ts
+++ b/src/resources/radar/quality/index.ts
@@ -1,17 +1,17 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  IQISummaryResponse,
-  IQITimeseriesGroupsResponse,
-  IQISummaryParams,
-  IQITimeseriesGroupsParams,
   IQI,
+  type IQISummaryResponse,
+  type IQITimeseriesGroupsResponse,
+  type IQISummaryParams,
+  type IQITimeseriesGroupsParams,
 } from './iqi';
 export { Quality } from './quality';
 export {
-  SpeedHistogramResponse,
-  SpeedSummaryResponse,
-  SpeedHistogramParams,
-  SpeedSummaryParams,
   Speed,
+  type SpeedHistogramResponse,
+  type SpeedSummaryResponse,
+  type SpeedHistogramParams,
+  type SpeedSummaryParams,
 } from './speed/index';
diff --git a/src/resources/radar/quality/iqi.ts b/src/resources/radar/quality/iqi.ts
index b12f6c1298..06fad05efc 100644
--- a/src/resources/radar/quality/iqi.ts
+++ b/src/resources/radar/quality/iqi.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as IQIAPI from './iqi';
 
 export class IQI extends APIResource {
   /**
@@ -237,9 +236,11 @@ export interface IQITimeseriesGroupsParams {
   name?: Array<string>;
 }
 
-export namespace IQI {
-  export import IQISummaryResponse = IQIAPI.IQISummaryResponse;
-  export import IQITimeseriesGroupsResponse = IQIAPI.IQITimeseriesGroupsResponse;
-  export import IQISummaryParams = IQIAPI.IQISummaryParams;
-  export import IQITimeseriesGroupsParams = IQIAPI.IQITimeseriesGroupsParams;
+export declare namespace IQI {
+  export {
+    type IQISummaryResponse as IQISummaryResponse,
+    type IQITimeseriesGroupsResponse as IQITimeseriesGroupsResponse,
+    type IQISummaryParams as IQISummaryParams,
+    type IQITimeseriesGroupsParams as IQITimeseriesGroupsParams,
+  };
 }
diff --git a/src/resources/radar/quality/quality.ts b/src/resources/radar/quality/quality.ts
index d1836e4e82..ecab431d24 100644
--- a/src/resources/radar/quality/quality.ts
+++ b/src/resources/radar/quality/quality.ts
@@ -2,22 +2,44 @@
 
 import { APIResource } from '../../../resource';
 import * as IQIAPI from './iqi';
+import {
+  IQI,
+  IQISummaryParams,
+  IQISummaryResponse,
+  IQITimeseriesGroupsParams,
+  IQITimeseriesGroupsResponse,
+} from './iqi';
 import * as SpeedAPI from './speed/speed';
+import {
+  Speed,
+  SpeedHistogramParams,
+  SpeedHistogramResponse,
+  SpeedSummaryParams,
+  SpeedSummaryResponse,
+} from './speed/speed';
 
 export class Quality extends APIResource {
   iqi: IQIAPI.IQI = new IQIAPI.IQI(this._client);
   speed: SpeedAPI.Speed = new SpeedAPI.Speed(this._client);
 }
 
-export namespace Quality {
-  export import IQI = IQIAPI.IQI;
-  export import IQISummaryResponse = IQIAPI.IQISummaryResponse;
-  export import IQITimeseriesGroupsResponse = IQIAPI.IQITimeseriesGroupsResponse;
-  export import IQISummaryParams = IQIAPI.IQISummaryParams;
-  export import IQITimeseriesGroupsParams = IQIAPI.IQITimeseriesGroupsParams;
-  export import Speed = SpeedAPI.Speed;
-  export import SpeedHistogramResponse = SpeedAPI.SpeedHistogramResponse;
-  export import SpeedSummaryResponse = SpeedAPI.SpeedSummaryResponse;
-  export import SpeedHistogramParams = SpeedAPI.SpeedHistogramParams;
-  export import SpeedSummaryParams = SpeedAPI.SpeedSummaryParams;
+Quality.IQI = IQI;
+Quality.Speed = Speed;
+
+export declare namespace Quality {
+  export {
+    IQI as IQI,
+    type IQISummaryResponse as IQISummaryResponse,
+    type IQITimeseriesGroupsResponse as IQITimeseriesGroupsResponse,
+    type IQISummaryParams as IQISummaryParams,
+    type IQITimeseriesGroupsParams as IQITimeseriesGroupsParams,
+  };
+
+  export {
+    Speed as Speed,
+    type SpeedHistogramResponse as SpeedHistogramResponse,
+    type SpeedSummaryResponse as SpeedSummaryResponse,
+    type SpeedHistogramParams as SpeedHistogramParams,
+    type SpeedSummaryParams as SpeedSummaryParams,
+  };
 }
diff --git a/src/resources/radar/quality/speed/index.ts b/src/resources/radar/quality/speed/index.ts
index 23181ef5d4..9a8a0c8e81 100644
--- a/src/resources/radar/quality/speed/index.ts
+++ b/src/resources/radar/quality/speed/index.ts
@@ -1,10 +1,16 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  SpeedHistogramResponse,
-  SpeedSummaryResponse,
-  SpeedHistogramParams,
-  SpeedSummaryParams,
   Speed,
+  type SpeedHistogramResponse,
+  type SpeedSummaryResponse,
+  type SpeedHistogramParams,
+  type SpeedSummaryParams,
 } from './speed';
-export { TopAsesResponse, TopLocationsResponse, TopAsesParams, TopLocationsParams, Top } from './top';
+export {
+  Top,
+  type TopAsesResponse,
+  type TopLocationsResponse,
+  type TopAsesParams,
+  type TopLocationsParams,
+} from './top';
diff --git a/src/resources/radar/quality/speed/speed.ts b/src/resources/radar/quality/speed/speed.ts
index 97721d9399..7fc18b213d 100644
--- a/src/resources/radar/quality/speed/speed.ts
+++ b/src/resources/radar/quality/speed/speed.ts
@@ -3,8 +3,8 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as SpeedAPI from './speed';
 import * as TopAPI from './top';
+import { Top, TopAsesParams, TopAsesResponse, TopLocationsParams, TopLocationsResponse } from './top';
 
 export class Speed extends APIResource {
   top: TopAPI.Top = new TopAPI.Top(this._client);
@@ -227,14 +227,21 @@ export interface SpeedSummaryParams {
   name?: Array<string>;
 }
 
-export namespace Speed {
-  export import SpeedHistogramResponse = SpeedAPI.SpeedHistogramResponse;
-  export import SpeedSummaryResponse = SpeedAPI.SpeedSummaryResponse;
-  export import SpeedHistogramParams = SpeedAPI.SpeedHistogramParams;
-  export import SpeedSummaryParams = SpeedAPI.SpeedSummaryParams;
-  export import Top = TopAPI.Top;
-  export import TopAsesResponse = TopAPI.TopAsesResponse;
-  export import TopLocationsResponse = TopAPI.TopLocationsResponse;
-  export import TopAsesParams = TopAPI.TopAsesParams;
-  export import TopLocationsParams = TopAPI.TopLocationsParams;
+Speed.Top = Top;
+
+export declare namespace Speed {
+  export {
+    type SpeedHistogramResponse as SpeedHistogramResponse,
+    type SpeedSummaryResponse as SpeedSummaryResponse,
+    type SpeedHistogramParams as SpeedHistogramParams,
+    type SpeedSummaryParams as SpeedSummaryParams,
+  };
+
+  export {
+    Top as Top,
+    type TopAsesResponse as TopAsesResponse,
+    type TopLocationsResponse as TopLocationsResponse,
+    type TopAsesParams as TopAsesParams,
+    type TopLocationsParams as TopLocationsParams,
+  };
 }
diff --git a/src/resources/radar/quality/speed/top.ts b/src/resources/radar/quality/speed/top.ts
index c28c7dc659..bbfe641ccc 100644
--- a/src/resources/radar/quality/speed/top.ts
+++ b/src/resources/radar/quality/speed/top.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as TopAPI from './top';
 
 export class Top extends APIResource {
   /**
@@ -317,9 +316,11 @@ export interface TopLocationsParams {
   reverse?: boolean;
 }
 
-export namespace Top {
-  export import TopAsesResponse = TopAPI.TopAsesResponse;
-  export import TopLocationsResponse = TopAPI.TopLocationsResponse;
-  export import TopAsesParams = TopAPI.TopAsesParams;
-  export import TopLocationsParams = TopAPI.TopLocationsParams;
+export declare namespace Top {
+  export {
+    type TopAsesResponse as TopAsesResponse,
+    type TopLocationsResponse as TopLocationsResponse,
+    type TopAsesParams as TopAsesParams,
+    type TopLocationsParams as TopLocationsParams,
+  };
 }
diff --git a/src/resources/radar/radar.ts b/src/resources/radar/radar.ts
index 038030f0fd..d7634e0786 100644
--- a/src/resources/radar/radar.ts
+++ b/src/resources/radar/radar.ts
@@ -2,23 +2,71 @@
 
 import { APIResource } from '../../resource';
 import * as DatasetsAPI from './datasets';
+import {
+  DatasetDownloadParams,
+  DatasetDownloadResponse,
+  DatasetGetResponse,
+  DatasetListParams,
+  DatasetListResponse,
+  Datasets,
+} from './datasets';
 import * as SearchAPI from './search';
+import { Search, SearchGlobalParams, SearchGlobalResponse } from './search';
 import * as TCPResetsTimeoutsAPI from './tcp-resets-timeouts';
+import {
+  TCPResetsTimeoutSummaryParams,
+  TCPResetsTimeoutSummaryResponse,
+  TCPResetsTimeoutTimeseriesGroupsParams,
+  TCPResetsTimeoutTimeseriesGroupsResponse,
+  TCPResetsTimeouts,
+} from './tcp-resets-timeouts';
+import * as AIAPI from './ai/ai';
+import { AI } from './ai/ai';
 import * as AnnotationsAPI from './annotations/annotations';
+import { AnnotationListParams, AnnotationListResponse, Annotations } from './annotations/annotations';
 import * as AS112API from './as112/as112';
+import { AS112, AS112TimeseriesParams, AS112TimeseriesResponse } from './as112/as112';
 import * as AttacksAPI from './attacks/attacks';
+import { Attacks } from './attacks/attacks';
 import * as BGPAPI from './bgp/bgp';
+import { BGP, BGPTimeseriesParams, BGPTimeseriesResponse } from './bgp/bgp';
 import * as DNSAPI from './dns/dns';
+import { DNS } from './dns/dns';
 import * as EmailAPI from './email/email';
+import { Email, RadarEmailSeries, RadarEmailSummary } from './email/email';
 import * as EntitiesAPI from './entities/entities';
+import { Entities, EntityGetParams, EntityGetResponse } from './entities/entities';
 import * as HTTPAPI from './http/http';
+import { HTTP, HTTPTimeseriesParams, HTTPTimeseriesResponse } from './http/http';
 import * as NetflowsAPI from './netflows/netflows';
+import {
+  NetflowSummaryParams,
+  NetflowSummaryResponse,
+  NetflowTimeseriesParams,
+  NetflowTimeseriesResponse,
+  Netflows,
+} from './netflows/netflows';
 import * as QualityAPI from './quality/quality';
+import { Quality } from './quality/quality';
 import * as RankingAPI from './ranking/ranking';
+import {
+  Ranking,
+  RankingTimeseriesGroupsParams,
+  RankingTimeseriesGroupsResponse,
+  RankingTopParams,
+  RankingTopResponse,
+} from './ranking/ranking';
 import * as TrafficAnomaliesAPI from './traffic-anomalies/traffic-anomalies';
+import {
+  TrafficAnomalies,
+  TrafficAnomalyGetParams,
+  TrafficAnomalyGetResponse,
+} from './traffic-anomalies/traffic-anomalies';
 import * as VerifiedBotsAPI from './verified-bots/verified-bots';
+import { VerifiedBots } from './verified-bots/verified-bots';
 
 export class Radar extends APIResource {
+  ai: AIAPI.AI = new AIAPI.AI(this._client);
   annotations: AnnotationsAPI.Annotations = new AnnotationsAPI.Annotations(this._client);
   bgp: BGPAPI.BGP = new BGPAPI.BGP(this._client);
   datasets: DatasetsAPI.Datasets = new DatasetsAPI.Datasets(this._client);
@@ -41,50 +89,113 @@ export class Radar extends APIResource {
   );
 }
 
-export namespace Radar {
-  export import Annotations = AnnotationsAPI.Annotations;
-  export import BGP = BGPAPI.BGP;
-  export import BGPTimeseriesResponse = BGPAPI.BGPTimeseriesResponse;
-  export import BGPTimeseriesParams = BGPAPI.BGPTimeseriesParams;
-  export import Datasets = DatasetsAPI.Datasets;
-  export import DatasetListResponse = DatasetsAPI.DatasetListResponse;
-  export import DatasetDownloadResponse = DatasetsAPI.DatasetDownloadResponse;
-  export import DatasetGetResponse = DatasetsAPI.DatasetGetResponse;
-  export import DatasetListParams = DatasetsAPI.DatasetListParams;
-  export import DatasetDownloadParams = DatasetsAPI.DatasetDownloadParams;
-  export import DNS = DNSAPI.DNS;
-  export import Netflows = NetflowsAPI.Netflows;
-  export import NetflowTimeseriesResponse = NetflowsAPI.NetflowTimeseriesResponse;
-  export import NetflowTimeseriesParams = NetflowsAPI.NetflowTimeseriesParams;
-  export import Search = SearchAPI.Search;
-  export import SearchGlobalResponse = SearchAPI.SearchGlobalResponse;
-  export import SearchGlobalParams = SearchAPI.SearchGlobalParams;
-  export import VerifiedBots = VerifiedBotsAPI.VerifiedBots;
-  export import AS112 = AS112API.AS112;
-  export import AS112TimeseriesResponse = AS112API.AS112TimeseriesResponse;
-  export import AS112TimeseriesParams = AS112API.AS112TimeseriesParams;
-  export import Email = EmailAPI.Email;
-  export import RadarEmailSeries = EmailAPI.RadarEmailSeries;
-  export import RadarEmailSummary = EmailAPI.RadarEmailSummary;
-  export import Attacks = AttacksAPI.Attacks;
-  export import Entities = EntitiesAPI.Entities;
-  export import EntityGetResponse = EntitiesAPI.EntityGetResponse;
-  export import EntityGetParams = EntitiesAPI.EntityGetParams;
-  export import HTTP = HTTPAPI.HTTP;
-  export import HTTPTimeseriesResponse = HTTPAPI.HTTPTimeseriesResponse;
-  export import HTTPTimeseriesParams = HTTPAPI.HTTPTimeseriesParams;
-  export import Quality = QualityAPI.Quality;
-  export import Ranking = RankingAPI.Ranking;
-  export import RankingTimeseriesGroupsResponse = RankingAPI.RankingTimeseriesGroupsResponse;
-  export import RankingTopResponse = RankingAPI.RankingTopResponse;
-  export import RankingTimeseriesGroupsParams = RankingAPI.RankingTimeseriesGroupsParams;
-  export import RankingTopParams = RankingAPI.RankingTopParams;
-  export import TrafficAnomalies = TrafficAnomaliesAPI.TrafficAnomalies;
-  export import TrafficAnomalyGetResponse = TrafficAnomaliesAPI.TrafficAnomalyGetResponse;
-  export import TrafficAnomalyGetParams = TrafficAnomaliesAPI.TrafficAnomalyGetParams;
-  export import TCPResetsTimeouts = TCPResetsTimeoutsAPI.TCPResetsTimeouts;
-  export import TCPResetsTimeoutSummaryResponse = TCPResetsTimeoutsAPI.TCPResetsTimeoutSummaryResponse;
-  export import TCPResetsTimeoutTimeseriesGroupsResponse = TCPResetsTimeoutsAPI.TCPResetsTimeoutTimeseriesGroupsResponse;
-  export import TCPResetsTimeoutSummaryParams = TCPResetsTimeoutsAPI.TCPResetsTimeoutSummaryParams;
-  export import TCPResetsTimeoutTimeseriesGroupsParams = TCPResetsTimeoutsAPI.TCPResetsTimeoutTimeseriesGroupsParams;
+Radar.AI = AI;
+Radar.Annotations = Annotations;
+Radar.BGP = BGP;
+Radar.Datasets = Datasets;
+Radar.DNS = DNS;
+Radar.Netflows = Netflows;
+Radar.Search = Search;
+Radar.VerifiedBots = VerifiedBots;
+Radar.AS112 = AS112;
+Radar.Email = Email;
+Radar.Attacks = Attacks;
+Radar.Entities = Entities;
+Radar.HTTP = HTTP;
+Radar.Quality = Quality;
+Radar.Ranking = Ranking;
+Radar.TrafficAnomalies = TrafficAnomalies;
+Radar.TCPResetsTimeouts = TCPResetsTimeouts;
+
+export declare namespace Radar {
+  export { AI as AI };
+
+  export {
+    Annotations as Annotations,
+    type AnnotationListResponse as AnnotationListResponse,
+    type AnnotationListParams as AnnotationListParams,
+  };
+
+  export {
+    BGP as BGP,
+    type BGPTimeseriesResponse as BGPTimeseriesResponse,
+    type BGPTimeseriesParams as BGPTimeseriesParams,
+  };
+
+  export {
+    Datasets as Datasets,
+    type DatasetListResponse as DatasetListResponse,
+    type DatasetDownloadResponse as DatasetDownloadResponse,
+    type DatasetGetResponse as DatasetGetResponse,
+    type DatasetListParams as DatasetListParams,
+    type DatasetDownloadParams as DatasetDownloadParams,
+  };
+
+  export { DNS as DNS };
+
+  export {
+    Netflows as Netflows,
+    type NetflowSummaryResponse as NetflowSummaryResponse,
+    type NetflowTimeseriesResponse as NetflowTimeseriesResponse,
+    type NetflowSummaryParams as NetflowSummaryParams,
+    type NetflowTimeseriesParams as NetflowTimeseriesParams,
+  };
+
+  export {
+    Search as Search,
+    type SearchGlobalResponse as SearchGlobalResponse,
+    type SearchGlobalParams as SearchGlobalParams,
+  };
+
+  export { VerifiedBots as VerifiedBots };
+
+  export {
+    AS112 as AS112,
+    type AS112TimeseriesResponse as AS112TimeseriesResponse,
+    type AS112TimeseriesParams as AS112TimeseriesParams,
+  };
+
+  export {
+    Email as Email,
+    type RadarEmailSeries as RadarEmailSeries,
+    type RadarEmailSummary as RadarEmailSummary,
+  };
+
+  export { Attacks as Attacks };
+
+  export {
+    Entities as Entities,
+    type EntityGetResponse as EntityGetResponse,
+    type EntityGetParams as EntityGetParams,
+  };
+
+  export {
+    HTTP as HTTP,
+    type HTTPTimeseriesResponse as HTTPTimeseriesResponse,
+    type HTTPTimeseriesParams as HTTPTimeseriesParams,
+  };
+
+  export { Quality as Quality };
+
+  export {
+    Ranking as Ranking,
+    type RankingTimeseriesGroupsResponse as RankingTimeseriesGroupsResponse,
+    type RankingTopResponse as RankingTopResponse,
+    type RankingTimeseriesGroupsParams as RankingTimeseriesGroupsParams,
+    type RankingTopParams as RankingTopParams,
+  };
+
+  export {
+    TrafficAnomalies as TrafficAnomalies,
+    type TrafficAnomalyGetResponse as TrafficAnomalyGetResponse,
+    type TrafficAnomalyGetParams as TrafficAnomalyGetParams,
+  };
+
+  export {
+    TCPResetsTimeouts as TCPResetsTimeouts,
+    type TCPResetsTimeoutSummaryResponse as TCPResetsTimeoutSummaryResponse,
+    type TCPResetsTimeoutTimeseriesGroupsResponse as TCPResetsTimeoutTimeseriesGroupsResponse,
+    type TCPResetsTimeoutSummaryParams as TCPResetsTimeoutSummaryParams,
+    type TCPResetsTimeoutTimeseriesGroupsParams as TCPResetsTimeoutTimeseriesGroupsParams,
+  };
 }
diff --git a/src/resources/radar/ranking/domain.ts b/src/resources/radar/ranking/domain.ts
index 63c3d14ccb..c9414f5038 100644
--- a/src/resources/radar/ranking/domain.ts
+++ b/src/resources/radar/ranking/domain.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as DomainAPI from './domain';
 
 export class Domain extends APIResource {
   /**
@@ -82,6 +81,11 @@ export interface DomainGetParams {
    */
   format?: 'JSON' | 'CSV';
 
+  /**
+   * Include top locations in the response.
+   */
+  includeTopLocations?: boolean;
+
   /**
    * Limit the number of objects in the response.
    */
@@ -98,7 +102,6 @@ export interface DomainGetParams {
   rankingType?: 'POPULAR' | 'TRENDING_RISE' | 'TRENDING_STEADY';
 }
 
-export namespace Domain {
-  export import DomainGetResponse = DomainAPI.DomainGetResponse;
-  export import DomainGetParams = DomainAPI.DomainGetParams;
+export declare namespace Domain {
+  export { type DomainGetResponse as DomainGetResponse, type DomainGetParams as DomainGetParams };
 }
diff --git a/src/resources/radar/ranking/index.ts b/src/resources/radar/ranking/index.ts
index 8712f0452c..baf7f19d56 100644
--- a/src/resources/radar/ranking/index.ts
+++ b/src/resources/radar/ranking/index.ts
@@ -1,10 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { DomainGetResponse, DomainGetParams, Domain } from './domain';
+export { Domain, type DomainGetResponse, type DomainGetParams } from './domain';
 export {
-  RankingTimeseriesGroupsResponse,
-  RankingTopResponse,
-  RankingTimeseriesGroupsParams,
-  RankingTopParams,
   Ranking,
+  type RankingTimeseriesGroupsResponse,
+  type RankingTopResponse,
+  type RankingTimeseriesGroupsParams,
+  type RankingTopParams,
 } from './ranking';
diff --git a/src/resources/radar/ranking/ranking.ts b/src/resources/radar/ranking/ranking.ts
index e1480a1fdb..56b6b4fcb7 100644
--- a/src/resources/radar/ranking/ranking.ts
+++ b/src/resources/radar/ranking/ranking.ts
@@ -3,8 +3,8 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as RankingAPI from './ranking';
 import * as DomainAPI from './domain';
+import { Domain, DomainGetParams, DomainGetResponse } from './domain';
 
 export class Ranking extends APIResource {
   domain: DomainAPI.Domain = new DomainAPI.Domain(this._client);
@@ -207,12 +207,19 @@ export interface RankingTopParams {
   rankingType?: 'POPULAR' | 'TRENDING_RISE' | 'TRENDING_STEADY';
 }
 
-export namespace Ranking {
-  export import RankingTimeseriesGroupsResponse = RankingAPI.RankingTimeseriesGroupsResponse;
-  export import RankingTopResponse = RankingAPI.RankingTopResponse;
-  export import RankingTimeseriesGroupsParams = RankingAPI.RankingTimeseriesGroupsParams;
-  export import RankingTopParams = RankingAPI.RankingTopParams;
-  export import Domain = DomainAPI.Domain;
-  export import DomainGetResponse = DomainAPI.DomainGetResponse;
-  export import DomainGetParams = DomainAPI.DomainGetParams;
+Ranking.Domain = Domain;
+
+export declare namespace Ranking {
+  export {
+    type RankingTimeseriesGroupsResponse as RankingTimeseriesGroupsResponse,
+    type RankingTopResponse as RankingTopResponse,
+    type RankingTimeseriesGroupsParams as RankingTimeseriesGroupsParams,
+    type RankingTopParams as RankingTopParams,
+  };
+
+  export {
+    Domain as Domain,
+    type DomainGetResponse as DomainGetResponse,
+    type DomainGetParams as DomainGetParams,
+  };
 }
diff --git a/src/resources/radar/search.ts b/src/resources/radar/search.ts
index cc0bd31f45..e8dcaa5a6a 100644
--- a/src/resources/radar/search.ts
+++ b/src/resources/radar/search.ts
@@ -2,11 +2,10 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SearchAPI from './search';
 
 export class Search extends APIResource {
   /**
-   * Lets you search for locations, autonomous systems (AS) and reports.
+   * Lets you search for locations, autonomous systems (ASes), and reports.
    */
   global(query: SearchGlobalParams, options?: Core.RequestOptions): Core.APIPromise<SearchGlobalResponse> {
     return (
@@ -63,7 +62,6 @@ export interface SearchGlobalParams {
   limitPerGroup?: number;
 }
 
-export namespace Search {
-  export import SearchGlobalResponse = SearchAPI.SearchGlobalResponse;
-  export import SearchGlobalParams = SearchAPI.SearchGlobalParams;
+export declare namespace Search {
+  export { type SearchGlobalResponse as SearchGlobalResponse, type SearchGlobalParams as SearchGlobalParams };
 }
diff --git a/src/resources/radar/tcp-resets-timeouts.ts b/src/resources/radar/tcp-resets-timeouts.ts
index 05b12d1e2d..c101e0732e 100644
--- a/src/resources/radar/tcp-resets-timeouts.ts
+++ b/src/resources/radar/tcp-resets-timeouts.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as TCPResetsTimeoutsAPI from './tcp-resets-timeouts';
 
 export class TCPResetsTimeouts extends APIResource {
   /**
@@ -193,33 +192,14 @@ export namespace TCPResetsTimeoutTimeseriesGroupsResponse {
   }
 
   export interface Serie0 {
-    /**
-     * Connection resets within the first 10 packets from the client, but after the
-     * server has received multiple data packets.
-     */
     later_in_flow: Array<string>;
 
-    /**
-     * All other connections.
-     */
     no_match: Array<string>;
 
-    /**
-     * Connection resets or timeouts after the server received both a SYN packet and an
-     * ACK packet, meaning the connection was successfully established.
-     */
     post_ack: Array<string>;
 
-    /**
-     * Connection resets or timeouts after the server received a packet with PSH flag
-     * set, following connection establishment.
-     */
     post_psh: Array<string>;
 
-    /**
-     * Connection resets or timeouts after the server received only a single SYN
-     * packet.
-     */
     post_syn: Array<string>;
 
     timestamps: Array<string>;
@@ -333,9 +313,11 @@ export interface TCPResetsTimeoutTimeseriesGroupsParams {
   name?: Array<string>;
 }
 
-export namespace TCPResetsTimeouts {
-  export import TCPResetsTimeoutSummaryResponse = TCPResetsTimeoutsAPI.TCPResetsTimeoutSummaryResponse;
-  export import TCPResetsTimeoutTimeseriesGroupsResponse = TCPResetsTimeoutsAPI.TCPResetsTimeoutTimeseriesGroupsResponse;
-  export import TCPResetsTimeoutSummaryParams = TCPResetsTimeoutsAPI.TCPResetsTimeoutSummaryParams;
-  export import TCPResetsTimeoutTimeseriesGroupsParams = TCPResetsTimeoutsAPI.TCPResetsTimeoutTimeseriesGroupsParams;
+export declare namespace TCPResetsTimeouts {
+  export {
+    type TCPResetsTimeoutSummaryResponse as TCPResetsTimeoutSummaryResponse,
+    type TCPResetsTimeoutTimeseriesGroupsResponse as TCPResetsTimeoutTimeseriesGroupsResponse,
+    type TCPResetsTimeoutSummaryParams as TCPResetsTimeoutSummaryParams,
+    type TCPResetsTimeoutTimeseriesGroupsParams as TCPResetsTimeoutTimeseriesGroupsParams,
+  };
 }
diff --git a/src/resources/radar/traffic-anomalies/index.ts b/src/resources/radar/traffic-anomalies/index.ts
index e858e79a73..77a5579b0d 100644
--- a/src/resources/radar/traffic-anomalies/index.ts
+++ b/src/resources/radar/traffic-anomalies/index.ts
@@ -1,4 +1,8 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { LocationGetResponse, LocationGetParams, Locations } from './locations';
-export { TrafficAnomalyGetResponse, TrafficAnomalyGetParams, TrafficAnomalies } from './traffic-anomalies';
+export { Locations, type LocationGetResponse, type LocationGetParams } from './locations';
+export {
+  TrafficAnomalies,
+  type TrafficAnomalyGetResponse,
+  type TrafficAnomalyGetParams,
+} from './traffic-anomalies';
diff --git a/src/resources/radar/traffic-anomalies/locations.ts b/src/resources/radar/traffic-anomalies/locations.ts
index d9a47f375f..96d4ff5428 100644
--- a/src/resources/radar/traffic-anomalies/locations.ts
+++ b/src/resources/radar/traffic-anomalies/locations.ts
@@ -3,11 +3,10 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as LocationsAPI from './locations';
 
 export class Locations extends APIResource {
   /**
-   * Internet traffic anomalies are signals that might point to an outage, These
+   * Internet traffic anomalies are signals that might point to an outage. These
    * alerts are automatically detected by Radar and then manually verified by our
    * team. This endpoint returns the sum of alerts grouped by location.
    */
@@ -72,7 +71,6 @@ export interface LocationGetParams {
   status?: 'VERIFIED' | 'UNVERIFIED';
 }
 
-export namespace Locations {
-  export import LocationGetResponse = LocationsAPI.LocationGetResponse;
-  export import LocationGetParams = LocationsAPI.LocationGetParams;
+export declare namespace Locations {
+  export { type LocationGetResponse as LocationGetResponse, type LocationGetParams as LocationGetParams };
 }
diff --git a/src/resources/radar/traffic-anomalies/traffic-anomalies.ts b/src/resources/radar/traffic-anomalies/traffic-anomalies.ts
index 202f42bc72..6fb2b431ee 100644
--- a/src/resources/radar/traffic-anomalies/traffic-anomalies.ts
+++ b/src/resources/radar/traffic-anomalies/traffic-anomalies.ts
@@ -3,14 +3,14 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as TrafficAnomaliesAPI from './traffic-anomalies';
 import * as LocationsAPI from './locations';
+import { LocationGetParams, LocationGetResponse, Locations as LocationsAPILocations } from './locations';
 
 export class TrafficAnomalies extends APIResource {
   locations: LocationsAPI.Locations = new LocationsAPI.Locations(this._client);
 
   /**
-   * Internet traffic anomalies are signals that might point to an outage, These
+   * Internet traffic anomalies are signals that might point to an outage. These
    * alerts are automatically detected by Radar and then manually verified by our
    * team. This endpoint returns the latest alerts.
    */
@@ -127,10 +127,17 @@ export interface TrafficAnomalyGetParams {
   status?: 'VERIFIED' | 'UNVERIFIED';
 }
 
-export namespace TrafficAnomalies {
-  export import TrafficAnomalyGetResponse = TrafficAnomaliesAPI.TrafficAnomalyGetResponse;
-  export import TrafficAnomalyGetParams = TrafficAnomaliesAPI.TrafficAnomalyGetParams;
-  export import Locations = LocationsAPI.Locations;
-  export import LocationGetResponse = LocationsAPI.LocationGetResponse;
-  export import LocationGetParams = LocationsAPI.LocationGetParams;
+TrafficAnomalies.Locations = LocationsAPILocations;
+
+export declare namespace TrafficAnomalies {
+  export {
+    type TrafficAnomalyGetResponse as TrafficAnomalyGetResponse,
+    type TrafficAnomalyGetParams as TrafficAnomalyGetParams,
+  };
+
+  export {
+    LocationsAPILocations as Locations,
+    type LocationGetResponse as LocationGetResponse,
+    type LocationGetParams as LocationGetParams,
+  };
 }
diff --git a/src/resources/radar/verified-bots/index.ts b/src/resources/radar/verified-bots/index.ts
index 5c1332dfe1..49f218000e 100644
--- a/src/resources/radar/verified-bots/index.ts
+++ b/src/resources/radar/verified-bots/index.ts
@@ -1,4 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { TopBotsResponse, TopCategoriesResponse, TopBotsParams, TopCategoriesParams, Top } from './top';
+export {
+  Top,
+  type TopBotsResponse,
+  type TopCategoriesResponse,
+  type TopBotsParams,
+  type TopCategoriesParams,
+} from './top';
 export { VerifiedBots } from './verified-bots';
diff --git a/src/resources/radar/verified-bots/top.ts b/src/resources/radar/verified-bots/top.ts
index 5b39674fa8..7e8fae769f 100644
--- a/src/resources/radar/verified-bots/top.ts
+++ b/src/resources/radar/verified-bots/top.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as TopAPI from './top';
 
 export class Top extends APIResource {
   /**
@@ -279,9 +278,11 @@ export interface TopCategoriesParams {
   name?: Array<string>;
 }
 
-export namespace Top {
-  export import TopBotsResponse = TopAPI.TopBotsResponse;
-  export import TopCategoriesResponse = TopAPI.TopCategoriesResponse;
-  export import TopBotsParams = TopAPI.TopBotsParams;
-  export import TopCategoriesParams = TopAPI.TopCategoriesParams;
+export declare namespace Top {
+  export {
+    type TopBotsResponse as TopBotsResponse,
+    type TopCategoriesResponse as TopCategoriesResponse,
+    type TopBotsParams as TopBotsParams,
+    type TopCategoriesParams as TopCategoriesParams,
+  };
 }
diff --git a/src/resources/radar/verified-bots/verified-bots.ts b/src/resources/radar/verified-bots/verified-bots.ts
index 9983346183..18b72ca619 100644
--- a/src/resources/radar/verified-bots/verified-bots.ts
+++ b/src/resources/radar/verified-bots/verified-bots.ts
@@ -2,15 +2,20 @@
 
 import { APIResource } from '../../../resource';
 import * as TopAPI from './top';
+import { Top, TopBotsParams, TopBotsResponse, TopCategoriesParams, TopCategoriesResponse } from './top';
 
 export class VerifiedBots extends APIResource {
   top: TopAPI.Top = new TopAPI.Top(this._client);
 }
 
-export namespace VerifiedBots {
-  export import Top = TopAPI.Top;
-  export import TopBotsResponse = TopAPI.TopBotsResponse;
-  export import TopCategoriesResponse = TopAPI.TopCategoriesResponse;
-  export import TopBotsParams = TopAPI.TopBotsParams;
-  export import TopCategoriesParams = TopAPI.TopCategoriesParams;
+VerifiedBots.Top = Top;
+
+export declare namespace VerifiedBots {
+  export {
+    Top as Top,
+    type TopBotsResponse as TopBotsResponse,
+    type TopCategoriesResponse as TopCategoriesResponse,
+    type TopBotsParams as TopBotsParams,
+    type TopCategoriesParams as TopCategoriesParams,
+  };
 }
diff --git a/src/resources/rate-limits.ts b/src/resources/rate-limits.ts
index dbc788d85e..bb572da598 100644
--- a/src/resources/rate-limits.ts
+++ b/src/resources/rate-limits.ts
@@ -1,7 +1,6 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../resource';
-import { isRequestOptions } from '../core';
 import * as Core from '../core';
 import * as RateLimitsAPI from './rate-limits';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../pagination';
@@ -13,14 +12,11 @@ export class RateLimits extends APIResource {
    *
    * @deprecated Rate limiting API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#rate-limiting-api-previous-version for full details.
    */
-  create(
-    zoneIdentifier: string,
-    body: RateLimitCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<RateLimitCreateResponse> {
+  create(params: RateLimitCreateParams, options?: Core.RequestOptions): Core.APIPromise<RateLimit> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.post(`/zones/${zoneIdentifier}/rate_limits`, { body, ...options }) as Core.APIPromise<{
-        result: RateLimitCreateResponse;
+      this._client.post(`/zones/${zone_id}/rate_limits`, { body, ...options }) as Core.APIPromise<{
+        result: RateLimit;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -31,23 +27,11 @@ export class RateLimits extends APIResource {
    * @deprecated Rate limiting API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#rate-limiting-api-previous-version for full details.
    */
   list(
-    zoneIdentifier: string,
-    query?: RateLimitListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<RateLimitsV4PagePaginationArray, RateLimit>;
-  list(
-    zoneIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<RateLimitsV4PagePaginationArray, RateLimit>;
-  list(
-    zoneIdentifier: string,
-    query: RateLimitListParams | Core.RequestOptions = {},
+    params: RateLimitListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<RateLimitsV4PagePaginationArray, RateLimit> {
-    if (isRequestOptions(query)) {
-      return this.list(zoneIdentifier, {}, query);
-    }
-    return this._client.getAPIList(`/zones/${zoneIdentifier}/rate_limits`, RateLimitsV4PagePaginationArray, {
+    const { zone_id, ...query } = params;
+    return this._client.getAPIList(`/zones/${zone_id}/rate_limits`, RateLimitsV4PagePaginationArray, {
       query,
       ...options,
     });
@@ -59,12 +43,13 @@ export class RateLimits extends APIResource {
    * @deprecated Rate limiting API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#rate-limiting-api-previous-version for full details.
    */
   delete(
-    zoneIdentifier: string,
-    id: string,
+    rateLimitId: string,
+    params: RateLimitDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<RateLimitDeleteResponse> {
+    const { zone_id } = params;
     return (
-      this._client.delete(`/zones/${zoneIdentifier}/rate_limits/${id}`, options) as Core.APIPromise<{
+      this._client.delete(`/zones/${zone_id}/rate_limits/${rateLimitId}`, options) as Core.APIPromise<{
         result: RateLimitDeleteResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -76,16 +61,16 @@ export class RateLimits extends APIResource {
    * @deprecated Rate limiting API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#rate-limiting-api-previous-version for full details.
    */
   edit(
-    zoneIdentifier: string,
-    id: string,
-    body: RateLimitEditParams,
+    rateLimitId: string,
+    params: RateLimitEditParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<RateLimitEditResponse> {
+  ): Core.APIPromise<RateLimit> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.put(`/zones/${zoneIdentifier}/rate_limits/${id}`, {
+      this._client.put(`/zones/${zone_id}/rate_limits/${rateLimitId}`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: RateLimitEditResponse }>
+      }) as Core.APIPromise<{ result: RateLimit }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -95,13 +80,14 @@ export class RateLimits extends APIResource {
    * @deprecated Rate limiting API is deprecated in favour of using the Ruleset Engine. See https://developers.cloudflare.com/fundamentals/api/reference/deprecations/#rate-limiting-api-previous-version for full details.
    */
   get(
-    zoneIdentifier: string,
-    id: string,
+    rateLimitId: string,
+    params: RateLimitGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<RateLimitGetResponse> {
+  ): Core.APIPromise<RateLimit> {
+    const { zone_id } = params;
     return (
-      this._client.get(`/zones/${zoneIdentifier}/rate_limits/${id}`, options) as Core.APIPromise<{
-        result: RateLimitGetResponse;
+      this._client.get(`/zones/${zone_id}/rate_limits/${rateLimitId}`, options) as Core.APIPromise<{
+        result: RateLimit;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -127,6 +113,11 @@ export type Action =
  */
 export type Methods = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | '_ALL_';
 
+/**
+ * An HTTP method or `_ALL_` to indicate all methods.
+ */
+export type MethodsParam = 'GET' | 'POST' | 'PUT' | 'DELETE' | 'PATCH' | 'HEAD' | '_ALL_';
+
 export interface RateLimit {
   /**
    * The unique identifier of the rate limit.
@@ -304,21 +295,506 @@ export namespace RateLimit {
   }
 }
 
-export type RateLimitCreateResponse = unknown | string | null;
-
 export interface RateLimitDeleteResponse {
   /**
    * The unique identifier of the rate limit.
    */
   id?: string;
+
+  /**
+   * The action to perform when the threshold of matched traffic within the
+   * configured period is exceeded.
+   */
+  action?: RateLimitDeleteResponse.Action;
+
+  /**
+   * Criteria specifying when the current rate limit should be bypassed. You can
+   * specify that the rate limit should not apply to one or more URLs.
+   */
+  bypass?: Array<RateLimitDeleteResponse.Bypass>;
+
+  /**
+   * An informative summary of the rate limit. This value is sanitized and any tags
+   * will be removed.
+   */
+  description?: string;
+
+  /**
+   * When true, indicates that the rate limit is currently disabled.
+   */
+  disabled?: boolean;
+
+  /**
+   * Determines which traffic the rate limit counts towards the threshold.
+   */
+  match?: RateLimitDeleteResponse.Match;
+
+  /**
+   * The time in seconds (an integer value) to count matching traffic. If the count
+   * exceeds the configured threshold within this period, Cloudflare will perform the
+   * configured action.
+   */
+  period?: number;
+
+  /**
+   * The threshold that will trigger the configured mitigation action. Configure this
+   * value along with the `period` property to establish a threshold per period.
+   */
+  threshold?: number;
+}
+
+export namespace RateLimitDeleteResponse {
+  /**
+   * The action to perform when the threshold of matched traffic within the
+   * configured period is exceeded.
+   */
+  export interface Action {
+    /**
+     * The action to perform.
+     */
+    mode?: 'simulate' | 'ban' | 'challenge' | 'js_challenge' | 'managed_challenge';
+
+    /**
+     * A custom content type and reponse to return when the threshold is exceeded. The
+     * custom response configured in this object will override the custom error for the
+     * zone. This object is optional. Notes: If you omit this object, Cloudflare will
+     * use the default HTML error page. If "mode" is "challenge", "managed_challenge",
+     * or "js_challenge", Cloudflare will use the zone challenge pages and you should
+     * not provide the "response" object.
+     */
+    response?: Action.Response;
+
+    /**
+     * The time in seconds during which Cloudflare will perform the mitigation action.
+     * Must be an integer value greater than or equal to the period. Notes: If "mode"
+     * is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the
+     * zone's Challenge Passage time and you should not provide this value.
+     */
+    timeout?: number;
+  }
+
+  export namespace Action {
+    /**
+     * A custom content type and reponse to return when the threshold is exceeded. The
+     * custom response configured in this object will override the custom error for the
+     * zone. This object is optional. Notes: If you omit this object, Cloudflare will
+     * use the default HTML error page. If "mode" is "challenge", "managed_challenge",
+     * or "js_challenge", Cloudflare will use the zone challenge pages and you should
+     * not provide the "response" object.
+     */
+    export interface Response {
+      /**
+       * The response body to return. The value must conform to the configured content
+       * type.
+       */
+      body?: string;
+
+      /**
+       * The content type of the body. Must be one of the following: `text/plain`,
+       * `text/xml`, or `application/json`.
+       */
+      content_type?: string;
+    }
+  }
+
+  export interface Bypass {
+    name?: 'url';
+
+    /**
+     * The URL to bypass.
+     */
+    value?: string;
+  }
+
+  /**
+   * Determines which traffic the rate limit counts towards the threshold.
+   */
+  export interface Match {
+    headers?: Array<Match.Header>;
+
+    request?: Match.Request;
+
+    response?: Match.Response;
+  }
+
+  export namespace Match {
+    export interface Header {
+      /**
+       * The name of the response header to match.
+       */
+      name?: string;
+
+      /**
+       * The operator used when matching: `eq` means "equal" and `ne` means "not equal".
+       */
+      op?: 'eq' | 'ne';
+
+      /**
+       * The value of the response header, which must match exactly.
+       */
+      value?: string;
+    }
+
+    export interface Request {
+      /**
+       * The HTTP methods to match. You can specify a subset (for example,
+       * `['POST','PUT']`) or all methods (`['_ALL_']`). This field is optional when
+       * creating a rate limit.
+       */
+      methods?: Array<RateLimitsAPI.Methods>;
+
+      /**
+       * The HTTP schemes to match. You can specify one scheme (`['HTTPS']`), both
+       * schemes (`['HTTP','HTTPS']`), or all schemes (`['_ALL_']`). This field is
+       * optional.
+       */
+      schemes?: Array<string>;
+
+      /**
+       * The URL pattern to match, composed of a host and a path such as
+       * `example.org/path*`. Normalization is applied before the pattern is matched. `*`
+       * wildcards are expanded to match applicable traffic. Query strings are not
+       * matched. Set the value to `*` to match all traffic to your zone.
+       */
+      url?: string;
+    }
+
+    export interface Response {
+      /**
+       * When true, only the uncached traffic served from your origin servers will count
+       * towards rate limiting. In this case, any cached traffic served by Cloudflare
+       * will not count towards rate limiting. This field is optional. Notes: This field
+       * is deprecated. Instead, use response headers and set "origin_traffic" to "false"
+       * to avoid legacy behaviour interacting with the "response_headers" property.
+       */
+      origin_traffic?: boolean;
+    }
+  }
+}
+
+export interface RateLimitCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The action to perform when the threshold of matched traffic within
+   * the configured period is exceeded.
+   */
+  action: RateLimitCreateParams.Action;
+
+  /**
+   * Body param: Determines which traffic the rate limit counts towards the
+   * threshold.
+   */
+  match: RateLimitCreateParams.Match;
+
+  /**
+   * Body param: The time in seconds (an integer value) to count matching traffic. If
+   * the count exceeds the configured threshold within this period, Cloudflare will
+   * perform the configured action.
+   */
+  period: number;
+
+  /**
+   * Body param: The threshold that will trigger the configured mitigation action.
+   * Configure this value along with the `period` property to establish a threshold
+   * per period.
+   */
+  threshold: number;
+}
+
+export namespace RateLimitCreateParams {
+  /**
+   * The action to perform when the threshold of matched traffic within the
+   * configured period is exceeded.
+   */
+  export interface Action {
+    /**
+     * The action to perform.
+     */
+    mode?: 'simulate' | 'ban' | 'challenge' | 'js_challenge' | 'managed_challenge';
+
+    /**
+     * A custom content type and reponse to return when the threshold is exceeded. The
+     * custom response configured in this object will override the custom error for the
+     * zone. This object is optional. Notes: If you omit this object, Cloudflare will
+     * use the default HTML error page. If "mode" is "challenge", "managed_challenge",
+     * or "js_challenge", Cloudflare will use the zone challenge pages and you should
+     * not provide the "response" object.
+     */
+    response?: Action.Response;
+
+    /**
+     * The time in seconds during which Cloudflare will perform the mitigation action.
+     * Must be an integer value greater than or equal to the period. Notes: If "mode"
+     * is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the
+     * zone's Challenge Passage time and you should not provide this value.
+     */
+    timeout?: number;
+  }
+
+  export namespace Action {
+    /**
+     * A custom content type and reponse to return when the threshold is exceeded. The
+     * custom response configured in this object will override the custom error for the
+     * zone. This object is optional. Notes: If you omit this object, Cloudflare will
+     * use the default HTML error page. If "mode" is "challenge", "managed_challenge",
+     * or "js_challenge", Cloudflare will use the zone challenge pages and you should
+     * not provide the "response" object.
+     */
+    export interface Response {
+      /**
+       * The response body to return. The value must conform to the configured content
+       * type.
+       */
+      body?: string;
+
+      /**
+       * The content type of the body. Must be one of the following: `text/plain`,
+       * `text/xml`, or `application/json`.
+       */
+      content_type?: string;
+    }
+  }
+
+  /**
+   * Determines which traffic the rate limit counts towards the threshold.
+   */
+  export interface Match {
+    headers?: Array<Match.Header>;
+
+    request?: Match.Request;
+
+    response?: Match.Response;
+  }
+
+  export namespace Match {
+    export interface Header {
+      /**
+       * The name of the response header to match.
+       */
+      name?: string;
+
+      /**
+       * The operator used when matching: `eq` means "equal" and `ne` means "not equal".
+       */
+      op?: 'eq' | 'ne';
+
+      /**
+       * The value of the response header, which must match exactly.
+       */
+      value?: string;
+    }
+
+    export interface Request {
+      /**
+       * The HTTP methods to match. You can specify a subset (for example,
+       * `['POST','PUT']`) or all methods (`['_ALL_']`). This field is optional when
+       * creating a rate limit.
+       */
+      methods?: Array<RateLimitsAPI.MethodsParam>;
+
+      /**
+       * The HTTP schemes to match. You can specify one scheme (`['HTTPS']`), both
+       * schemes (`['HTTP','HTTPS']`), or all schemes (`['_ALL_']`). This field is
+       * optional.
+       */
+      schemes?: Array<string>;
+
+      /**
+       * The URL pattern to match, composed of a host and a path such as
+       * `example.org/path*`. Normalization is applied before the pattern is matched. `*`
+       * wildcards are expanded to match applicable traffic. Query strings are not
+       * matched. Set the value to `*` to match all traffic to your zone.
+       */
+      url?: string;
+    }
+
+    export interface Response {
+      /**
+       * When true, only the uncached traffic served from your origin servers will count
+       * towards rate limiting. In this case, any cached traffic served by Cloudflare
+       * will not count towards rate limiting. This field is optional. Notes: This field
+       * is deprecated. Instead, use response headers and set "origin_traffic" to "false"
+       * to avoid legacy behaviour interacting with the "response_headers" property.
+       */
+      origin_traffic?: boolean;
+    }
+  }
 }
 
-export type RateLimitEditResponse = unknown | string | null;
+export interface RateLimitListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+}
+
+export interface RateLimitDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface RateLimitEditParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The action to perform when the threshold of matched traffic within
+   * the configured period is exceeded.
+   */
+  action: RateLimitEditParams.Action;
+
+  /**
+   * Body param: Determines which traffic the rate limit counts towards the
+   * threshold.
+   */
+  match: RateLimitEditParams.Match;
+
+  /**
+   * Body param: The time in seconds (an integer value) to count matching traffic. If
+   * the count exceeds the configured threshold within this period, Cloudflare will
+   * perform the configured action.
+   */
+  period: number;
+
+  /**
+   * Body param: The threshold that will trigger the configured mitigation action.
+   * Configure this value along with the `period` property to establish a threshold
+   * per period.
+   */
+  threshold: number;
+}
+
+export namespace RateLimitEditParams {
+  /**
+   * The action to perform when the threshold of matched traffic within the
+   * configured period is exceeded.
+   */
+  export interface Action {
+    /**
+     * The action to perform.
+     */
+    mode?: 'simulate' | 'ban' | 'challenge' | 'js_challenge' | 'managed_challenge';
+
+    /**
+     * A custom content type and reponse to return when the threshold is exceeded. The
+     * custom response configured in this object will override the custom error for the
+     * zone. This object is optional. Notes: If you omit this object, Cloudflare will
+     * use the default HTML error page. If "mode" is "challenge", "managed_challenge",
+     * or "js_challenge", Cloudflare will use the zone challenge pages and you should
+     * not provide the "response" object.
+     */
+    response?: Action.Response;
 
-export type RateLimitGetResponse = unknown | string | null;
+    /**
+     * The time in seconds during which Cloudflare will perform the mitigation action.
+     * Must be an integer value greater than or equal to the period. Notes: If "mode"
+     * is "challenge", "managed_challenge", or "js_challenge", Cloudflare will use the
+     * zone's Challenge Passage time and you should not provide this value.
+     */
+    timeout?: number;
+  }
 
-export type RateLimitCreateParams = unknown;
+  export namespace Action {
+    /**
+     * A custom content type and reponse to return when the threshold is exceeded. The
+     * custom response configured in this object will override the custom error for the
+     * zone. This object is optional. Notes: If you omit this object, Cloudflare will
+     * use the default HTML error page. If "mode" is "challenge", "managed_challenge",
+     * or "js_challenge", Cloudflare will use the zone challenge pages and you should
+     * not provide the "response" object.
+     */
+    export interface Response {
+      /**
+       * The response body to return. The value must conform to the configured content
+       * type.
+       */
+      body?: string;
+
+      /**
+       * The content type of the body. Must be one of the following: `text/plain`,
+       * `text/xml`, or `application/json`.
+       */
+      content_type?: string;
+    }
+  }
+
+  /**
+   * Determines which traffic the rate limit counts towards the threshold.
+   */
+  export interface Match {
+    headers?: Array<Match.Header>;
 
-export interface RateLimitListParams extends V4PagePaginationArrayParams {}
+    request?: Match.Request;
 
-export type RateLimitEditParams = unknown;
+    response?: Match.Response;
+  }
+
+  export namespace Match {
+    export interface Header {
+      /**
+       * The name of the response header to match.
+       */
+      name?: string;
+
+      /**
+       * The operator used when matching: `eq` means "equal" and `ne` means "not equal".
+       */
+      op?: 'eq' | 'ne';
+
+      /**
+       * The value of the response header, which must match exactly.
+       */
+      value?: string;
+    }
+
+    export interface Request {
+      /**
+       * The HTTP methods to match. You can specify a subset (for example,
+       * `['POST','PUT']`) or all methods (`['_ALL_']`). This field is optional when
+       * creating a rate limit.
+       */
+      methods?: Array<RateLimitsAPI.MethodsParam>;
+
+      /**
+       * The HTTP schemes to match. You can specify one scheme (`['HTTPS']`), both
+       * schemes (`['HTTP','HTTPS']`), or all schemes (`['_ALL_']`). This field is
+       * optional.
+       */
+      schemes?: Array<string>;
+
+      /**
+       * The URL pattern to match, composed of a host and a path such as
+       * `example.org/path*`. Normalization is applied before the pattern is matched. `*`
+       * wildcards are expanded to match applicable traffic. Query strings are not
+       * matched. Set the value to `*` to match all traffic to your zone.
+       */
+      url?: string;
+    }
+
+    export interface Response {
+      /**
+       * When true, only the uncached traffic served from your origin servers will count
+       * towards rate limiting. In this case, any cached traffic served by Cloudflare
+       * will not count towards rate limiting. This field is optional. Notes: This field
+       * is deprecated. Instead, use response headers and set "origin_traffic" to "false"
+       * to avoid legacy behaviour interacting with the "response_headers" property.
+       */
+      origin_traffic?: boolean;
+    }
+  }
+}
+
+export interface RateLimitGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
diff --git a/src/resources/rate-plans.ts b/src/resources/rate-plans.ts
deleted file mode 100644
index 661962ff54..0000000000
--- a/src/resources/rate-plans.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../resource';
-import * as Core from '../core';
-
-export class RatePlans extends APIResource {
-  /**
-   * Lists all rate plans the zone can subscribe to.
-   */
-  get(zoneIdentifier: string, options?: Core.RequestOptions): Core.APIPromise<RatePlanGetResponse | null> {
-    return (
-      this._client.get(`/zones/${zoneIdentifier}/available_rate_plans`, options) as Core.APIPromise<{
-        result: RatePlanGetResponse | null;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export interface RatePlan {
-  /**
-   * Plan identifier tag.
-   */
-  id?: string;
-
-  /**
-   * Array of available components values for the plan.
-   */
-  components?: Array<RatePlan.Component>;
-
-  /**
-   * The monetary unit in which pricing information is displayed.
-   */
-  currency?: string;
-
-  /**
-   * The duration of the plan subscription.
-   */
-  duration?: number;
-
-  /**
-   * The frequency at which you will be billed for this plan.
-   */
-  frequency?: 'weekly' | 'monthly' | 'quarterly' | 'yearly';
-
-  /**
-   * The plan name.
-   */
-  name?: string;
-}
-
-export namespace RatePlan {
-  export interface Component {
-    /**
-     * The default amount allocated.
-     */
-    default?: number;
-
-    /**
-     * The unique component.
-     */
-    name?: 'zones' | 'page_rules' | 'dedicated_certificates' | 'dedicated_certificates_custom';
-
-    /**
-     * The unit price of the addon.
-     */
-    unit_price?: number;
-  }
-}
-
-export type RatePlanGetResponse = Array<RatePlan>;
diff --git a/src/resources/registrar/domains.ts b/src/resources/registrar/domains.ts
index e065542937..eccc7effdb 100644
--- a/src/resources/registrar/domains.ts
+++ b/src/resources/registrar/domains.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as DomainsAPI from './domains';
 import { SinglePage } from '../../pagination';
 
 export class Domains extends APIResource {
@@ -195,12 +194,12 @@ export namespace Domain {
     /**
      * Form of authorization has been accepted by the registrant.
      */
-    accept_foa?: string;
+    accept_foa?: 'needed' | 'ok';
 
     /**
      * Shows transfer status with the registry.
      */
-    approve_transfer?: string;
+    approve_transfer?: 'needed' | 'ok' | 'pending' | 'trying' | 'rejected' | 'unknown';
 
     /**
      * Indicates if cancellation is still possible.
@@ -210,23 +209,23 @@ export namespace Domain {
     /**
      * Privacy guards are disabled at the foreign registrar.
      */
-    disable_privacy?: unknown;
+    disable_privacy?: 'needed' | 'ok' | 'unknown';
 
     /**
      * Auth code has been entered and verified.
      */
-    enter_auth_code?: string;
+    enter_auth_code?: 'needed' | 'ok' | 'pending' | 'trying' | 'rejected';
 
     /**
      * Domain is unlocked at the foreign registrar.
      */
-    unlock_domain?: unknown;
+    unlock_domain?: 'needed' | 'ok' | 'pending' | 'trying' | 'unknown';
   }
 }
 
-export type DomainUpdateResponse = unknown | Array<unknown> | string;
+export type DomainUpdateResponse = unknown;
 
-export type DomainGetResponse = unknown | Array<unknown> | string;
+export type DomainGetResponse = unknown;
 
 export interface DomainUpdateParams {
   /**
@@ -265,12 +264,16 @@ export interface DomainGetParams {
   account_id: string;
 }
 
-export namespace Domains {
-  export import Domain = DomainsAPI.Domain;
-  export import DomainUpdateResponse = DomainsAPI.DomainUpdateResponse;
-  export import DomainGetResponse = DomainsAPI.DomainGetResponse;
-  export import DomainsSinglePage = DomainsAPI.DomainsSinglePage;
-  export import DomainUpdateParams = DomainsAPI.DomainUpdateParams;
-  export import DomainListParams = DomainsAPI.DomainListParams;
-  export import DomainGetParams = DomainsAPI.DomainGetParams;
+Domains.DomainsSinglePage = DomainsSinglePage;
+
+export declare namespace Domains {
+  export {
+    type Domain as Domain,
+    type DomainUpdateResponse as DomainUpdateResponse,
+    type DomainGetResponse as DomainGetResponse,
+    DomainsSinglePage as DomainsSinglePage,
+    type DomainUpdateParams as DomainUpdateParams,
+    type DomainListParams as DomainListParams,
+    type DomainGetParams as DomainGetParams,
+  };
 }
diff --git a/src/resources/registrar/index.ts b/src/resources/registrar/index.ts
index 20862ab100..577c1befbe 100644
--- a/src/resources/registrar/index.ts
+++ b/src/resources/registrar/index.ts
@@ -1,13 +1,13 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Domain,
-  DomainUpdateResponse,
-  DomainGetResponse,
-  DomainUpdateParams,
-  DomainListParams,
-  DomainGetParams,
   DomainsSinglePage,
   Domains,
+  type Domain,
+  type DomainUpdateResponse,
+  type DomainGetResponse,
+  type DomainUpdateParams,
+  type DomainListParams,
+  type DomainGetParams,
 } from './domains';
 export { Registrar } from './registrar';
diff --git a/src/resources/registrar/registrar.ts b/src/resources/registrar/registrar.ts
index c7b79a625d..024ae38f57 100644
--- a/src/resources/registrar/registrar.ts
+++ b/src/resources/registrar/registrar.ts
@@ -2,18 +2,33 @@
 
 import { APIResource } from '../../resource';
 import * as DomainsAPI from './domains';
+import {
+  Domain,
+  DomainGetParams,
+  DomainGetResponse,
+  DomainListParams,
+  DomainUpdateParams,
+  DomainUpdateResponse,
+  Domains,
+  DomainsSinglePage,
+} from './domains';
 
 export class Registrar extends APIResource {
   domains: DomainsAPI.Domains = new DomainsAPI.Domains(this._client);
 }
 
-export namespace Registrar {
-  export import Domains = DomainsAPI.Domains;
-  export import Domain = DomainsAPI.Domain;
-  export import DomainUpdateResponse = DomainsAPI.DomainUpdateResponse;
-  export import DomainGetResponse = DomainsAPI.DomainGetResponse;
-  export import DomainsSinglePage = DomainsAPI.DomainsSinglePage;
-  export import DomainUpdateParams = DomainsAPI.DomainUpdateParams;
-  export import DomainListParams = DomainsAPI.DomainListParams;
-  export import DomainGetParams = DomainsAPI.DomainGetParams;
+Registrar.Domains = Domains;
+Registrar.DomainsSinglePage = DomainsSinglePage;
+
+export declare namespace Registrar {
+  export {
+    Domains as Domains,
+    type Domain as Domain,
+    type DomainUpdateResponse as DomainUpdateResponse,
+    type DomainGetResponse as DomainGetResponse,
+    DomainsSinglePage as DomainsSinglePage,
+    type DomainUpdateParams as DomainUpdateParams,
+    type DomainListParams as DomainListParams,
+    type DomainGetParams as DomainGetParams,
+  };
 }
diff --git a/src/resources/request-tracers/index.ts b/src/resources/request-tracers/index.ts
index 0a4f6b455a..9e028924a4 100644
--- a/src/resources/request-tracers/index.ts
+++ b/src/resources/request-tracers/index.ts
@@ -1,4 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { RequestTracers } from './request-tracers';
-export { Trace, TraceItem, TraceCreateResponse, TraceCreateParams, Traces } from './traces';
+export {
+  Traces,
+  type Trace,
+  type TraceItem,
+  type TraceCreateResponse,
+  type TraceCreateParams,
+} from './traces';
diff --git a/src/resources/request-tracers/request-tracers.ts b/src/resources/request-tracers/request-tracers.ts
index 4d7396aa06..1980dfad3c 100644
--- a/src/resources/request-tracers/request-tracers.ts
+++ b/src/resources/request-tracers/request-tracers.ts
@@ -2,15 +2,20 @@
 
 import { APIResource } from '../../resource';
 import * as TracesAPI from './traces';
+import { Trace, TraceCreateParams, TraceCreateResponse, TraceItem, Traces } from './traces';
 
 export class RequestTracers extends APIResource {
   traces: TracesAPI.Traces = new TracesAPI.Traces(this._client);
 }
 
-export namespace RequestTracers {
-  export import Traces = TracesAPI.Traces;
-  export import Trace = TracesAPI.Trace;
-  export import TraceItem = TracesAPI.TraceItem;
-  export import TraceCreateResponse = TracesAPI.TraceCreateResponse;
-  export import TraceCreateParams = TracesAPI.TraceCreateParams;
+RequestTracers.Traces = Traces;
+
+export declare namespace RequestTracers {
+  export {
+    Traces as Traces,
+    type Trace as Trace,
+    type TraceItem as TraceItem,
+    type TraceCreateResponse as TraceCreateResponse,
+    type TraceCreateParams as TraceCreateParams,
+  };
 }
diff --git a/src/resources/request-tracers/traces.ts b/src/resources/request-tracers/traces.ts
index a93c4910c1..d86f1f49ac 100644
--- a/src/resources/request-tracers/traces.ts
+++ b/src/resources/request-tracers/traces.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as TracesAPI from './traces';
 
 export class Traces extends APIResource {
   /**
@@ -204,9 +203,11 @@ export namespace TraceCreateParams {
   }
 }
 
-export namespace Traces {
-  export import Trace = TracesAPI.Trace;
-  export import TraceItem = TracesAPI.TraceItem;
-  export import TraceCreateResponse = TracesAPI.TraceCreateResponse;
-  export import TraceCreateParams = TracesAPI.TraceCreateParams;
+export declare namespace Traces {
+  export {
+    type Trace as Trace,
+    type TraceItem as TraceItem,
+    type TraceCreateResponse as TraceCreateResponse,
+    type TraceCreateParams as TraceCreateParams,
+  };
 }
diff --git a/src/resources/resource-sharing/index.ts b/src/resources/resource-sharing/index.ts
new file mode 100644
index 0000000000..dc65044d98
--- /dev/null
+++ b/src/resources/resource-sharing/index.ts
@@ -0,0 +1,29 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  RecipientListResponsesV4PagePaginationArray,
+  Recipients,
+  type RecipientCreateResponse,
+  type RecipientListResponse,
+  type RecipientDeleteResponse,
+  type RecipientGetResponse,
+  type RecipientCreateParams,
+  type RecipientListParams,
+  type RecipientDeleteParams,
+  type RecipientGetParams,
+} from './recipients';
+export {
+  ResourceListResponsesV4PagePaginationArray,
+  Resources,
+  type ResourceCreateResponse,
+  type ResourceUpdateResponse,
+  type ResourceListResponse,
+  type ResourceDeleteResponse,
+  type ResourceGetResponse,
+  type ResourceCreateParams,
+  type ResourceUpdateParams,
+  type ResourceListParams,
+  type ResourceDeleteParams,
+  type ResourceGetParams,
+} from './resources';
+export { ResourceSharing } from './resource-sharing';
diff --git a/src/resources/resource-sharing/recipients.ts b/src/resources/resource-sharing/recipients.ts
new file mode 100644
index 0000000000..b1e19b8784
--- /dev/null
+++ b/src/resources/resource-sharing/recipients.ts
@@ -0,0 +1,261 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
+
+export class Recipients extends APIResource {
+  /**
+   * Create a new share recipient
+   */
+  create(
+    shareId: string,
+    params: RecipientCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RecipientCreateResponse> {
+    const { path_account_id, body_account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${path_account_id}/shares/${shareId}/recipients`, {
+        body: { account_id: body_account_id, ...body },
+        ...options,
+      }) as Core.APIPromise<{ result: RecipientCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List share recipients by share ID.
+   */
+  list(
+    shareId: string,
+    params: RecipientListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<RecipientListResponsesV4PagePaginationArray, RecipientListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/shares/${shareId}/recipients`,
+      RecipientListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Deletion is not immediate, an updated share recipient object with a new status
+   * will be returned.
+   */
+  delete(
+    shareId: string,
+    recipientId: string,
+    params: RecipientDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RecipientDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/shares/${shareId}/recipients/${recipientId}`,
+        options,
+      ) as Core.APIPromise<{ result: RecipientDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get share recipient by ID.
+   */
+  get(
+    shareId: string,
+    recipientId: string,
+    params: RecipientGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RecipientGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/shares/${shareId}/recipients/${recipientId}`,
+        options,
+      ) as Core.APIPromise<{ result: RecipientGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class RecipientListResponsesV4PagePaginationArray extends V4PagePaginationArray<RecipientListResponse> {}
+
+export interface RecipientCreateResponse {
+  /**
+   * Share Recipient identifier tag.
+   */
+  id: string;
+
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * Share Recipient association status.
+   */
+  association_status: 'associating' | 'associated' | 'disassociating' | 'disassociated';
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * Share Recipient status message.
+   */
+  status_message: string;
+}
+
+export interface RecipientListResponse {
+  /**
+   * Share Recipient identifier tag.
+   */
+  id: string;
+
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * Share Recipient association status.
+   */
+  association_status: 'associating' | 'associated' | 'disassociating' | 'disassociated';
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * Share Recipient status message.
+   */
+  status_message: string;
+}
+
+export interface RecipientDeleteResponse {
+  /**
+   * Share Recipient identifier tag.
+   */
+  id: string;
+
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * Share Recipient association status.
+   */
+  association_status: 'associating' | 'associated' | 'disassociating' | 'disassociated';
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * Share Recipient status message.
+   */
+  status_message: string;
+}
+
+export interface RecipientGetResponse {
+  /**
+   * Share Recipient identifier tag.
+   */
+  id: string;
+
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * Share Recipient association status.
+   */
+  association_status: 'associating' | 'associated' | 'disassociating' | 'disassociated';
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * Share Recipient status message.
+   */
+  status_message: string;
+}
+
+export interface RecipientCreateParams {
+  /**
+   * Path param: Account identifier.
+   */
+  path_account_id: string;
+
+  /**
+   * Body param: Account identifier.
+   */
+  body_account_id?: string;
+
+  /**
+   * Body param: Organization identifier.
+   */
+  organization_id?: string;
+}
+
+export interface RecipientListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account identifier.
+   */
+  account_id: string;
+}
+
+export interface RecipientDeleteParams {
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+}
+
+export interface RecipientGetParams {
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+}
+
+Recipients.RecipientListResponsesV4PagePaginationArray = RecipientListResponsesV4PagePaginationArray;
+
+export declare namespace Recipients {
+  export {
+    type RecipientCreateResponse as RecipientCreateResponse,
+    type RecipientListResponse as RecipientListResponse,
+    type RecipientDeleteResponse as RecipientDeleteResponse,
+    type RecipientGetResponse as RecipientGetResponse,
+    RecipientListResponsesV4PagePaginationArray as RecipientListResponsesV4PagePaginationArray,
+    type RecipientCreateParams as RecipientCreateParams,
+    type RecipientListParams as RecipientListParams,
+    type RecipientDeleteParams as RecipientDeleteParams,
+    type RecipientGetParams as RecipientGetParams,
+  };
+}
diff --git a/src/resources/resource-sharing/resource-sharing.ts b/src/resources/resource-sharing/resource-sharing.ts
new file mode 100644
index 0000000000..ddd96b75a6
--- /dev/null
+++ b/src/resources/resource-sharing/resource-sharing.ts
@@ -0,0 +1,489 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import * as RecipientsAPI from './recipients';
+import {
+  RecipientCreateParams,
+  RecipientCreateResponse,
+  RecipientDeleteParams,
+  RecipientDeleteResponse,
+  RecipientGetParams,
+  RecipientGetResponse,
+  RecipientListParams,
+  RecipientListResponse,
+  RecipientListResponsesV4PagePaginationArray,
+  Recipients,
+} from './recipients';
+import * as ResourcesAPI from './resources';
+import {
+  ResourceCreateParams,
+  ResourceCreateResponse,
+  ResourceDeleteParams,
+  ResourceDeleteResponse,
+  ResourceGetParams,
+  ResourceGetResponse,
+  ResourceListParams,
+  ResourceListResponse,
+  ResourceListResponsesV4PagePaginationArray,
+  ResourceUpdateParams,
+  ResourceUpdateResponse,
+  Resources,
+} from './resources';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
+
+export class ResourceSharing extends APIResource {
+  recipients: RecipientsAPI.Recipients = new RecipientsAPI.Recipients(this._client);
+  resources: ResourcesAPI.Resources = new ResourcesAPI.Resources(this._client);
+
+  /**
+   * Create a new share
+   */
+  create(
+    params: ResourceSharingCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ResourceSharingCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/shares`, { body, ...options }) as Core.APIPromise<{
+        result: ResourceSharingCreateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Updating is not immediate, an updated share object with a new status will be
+   * returned.
+   */
+  update(
+    shareId: string,
+    params: ResourceSharingUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ResourceSharingUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/shares/${shareId}`, { body, ...options }) as Core.APIPromise<{
+        result: ResourceSharingUpdateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists all account shares.
+   */
+  list(
+    params: ResourceSharingListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<ResourceSharingListResponsesV4PagePaginationArray, ResourceSharingListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/shares`,
+      ResourceSharingListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Deletion is not immediate, an updated share object with a new status will be
+   * returned.
+   */
+  delete(
+    shareId: string,
+    params: ResourceSharingDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ResourceSharingDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}/shares/${shareId}`, options) as Core.APIPromise<{
+        result: ResourceSharingDeleteResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches share by ID.
+   */
+  get(
+    shareId: string,
+    params: ResourceSharingGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ResourceSharingGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/shares/${shareId}`, options) as Core.APIPromise<{
+        result: ResourceSharingGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class ResourceSharingListResponsesV4PagePaginationArray extends V4PagePaginationArray<ResourceSharingListResponse> {}
+
+export interface ResourceSharingCreateResponse {
+  /**
+   * Share identifier tag.
+   */
+  id: string;
+
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * The display name of an account.
+   */
+  account_name: string;
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * The name of the share.
+   */
+  name: string;
+
+  /**
+   * Organization identifier.
+   */
+  organization_id: string;
+
+  status: 'active' | 'deleting' | 'deleted';
+
+  target_type: 'account' | 'organization';
+
+  kind?: 'sent' | 'received';
+}
+
+export interface ResourceSharingUpdateResponse {
+  /**
+   * Share identifier tag.
+   */
+  id: string;
+
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * The display name of an account.
+   */
+  account_name: string;
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * The name of the share.
+   */
+  name: string;
+
+  /**
+   * Organization identifier.
+   */
+  organization_id: string;
+
+  status: 'active' | 'deleting' | 'deleted';
+
+  target_type: 'account' | 'organization';
+
+  kind?: 'sent' | 'received';
+}
+
+export interface ResourceSharingListResponse {
+  /**
+   * Share identifier tag.
+   */
+  id: string;
+
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * The display name of an account.
+   */
+  account_name: string;
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * The name of the share.
+   */
+  name: string;
+
+  /**
+   * Organization identifier.
+   */
+  organization_id: string;
+
+  status: 'active' | 'deleting' | 'deleted';
+
+  target_type: 'account' | 'organization';
+
+  kind?: 'sent' | 'received';
+}
+
+export interface ResourceSharingDeleteResponse {
+  /**
+   * Share identifier tag.
+   */
+  id: string;
+
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * The display name of an account.
+   */
+  account_name: string;
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * The name of the share.
+   */
+  name: string;
+
+  /**
+   * Organization identifier.
+   */
+  organization_id: string;
+
+  status: 'active' | 'deleting' | 'deleted';
+
+  target_type: 'account' | 'organization';
+
+  kind?: 'sent' | 'received';
+}
+
+export interface ResourceSharingGetResponse {
+  /**
+   * Share identifier tag.
+   */
+  id: string;
+
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * The display name of an account.
+   */
+  account_name: string;
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * The name of the share.
+   */
+  name: string;
+
+  /**
+   * Organization identifier.
+   */
+  organization_id: string;
+
+  status: 'active' | 'deleting' | 'deleted';
+
+  target_type: 'account' | 'organization';
+
+  kind?: 'sent' | 'received';
+}
+
+export interface ResourceSharingCreateParams {
+  /**
+   * Path param: Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * Body param: The name of the share.
+   */
+  name: string;
+
+  /**
+   * Body param:
+   */
+  recipients: Array<ResourceSharingCreateParams.Recipient>;
+
+  /**
+   * Body param:
+   */
+  resources: Array<ResourceSharingCreateParams.Resource>;
+}
+
+export namespace ResourceSharingCreateParams {
+  /**
+   * Account or organization ID must be provided.
+   */
+  export interface Recipient {
+    /**
+     * Account identifier.
+     */
+    account_id?: string;
+
+    /**
+     * Organization identifier.
+     */
+    organization_id?: string;
+  }
+
+  export interface Resource {
+    /**
+     * Resource Metadata.
+     */
+    meta: unknown;
+
+    /**
+     * Account identifier.
+     */
+    resource_account_id: string;
+
+    /**
+     * Share Resource identifier.
+     */
+    resource_id: string;
+
+    /**
+     * Resource Type.
+     */
+    resource_type: 'custom-ruleset' | 'widget';
+  }
+}
+
+export interface ResourceSharingUpdateParams {
+  /**
+   * Path param: Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * Body param: The name of the share.
+   */
+  name: string;
+}
+
+export interface ResourceSharingListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * Query param: Direction to sort objects.
+   */
+  direction?: 'asc' | 'desc';
+
+  /**
+   * Query param: Filter shares by kind.
+   */
+  kind?: 'sent' | 'received';
+
+  /**
+   * Query param: Order shares by values in the given field.
+   */
+  order?: 'name' | 'created';
+
+  /**
+   * Query param: Filter shares by status.
+   */
+  status?: 'active' | 'deleting' | 'deleted';
+
+  /**
+   * Query param: Filter shares by target_type.
+   */
+  target_type?: 'account' | 'organization';
+}
+
+export interface ResourceSharingDeleteParams {
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+}
+
+export interface ResourceSharingGetParams {
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+}
+
+ResourceSharing.Recipients = Recipients;
+ResourceSharing.RecipientListResponsesV4PagePaginationArray = RecipientListResponsesV4PagePaginationArray;
+ResourceSharing.Resources = Resources;
+ResourceSharing.ResourceListResponsesV4PagePaginationArray = ResourceListResponsesV4PagePaginationArray;
+
+export declare namespace ResourceSharing {
+  export {
+    Recipients as Recipients,
+    type RecipientCreateResponse as RecipientCreateResponse,
+    type RecipientListResponse as RecipientListResponse,
+    type RecipientDeleteResponse as RecipientDeleteResponse,
+    type RecipientGetResponse as RecipientGetResponse,
+    RecipientListResponsesV4PagePaginationArray as RecipientListResponsesV4PagePaginationArray,
+    type RecipientCreateParams as RecipientCreateParams,
+    type RecipientListParams as RecipientListParams,
+    type RecipientDeleteParams as RecipientDeleteParams,
+    type RecipientGetParams as RecipientGetParams,
+  };
+
+  export {
+    Resources as Resources,
+    type ResourceCreateResponse as ResourceCreateResponse,
+    type ResourceUpdateResponse as ResourceUpdateResponse,
+    type ResourceListResponse as ResourceListResponse,
+    type ResourceDeleteResponse as ResourceDeleteResponse,
+    type ResourceGetResponse as ResourceGetResponse,
+    ResourceListResponsesV4PagePaginationArray as ResourceListResponsesV4PagePaginationArray,
+    type ResourceCreateParams as ResourceCreateParams,
+    type ResourceUpdateParams as ResourceUpdateParams,
+    type ResourceListParams as ResourceListParams,
+    type ResourceDeleteParams as ResourceDeleteParams,
+    type ResourceGetParams as ResourceGetParams,
+  };
+}
diff --git a/src/resources/resource-sharing/resources.ts b/src/resources/resource-sharing/resources.ts
new file mode 100644
index 0000000000..b5795c87ed
--- /dev/null
+++ b/src/resources/resource-sharing/resources.ts
@@ -0,0 +1,421 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
+
+export class Resources extends APIResource {
+  /**
+   * Create a new share resource
+   */
+  create(
+    shareId: string,
+    params: ResourceCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ResourceCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/shares/${shareId}/resources`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: ResourceCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update is not immediate, an updated share resource object with a new status will
+   * be returned.
+   */
+  update(
+    shareId: string,
+    resourceId: string,
+    params: ResourceUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ResourceUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/shares/${shareId}/resources/${resourceId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: ResourceUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List share resources by share ID.
+   */
+  list(
+    shareId: string,
+    params: ResourceListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<ResourceListResponsesV4PagePaginationArray, ResourceListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/shares/${shareId}/resources`,
+      ResourceListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Deletion is not immediate, an updated share resource object with a new status
+   * will be returned.
+   */
+  delete(
+    shareId: string,
+    resourceId: string,
+    params: ResourceDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ResourceDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/shares/${shareId}/resources/${resourceId}`,
+        options,
+      ) as Core.APIPromise<{ result: ResourceDeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get share resource by ID.
+   */
+  get(
+    shareId: string,
+    resourceId: string,
+    params: ResourceGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ResourceGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/shares/${shareId}/resources/${resourceId}`,
+        options,
+      ) as Core.APIPromise<{ result: ResourceGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class ResourceListResponsesV4PagePaginationArray extends V4PagePaginationArray<ResourceListResponse> {}
+
+export interface ResourceCreateResponse {
+  /**
+   * Share Resource identifier.
+   */
+  id: string;
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * Resource Metadata.
+   */
+  meta: unknown;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * Account identifier.
+   */
+  resource_account_id: string;
+
+  /**
+   * Share Resource identifier.
+   */
+  resource_id: string;
+
+  /**
+   * Resource Type.
+   */
+  resource_type: 'custom-ruleset' | 'widget';
+
+  /**
+   * Resource Version.
+   */
+  resource_version: number;
+
+  /**
+   * Resource Status.
+   */
+  status: 'active' | 'deleting' | 'deleted';
+}
+
+export interface ResourceUpdateResponse {
+  /**
+   * Share Resource identifier.
+   */
+  id: string;
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * Resource Metadata.
+   */
+  meta: unknown;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * Account identifier.
+   */
+  resource_account_id: string;
+
+  /**
+   * Share Resource identifier.
+   */
+  resource_id: string;
+
+  /**
+   * Resource Type.
+   */
+  resource_type: 'custom-ruleset' | 'widget';
+
+  /**
+   * Resource Version.
+   */
+  resource_version: number;
+
+  /**
+   * Resource Status.
+   */
+  status: 'active' | 'deleting' | 'deleted';
+}
+
+export interface ResourceListResponse {
+  /**
+   * Share Resource identifier.
+   */
+  id: string;
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * Resource Metadata.
+   */
+  meta: unknown;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * Account identifier.
+   */
+  resource_account_id: string;
+
+  /**
+   * Share Resource identifier.
+   */
+  resource_id: string;
+
+  /**
+   * Resource Type.
+   */
+  resource_type: 'custom-ruleset' | 'widget';
+
+  /**
+   * Resource Version.
+   */
+  resource_version: number;
+
+  /**
+   * Resource Status.
+   */
+  status: 'active' | 'deleting' | 'deleted';
+}
+
+export interface ResourceDeleteResponse {
+  /**
+   * Share Resource identifier.
+   */
+  id: string;
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * Resource Metadata.
+   */
+  meta: unknown;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * Account identifier.
+   */
+  resource_account_id: string;
+
+  /**
+   * Share Resource identifier.
+   */
+  resource_id: string;
+
+  /**
+   * Resource Type.
+   */
+  resource_type: 'custom-ruleset' | 'widget';
+
+  /**
+   * Resource Version.
+   */
+  resource_version: number;
+
+  /**
+   * Resource Status.
+   */
+  status: 'active' | 'deleting' | 'deleted';
+}
+
+export interface ResourceGetResponse {
+  /**
+   * Share Resource identifier.
+   */
+  id: string;
+
+  /**
+   * When the share was created.
+   */
+  created: string;
+
+  /**
+   * Resource Metadata.
+   */
+  meta: unknown;
+
+  /**
+   * When the share was modified.
+   */
+  modified: string;
+
+  /**
+   * Account identifier.
+   */
+  resource_account_id: string;
+
+  /**
+   * Share Resource identifier.
+   */
+  resource_id: string;
+
+  /**
+   * Resource Type.
+   */
+  resource_type: 'custom-ruleset' | 'widget';
+
+  /**
+   * Resource Version.
+   */
+  resource_version: number;
+
+  /**
+   * Resource Status.
+   */
+  status: 'active' | 'deleting' | 'deleted';
+}
+
+export interface ResourceCreateParams {
+  /**
+   * Path param: Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * Body param: Resource Metadata.
+   */
+  meta: unknown;
+
+  /**
+   * Body param: Account identifier.
+   */
+  resource_account_id: string;
+
+  /**
+   * Body param: Share Resource identifier.
+   */
+  resource_id: string;
+
+  /**
+   * Body param: Resource Type.
+   */
+  resource_type: 'custom-ruleset' | 'widget';
+}
+
+export interface ResourceUpdateParams {
+  /**
+   * Path param: Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * Body param: Resource Metadata.
+   */
+  meta: unknown;
+}
+
+export interface ResourceListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account identifier.
+   */
+  account_id: string;
+
+  /**
+   * Query param: Filter share resources by resource_type.
+   */
+  resource_type?: 'custom-ruleset' | 'widget';
+
+  /**
+   * Query param: Filter share resources by status.
+   */
+  status?: 'active' | 'deleting' | 'deleted';
+}
+
+export interface ResourceDeleteParams {
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+}
+
+export interface ResourceGetParams {
+  /**
+   * Account identifier.
+   */
+  account_id: string;
+}
+
+Resources.ResourceListResponsesV4PagePaginationArray = ResourceListResponsesV4PagePaginationArray;
+
+export declare namespace Resources {
+  export {
+    type ResourceCreateResponse as ResourceCreateResponse,
+    type ResourceUpdateResponse as ResourceUpdateResponse,
+    type ResourceListResponse as ResourceListResponse,
+    type ResourceDeleteResponse as ResourceDeleteResponse,
+    type ResourceGetResponse as ResourceGetResponse,
+    ResourceListResponsesV4PagePaginationArray as ResourceListResponsesV4PagePaginationArray,
+    type ResourceCreateParams as ResourceCreateParams,
+    type ResourceUpdateParams as ResourceUpdateParams,
+    type ResourceListParams as ResourceListParams,
+    type ResourceDeleteParams as ResourceDeleteParams,
+    type ResourceGetParams as ResourceGetParams,
+  };
+}
diff --git a/src/resources/rules/index.ts b/src/resources/rules/index.ts
index 6d4f2c3525..5cf6cec221 100644
--- a/src/resources/rules/index.ts
+++ b/src/resources/rules/index.ts
@@ -1,16 +1,16 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Hostname,
-  ListsList,
-  Redirect,
-  ListDeleteResponse,
-  ListCreateParams,
-  ListUpdateParams,
-  ListListParams,
-  ListDeleteParams,
-  ListGetParams,
   ListsListsSinglePage,
   Lists,
+  type Hostname,
+  type ListsList,
+  type Redirect,
+  type ListDeleteResponse,
+  type ListCreateParams,
+  type ListUpdateParams,
+  type ListListParams,
+  type ListDeleteParams,
+  type ListGetParams,
 } from './lists/index';
 export { Rules } from './rules';
diff --git a/src/resources/rules/lists/bulk-operations.ts b/src/resources/rules/lists/bulk-operations.ts
index 97571df020..f321d4858a 100644
--- a/src/resources/rules/lists/bulk-operations.ts
+++ b/src/resources/rules/lists/bulk-operations.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as BulkOperationsAPI from './bulk-operations';
 
 export class BulkOperations extends APIResource {
   /**
@@ -16,12 +15,12 @@ export class BulkOperations extends APIResource {
     accountIdentifier: string,
     operationId: string,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<BulkOperationGetResponse | null> {
+  ): Core.APIPromise<BulkOperationGetResponse> {
     return (
       this._client.get(
         `/accounts/${accountIdentifier}/rules/lists/bulk_operations/${operationId}`,
         options,
-      ) as Core.APIPromise<{ result: BulkOperationGetResponse | null }>
+      ) as Core.APIPromise<{ result: BulkOperationGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -31,9 +30,31 @@ export class BulkOperations extends APIResource {
  */
 export type OperationStatus = 'pending' | 'running' | 'completed' | 'failed';
 
-export type BulkOperationGetResponse = Array<unknown>;
+export interface BulkOperationGetResponse {
+  /**
+   * The unique operation ID of the asynchronous action.
+   */
+  id: string;
+
+  /**
+   * The current status of the asynchronous operation.
+   */
+  status: OperationStatus;
+
+  /**
+   * The RFC 3339 timestamp of when the operation was completed.
+   */
+  completed?: string;
+
+  /**
+   * A message describing the error when the status is `failed`.
+   */
+  error?: string;
+}
 
-export namespace BulkOperations {
-  export import OperationStatus = BulkOperationsAPI.OperationStatus;
-  export import BulkOperationGetResponse = BulkOperationsAPI.BulkOperationGetResponse;
+export declare namespace BulkOperations {
+  export {
+    type OperationStatus as OperationStatus,
+    type BulkOperationGetResponse as BulkOperationGetResponse,
+  };
 }
diff --git a/src/resources/rules/lists/index.ts b/src/resources/rules/lists/index.ts
index 02e60d5a15..125176ba37 100644
--- a/src/resources/rules/lists/index.ts
+++ b/src/resources/rules/lists/index.ts
@@ -1,31 +1,31 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export { BulkOperations, type OperationStatus, type BulkOperationGetResponse } from './bulk-operations';
 export {
-  Hostname,
-  ListsList,
-  Redirect,
-  ListDeleteResponse,
-  ListCreateParams,
-  ListUpdateParams,
-  ListListParams,
-  ListDeleteParams,
-  ListGetParams,
-  ListsListsSinglePage,
-  Lists,
-} from './lists';
-export {
-  ListCursor,
-  ListItem,
-  ItemCreateResponse,
-  ItemUpdateResponse,
-  ItemListResponse,
-  ItemDeleteResponse,
-  ItemGetResponse,
-  ItemCreateParams,
-  ItemUpdateParams,
-  ItemListParams,
-  ItemDeleteParams,
   ItemListResponsesCursorPagination,
   Items,
+  type ListCursor,
+  type ListItem,
+  type ItemCreateResponse,
+  type ItemUpdateResponse,
+  type ItemListResponse,
+  type ItemDeleteResponse,
+  type ItemGetResponse,
+  type ItemCreateParams,
+  type ItemUpdateParams,
+  type ItemListParams,
+  type ItemDeleteParams,
 } from './items';
-export { OperationStatus, BulkOperationGetResponse, BulkOperations } from './bulk-operations';
+export {
+  ListsListsSinglePage,
+  Lists,
+  type Hostname,
+  type ListsList,
+  type Redirect,
+  type ListDeleteResponse,
+  type ListCreateParams,
+  type ListUpdateParams,
+  type ListListParams,
+  type ListDeleteParams,
+  type ListGetParams,
+} from './lists';
diff --git a/src/resources/rules/lists/items.ts b/src/resources/rules/lists/items.ts
index 0ffb89b0bf..90d1442bf7 100644
--- a/src/resources/rules/lists/items.ts
+++ b/src/resources/rules/lists/items.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ItemsAPI from './items';
 import * as ListsAPI from './lists';
 import { CursorPagination, type CursorPaginationParams } from '../../../pagination';
 
@@ -18,13 +17,13 @@ export class Items extends APIResource {
     listId: string,
     params: ItemCreateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ItemCreateResponse | null> {
+  ): Core.APIPromise<ItemCreateResponse> {
     const { account_id, body } = params;
     return (
       this._client.post(`/accounts/${account_id}/rules/lists/${listId}/items`, {
         body: body,
         ...options,
-      }) as Core.APIPromise<{ result: ItemCreateResponse | null }>
+      }) as Core.APIPromise<{ result: ItemCreateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -40,13 +39,13 @@ export class Items extends APIResource {
     listId: string,
     params: ItemUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ItemUpdateResponse | null> {
+  ): Core.APIPromise<ItemUpdateResponse> {
     const { account_id, body } = params;
     return (
       this._client.put(`/accounts/${account_id}/rules/lists/${listId}/items`, {
         body: body,
         ...options,
-      }) as Core.APIPromise<{ result: ItemUpdateResponse | null }>
+      }) as Core.APIPromise<{ result: ItemUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -77,11 +76,11 @@ export class Items extends APIResource {
     listId: string,
     params: ItemDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ItemDeleteResponse | null> {
+  ): Core.APIPromise<ItemDeleteResponse> {
     const { account_id } = params;
     return (
       this._client.delete(`/accounts/${account_id}/rules/lists/${listId}/items`, options) as Core.APIPromise<{
-        result: ItemDeleteResponse | null;
+        result: ItemDeleteResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -94,12 +93,12 @@ export class Items extends APIResource {
     listId: string,
     itemId: string,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ItemGetResponse | null> {
+  ): Core.APIPromise<ItemGetResponse> {
     return (
       this._client.get(
         `/accounts/${accountIdentifier}/rules/lists/${listId}/items/${itemId}`,
         options,
-      ) as Core.APIPromise<{ result: ItemGetResponse | null }>
+      ) as Core.APIPromise<{ result: ItemGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -133,7 +132,49 @@ export interface ItemUpdateResponse {
   operation_id?: string;
 }
 
-export type ItemListResponse = unknown;
+export interface ItemListResponse {
+  /**
+   * The unique ID of the list.
+   */
+  id?: string;
+
+  /**
+   * A non-negative 32 bit integer
+   */
+  asn?: number;
+
+  /**
+   * An informative summary of the list item.
+   */
+  comment?: string;
+
+  /**
+   * The RFC 3339 timestamp of when the item was created.
+   */
+  created_on?: string;
+
+  /**
+   * Valid characters for hostnames are ASCII(7) letters from a to z, the digits from
+   * 0 to 9, wildcards (\*), and the hyphen (-).
+   */
+  hostname?: ListsAPI.Hostname;
+
+  /**
+   * An IPv4 address, an IPv4 CIDR, or an IPv6 CIDR. IPv6 CIDRs are limited to a
+   * maximum of /64.
+   */
+  ip?: string;
+
+  /**
+   * The RFC 3339 timestamp of when the item was last modified.
+   */
+  modified_on?: string;
+
+  /**
+   * The definition of the redirect.
+   */
+  redirect?: ListsAPI.Redirect;
+}
 
 export interface ItemDeleteResponse {
   /**
@@ -142,11 +183,49 @@ export interface ItemDeleteResponse {
   operation_id?: string;
 }
 
-/**
- * An IPv4 address, an IPv4 CIDR, or an IPv6 CIDR. IPv6 CIDRs are limited to a
- * maximum of /64.
- */
-export type ItemGetResponse = string | ListsAPI.Redirect | ListsAPI.Hostname | number;
+export interface ItemGetResponse {
+  /**
+   * The unique ID of the list.
+   */
+  id?: string;
+
+  /**
+   * A non-negative 32 bit integer
+   */
+  asn?: number;
+
+  /**
+   * An informative summary of the list item.
+   */
+  comment?: string;
+
+  /**
+   * The RFC 3339 timestamp of when the item was created.
+   */
+  created_on?: string;
+
+  /**
+   * Valid characters for hostnames are ASCII(7) letters from a to z, the digits from
+   * 0 to 9, wildcards (\*), and the hyphen (-).
+   */
+  hostname?: ListsAPI.Hostname;
+
+  /**
+   * An IPv4 address, an IPv4 CIDR, or an IPv6 CIDR. IPv6 CIDRs are limited to a
+   * maximum of /64.
+   */
+  ip?: string;
+
+  /**
+   * The RFC 3339 timestamp of when the item was last modified.
+   */
+  modified_on?: string;
+
+  /**
+   * The definition of the redirect.
+   */
+  redirect?: ListsAPI.Redirect;
+}
 
 export interface ItemCreateParams {
   /**
@@ -255,17 +334,21 @@ export interface ItemDeleteParams {
   account_id: string;
 }
 
-export namespace Items {
-  export import ListCursor = ItemsAPI.ListCursor;
-  export import ListItem = ItemsAPI.ListItem;
-  export import ItemCreateResponse = ItemsAPI.ItemCreateResponse;
-  export import ItemUpdateResponse = ItemsAPI.ItemUpdateResponse;
-  export import ItemListResponse = ItemsAPI.ItemListResponse;
-  export import ItemDeleteResponse = ItemsAPI.ItemDeleteResponse;
-  export import ItemGetResponse = ItemsAPI.ItemGetResponse;
-  export import ItemListResponsesCursorPagination = ItemsAPI.ItemListResponsesCursorPagination;
-  export import ItemCreateParams = ItemsAPI.ItemCreateParams;
-  export import ItemUpdateParams = ItemsAPI.ItemUpdateParams;
-  export import ItemListParams = ItemsAPI.ItemListParams;
-  export import ItemDeleteParams = ItemsAPI.ItemDeleteParams;
+Items.ItemListResponsesCursorPagination = ItemListResponsesCursorPagination;
+
+export declare namespace Items {
+  export {
+    type ListCursor as ListCursor,
+    type ListItem as ListItem,
+    type ItemCreateResponse as ItemCreateResponse,
+    type ItemUpdateResponse as ItemUpdateResponse,
+    type ItemListResponse as ItemListResponse,
+    type ItemDeleteResponse as ItemDeleteResponse,
+    type ItemGetResponse as ItemGetResponse,
+    ItemListResponsesCursorPagination as ItemListResponsesCursorPagination,
+    type ItemCreateParams as ItemCreateParams,
+    type ItemUpdateParams as ItemUpdateParams,
+    type ItemListParams as ItemListParams,
+    type ItemDeleteParams as ItemDeleteParams,
+  };
 }
diff --git a/src/resources/rules/lists/lists.ts b/src/resources/rules/lists/lists.ts
index 5db7df38f3..e93cf4c831 100644
--- a/src/resources/rules/lists/lists.ts
+++ b/src/resources/rules/lists/lists.ts
@@ -2,9 +2,24 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ListsAPI from './lists';
 import * as BulkOperationsAPI from './bulk-operations';
+import { BulkOperationGetResponse, BulkOperations, OperationStatus } from './bulk-operations';
 import * as ItemsAPI from './items';
+import {
+  ItemCreateParams,
+  ItemCreateResponse,
+  ItemDeleteParams,
+  ItemDeleteResponse,
+  ItemGetResponse,
+  ItemListParams,
+  ItemListResponse,
+  ItemListResponsesCursorPagination,
+  ItemUpdateParams,
+  ItemUpdateResponse,
+  Items,
+  ListCursor,
+  ListItem,
+} from './items';
 import { SinglePage } from '../../../pagination';
 
 export class Lists extends APIResource {
@@ -14,11 +29,11 @@ export class Lists extends APIResource {
   /**
    * Creates a new list of the specified type.
    */
-  create(params: ListCreateParams, options?: Core.RequestOptions): Core.APIPromise<ListsList | null> {
+  create(params: ListCreateParams, options?: Core.RequestOptions): Core.APIPromise<ListsList> {
     const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/rules/lists`, { body, ...options }) as Core.APIPromise<{
-        result: ListsList | null;
+        result: ListsList;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -30,13 +45,13 @@ export class Lists extends APIResource {
     listId: string,
     params: ListUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ListsList | null> {
+  ): Core.APIPromise<ListsList> {
     const { account_id, ...body } = params;
     return (
       this._client.put(`/accounts/${account_id}/rules/lists/${listId}`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: ListsList | null }>
+      }) as Core.APIPromise<{ result: ListsList }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -58,11 +73,11 @@ export class Lists extends APIResource {
     listId: string,
     params: ListDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ListDeleteResponse | null> {
+  ): Core.APIPromise<ListDeleteResponse> {
     const { account_id } = params;
     return (
       this._client.delete(`/accounts/${account_id}/rules/lists/${listId}`, options) as Core.APIPromise<{
-        result: ListDeleteResponse | null;
+        result: ListDeleteResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -70,15 +85,11 @@ export class Lists extends APIResource {
   /**
    * Fetches the details of a list.
    */
-  get(
-    listId: string,
-    params: ListGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<ListsList | null> {
+  get(listId: string, params: ListGetParams, options?: Core.RequestOptions): Core.APIPromise<ListsList> {
     const { account_id } = params;
     return (
       this._client.get(`/accounts/${account_id}/rules/lists/${listId}`, options) as Core.APIPromise<{
-        result: ListsList | null;
+        result: ListsList;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -247,31 +258,44 @@ export interface ListGetParams {
   account_id: string;
 }
 
-export namespace Lists {
-  export import Hostname = ListsAPI.Hostname;
-  export import ListsList = ListsAPI.ListsList;
-  export import Redirect = ListsAPI.Redirect;
-  export import ListDeleteResponse = ListsAPI.ListDeleteResponse;
-  export import ListsListsSinglePage = ListsAPI.ListsListsSinglePage;
-  export import ListCreateParams = ListsAPI.ListCreateParams;
-  export import ListUpdateParams = ListsAPI.ListUpdateParams;
-  export import ListListParams = ListsAPI.ListListParams;
-  export import ListDeleteParams = ListsAPI.ListDeleteParams;
-  export import ListGetParams = ListsAPI.ListGetParams;
-  export import BulkOperations = BulkOperationsAPI.BulkOperations;
-  export import OperationStatus = BulkOperationsAPI.OperationStatus;
-  export import BulkOperationGetResponse = BulkOperationsAPI.BulkOperationGetResponse;
-  export import Items = ItemsAPI.Items;
-  export import ListCursor = ItemsAPI.ListCursor;
-  export import ListItem = ItemsAPI.ListItem;
-  export import ItemCreateResponse = ItemsAPI.ItemCreateResponse;
-  export import ItemUpdateResponse = ItemsAPI.ItemUpdateResponse;
-  export import ItemListResponse = ItemsAPI.ItemListResponse;
-  export import ItemDeleteResponse = ItemsAPI.ItemDeleteResponse;
-  export import ItemGetResponse = ItemsAPI.ItemGetResponse;
-  export import ItemListResponsesCursorPagination = ItemsAPI.ItemListResponsesCursorPagination;
-  export import ItemCreateParams = ItemsAPI.ItemCreateParams;
-  export import ItemUpdateParams = ItemsAPI.ItemUpdateParams;
-  export import ItemListParams = ItemsAPI.ItemListParams;
-  export import ItemDeleteParams = ItemsAPI.ItemDeleteParams;
+Lists.ListsListsSinglePage = ListsListsSinglePage;
+Lists.BulkOperations = BulkOperations;
+Lists.Items = Items;
+Lists.ItemListResponsesCursorPagination = ItemListResponsesCursorPagination;
+
+export declare namespace Lists {
+  export {
+    type Hostname as Hostname,
+    type ListsList as ListsList,
+    type Redirect as Redirect,
+    type ListDeleteResponse as ListDeleteResponse,
+    ListsListsSinglePage as ListsListsSinglePage,
+    type ListCreateParams as ListCreateParams,
+    type ListUpdateParams as ListUpdateParams,
+    type ListListParams as ListListParams,
+    type ListDeleteParams as ListDeleteParams,
+    type ListGetParams as ListGetParams,
+  };
+
+  export {
+    BulkOperations as BulkOperations,
+    type OperationStatus as OperationStatus,
+    type BulkOperationGetResponse as BulkOperationGetResponse,
+  };
+
+  export {
+    Items as Items,
+    type ListCursor as ListCursor,
+    type ListItem as ListItem,
+    type ItemCreateResponse as ItemCreateResponse,
+    type ItemUpdateResponse as ItemUpdateResponse,
+    type ItemListResponse as ItemListResponse,
+    type ItemDeleteResponse as ItemDeleteResponse,
+    type ItemGetResponse as ItemGetResponse,
+    ItemListResponsesCursorPagination as ItemListResponsesCursorPagination,
+    type ItemCreateParams as ItemCreateParams,
+    type ItemUpdateParams as ItemUpdateParams,
+    type ItemListParams as ItemListParams,
+    type ItemDeleteParams as ItemDeleteParams,
+  };
 }
diff --git a/src/resources/rules/rules.ts b/src/resources/rules/rules.ts
index 024dcf605e..d2a2ccbf5e 100644
--- a/src/resources/rules/rules.ts
+++ b/src/resources/rules/rules.ts
@@ -2,21 +2,39 @@
 
 import { APIResource } from '../../resource';
 import * as ListsAPI from './lists/lists';
+import {
+  Hostname,
+  ListCreateParams,
+  ListDeleteParams,
+  ListDeleteResponse,
+  ListGetParams,
+  ListListParams,
+  ListUpdateParams,
+  Lists,
+  ListsList,
+  ListsListsSinglePage,
+  Redirect,
+} from './lists/lists';
 
 export class Rules extends APIResource {
   lists: ListsAPI.Lists = new ListsAPI.Lists(this._client);
 }
 
-export namespace Rules {
-  export import Lists = ListsAPI.Lists;
-  export import Hostname = ListsAPI.Hostname;
-  export import ListsList = ListsAPI.ListsList;
-  export import Redirect = ListsAPI.Redirect;
-  export import ListDeleteResponse = ListsAPI.ListDeleteResponse;
-  export import ListsListsSinglePage = ListsAPI.ListsListsSinglePage;
-  export import ListCreateParams = ListsAPI.ListCreateParams;
-  export import ListUpdateParams = ListsAPI.ListUpdateParams;
-  export import ListListParams = ListsAPI.ListListParams;
-  export import ListDeleteParams = ListsAPI.ListDeleteParams;
-  export import ListGetParams = ListsAPI.ListGetParams;
+Rules.Lists = Lists;
+Rules.ListsListsSinglePage = ListsListsSinglePage;
+
+export declare namespace Rules {
+  export {
+    Lists as Lists,
+    type Hostname as Hostname,
+    type ListsList as ListsList,
+    type Redirect as Redirect,
+    type ListDeleteResponse as ListDeleteResponse,
+    ListsListsSinglePage as ListsListsSinglePage,
+    type ListCreateParams as ListCreateParams,
+    type ListUpdateParams as ListUpdateParams,
+    type ListListParams as ListListParams,
+    type ListDeleteParams as ListDeleteParams,
+    type ListGetParams as ListGetParams,
+  };
 }
diff --git a/src/resources/rulesets/index.ts b/src/resources/rulesets/index.ts
index 1422ae1008..f36949cca7 100644
--- a/src/resources/rulesets/index.ts
+++ b/src/resources/rulesets/index.ts
@@ -1,46 +1,47 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  BlockRule,
-  ChallengeRule,
-  CompressResponseRule,
-  ExecuteRule,
-  JSChallengeRule,
-  LogRule,
-  Logging,
-  ManagedChallengeRule,
-  RedirectRule,
-  RewriteRule,
-  RewriteURIPart,
-  RouteRule,
-  RulesetRule,
-  ScoreRule,
-  ServeErrorRule,
-  SetCacheSettingsRule,
-  SetConfigRule,
-  SkipRule,
-  RuleCreateResponse,
-  RuleDeleteResponse,
-  RuleEditResponse,
-  RuleCreateParams,
-  RuleDeleteParams,
-  RuleEditParams,
-  Rules,
-} from './rules';
-export {
-  PhaseUpdateResponse,
-  PhaseGetResponse,
-  PhaseUpdateParams,
-  PhaseGetParams,
   Phases,
+  type PhaseUpdateResponse,
+  type PhaseGetResponse,
+  type PhaseUpdateParams,
+  type PhaseGetParams,
 } from './phases/index';
+export {
+  Rules,
+  type BlockRule,
+  type CompressResponseRule,
+  type DDoSDynamicRule,
+  type ExecuteRule,
+  type ForceConnectionCloseRule,
+  type LogCustomFieldRule,
+  type LogRule,
+  type Logging,
+  type ManagedChallengeRule,
+  type RedirectRule,
+  type RewriteRule,
+  type RewriteURIPart,
+  type RouteRule,
+  type RulesetRule,
+  type ScoreRule,
+  type ServeErrorRule,
+  type SetCacheSettingsRule,
+  type SetConfigRule,
+  type SkipRule,
+  type RuleCreateResponse,
+  type RuleDeleteResponse,
+  type RuleEditResponse,
+  type RuleCreateParams,
+  type RuleDeleteParams,
+  type RuleEditParams,
+} from './rules';
 export { Rulesets } from './rulesets';
 export {
-  VersionListResponse,
-  VersionGetResponse,
-  VersionListParams,
-  VersionDeleteParams,
-  VersionGetParams,
   VersionListResponsesSinglePage,
   Versions,
-} from './versions/index';
+  type VersionListResponse,
+  type VersionGetResponse,
+  type VersionListParams,
+  type VersionDeleteParams,
+  type VersionGetParams,
+} from './versions';
diff --git a/src/resources/rulesets/phases/index.ts b/src/resources/rulesets/phases/index.ts
index 048dff1de6..ed7b852e8b 100644
--- a/src/resources/rulesets/phases/index.ts
+++ b/src/resources/rulesets/phases/index.ts
@@ -1,11 +1,17 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { PhaseUpdateResponse, PhaseGetResponse, PhaseUpdateParams, PhaseGetParams, Phases } from './phases';
 export {
-  VersionListResponse,
-  VersionGetResponse,
-  VersionListParams,
-  VersionGetParams,
+  Phases,
+  type PhaseUpdateResponse,
+  type PhaseGetResponse,
+  type PhaseUpdateParams,
+  type PhaseGetParams,
+} from './phases';
+export {
   VersionListResponsesSinglePage,
   Versions,
+  type VersionListResponse,
+  type VersionGetResponse,
+  type VersionListParams,
+  type VersionGetParams,
 } from './versions';
diff --git a/src/resources/rulesets/phases/phases.ts b/src/resources/rulesets/phases/phases.ts
index 204c0334ca..c01d50a013 100644
--- a/src/resources/rulesets/phases/phases.ts
+++ b/src/resources/rulesets/phases/phases.ts
@@ -3,11 +3,18 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import { CloudflareError } from '../../../error';
-import * as PhasesAPI from './phases';
+import { CloudflareError } from 'cloudflare/error';
 import * as RulesAPI from '../rules';
 import * as RulesetsAPI from '../rulesets';
 import * as VersionsAPI from './versions';
+import {
+  VersionGetParams,
+  VersionGetResponse,
+  VersionListParams,
+  VersionListResponse,
+  VersionListResponsesSinglePage,
+  Versions,
+} from './versions';
 
 export class Phases extends APIResource {
   versions: VersionsAPI.Versions = new VersionsAPI.Versions(this._client);
@@ -123,10 +130,10 @@ export interface PhaseUpdateResponse {
    */
   rules: Array<
     | RulesAPI.BlockRule
-    | RulesAPI.ChallengeRule
+    | PhaseUpdateResponse.RulesetsChallengeRule
     | RulesAPI.CompressResponseRule
     | RulesAPI.ExecuteRule
-    | RulesAPI.JSChallengeRule
+    | PhaseUpdateResponse.RulesetsJSChallengeRule
     | RulesAPI.LogRule
     | RulesAPI.ManagedChallengeRule
     | RulesAPI.RedirectRule
@@ -137,9 +144,9 @@ export interface PhaseUpdateResponse {
     | RulesAPI.SetConfigRule
     | RulesAPI.SkipRule
     | RulesAPI.SetCacheSettingsRule
-    | PhaseUpdateResponse.RulesetsLogCustomFieldRule
-    | PhaseUpdateResponse.RulesetsDDoSDynamicRule
-    | PhaseUpdateResponse.RulesetsForceConnectionCloseRule
+    | RulesAPI.LogCustomFieldRule
+    | RulesAPI.DDoSDynamicRule
+    | RulesAPI.ForceConnectionCloseRule
   >;
 
   /**
@@ -154,7 +161,7 @@ export interface PhaseUpdateResponse {
 }
 
 export namespace PhaseUpdateResponse {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -173,12 +180,12 @@ export namespace PhaseUpdateResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * The categories of the rule.
@@ -195,6 +202,11 @@ export namespace PhaseUpdateResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -205,67 +217,86 @@ export namespace PhaseUpdateResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
       /**
-       * The cookie fields to log.
+       * Expression that selects the password used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      password_expression: string;
 
       /**
-       * The request fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The response fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      mitigation_timeout?: number;
 
       /**
-       * The request field to log.
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      requests_per_period?: number;
 
       /**
-       * The response field to log.
+       * Defines if ratelimit counting is only done when an origin is reached.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -284,7 +315,7 @@ export namespace PhaseUpdateResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -306,6 +337,11 @@ export namespace PhaseUpdateResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -317,66 +353,82 @@ export namespace PhaseUpdateResponse {
     logging?: RulesAPI.Logging;
 
     /**
-     * The reference of the rule (the rule ID by default).
+     * An object configuring the rule's ratelimit behavior.
      */
-    ref?: string;
-  }
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
 
-  export interface RulesetsForceConnectionCloseRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * The reference of the rule (the rule ID by default).
      */
-    last_updated: string;
+    ref?: string;
+  }
 
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The version of the rule.
+     * Configure checks for exposed credentials.
      */
-    version: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The unique ID of the rule.
-     */
-    id?: string;
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The action to perform when the rule matches.
+     * An object configuring the rule's ratelimit behavior.
      */
-    action?: 'force_connection_close';
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * The parameters configuring the rule's action.
-     */
-    action_parameters?: unknown;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -414,10 +466,10 @@ export interface PhaseGetResponse {
    */
   rules: Array<
     | RulesAPI.BlockRule
-    | RulesAPI.ChallengeRule
+    | PhaseGetResponse.RulesetsChallengeRule
     | RulesAPI.CompressResponseRule
     | RulesAPI.ExecuteRule
-    | RulesAPI.JSChallengeRule
+    | PhaseGetResponse.RulesetsJSChallengeRule
     | RulesAPI.LogRule
     | RulesAPI.ManagedChallengeRule
     | RulesAPI.RedirectRule
@@ -428,9 +480,9 @@ export interface PhaseGetResponse {
     | RulesAPI.SetConfigRule
     | RulesAPI.SkipRule
     | RulesAPI.SetCacheSettingsRule
-    | PhaseGetResponse.RulesetsLogCustomFieldRule
-    | PhaseGetResponse.RulesetsDDoSDynamicRule
-    | PhaseGetResponse.RulesetsForceConnectionCloseRule
+    | RulesAPI.LogCustomFieldRule
+    | RulesAPI.DDoSDynamicRule
+    | RulesAPI.ForceConnectionCloseRule
   >;
 
   /**
@@ -445,7 +497,7 @@ export interface PhaseGetResponse {
 }
 
 export namespace PhaseGetResponse {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -464,12 +516,12 @@ export namespace PhaseGetResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * The categories of the rule.
@@ -486,6 +538,11 @@ export namespace PhaseGetResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -496,67 +553,86 @@ export namespace PhaseGetResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
       /**
-       * The cookie fields to log.
+       * Expression that selects the password used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      password_expression: string;
 
       /**
-       * The request fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The response fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      characteristics: Array<string>;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * Period in seconds over which the counter is being incremented.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      period: 10 | 60 | 600 | 3600;
 
       /**
-       * The request field to log.
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      counting_expression?: string;
 
       /**
-       * The response field to log.
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -575,7 +651,7 @@ export namespace PhaseGetResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -597,6 +673,11 @@ export namespace PhaseGetResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -608,66 +689,82 @@ export namespace PhaseGetResponse {
     logging?: RulesAPI.Logging;
 
     /**
-     * The reference of the rule (the rule ID by default).
+     * An object configuring the rule's ratelimit behavior.
      */
-    ref?: string;
-  }
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
 
-  export interface RulesetsForceConnectionCloseRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * The reference of the rule (the rule ID by default).
      */
-    last_updated: string;
+    ref?: string;
+  }
 
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The version of the rule.
+     * Configure checks for exposed credentials.
      */
-    version: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The unique ID of the rule.
-     */
-    id?: string;
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The action to perform when the rule matches.
+     * An object configuring the rule's ratelimit behavior.
      */
-    action?: 'force_connection_close';
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * The parameters configuring the rule's action.
-     */
-    action_parameters?: unknown;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -677,10 +774,10 @@ export interface PhaseUpdateParams {
    */
   rules: Array<
     | RulesAPI.BlockRuleParam
-    | RulesAPI.ChallengeRuleParam
+    | PhaseUpdateParams.RulesetsChallengeRule
     | RulesAPI.CompressResponseRuleParam
     | RulesAPI.ExecuteRuleParam
-    | RulesAPI.JSChallengeRuleParam
+    | PhaseUpdateParams.RulesetsJSChallengeRule
     | RulesAPI.LogRuleParam
     | RulesAPI.ManagedChallengeRuleParam
     | RulesAPI.RedirectRuleParam
@@ -691,9 +788,9 @@ export interface PhaseUpdateParams {
     | RulesAPI.SetConfigRuleParam
     | RulesAPI.SkipRuleParam
     | RulesAPI.SetCacheSettingsRuleParam
-    | PhaseUpdateParams.RulesetsLogCustomFieldRule
-    | PhaseUpdateParams.RulesetsDDoSDynamicRule
-    | PhaseUpdateParams.RulesetsForceConnectionCloseRule
+    | RulesAPI.LogCustomFieldRuleParam
+    | RulesAPI.DDoSDynamicRuleParam
+    | RulesAPI.ForceConnectionCloseRuleParam
   >;
 
   /**
@@ -720,7 +817,7 @@ export interface PhaseUpdateParams {
 }
 
 export namespace PhaseUpdateParams {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The unique ID of the rule.
      */
@@ -729,12 +826,12 @@ export namespace PhaseUpdateParams {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * An informative description of the rule.
@@ -746,6 +843,11 @@ export namespace PhaseUpdateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -756,67 +858,86 @@ export namespace PhaseUpdateParams {
      */
     logging?: RulesAPI.LoggingParam;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
       /**
-       * The cookie fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The request fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      characteristics: Array<string>;
 
       /**
-       * The response fields to log.
+       * Period in seconds over which the counter is being incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      period: 10 | 60 | 600 | 3600;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      counting_expression?: string;
 
       /**
-       * The request field to log.
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      mitigation_timeout?: number;
 
       /**
-       * The response field to log.
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The unique ID of the rule.
      */
@@ -825,7 +946,7 @@ export namespace PhaseUpdateParams {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -842,6 +963,11 @@ export namespace PhaseUpdateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -852,52 +978,83 @@ export namespace PhaseUpdateParams {
      */
     logging?: RulesAPI.LoggingParam;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export interface RulesetsForceConnectionCloseRule {
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The unique ID of the rule.
+     * Configure checks for exposed credentials.
      */
-    id?: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The action to perform when the rule matches.
-     */
-    action?: 'force_connection_close';
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The parameters configuring the rule's action.
+     * An object configuring the rule's ratelimit behavior.
      */
-    action_parameters?: unknown;
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.LoggingParam;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -913,15 +1070,23 @@ export interface PhaseGetParams {
   zone_id?: string;
 }
 
-export namespace Phases {
-  export import PhaseUpdateResponse = PhasesAPI.PhaseUpdateResponse;
-  export import PhaseGetResponse = PhasesAPI.PhaseGetResponse;
-  export import PhaseUpdateParams = PhasesAPI.PhaseUpdateParams;
-  export import PhaseGetParams = PhasesAPI.PhaseGetParams;
-  export import Versions = VersionsAPI.Versions;
-  export import VersionListResponse = VersionsAPI.VersionListResponse;
-  export import VersionGetResponse = VersionsAPI.VersionGetResponse;
-  export import VersionListResponsesSinglePage = VersionsAPI.VersionListResponsesSinglePage;
-  export import VersionListParams = VersionsAPI.VersionListParams;
-  export import VersionGetParams = VersionsAPI.VersionGetParams;
+Phases.Versions = Versions;
+Phases.VersionListResponsesSinglePage = VersionListResponsesSinglePage;
+
+export declare namespace Phases {
+  export {
+    type PhaseUpdateResponse as PhaseUpdateResponse,
+    type PhaseGetResponse as PhaseGetResponse,
+    type PhaseUpdateParams as PhaseUpdateParams,
+    type PhaseGetParams as PhaseGetParams,
+  };
+
+  export {
+    Versions as Versions,
+    type VersionListResponse as VersionListResponse,
+    type VersionGetResponse as VersionGetResponse,
+    VersionListResponsesSinglePage as VersionListResponsesSinglePage,
+    type VersionListParams as VersionListParams,
+    type VersionGetParams as VersionGetParams,
+  };
 }
diff --git a/src/resources/rulesets/phases/versions.ts b/src/resources/rulesets/phases/versions.ts
index 6aef23ca2a..9cba4a8c22 100644
--- a/src/resources/rulesets/phases/versions.ts
+++ b/src/resources/rulesets/phases/versions.ts
@@ -3,8 +3,7 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import { CloudflareError } from '../../../error';
-import * as VersionsAPI from './versions';
+import { CloudflareError } from 'cloudflare/error';
 import * as RulesAPI from '../rules';
 import * as RulesetsAPI from '../rulesets';
 import { SinglePage } from '../../../pagination';
@@ -179,10 +178,10 @@ export interface VersionGetResponse {
    */
   rules: Array<
     | RulesAPI.BlockRule
-    | RulesAPI.ChallengeRule
+    | VersionGetResponse.RulesetsChallengeRule
     | RulesAPI.CompressResponseRule
     | RulesAPI.ExecuteRule
-    | RulesAPI.JSChallengeRule
+    | VersionGetResponse.RulesetsJSChallengeRule
     | RulesAPI.LogRule
     | RulesAPI.ManagedChallengeRule
     | RulesAPI.RedirectRule
@@ -193,9 +192,9 @@ export interface VersionGetResponse {
     | RulesAPI.SetConfigRule
     | RulesAPI.SkipRule
     | RulesAPI.SetCacheSettingsRule
-    | VersionGetResponse.RulesetsLogCustomFieldRule
-    | VersionGetResponse.RulesetsDDoSDynamicRule
-    | VersionGetResponse.RulesetsForceConnectionCloseRule
+    | RulesAPI.LogCustomFieldRule
+    | RulesAPI.DDoSDynamicRule
+    | RulesAPI.ForceConnectionCloseRule
   >;
 
   /**
@@ -210,7 +209,7 @@ export interface VersionGetResponse {
 }
 
 export namespace VersionGetResponse {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -229,12 +228,12 @@ export namespace VersionGetResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * The categories of the rule.
@@ -251,6 +250,11 @@ export namespace VersionGetResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -261,67 +265,86 @@ export namespace VersionGetResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
       /**
-       * The cookie fields to log.
+       * Expression that selects the password used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      password_expression: string;
 
       /**
-       * The request fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The response fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * Defines if ratelimit counting is only done when an origin is reached.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      requests_to_origin?: boolean;
 
       /**
-       * The request field to log.
+       * The score threshold per period for which the action will be executed the first
+       * time.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      score_per_period?: number;
 
       /**
-       * The response field to log.
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -340,7 +363,7 @@ export namespace VersionGetResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -362,6 +385,11 @@ export namespace VersionGetResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -373,66 +401,82 @@ export namespace VersionGetResponse {
     logging?: RulesAPI.Logging;
 
     /**
-     * The reference of the rule (the rule ID by default).
+     * An object configuring the rule's ratelimit behavior.
      */
-    ref?: string;
-  }
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
 
-  export interface RulesetsForceConnectionCloseRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * The reference of the rule (the rule ID by default).
      */
-    last_updated: string;
+    ref?: string;
+  }
 
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The version of the rule.
+     * Configure checks for exposed credentials.
      */
-    version: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The unique ID of the rule.
-     */
-    id?: string;
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The action to perform when the rule matches.
+     * An object configuring the rule's ratelimit behavior.
      */
-    action?: 'force_connection_close';
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * The parameters configuring the rule's action.
-     */
-    action_parameters?: unknown;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -460,10 +504,14 @@ export interface VersionGetParams {
   zone_id?: string;
 }
 
-export namespace Versions {
-  export import VersionListResponse = VersionsAPI.VersionListResponse;
-  export import VersionGetResponse = VersionsAPI.VersionGetResponse;
-  export import VersionListResponsesSinglePage = VersionsAPI.VersionListResponsesSinglePage;
-  export import VersionListParams = VersionsAPI.VersionListParams;
-  export import VersionGetParams = VersionsAPI.VersionGetParams;
+Versions.VersionListResponsesSinglePage = VersionListResponsesSinglePage;
+
+export declare namespace Versions {
+  export {
+    type VersionListResponse as VersionListResponse,
+    type VersionGetResponse as VersionGetResponse,
+    VersionListResponsesSinglePage as VersionListResponsesSinglePage,
+    type VersionListParams as VersionListParams,
+    type VersionGetParams as VersionGetParams,
+  };
 }
diff --git a/src/resources/rulesets/rules.ts b/src/resources/rulesets/rules.ts
index 98a27fd7df..3cda9367df 100644
--- a/src/resources/rulesets/rules.ts
+++ b/src/resources/rulesets/rules.ts
@@ -3,7 +3,7 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import { CloudflareError } from '../../error';
+import { CloudflareError } from 'cloudflare/error';
 import * as RulesAPI from './rules';
 import * as RulesetsAPI from './rulesets';
 
@@ -166,6 +166,11 @@ export interface BlockRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: BlockRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -176,6 +181,11 @@ export interface BlockRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: BlockRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -214,6 +224,72 @@ export namespace BlockRule {
       status_code: number;
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface BlockRuleParam {
@@ -242,6 +318,11 @@ export interface BlockRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: BlockRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -252,6 +333,11 @@ export interface BlockRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: BlockRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -290,105 +376,72 @@ export namespace BlockRuleParam {
       status_code: number;
     }
   }
-}
-
-export interface ChallengeRule {
-  /**
-   * The timestamp of when the rule was last modified.
-   */
-  last_updated: string;
-
-  /**
-   * The version of the rule.
-   */
-  version: string;
-
-  /**
-   * The unique ID of the rule.
-   */
-  id?: string;
 
   /**
-   * The action to perform when the rule matches.
-   */
-  action?: 'challenge';
-
-  /**
-   * The parameters configuring the rule's action.
-   */
-  action_parameters?: unknown;
-
-  /**
-   * The categories of the rule.
-   */
-  categories?: Array<string>;
-
-  /**
-   * An informative description of the rule.
-   */
-  description?: string;
-
-  /**
-   * Whether the rule should be executed.
-   */
-  enabled?: boolean;
-
-  /**
-   * The expression defining which traffic will match the rule.
-   */
-  expression?: string;
-
-  /**
-   * An object configuring the rule's logging behavior.
+   * Configure checks for exposed credentials.
    */
-  logging?: Logging;
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
 
-  /**
-   * The reference of the rule (the rule ID by default).
-   */
-  ref?: string;
-}
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
 
-export interface ChallengeRuleParam {
   /**
-   * The unique ID of the rule.
+   * An object configuring the rule's ratelimit behavior.
    */
-  id?: string;
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
 
-  /**
-   * The action to perform when the rule matches.
-   */
-  action?: 'challenge';
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
 
-  /**
-   * The parameters configuring the rule's action.
-   */
-  action_parameters?: unknown;
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
 
-  /**
-   * An informative description of the rule.
-   */
-  description?: string;
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
 
-  /**
-   * Whether the rule should be executed.
-   */
-  enabled?: boolean;
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
 
-  /**
-   * The expression defining which traffic will match the rule.
-   */
-  expression?: string;
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
 
-  /**
-   * An object configuring the rule's logging behavior.
-   */
-  logging?: LoggingParam;
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
 
-  /**
-   * The reference of the rule (the rule ID by default).
-   */
-  ref?: string;
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface CompressResponseRule {
@@ -432,6 +485,11 @@ export interface CompressResponseRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: CompressResponseRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -442,6 +500,11 @@ export interface CompressResponseRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: CompressResponseRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -470,6 +533,72 @@ export namespace CompressResponseRule {
       name?: 'none' | 'auto' | 'default' | 'gzip' | 'brotli';
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface CompressResponseRuleParam {
@@ -498,6 +627,11 @@ export interface CompressResponseRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: CompressResponseRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -508,6 +642,11 @@ export interface CompressResponseRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: CompressResponseRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -536,9 +675,75 @@ export namespace CompressResponseRuleParam {
       name?: 'none' | 'auto' | 'default' | 'gzip' | 'brotli';
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
-export interface ExecuteRule {
+export interface DDoSDynamicRule {
   /**
    * The timestamp of when the rule was last modified.
    */
@@ -557,12 +762,12 @@ export interface ExecuteRule {
   /**
    * The action to perform when the rule matches.
    */
-  action?: 'execute';
+  action?: 'ddos_dynamic';
 
   /**
    * The parameters configuring the rule's action.
    */
-  action_parameters?: ExecuteRule.ActionParameters;
+  action_parameters?: unknown;
 
   /**
    * The categories of the rule.
@@ -579,6 +784,11 @@ export interface ExecuteRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: DDoSDynamicRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -589,29 +799,289 @@ export interface ExecuteRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: DDoSDynamicRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
   ref?: string;
 }
 
-export namespace ExecuteRule {
+export namespace DDoSDynamicRule {
   /**
-   * The parameters configuring the rule's action.
+   * Configure checks for exposed credentials.
    */
-  export interface ActionParameters {
+  export interface ExposedCredentialCheck {
     /**
-     * The ID of the ruleset to execute.
+     * Expression that selects the password used in the credentials check.
      */
-    id: string;
+    password_expression: string;
 
     /**
-     * The configuration to use for matched data logging.
+     * Expression that selects the user ID used in the credentials check.
      */
-    matched_data?: ActionParameters.MatchedData;
+    username_expression: string;
+  }
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
     /**
-     * A set of overrides to apply to the target ruleset.
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
+export interface DDoSDynamicRuleParam {
+  /**
+   * The unique ID of the rule.
+   */
+  id?: string;
+
+  /**
+   * The action to perform when the rule matches.
+   */
+  action?: 'ddos_dynamic';
+
+  /**
+   * The parameters configuring the rule's action.
+   */
+  action_parameters?: unknown;
+
+  /**
+   * An informative description of the rule.
+   */
+  description?: string;
+
+  /**
+   * Whether the rule should be executed.
+   */
+  enabled?: boolean;
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: DDoSDynamicRuleParam.ExposedCredentialCheck;
+
+  /**
+   * The expression defining which traffic will match the rule.
+   */
+  expression?: string;
+
+  /**
+   * An object configuring the rule's logging behavior.
+   */
+  logging?: LoggingParam;
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: DDoSDynamicRuleParam.Ratelimit;
+
+  /**
+   * The reference of the rule (the rule ID by default).
+   */
+  ref?: string;
+}
+
+export namespace DDoSDynamicRuleParam {
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
+export interface ExecuteRule {
+  /**
+   * The timestamp of when the rule was last modified.
+   */
+  last_updated: string;
+
+  /**
+   * The version of the rule.
+   */
+  version: string;
+
+  /**
+   * The unique ID of the rule.
+   */
+  id?: string;
+
+  /**
+   * The action to perform when the rule matches.
+   */
+  action?: 'execute';
+
+  /**
+   * The parameters configuring the rule's action.
+   */
+  action_parameters?: ExecuteRule.ActionParameters;
+
+  /**
+   * The categories of the rule.
+   */
+  categories?: Array<string>;
+
+  /**
+   * An informative description of the rule.
+   */
+  description?: string;
+
+  /**
+   * Whether the rule should be executed.
+   */
+  enabled?: boolean;
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: ExecuteRule.ExposedCredentialCheck;
+
+  /**
+   * The expression defining which traffic will match the rule.
+   */
+  expression?: string;
+
+  /**
+   * An object configuring the rule's logging behavior.
+   */
+  logging?: Logging;
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: ExecuteRule.Ratelimit;
+
+  /**
+   * The reference of the rule (the rule ID by default).
+   */
+  ref?: string;
+}
+
+export namespace ExecuteRule {
+  /**
+   * The parameters configuring the rule's action.
+   */
+  export interface ActionParameters {
+    /**
+     * The ID of the ruleset to execute.
+     */
+    id: string;
+
+    /**
+     * The configuration to use for matched data logging.
+     */
+    matched_data?: ActionParameters.MatchedData;
+
+    /**
+     * A set of overrides to apply to the target ruleset.
      */
     overrides?: ActionParameters.Overrides;
   }
@@ -718,6 +1188,72 @@ export namespace ExecuteRule {
       }
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface ExecuteRuleParam {
@@ -746,6 +1282,11 @@ export interface ExecuteRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: ExecuteRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -756,6 +1297,11 @@ export interface ExecuteRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: ExecuteRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -885,33 +1431,99 @@ export namespace ExecuteRuleParam {
       }
     }
   }
-}
-
-export interface JSChallengeRule {
-  /**
-   * The timestamp of when the rule was last modified.
-   */
-  last_updated: string;
 
   /**
-   * The version of the rule.
+   * Configure checks for exposed credentials.
    */
-  version: string;
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
 
-  /**
-   * The unique ID of the rule.
-   */
-  id?: string;
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
 
   /**
-   * The action to perform when the rule matches.
+   * An object configuring the rule's ratelimit behavior.
    */
-  action?: 'js_challenge';
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
 
-  /**
-   * The parameters configuring the rule's action.
-   */
-  action_parameters?: unknown;
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
+export interface ForceConnectionCloseRule {
+  /**
+   * The timestamp of when the rule was last modified.
+   */
+  last_updated: string;
+
+  /**
+   * The version of the rule.
+   */
+  version: string;
+
+  /**
+   * The unique ID of the rule.
+   */
+  id?: string;
+
+  /**
+   * The action to perform when the rule matches.
+   */
+  action?: 'force_connection_close';
+
+  /**
+   * The parameters configuring the rule's action.
+   */
+  action_parameters?: unknown;
 
   /**
    * The categories of the rule.
@@ -928,6 +1540,11 @@ export interface JSChallengeRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: ForceConnectionCloseRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -938,13 +1555,86 @@ export interface JSChallengeRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: ForceConnectionCloseRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
   ref?: string;
 }
 
-export interface JSChallengeRuleParam {
+export namespace ForceConnectionCloseRule {
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
+export interface ForceConnectionCloseRuleParam {
   /**
    * The unique ID of the rule.
    */
@@ -953,7 +1643,7 @@ export interface JSChallengeRuleParam {
   /**
    * The action to perform when the rule matches.
    */
-  action?: 'js_challenge';
+  action?: 'force_connection_close';
 
   /**
    * The parameters configuring the rule's action.
@@ -970,6 +1660,318 @@ export interface JSChallengeRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: ForceConnectionCloseRuleParam.ExposedCredentialCheck;
+
+  /**
+   * The expression defining which traffic will match the rule.
+   */
+  expression?: string;
+
+  /**
+   * An object configuring the rule's logging behavior.
+   */
+  logging?: LoggingParam;
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: ForceConnectionCloseRuleParam.Ratelimit;
+
+  /**
+   * The reference of the rule (the rule ID by default).
+   */
+  ref?: string;
+}
+
+export namespace ForceConnectionCloseRuleParam {
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
+export interface LogCustomFieldRule {
+  /**
+   * The timestamp of when the rule was last modified.
+   */
+  last_updated: string;
+
+  /**
+   * The version of the rule.
+   */
+  version: string;
+
+  /**
+   * The unique ID of the rule.
+   */
+  id?: string;
+
+  /**
+   * The action to perform when the rule matches.
+   */
+  action?: 'log_custom_field';
+
+  /**
+   * The parameters configuring the rule's action.
+   */
+  action_parameters?: LogCustomFieldRule.ActionParameters;
+
+  /**
+   * The categories of the rule.
+   */
+  categories?: Array<string>;
+
+  /**
+   * An informative description of the rule.
+   */
+  description?: string;
+
+  /**
+   * Whether the rule should be executed.
+   */
+  enabled?: boolean;
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: LogCustomFieldRule.ExposedCredentialCheck;
+
+  /**
+   * The expression defining which traffic will match the rule.
+   */
+  expression?: string;
+
+  /**
+   * An object configuring the rule's logging behavior.
+   */
+  logging?: Logging;
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: LogCustomFieldRule.Ratelimit;
+
+  /**
+   * The reference of the rule (the rule ID by default).
+   */
+  ref?: string;
+}
+
+export namespace LogCustomFieldRule {
+  /**
+   * The parameters configuring the rule's action.
+   */
+  export interface ActionParameters {
+    /**
+     * The cookie fields to log.
+     */
+    cookie_fields?: Array<ActionParameters.CookieField>;
+
+    /**
+     * The request fields to log.
+     */
+    request_fields?: Array<ActionParameters.RequestField>;
+
+    /**
+     * The response fields to log.
+     */
+    response_fields?: Array<ActionParameters.ResponseField>;
+  }
+
+  export namespace ActionParameters {
+    /**
+     * The cookie field to log.
+     */
+    export interface CookieField {
+      /**
+       * The name of the field.
+       */
+      name: string;
+    }
+
+    /**
+     * The request field to log.
+     */
+    export interface RequestField {
+      /**
+       * The name of the field.
+       */
+      name: string;
+    }
+
+    /**
+     * The response field to log.
+     */
+    export interface ResponseField {
+      /**
+       * The name of the field.
+       */
+      name: string;
+    }
+  }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
+export interface LogCustomFieldRuleParam {
+  /**
+   * The unique ID of the rule.
+   */
+  id?: string;
+
+  /**
+   * The action to perform when the rule matches.
+   */
+  action?: 'log_custom_field';
+
+  /**
+   * The parameters configuring the rule's action.
+   */
+  action_parameters?: LogCustomFieldRuleParam.ActionParameters;
+
+  /**
+   * An informative description of the rule.
+   */
+  description?: string;
+
+  /**
+   * Whether the rule should be executed.
+   */
+  enabled?: boolean;
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: LogCustomFieldRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -980,12 +1982,137 @@ export interface JSChallengeRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: LogCustomFieldRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
   ref?: string;
 }
 
+export namespace LogCustomFieldRuleParam {
+  /**
+   * The parameters configuring the rule's action.
+   */
+  export interface ActionParameters {
+    /**
+     * The cookie fields to log.
+     */
+    cookie_fields?: Array<ActionParameters.CookieField>;
+
+    /**
+     * The request fields to log.
+     */
+    request_fields?: Array<ActionParameters.RequestField>;
+
+    /**
+     * The response fields to log.
+     */
+    response_fields?: Array<ActionParameters.ResponseField>;
+  }
+
+  export namespace ActionParameters {
+    /**
+     * The cookie field to log.
+     */
+    export interface CookieField {
+      /**
+       * The name of the field.
+       */
+      name: string;
+    }
+
+    /**
+     * The request field to log.
+     */
+    export interface RequestField {
+      /**
+       * The name of the field.
+       */
+      name: string;
+    }
+
+    /**
+     * The response field to log.
+     */
+    export interface ResponseField {
+      /**
+       * The name of the field.
+       */
+      name: string;
+    }
+  }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
 export interface LogRule {
   /**
    * The timestamp of when the rule was last modified.
@@ -1027,6 +2154,11 @@ export interface LogRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: LogRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -1037,12 +2169,85 @@ export interface LogRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: LogRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
   ref?: string;
 }
 
+export namespace LogRule {
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
 export interface LogRuleParam {
   /**
    * The unique ID of the rule.
@@ -1067,7 +2272,12 @@ export interface LogRuleParam {
   /**
    * Whether the rule should be executed.
    */
-  enabled?: boolean;
+  enabled?: boolean;
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: LogRuleParam.ExposedCredentialCheck;
 
   /**
    * The expression defining which traffic will match the rule.
@@ -1079,12 +2289,85 @@ export interface LogRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: LogRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
   ref?: string;
 }
 
+export namespace LogRuleParam {
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
 /**
  * An object configuring the rule's logging behavior.
  */
@@ -1146,6 +2429,11 @@ export interface ManagedChallengeRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: ManagedChallengeRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -1156,12 +2444,85 @@ export interface ManagedChallengeRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: ManagedChallengeRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
   ref?: string;
 }
 
+export namespace ManagedChallengeRule {
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
 export interface ManagedChallengeRuleParam {
   /**
    * The unique ID of the rule.
@@ -1188,6 +2549,11 @@ export interface ManagedChallengeRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: ManagedChallengeRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -1198,12 +2564,85 @@ export interface ManagedChallengeRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: ManagedChallengeRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
   ref?: string;
 }
 
+export namespace ManagedChallengeRuleParam {
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
 export interface RedirectRule {
   /**
    * The timestamp of when the rule was last modified.
@@ -1245,6 +2684,11 @@ export interface RedirectRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: RedirectRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -1255,6 +2699,11 @@ export interface RedirectRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: RedirectRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -1329,6 +2778,72 @@ export namespace RedirectRule {
       }
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface RedirectRuleParam {
@@ -1357,6 +2872,11 @@ export interface RedirectRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: RedirectRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -1367,6 +2887,11 @@ export interface RedirectRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: RedirectRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -1441,6 +2966,72 @@ export namespace RedirectRuleParam {
       }
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface RewriteRule {
@@ -1484,6 +3075,11 @@ export interface RewriteRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: RewriteRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -1494,6 +3090,11 @@ export interface RewriteRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: RewriteRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -1566,6 +3167,72 @@ export namespace RewriteRule {
       query?: RulesAPI.RewriteURIPart;
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface RewriteRuleParam {
@@ -1594,6 +3261,11 @@ export interface RewriteRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: RewriteRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -1604,6 +3276,11 @@ export interface RewriteRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: RewriteRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -1676,6 +3353,72 @@ export namespace RewriteRuleParam {
       query?: RulesAPI.RewriteURIPartParam;
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export type RewriteURIPart = RewriteURIPart.StaticValue | RewriteURIPart.DynamicValue;
@@ -1755,6 +3498,11 @@ export interface RouteRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: RouteRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -1765,6 +3513,11 @@ export interface RouteRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: RouteRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -1818,6 +3571,72 @@ export namespace RouteRule {
       value: string;
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface RouteRuleParam {
@@ -1846,6 +3665,11 @@ export interface RouteRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: RouteRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -1856,6 +3680,11 @@ export interface RouteRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: RouteRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -1909,6 +3738,72 @@ export namespace RouteRuleParam {
       value: string;
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface RulesetRule {
@@ -1952,6 +3847,11 @@ export interface RulesetRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: RulesetRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -1962,12 +3862,85 @@ export interface RulesetRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: RulesetRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
   ref?: string;
 }
 
+export namespace RulesetRule {
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
+}
+
 export interface ScoreRule {
   /**
    * The timestamp of when the rule was last modified.
@@ -2009,6 +3982,11 @@ export interface ScoreRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: ScoreRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -2019,6 +3997,11 @@ export interface ScoreRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: ScoreRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -2036,6 +4019,72 @@ export namespace ScoreRule {
      */
     increment?: number;
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface ScoreRuleParam {
@@ -2064,6 +4113,11 @@ export interface ScoreRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: ScoreRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -2074,6 +4128,11 @@ export interface ScoreRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: ScoreRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -2091,6 +4150,72 @@ export namespace ScoreRuleParam {
      */
     increment?: number;
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface ServeErrorRule {
@@ -2134,6 +4259,11 @@ export interface ServeErrorRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: ServeErrorRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -2144,6 +4274,11 @@ export interface ServeErrorRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: ServeErrorRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -2170,6 +4305,72 @@ export namespace ServeErrorRule {
      */
     status_code?: number;
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface ServeErrorRuleParam {
@@ -2198,6 +4399,11 @@ export interface ServeErrorRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: ServeErrorRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -2208,6 +4414,11 @@ export interface ServeErrorRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: ServeErrorRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -2234,6 +4445,72 @@ export namespace ServeErrorRuleParam {
      */
     status_code?: number;
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface SetCacheSettingsRule {
@@ -2277,6 +4554,11 @@ export interface SetCacheSettingsRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: SetCacheSettingsRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -2287,6 +4569,11 @@ export interface SetCacheSettingsRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: SetCacheSettingsRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -2438,10 +4725,9 @@ export namespace SetCacheSettingsRule {
         host?: CustomKey.Host;
 
         /**
-         * Use the presence or absence of parameters in the query string to build the cache
-         * key.
+         * Use the presence of parameters in the query string to build the cache key.
          */
-        query_string?: CustomKey.QueryString;
+        query_string?: CustomKey.IncludedQueryStringParameters | CustomKey.ExcludedQueryStringParameters;
 
         /**
          * Characteristics of the request user agent used in building the cache key.
@@ -2508,56 +4794,69 @@ export namespace SetCacheSettingsRule {
         }
 
         /**
-         * Use the presence or absence of parameters in the query string to build the cache
-         * key.
+         * Use the presence of parameters in the query string to build the cache key.
          */
-        export interface QueryString {
+        export interface IncludedQueryStringParameters {
           /**
-           * build the cache key using all query string parameters EXCECPT these excluded
-           * parameters
+           * A list of query string parameters used to build the cache key.
            */
-          exclude?: QueryString.Exclude;
+          include?:
+            | IncludedQueryStringParameters.SomeQueryStringParameters
+            | IncludedQueryStringParameters.AllQueryStringParameters;
+        }
 
+        export namespace IncludedQueryStringParameters {
           /**
-           * build the cache key using a list of query string parameters that ARE in the
-           * request.
+           * A list of query string parameters used to build the cache key.
            */
-          include?: QueryString.Include;
-        }
+          export interface SomeQueryStringParameters {
+            list?: Array<string>;
+          }
 
-        export namespace QueryString {
           /**
-           * build the cache key using all query string parameters EXCECPT these excluded
-           * parameters
+           * Build the cache key using ALL query string parameters that are in the request.
            */
-          export interface Exclude {
+          export interface AllQueryStringParameters {
             /**
-             * Exclude all query string parameters from use in building the cache key.
+             * Determines whether to include all query string parameters in the cache key.
              */
             all?: boolean;
+          }
+        }
 
-            /**
-             * A list of query string parameters NOT used to build the cache key. All
-             * parameters present in the request but missing in this list will be used to build
-             * the cache key.
-             */
+        /**
+         * Use the absence of parameters in the query string to build the cache key.
+         */
+        export interface ExcludedQueryStringParameters {
+          /**
+           * A list of query string parameters NOT used to build the cache key. All
+           * parameters present in the request but missing in this list will be used to build
+           * the cache key.
+           */
+          exclude?:
+            | ExcludedQueryStringParameters.SomeQueryStringParameters
+            | ExcludedQueryStringParameters.AllQueryStringParameters;
+        }
+
+        export namespace ExcludedQueryStringParameters {
+          /**
+           * A list of query string parameters NOT used to build the cache key. All
+           * parameters present in the request but missing in this list will be used to build
+           * the cache key.
+           */
+          export interface SomeQueryStringParameters {
             list?: Array<string>;
           }
 
           /**
-           * build the cache key using a list of query string parameters that ARE in the
+           * Build the cache key excluding ALL query string parameters that are in the
            * request.
            */
-          export interface Include {
+          export interface AllQueryStringParameters {
             /**
-             * Use all query string parameters in the cache key.
+             * Determines whether to exclude all query string parameters from the cache key.
              */
             all?: boolean;
-
-            /**
-             * A list of query string parameters used to build the cache key.
-             */
-            list?: Array<string>;
           }
         }
 
@@ -2597,7 +4896,7 @@ export namespace SetCacheSettingsRule {
       /**
        * The minimum file size eligible for store in cache reserve.
        */
-      min_file_size: number;
+      minimum_file_size: number;
     }
 
     /**
@@ -2677,6 +4976,72 @@ export namespace SetCacheSettingsRule {
       disable_stale_while_updating: boolean;
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface SetCacheSettingsRuleParam {
@@ -2705,6 +5070,11 @@ export interface SetCacheSettingsRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: SetCacheSettingsRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -2715,6 +5085,11 @@ export interface SetCacheSettingsRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: SetCacheSettingsRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -2866,10 +5241,9 @@ export namespace SetCacheSettingsRuleParam {
         host?: CustomKey.Host;
 
         /**
-         * Use the presence or absence of parameters in the query string to build the cache
-         * key.
+         * Use the presence of parameters in the query string to build the cache key.
          */
-        query_string?: CustomKey.QueryString;
+        query_string?: CustomKey.IncludedQueryStringParameters | CustomKey.ExcludedQueryStringParameters;
 
         /**
          * Characteristics of the request user agent used in building the cache key.
@@ -2936,56 +5310,69 @@ export namespace SetCacheSettingsRuleParam {
         }
 
         /**
-         * Use the presence or absence of parameters in the query string to build the cache
-         * key.
+         * Use the presence of parameters in the query string to build the cache key.
          */
-        export interface QueryString {
+        export interface IncludedQueryStringParameters {
           /**
-           * build the cache key using all query string parameters EXCECPT these excluded
-           * parameters
+           * A list of query string parameters used to build the cache key.
            */
-          exclude?: QueryString.Exclude;
+          include?:
+            | IncludedQueryStringParameters.SomeQueryStringParameters
+            | IncludedQueryStringParameters.AllQueryStringParameters;
+        }
 
+        export namespace IncludedQueryStringParameters {
           /**
-           * build the cache key using a list of query string parameters that ARE in the
-           * request.
+           * A list of query string parameters used to build the cache key.
            */
-          include?: QueryString.Include;
-        }
+          export interface SomeQueryStringParameters {
+            list?: Array<string>;
+          }
 
-        export namespace QueryString {
           /**
-           * build the cache key using all query string parameters EXCECPT these excluded
-           * parameters
+           * Build the cache key using ALL query string parameters that are in the request.
            */
-          export interface Exclude {
+          export interface AllQueryStringParameters {
             /**
-             * Exclude all query string parameters from use in building the cache key.
+             * Determines whether to include all query string parameters in the cache key.
              */
             all?: boolean;
+          }
+        }
 
-            /**
-             * A list of query string parameters NOT used to build the cache key. All
-             * parameters present in the request but missing in this list will be used to build
-             * the cache key.
-             */
+        /**
+         * Use the absence of parameters in the query string to build the cache key.
+         */
+        export interface ExcludedQueryStringParameters {
+          /**
+           * A list of query string parameters NOT used to build the cache key. All
+           * parameters present in the request but missing in this list will be used to build
+           * the cache key.
+           */
+          exclude?:
+            | ExcludedQueryStringParameters.SomeQueryStringParameters
+            | ExcludedQueryStringParameters.AllQueryStringParameters;
+        }
+
+        export namespace ExcludedQueryStringParameters {
+          /**
+           * A list of query string parameters NOT used to build the cache key. All
+           * parameters present in the request but missing in this list will be used to build
+           * the cache key.
+           */
+          export interface SomeQueryStringParameters {
             list?: Array<string>;
           }
 
           /**
-           * build the cache key using a list of query string parameters that ARE in the
+           * Build the cache key excluding ALL query string parameters that are in the
            * request.
            */
-          export interface Include {
+          export interface AllQueryStringParameters {
             /**
-             * Use all query string parameters in the cache key.
+             * Determines whether to exclude all query string parameters from the cache key.
              */
             all?: boolean;
-
-            /**
-             * A list of query string parameters used to build the cache key.
-             */
-            list?: Array<string>;
           }
         }
 
@@ -3025,7 +5412,7 @@ export namespace SetCacheSettingsRuleParam {
       /**
        * The minimum file size eligible for store in cache reserve.
        */
-      min_file_size: number;
+      minimum_file_size: number;
     }
 
     /**
@@ -3105,6 +5492,72 @@ export namespace SetCacheSettingsRuleParam {
       disable_stale_while_updating: boolean;
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface SetConfigRule {
@@ -3148,6 +5601,11 @@ export interface SetConfigRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: SetConfigRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -3158,6 +5616,11 @@ export interface SetConfigRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: SetConfigRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -3270,11 +5733,77 @@ export namespace SetConfigRule {
        */
       html?: boolean;
 
-      /**
-       * Minify JS files.
-       */
-      js?: boolean;
-    }
+      /**
+       * Minify JS files.
+       */
+      js?: boolean;
+    }
+  }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
   }
 }
 
@@ -3304,6 +5833,11 @@ export interface SetConfigRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: SetConfigRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -3314,6 +5848,11 @@ export interface SetConfigRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: SetConfigRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -3432,6 +5971,72 @@ export namespace SetConfigRuleParam {
       js?: boolean;
     }
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface SkipRule {
@@ -3475,6 +6080,11 @@ export interface SkipRule {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: SkipRule.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -3485,6 +6095,11 @@ export interface SkipRule {
    */
   logging?: Logging;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: SkipRule.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -3525,6 +6140,72 @@ export namespace SkipRule {
      */
     rulesets?: Array<string>;
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 export interface SkipRuleParam {
@@ -3553,6 +6234,11 @@ export interface SkipRuleParam {
    */
   enabled?: boolean;
 
+  /**
+   * Configure checks for exposed credentials.
+   */
+  exposed_credential_check?: SkipRuleParam.ExposedCredentialCheck;
+
   /**
    * The expression defining which traffic will match the rule.
    */
@@ -3563,6 +6249,11 @@ export interface SkipRuleParam {
    */
   logging?: LoggingParam;
 
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  ratelimit?: SkipRuleParam.Ratelimit;
+
   /**
    * The reference of the rule (the rule ID by default).
    */
@@ -3603,6 +6294,72 @@ export namespace SkipRuleParam {
      */
     rulesets?: Array<string>;
   }
+
+  /**
+   * Configure checks for exposed credentials.
+   */
+  export interface ExposedCredentialCheck {
+    /**
+     * Expression that selects the password used in the credentials check.
+     */
+    password_expression: string;
+
+    /**
+     * Expression that selects the user ID used in the credentials check.
+     */
+    username_expression: string;
+  }
+
+  /**
+   * An object configuring the rule's ratelimit behavior.
+   */
+  export interface Ratelimit {
+    /**
+     * Characteristics of the request on which the ratelimiter counter will be
+     * incremented.
+     */
+    characteristics: Array<string>;
+
+    /**
+     * Period in seconds over which the counter is being incremented.
+     */
+    period: 10 | 60 | 600 | 3600;
+
+    /**
+     * Defines when the ratelimit counter should be incremented. It is optional and
+     * defaults to the same as the rule's expression.
+     */
+    counting_expression?: string;
+
+    /**
+     * Period of time in seconds after which the action will be disabled following its
+     * first execution.
+     */
+    mitigation_timeout?: number;
+
+    /**
+     * The threshold of requests per period after which the action will be executed for
+     * the first time.
+     */
+    requests_per_period?: number;
+
+    /**
+     * Defines if ratelimit counting is only done when an origin is reached.
+     */
+    requests_to_origin?: boolean;
+
+    /**
+     * The score threshold per period for which the action will be executed the first
+     * time.
+     */
+    score_per_period?: number;
+
+    /**
+     * The response header name provided by the origin which should contain the score
+     * to increment ratelimit counter on.
+     */
+    score_response_header_name?: string;
+  }
 }
 
 /**
@@ -3639,10 +6396,10 @@ export interface RuleCreateResponse {
    */
   rules: Array<
     | BlockRule
-    | ChallengeRule
+    | RuleCreateResponse.RulesetsChallengeRule
     | CompressResponseRule
     | ExecuteRule
-    | JSChallengeRule
+    | RuleCreateResponse.RulesetsJSChallengeRule
     | LogRule
     | ManagedChallengeRule
     | RedirectRule
@@ -3653,9 +6410,9 @@ export interface RuleCreateResponse {
     | SetConfigRule
     | SkipRule
     | SetCacheSettingsRule
-    | RuleCreateResponse.RulesetsLogCustomFieldRule
-    | RuleCreateResponse.RulesetsDDoSDynamicRule
-    | RuleCreateResponse.RulesetsForceConnectionCloseRule
+    | LogCustomFieldRule
+    | DDoSDynamicRule
+    | ForceConnectionCloseRule
   >;
 
   /**
@@ -3670,7 +6427,7 @@ export interface RuleCreateResponse {
 }
 
 export namespace RuleCreateResponse {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -3689,12 +6446,12 @@ export namespace RuleCreateResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * The categories of the rule.
@@ -3711,6 +6468,11 @@ export namespace RuleCreateResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -3721,67 +6483,86 @@ export namespace RuleCreateResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
       /**
-       * The cookie fields to log.
+       * Expression that selects the password used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      password_expression: string;
 
       /**
-       * The request fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The response fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      characteristics: Array<string>;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * Period in seconds over which the counter is being incremented.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      period: 10 | 60 | 600 | 3600;
 
       /**
-       * The request field to log.
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      counting_expression?: string;
 
       /**
-       * The response field to log.
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -3800,7 +6581,7 @@ export namespace RuleCreateResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -3822,6 +6603,11 @@ export namespace RuleCreateResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -3833,66 +6619,82 @@ export namespace RuleCreateResponse {
     logging?: RulesAPI.Logging;
 
     /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
-  }
-
-  export interface RulesetsForceConnectionCloseRule {
-    /**
-     * The timestamp of when the rule was last modified.
+     * An object configuring the rule's ratelimit behavior.
      */
-    last_updated: string;
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
 
     /**
-     * The version of the rule.
+     * The reference of the rule (the rule ID by default).
      */
-    version: string;
+    ref?: string;
+  }
 
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The unique ID of the rule.
+     * Configure checks for exposed credentials.
      */
-    id?: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The action to perform when the rule matches.
-     */
-    action?: 'force_connection_close';
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The parameters configuring the rule's action.
+     * An object configuring the rule's ratelimit behavior.
      */
-    action_parameters?: unknown;
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -3930,10 +6732,10 @@ export interface RuleDeleteResponse {
    */
   rules: Array<
     | BlockRule
-    | ChallengeRule
+    | RuleDeleteResponse.RulesetsChallengeRule
     | CompressResponseRule
     | ExecuteRule
-    | JSChallengeRule
+    | RuleDeleteResponse.RulesetsJSChallengeRule
     | LogRule
     | ManagedChallengeRule
     | RedirectRule
@@ -3944,9 +6746,9 @@ export interface RuleDeleteResponse {
     | SetConfigRule
     | SkipRule
     | SetCacheSettingsRule
-    | RuleDeleteResponse.RulesetsLogCustomFieldRule
-    | RuleDeleteResponse.RulesetsDDoSDynamicRule
-    | RuleDeleteResponse.RulesetsForceConnectionCloseRule
+    | LogCustomFieldRule
+    | DDoSDynamicRule
+    | ForceConnectionCloseRule
   >;
 
   /**
@@ -3961,7 +6763,7 @@ export interface RuleDeleteResponse {
 }
 
 export namespace RuleDeleteResponse {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -3980,12 +6782,12 @@ export namespace RuleDeleteResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * The categories of the rule.
@@ -4002,6 +6804,11 @@ export namespace RuleDeleteResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -4012,67 +6819,86 @@ export namespace RuleDeleteResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
       /**
-       * The cookie fields to log.
+       * Expression that selects the password used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      password_expression: string;
 
       /**
-       * The request fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The response fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      characteristics: Array<string>;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * Period in seconds over which the counter is being incremented.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      period: 10 | 60 | 600 | 3600;
 
       /**
-       * The request field to log.
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      counting_expression?: string;
 
       /**
-       * The response field to log.
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -4091,7 +6917,7 @@ export namespace RuleDeleteResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -4113,6 +6939,11 @@ export namespace RuleDeleteResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -4124,66 +6955,82 @@ export namespace RuleDeleteResponse {
     logging?: RulesAPI.Logging;
 
     /**
-     * The reference of the rule (the rule ID by default).
+     * An object configuring the rule's ratelimit behavior.
      */
-    ref?: string;
-  }
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
 
-  export interface RulesetsForceConnectionCloseRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * The reference of the rule (the rule ID by default).
      */
-    last_updated: string;
+    ref?: string;
+  }
 
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The version of the rule.
+     * Configure checks for exposed credentials.
      */
-    version: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The unique ID of the rule.
-     */
-    id?: string;
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The action to perform when the rule matches.
+     * An object configuring the rule's ratelimit behavior.
      */
-    action?: 'force_connection_close';
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * The parameters configuring the rule's action.
-     */
-    action_parameters?: unknown;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -4221,10 +7068,10 @@ export interface RuleEditResponse {
    */
   rules: Array<
     | BlockRule
-    | ChallengeRule
+    | RuleEditResponse.RulesetsChallengeRule
     | CompressResponseRule
     | ExecuteRule
-    | JSChallengeRule
+    | RuleEditResponse.RulesetsJSChallengeRule
     | LogRule
     | ManagedChallengeRule
     | RedirectRule
@@ -4235,9 +7082,9 @@ export interface RuleEditResponse {
     | SetConfigRule
     | SkipRule
     | SetCacheSettingsRule
-    | RuleEditResponse.RulesetsLogCustomFieldRule
-    | RuleEditResponse.RulesetsDDoSDynamicRule
-    | RuleEditResponse.RulesetsForceConnectionCloseRule
+    | LogCustomFieldRule
+    | DDoSDynamicRule
+    | ForceConnectionCloseRule
   >;
 
   /**
@@ -4252,7 +7099,7 @@ export interface RuleEditResponse {
 }
 
 export namespace RuleEditResponse {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -4271,12 +7118,12 @@ export namespace RuleEditResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * The categories of the rule.
@@ -4293,6 +7140,11 @@ export namespace RuleEditResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -4303,67 +7155,86 @@ export namespace RuleEditResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
       /**
-       * The cookie fields to log.
+       * Expression that selects the password used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      password_expression: string;
 
       /**
-       * The request fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The response fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      characteristics: Array<string>;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * Period in seconds over which the counter is being incremented.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      period: 10 | 60 | 600 | 3600;
 
       /**
-       * The request field to log.
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      counting_expression?: string;
 
       /**
-       * The response field to log.
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -4382,7 +7253,7 @@ export namespace RuleEditResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -4404,6 +7275,11 @@ export namespace RuleEditResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -4415,90 +7291,106 @@ export namespace RuleEditResponse {
     logging?: RulesAPI.Logging;
 
     /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
-  }
-
-  export interface RulesetsForceConnectionCloseRule {
-    /**
-     * The timestamp of when the rule was last modified.
+     * An object configuring the rule's ratelimit behavior.
      */
-    last_updated: string;
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
 
     /**
-     * The version of the rule.
+     * The reference of the rule (the rule ID by default).
      */
-    version: string;
+    ref?: string;
+  }
 
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The unique ID of the rule.
+     * Configure checks for exposed credentials.
      */
-    id?: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The action to perform when the rule matches.
-     */
-    action?: 'force_connection_close';
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The parameters configuring the rule's action.
+     * An object configuring the rule's ratelimit behavior.
      */
-    action_parameters?: unknown;
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
 export type RuleCreateParams =
   | RuleCreateParams.BlockRule
   | RuleCreateParams.ChallengeRule
-  | RuleCreateParams.CompressResponseRule
+  | RuleCreateParams.CompressionRule
   | RuleCreateParams.ExecuteRule
-  | RuleCreateParams.JSChallengeRule
+  | RuleCreateParams.JavascriptChallengeRule
   | RuleCreateParams.LogRule
   | RuleCreateParams.ManagedChallengeRule
   | RuleCreateParams.RedirectRule
   | RuleCreateParams.RewriteRule
-  | RuleCreateParams.RouteRule
+  | RuleCreateParams.OriginRule
   | RuleCreateParams.ScoreRule
   | RuleCreateParams.ServeErrorRule
   | RuleCreateParams.SetConfigRule
   | RuleCreateParams.SkipRule
   | RuleCreateParams.SetCacheSettingsRule
-  | RuleCreateParams.RulesetsLogCustomFieldRule
-  | RuleCreateParams.RulesetsDDoSDynamicRule
-  | RuleCreateParams.RulesetsForceConnectionCloseRule;
+  | RuleCreateParams.LogCustomFieldRule
+  | RuleCreateParams.DDoSDynamicRule
+  | RuleCreateParams.ForceConnectionCloseRule;
 
-export namespace RuleCreateParams {
+export declare namespace RuleCreateParams {
   export interface BlockRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
@@ -4537,6 +7429,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.BlockRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -4547,6 +7444,19 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.BlockRule.BeforePosition
+      | RuleCreateParams.BlockRule.AfterPosition
+      | RuleCreateParams.BlockRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.BlockRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -4585,6 +7495,104 @@ export namespace RuleCreateParams {
         status_code: number;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
   export interface ChallengeRule {
@@ -4625,6 +7633,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.ChallengeRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -4635,13 +7648,126 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.ChallengeRule.BeforePosition
+      | RuleCreateParams.ChallengeRule.AfterPosition
+      | RuleCreateParams.ChallengeRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.ChallengeRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export interface CompressResponseRule {
+  export namespace ChallengeRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
+  export interface CompressionRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -4667,7 +7793,7 @@ export namespace RuleCreateParams {
     /**
      * Body param: The parameters configuring the rule's action.
      */
-    action_parameters?: RuleCreateParams.CompressResponseRule.ActionParameters;
+    action_parameters?: RuleCreateParams.CompressionRule.ActionParameters;
 
     /**
      * Body param: An informative description of the rule.
@@ -4679,6 +7805,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.CompressionRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -4689,13 +7820,26 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.CompressionRule.BeforePosition
+      | RuleCreateParams.CompressionRule.AfterPosition
+      | RuleCreateParams.CompressionRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.CompressionRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace CompressResponseRule {
+  export namespace CompressionRule {
     /**
      * The parameters configuring the rule's action.
      */
@@ -4717,6 +7861,104 @@ export namespace RuleCreateParams {
         name?: 'none' | 'auto' | 'default' | 'gzip' | 'brotli';
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
   export interface ExecuteRule {
@@ -4757,6 +7999,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.ExecuteRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -4767,6 +8014,19 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.ExecuteRule.BeforePosition
+      | RuleCreateParams.ExecuteRule.AfterPosition
+      | RuleCreateParams.ExecuteRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.ExecuteRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -4896,9 +8156,107 @@ export namespace RuleCreateParams {
         }
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
-  export interface JSChallengeRule {
+  export interface JavascriptChallengeRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -4936,6 +8294,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.JavascriptChallengeRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -4946,12 +8309,125 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.JavascriptChallengeRule.BeforePosition
+      | RuleCreateParams.JavascriptChallengeRule.AfterPosition
+      | RuleCreateParams.JavascriptChallengeRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.JavascriptChallengeRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
+  export namespace JavascriptChallengeRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
   export interface LogRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
@@ -4990,6 +8466,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.LogRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -5000,12 +8481,125 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.LogRule.BeforePosition
+      | RuleCreateParams.LogRule.AfterPosition
+      | RuleCreateParams.LogRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.LogRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
+  export namespace LogRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
   export interface ManagedChallengeRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
@@ -5044,6 +8638,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.ManagedChallengeRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -5054,12 +8653,125 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.ManagedChallengeRule.BeforePosition
+      | RuleCreateParams.ManagedChallengeRule.AfterPosition
+      | RuleCreateParams.ManagedChallengeRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.ManagedChallengeRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
+  export namespace ManagedChallengeRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
   export interface RedirectRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
@@ -5098,6 +8810,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.RedirectRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -5108,6 +8825,19 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.RedirectRule.BeforePosition
+      | RuleCreateParams.RedirectRule.AfterPosition
+      | RuleCreateParams.RedirectRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.RedirectRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -5182,6 +8912,104 @@ export namespace RuleCreateParams {
         }
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
   export interface RewriteRule {
@@ -5222,6 +9050,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.RewriteRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -5232,6 +9065,19 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.RewriteRule.BeforePosition
+      | RuleCreateParams.RewriteRule.AfterPosition
+      | RuleCreateParams.RewriteRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.RewriteRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -5304,9 +9150,107 @@ export namespace RuleCreateParams {
         query?: RulesAPI.RewriteURIPartParam;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
-  export interface RouteRule {
+  export interface OriginRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -5332,7 +9276,7 @@ export namespace RuleCreateParams {
     /**
      * Body param: The parameters configuring the rule's action.
      */
-    action_parameters?: RuleCreateParams.RouteRule.ActionParameters;
+    action_parameters?: RuleCreateParams.OriginRule.ActionParameters;
 
     /**
      * Body param: An informative description of the rule.
@@ -5344,6 +9288,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.OriginRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -5354,13 +9303,26 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.OriginRule.BeforePosition
+      | RuleCreateParams.OriginRule.AfterPosition
+      | RuleCreateParams.OriginRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.OriginRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RouteRule {
+  export namespace OriginRule {
     /**
      * The parameters configuring the rule's action.
      */
@@ -5407,9 +9369,290 @@ export namespace RuleCreateParams {
         value: string;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
+  export interface ScoreRule {
+    /**
+     * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
+     * Zone ID.
+     */
+    account_id?: string;
+
+    /**
+     * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
+     * Account ID.
+     */
+    zone_id?: string;
+
+    /**
+     * Body param: The unique ID of the rule.
+     */
+    id?: string;
+
+    /**
+     * Body param: The action to perform when the rule matches.
+     */
+    action?: 'score';
+
+    /**
+     * Body param: The parameters configuring the rule's action.
+     */
+    action_parameters?: RuleCreateParams.ScoreRule.ActionParameters;
+
+    /**
+     * Body param: An informative description of the rule.
+     */
+    description?: string;
+
+    /**
+     * Body param: Whether the rule should be executed.
+     */
+    enabled?: boolean;
+
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.ScoreRule.ExposedCredentialCheck;
+
+    /**
+     * Body param: The expression defining which traffic will match the rule.
+     */
+    expression?: string;
+
+    /**
+     * Body param: An object configuring the rule's logging behavior.
+     */
+    logging?: LoggingParam;
+
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.ScoreRule.BeforePosition
+      | RuleCreateParams.ScoreRule.AfterPosition
+      | RuleCreateParams.ScoreRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.ScoreRule.Ratelimit;
+
+    /**
+     * Body param: The reference of the rule (the rule ID by default).
+     */
+    ref?: string;
+  }
+
+  export namespace ScoreRule {
+    /**
+     * The parameters configuring the rule's action.
+     */
+    export interface ActionParameters {
+      /**
+       * Increment contains the delta to change the score and can be either positive or
+       * negative.
+       */
+      increment?: number;
+    }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
-  export interface ScoreRule {
+  export interface ServeErrorRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -5430,12 +9673,12 @@ export namespace RuleCreateParams {
     /**
      * Body param: The action to perform when the rule matches.
      */
-    action?: 'score';
+    action?: 'serve_error';
 
     /**
      * Body param: The parameters configuring the rule's action.
      */
-    action_parameters?: RuleCreateParams.ScoreRule.ActionParameters;
+    action_parameters?: RuleCreateParams.ServeErrorRule.ActionParameters;
 
     /**
      * Body param: An informative description of the rule.
@@ -5447,6 +9690,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.ServeErrorRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -5457,98 +9705,142 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.ServeErrorRule.BeforePosition
+      | RuleCreateParams.ServeErrorRule.AfterPosition
+      | RuleCreateParams.ServeErrorRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.ServeErrorRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace ScoreRule {
+  export namespace ServeErrorRule {
     /**
      * The parameters configuring the rule's action.
      */
     export interface ActionParameters {
       /**
-       * Increment contains the delta to change the score and can be either positive or
-       * negative.
+       * Error response content.
        */
-      increment?: number;
+      content?: string;
+
+      /**
+       * Content-type header to set with the response.
+       */
+      content_type?: 'application/json' | 'text/xml' | 'text/plain' | 'text/html';
+
+      /**
+       * The status code to use for the error.
+       */
+      status_code?: number;
     }
-  }
 
-  export interface ServeErrorRule {
     /**
-     * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
-     * Zone ID.
+     * Configure checks for exposed credentials.
      */
-    account_id?: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
-     * Account ID.
-     */
-    zone_id?: string;
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * Body param: The unique ID of the rule.
+     * An object configuring where the rule will be placed.
      */
-    id?: string;
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
 
     /**
-     * Body param: The action to perform when the rule matches.
+     * An object configuring where the rule will be placed.
      */
-    action?: 'serve_error';
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
 
     /**
-     * Body param: The parameters configuring the rule's action.
+     * An object configuring where the rule will be placed.
      */
-    action_parameters?: RuleCreateParams.ServeErrorRule.ActionParameters;
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
 
     /**
-     * Body param: An informative description of the rule.
+     * An object configuring the rule's ratelimit behavior.
      */
-    description?: string;
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * Body param: Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * Body param: The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * Body param: An object configuring the rule's logging behavior.
-     */
-    logging?: LoggingParam;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * Body param: The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
-  }
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-  export namespace ServeErrorRule {
-    /**
-     * The parameters configuring the rule's action.
-     */
-    export interface ActionParameters {
       /**
-       * Error response content.
+       * Defines if ratelimit counting is only done when an origin is reached.
        */
-      content?: string;
+      requests_to_origin?: boolean;
 
       /**
-       * Content-type header to set with the response.
+       * The score threshold per period for which the action will be executed the first
+       * time.
        */
-      content_type?: 'application/json' | 'text/xml' | 'text/plain' | 'text/html';
+      score_per_period?: number;
 
       /**
-       * The status code to use for the error.
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
        */
-      status_code?: number;
+      score_response_header_name?: string;
     }
   }
 
@@ -5590,6 +9882,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.SetConfigRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -5600,6 +9897,19 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.SetConfigRule.BeforePosition
+      | RuleCreateParams.SetConfigRule.AfterPosition
+      | RuleCreateParams.SetConfigRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.SetConfigRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -5718,6 +10028,104 @@ export namespace RuleCreateParams {
         js?: boolean;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
   export interface SkipRule {
@@ -5758,6 +10166,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.SkipRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -5768,6 +10181,19 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.SkipRule.BeforePosition
+      | RuleCreateParams.SkipRule.AfterPosition
+      | RuleCreateParams.SkipRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.SkipRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -5808,6 +10234,104 @@ export namespace RuleCreateParams {
        */
       rulesets?: Array<string>;
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
   export interface SetCacheSettingsRule {
@@ -5848,6 +10372,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.SetCacheSettingsRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -5858,6 +10387,19 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.SetCacheSettingsRule.BeforePosition
+      | RuleCreateParams.SetCacheSettingsRule.AfterPosition
+      | RuleCreateParams.SetCacheSettingsRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.SetCacheSettingsRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -6009,10 +10551,9 @@ export namespace RuleCreateParams {
           host?: CustomKey.Host;
 
           /**
-           * Use the presence or absence of parameters in the query string to build the cache
-           * key.
+           * Use the presence of parameters in the query string to build the cache key.
            */
-          query_string?: CustomKey.QueryString;
+          query_string?: CustomKey.IncludedQueryStringParameters | CustomKey.ExcludedQueryStringParameters;
 
           /**
            * Characteristics of the request user agent used in building the cache key.
@@ -6079,56 +10620,69 @@ export namespace RuleCreateParams {
           }
 
           /**
-           * Use the presence or absence of parameters in the query string to build the cache
-           * key.
+           * Use the presence of parameters in the query string to build the cache key.
            */
-          export interface QueryString {
+          export interface IncludedQueryStringParameters {
             /**
-             * build the cache key using all query string parameters EXCECPT these excluded
-             * parameters
+             * A list of query string parameters used to build the cache key.
              */
-            exclude?: QueryString.Exclude;
+            include?:
+              | IncludedQueryStringParameters.SomeQueryStringParameters
+              | IncludedQueryStringParameters.AllQueryStringParameters;
+          }
 
+          export namespace IncludedQueryStringParameters {
             /**
-             * build the cache key using a list of query string parameters that ARE in the
-             * request.
+             * A list of query string parameters used to build the cache key.
+             */
+            export interface SomeQueryStringParameters {
+              list?: Array<string>;
+            }
+
+            /**
+             * Build the cache key using ALL query string parameters that are in the request.
+             */
+            export interface AllQueryStringParameters {
+              /**
+               * Determines whether to include all query string parameters in the cache key.
+               */
+              all?: boolean;
+            }
+          }
+
+          /**
+           * Use the absence of parameters in the query string to build the cache key.
+           */
+          export interface ExcludedQueryStringParameters {
+            /**
+             * A list of query string parameters NOT used to build the cache key. All
+             * parameters present in the request but missing in this list will be used to build
+             * the cache key.
              */
-            include?: QueryString.Include;
+            exclude?:
+              | ExcludedQueryStringParameters.SomeQueryStringParameters
+              | ExcludedQueryStringParameters.AllQueryStringParameters;
           }
 
-          export namespace QueryString {
+          export namespace ExcludedQueryStringParameters {
             /**
-             * build the cache key using all query string parameters EXCECPT these excluded
-             * parameters
+             * A list of query string parameters NOT used to build the cache key. All
+             * parameters present in the request but missing in this list will be used to build
+             * the cache key.
              */
-            export interface Exclude {
-              /**
-               * Exclude all query string parameters from use in building the cache key.
-               */
-              all?: boolean;
-
-              /**
-               * A list of query string parameters NOT used to build the cache key. All
-               * parameters present in the request but missing in this list will be used to build
-               * the cache key.
-               */
+            export interface SomeQueryStringParameters {
               list?: Array<string>;
             }
 
             /**
-             * build the cache key using a list of query string parameters that ARE in the
+             * Build the cache key excluding ALL query string parameters that are in the
              * request.
              */
-            export interface Include {
+            export interface AllQueryStringParameters {
               /**
-               * Use all query string parameters in the cache key.
+               * Determines whether to exclude all query string parameters from the cache key.
                */
               all?: boolean;
-
-              /**
-               * A list of query string parameters used to build the cache key.
-               */
-              list?: Array<string>;
             }
           }
 
@@ -6168,7 +10722,7 @@ export namespace RuleCreateParams {
         /**
          * The minimum file size eligible for store in cache reserve.
          */
-        min_file_size: number;
+        minimum_file_size: number;
       }
 
       /**
@@ -6248,9 +10802,107 @@ export namespace RuleCreateParams {
         disable_stale_while_updating: boolean;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
-  export interface RulesetsLogCustomFieldRule {
+  export interface LogCustomFieldRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -6276,7 +10928,7 @@ export namespace RuleCreateParams {
     /**
      * Body param: The parameters configuring the rule's action.
      */
-    action_parameters?: RuleCreateParams.RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: RuleCreateParams.LogCustomFieldRule.ActionParameters;
 
     /**
      * Body param: An informative description of the rule.
@@ -6288,6 +10940,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.LogCustomFieldRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -6298,13 +10955,26 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.LogCustomFieldRule.BeforePosition
+      | RuleCreateParams.LogCustomFieldRule.AfterPosition
+      | RuleCreateParams.LogCustomFieldRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.LogCustomFieldRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace LogCustomFieldRule {
     /**
      * The parameters configuring the rule's action.
      */
@@ -6356,9 +11026,107 @@ export namespace RuleCreateParams {
         name: string;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface DDoSDynamicRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -6396,6 +11164,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.DDoSDynamicRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -6406,13 +11179,126 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.DDoSDynamicRule.BeforePosition
+      | RuleCreateParams.DDoSDynamicRule.AfterPosition
+      | RuleCreateParams.DDoSDynamicRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.DDoSDynamicRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export interface RulesetsForceConnectionCloseRule {
+  export namespace DDoSDynamicRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
+  export interface ForceConnectionCloseRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -6450,6 +11336,11 @@ export namespace RuleCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleCreateParams.ForceConnectionCloseRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -6460,11 +11351,124 @@ export namespace RuleCreateParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleCreateParams.ForceConnectionCloseRule.BeforePosition
+      | RuleCreateParams.ForceConnectionCloseRule.AfterPosition
+      | RuleCreateParams.ForceConnectionCloseRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleCreateParams.ForceConnectionCloseRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
+
+  export namespace ForceConnectionCloseRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
 }
 
 export interface RuleDeleteParams {
@@ -6482,24 +11486,24 @@ export interface RuleDeleteParams {
 export type RuleEditParams =
   | RuleEditParams.BlockRule
   | RuleEditParams.ChallengeRule
-  | RuleEditParams.CompressResponseRule
+  | RuleEditParams.CompressionRule
   | RuleEditParams.ExecuteRule
-  | RuleEditParams.JSChallengeRule
+  | RuleEditParams.JavascriptChallengeRule
   | RuleEditParams.LogRule
   | RuleEditParams.ManagedChallengeRule
   | RuleEditParams.RedirectRule
   | RuleEditParams.RewriteRule
-  | RuleEditParams.RouteRule
+  | RuleEditParams.OriginRule
   | RuleEditParams.ScoreRule
   | RuleEditParams.ServeErrorRule
   | RuleEditParams.SetConfigRule
   | RuleEditParams.SkipRule
   | RuleEditParams.SetCacheSettingsRule
-  | RuleEditParams.RulesetsLogCustomFieldRule
-  | RuleEditParams.RulesetsDDoSDynamicRule
-  | RuleEditParams.RulesetsForceConnectionCloseRule;
+  | RuleEditParams.LogCustomFieldRule
+  | RuleEditParams.DDoSDynamicRule
+  | RuleEditParams.ForceConnectionCloseRule;
 
-export namespace RuleEditParams {
+export declare namespace RuleEditParams {
   export interface BlockRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
@@ -6538,6 +11542,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.BlockRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -6548,6 +11557,19 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.BlockRule.BeforePosition
+      | RuleEditParams.BlockRule.AfterPosition
+      | RuleEditParams.BlockRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.BlockRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -6586,6 +11608,104 @@ export namespace RuleEditParams {
         status_code: number;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
   export interface ChallengeRule {
@@ -6626,6 +11746,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.ChallengeRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -6636,13 +11761,126 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.ChallengeRule.BeforePosition
+      | RuleEditParams.ChallengeRule.AfterPosition
+      | RuleEditParams.ChallengeRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.ChallengeRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export interface CompressResponseRule {
+  export namespace ChallengeRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
+  export interface CompressionRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -6668,7 +11906,7 @@ export namespace RuleEditParams {
     /**
      * Body param: The parameters configuring the rule's action.
      */
-    action_parameters?: RuleEditParams.CompressResponseRule.ActionParameters;
+    action_parameters?: RuleEditParams.CompressionRule.ActionParameters;
 
     /**
      * Body param: An informative description of the rule.
@@ -6680,6 +11918,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.CompressionRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -6690,13 +11933,26 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.CompressionRule.BeforePosition
+      | RuleEditParams.CompressionRule.AfterPosition
+      | RuleEditParams.CompressionRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.CompressionRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace CompressResponseRule {
+  export namespace CompressionRule {
     /**
      * The parameters configuring the rule's action.
      */
@@ -6718,6 +11974,104 @@ export namespace RuleEditParams {
         name?: 'none' | 'auto' | 'default' | 'gzip' | 'brotli';
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
   export interface ExecuteRule {
@@ -6758,6 +12112,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.ExecuteRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -6768,6 +12127,19 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.ExecuteRule.BeforePosition
+      | RuleEditParams.ExecuteRule.AfterPosition
+      | RuleEditParams.ExecuteRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.ExecuteRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -6897,9 +12269,107 @@ export namespace RuleEditParams {
         }
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
-  export interface JSChallengeRule {
+  export interface JavascriptChallengeRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -6937,6 +12407,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.JavascriptChallengeRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -6947,12 +12422,125 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.JavascriptChallengeRule.BeforePosition
+      | RuleEditParams.JavascriptChallengeRule.AfterPosition
+      | RuleEditParams.JavascriptChallengeRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.JavascriptChallengeRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
+  export namespace JavascriptChallengeRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
   export interface LogRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
@@ -6991,6 +12579,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.LogRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -7001,12 +12594,125 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.LogRule.BeforePosition
+      | RuleEditParams.LogRule.AfterPosition
+      | RuleEditParams.LogRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.LogRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
+  export namespace LogRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
   export interface ManagedChallengeRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
@@ -7045,6 +12751,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.ManagedChallengeRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -7055,12 +12766,125 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.ManagedChallengeRule.BeforePosition
+      | RuleEditParams.ManagedChallengeRule.AfterPosition
+      | RuleEditParams.ManagedChallengeRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.ManagedChallengeRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
+  export namespace ManagedChallengeRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
   export interface RedirectRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
@@ -7099,6 +12923,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.RedirectRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -7109,6 +12938,19 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.RedirectRule.BeforePosition
+      | RuleEditParams.RedirectRule.AfterPosition
+      | RuleEditParams.RedirectRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.RedirectRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -7183,6 +13025,104 @@ export namespace RuleEditParams {
         }
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
   export interface RewriteRule {
@@ -7223,6 +13163,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.RewriteRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -7233,6 +13178,19 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.RewriteRule.BeforePosition
+      | RuleEditParams.RewriteRule.AfterPosition
+      | RuleEditParams.RewriteRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.RewriteRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -7305,9 +13263,107 @@ export namespace RuleEditParams {
         query?: RulesAPI.RewriteURIPartParam;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
-  export interface RouteRule {
+  export interface OriginRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -7333,7 +13389,7 @@ export namespace RuleEditParams {
     /**
      * Body param: The parameters configuring the rule's action.
      */
-    action_parameters?: RuleEditParams.RouteRule.ActionParameters;
+    action_parameters?: RuleEditParams.OriginRule.ActionParameters;
 
     /**
      * Body param: An informative description of the rule.
@@ -7345,6 +13401,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.OriginRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -7355,13 +13416,26 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.OriginRule.BeforePosition
+      | RuleEditParams.OriginRule.AfterPosition
+      | RuleEditParams.OriginRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.OriginRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RouteRule {
+  export namespace OriginRule {
     /**
      * The parameters configuring the rule's action.
      */
@@ -7408,9 +13482,290 @@ export namespace RuleEditParams {
         value: string;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
+  export interface ScoreRule {
+    /**
+     * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
+     * Zone ID.
+     */
+    account_id?: string;
+
+    /**
+     * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
+     * Account ID.
+     */
+    zone_id?: string;
+
+    /**
+     * Body param: The unique ID of the rule.
+     */
+    id?: string;
+
+    /**
+     * Body param: The action to perform when the rule matches.
+     */
+    action?: 'score';
+
+    /**
+     * Body param: The parameters configuring the rule's action.
+     */
+    action_parameters?: RuleEditParams.ScoreRule.ActionParameters;
+
+    /**
+     * Body param: An informative description of the rule.
+     */
+    description?: string;
+
+    /**
+     * Body param: Whether the rule should be executed.
+     */
+    enabled?: boolean;
+
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.ScoreRule.ExposedCredentialCheck;
+
+    /**
+     * Body param: The expression defining which traffic will match the rule.
+     */
+    expression?: string;
+
+    /**
+     * Body param: An object configuring the rule's logging behavior.
+     */
+    logging?: LoggingParam;
+
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.ScoreRule.BeforePosition
+      | RuleEditParams.ScoreRule.AfterPosition
+      | RuleEditParams.ScoreRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.ScoreRule.Ratelimit;
+
+    /**
+     * Body param: The reference of the rule (the rule ID by default).
+     */
+    ref?: string;
+  }
+
+  export namespace ScoreRule {
+    /**
+     * The parameters configuring the rule's action.
+     */
+    export interface ActionParameters {
+      /**
+       * Increment contains the delta to change the score and can be either positive or
+       * negative.
+       */
+      increment?: number;
+    }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
-  export interface ScoreRule {
+  export interface ServeErrorRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -7431,12 +13786,12 @@ export namespace RuleEditParams {
     /**
      * Body param: The action to perform when the rule matches.
      */
-    action?: 'score';
+    action?: 'serve_error';
 
     /**
      * Body param: The parameters configuring the rule's action.
      */
-    action_parameters?: RuleEditParams.ScoreRule.ActionParameters;
+    action_parameters?: RuleEditParams.ServeErrorRule.ActionParameters;
 
     /**
      * Body param: An informative description of the rule.
@@ -7448,6 +13803,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.ServeErrorRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -7458,98 +13818,142 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.ServeErrorRule.BeforePosition
+      | RuleEditParams.ServeErrorRule.AfterPosition
+      | RuleEditParams.ServeErrorRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.ServeErrorRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace ScoreRule {
+  export namespace ServeErrorRule {
     /**
      * The parameters configuring the rule's action.
      */
     export interface ActionParameters {
       /**
-       * Increment contains the delta to change the score and can be either positive or
-       * negative.
+       * Error response content.
        */
-      increment?: number;
+      content?: string;
+
+      /**
+       * Content-type header to set with the response.
+       */
+      content_type?: 'application/json' | 'text/xml' | 'text/plain' | 'text/html';
+
+      /**
+       * The status code to use for the error.
+       */
+      status_code?: number;
     }
-  }
 
-  export interface ServeErrorRule {
     /**
-     * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
-     * Zone ID.
+     * Configure checks for exposed credentials.
      */
-    account_id?: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
-     * Account ID.
-     */
-    zone_id?: string;
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * Body param: The unique ID of the rule.
+     * An object configuring where the rule will be placed.
      */
-    id?: string;
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
 
     /**
-     * Body param: The action to perform when the rule matches.
+     * An object configuring where the rule will be placed.
      */
-    action?: 'serve_error';
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
 
     /**
-     * Body param: The parameters configuring the rule's action.
+     * An object configuring where the rule will be placed.
      */
-    action_parameters?: RuleEditParams.ServeErrorRule.ActionParameters;
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
 
     /**
-     * Body param: An informative description of the rule.
+     * An object configuring the rule's ratelimit behavior.
      */
-    description?: string;
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * Body param: Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * Body param: The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * Body param: An object configuring the rule's logging behavior.
-     */
-    logging?: LoggingParam;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * Body param: The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
-  }
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-  export namespace ServeErrorRule {
-    /**
-     * The parameters configuring the rule's action.
-     */
-    export interface ActionParameters {
       /**
-       * Error response content.
+       * Defines if ratelimit counting is only done when an origin is reached.
        */
-      content?: string;
+      requests_to_origin?: boolean;
 
       /**
-       * Content-type header to set with the response.
+       * The score threshold per period for which the action will be executed the first
+       * time.
        */
-      content_type?: 'application/json' | 'text/xml' | 'text/plain' | 'text/html';
+      score_per_period?: number;
 
       /**
-       * The status code to use for the error.
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
        */
-      status_code?: number;
+      score_response_header_name?: string;
     }
   }
 
@@ -7591,6 +13995,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.SetConfigRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -7601,6 +14010,19 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.SetConfigRule.BeforePosition
+      | RuleEditParams.SetConfigRule.AfterPosition
+      | RuleEditParams.SetConfigRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.SetConfigRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -7719,6 +14141,104 @@ export namespace RuleEditParams {
         js?: boolean;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
   export interface SkipRule {
@@ -7759,6 +14279,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.SkipRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -7769,6 +14294,19 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.SkipRule.BeforePosition
+      | RuleEditParams.SkipRule.AfterPosition
+      | RuleEditParams.SkipRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.SkipRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -7809,6 +14347,104 @@ export namespace RuleEditParams {
        */
       rulesets?: Array<string>;
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
   export interface SetCacheSettingsRule {
@@ -7849,6 +14485,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.SetCacheSettingsRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -7859,6 +14500,19 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.SetCacheSettingsRule.BeforePosition
+      | RuleEditParams.SetCacheSettingsRule.AfterPosition
+      | RuleEditParams.SetCacheSettingsRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.SetCacheSettingsRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
@@ -8010,10 +14664,9 @@ export namespace RuleEditParams {
           host?: CustomKey.Host;
 
           /**
-           * Use the presence or absence of parameters in the query string to build the cache
-           * key.
+           * Use the presence of parameters in the query string to build the cache key.
            */
-          query_string?: CustomKey.QueryString;
+          query_string?: CustomKey.IncludedQueryStringParameters | CustomKey.ExcludedQueryStringParameters;
 
           /**
            * Characteristics of the request user agent used in building the cache key.
@@ -8080,56 +14733,69 @@ export namespace RuleEditParams {
           }
 
           /**
-           * Use the presence or absence of parameters in the query string to build the cache
-           * key.
+           * Use the presence of parameters in the query string to build the cache key.
            */
-          export interface QueryString {
+          export interface IncludedQueryStringParameters {
             /**
-             * build the cache key using all query string parameters EXCECPT these excluded
-             * parameters
+             * A list of query string parameters used to build the cache key.
              */
-            exclude?: QueryString.Exclude;
+            include?:
+              | IncludedQueryStringParameters.SomeQueryStringParameters
+              | IncludedQueryStringParameters.AllQueryStringParameters;
+          }
 
+          export namespace IncludedQueryStringParameters {
             /**
-             * build the cache key using a list of query string parameters that ARE in the
-             * request.
+             * A list of query string parameters used to build the cache key.
              */
-            include?: QueryString.Include;
-          }
+            export interface SomeQueryStringParameters {
+              list?: Array<string>;
+            }
 
-          export namespace QueryString {
             /**
-             * build the cache key using all query string parameters EXCECPT these excluded
-             * parameters
+             * Build the cache key using ALL query string parameters that are in the request.
              */
-            export interface Exclude {
+            export interface AllQueryStringParameters {
               /**
-               * Exclude all query string parameters from use in building the cache key.
+               * Determines whether to include all query string parameters in the cache key.
                */
               all?: boolean;
+            }
+          }
+
+          /**
+           * Use the absence of parameters in the query string to build the cache key.
+           */
+          export interface ExcludedQueryStringParameters {
+            /**
+             * A list of query string parameters NOT used to build the cache key. All
+             * parameters present in the request but missing in this list will be used to build
+             * the cache key.
+             */
+            exclude?:
+              | ExcludedQueryStringParameters.SomeQueryStringParameters
+              | ExcludedQueryStringParameters.AllQueryStringParameters;
+          }
 
-              /**
-               * A list of query string parameters NOT used to build the cache key. All
-               * parameters present in the request but missing in this list will be used to build
-               * the cache key.
-               */
+          export namespace ExcludedQueryStringParameters {
+            /**
+             * A list of query string parameters NOT used to build the cache key. All
+             * parameters present in the request but missing in this list will be used to build
+             * the cache key.
+             */
+            export interface SomeQueryStringParameters {
               list?: Array<string>;
             }
 
             /**
-             * build the cache key using a list of query string parameters that ARE in the
+             * Build the cache key excluding ALL query string parameters that are in the
              * request.
              */
-            export interface Include {
+            export interface AllQueryStringParameters {
               /**
-               * Use all query string parameters in the cache key.
+               * Determines whether to exclude all query string parameters from the cache key.
                */
               all?: boolean;
-
-              /**
-               * A list of query string parameters used to build the cache key.
-               */
-              list?: Array<string>;
             }
           }
 
@@ -8169,7 +14835,7 @@ export namespace RuleEditParams {
         /**
          * The minimum file size eligible for store in cache reserve.
          */
-        min_file_size: number;
+        minimum_file_size: number;
       }
 
       /**
@@ -8249,9 +14915,107 @@ export namespace RuleEditParams {
         disable_stale_while_updating: boolean;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
-  export interface RulesetsLogCustomFieldRule {
+  export interface LogCustomFieldRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -8277,7 +15041,7 @@ export namespace RuleEditParams {
     /**
      * Body param: The parameters configuring the rule's action.
      */
-    action_parameters?: RuleEditParams.RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: RuleEditParams.LogCustomFieldRule.ActionParameters;
 
     /**
      * Body param: An informative description of the rule.
@@ -8289,6 +15053,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.LogCustomFieldRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -8299,13 +15068,26 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.LogCustomFieldRule.BeforePosition
+      | RuleEditParams.LogCustomFieldRule.AfterPosition
+      | RuleEditParams.LogCustomFieldRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.LogCustomFieldRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace LogCustomFieldRule {
     /**
      * The parameters configuring the rule's action.
      */
@@ -8357,9 +15139,107 @@ export namespace RuleEditParams {
         name: string;
       }
     }
+
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface DDoSDynamicRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -8397,6 +15277,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.DDoSDynamicRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -8407,13 +15292,126 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.DDoSDynamicRule.BeforePosition
+      | RuleEditParams.DDoSDynamicRule.AfterPosition
+      | RuleEditParams.DDoSDynamicRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.DDoSDynamicRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export interface RulesetsForceConnectionCloseRule {
+  export namespace DDoSDynamicRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
+
+  export interface ForceConnectionCloseRule {
     /**
      * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
      * Zone ID.
@@ -8451,6 +15449,11 @@ export namespace RuleEditParams {
      */
     enabled?: boolean;
 
+    /**
+     * Body param: Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RuleEditParams.ForceConnectionCloseRule.ExposedCredentialCheck;
+
     /**
      * Body param: The expression defining which traffic will match the rule.
      */
@@ -8461,36 +15464,152 @@ export namespace RuleEditParams {
      */
     logging?: LoggingParam;
 
+    /**
+     * Body param: An object configuring where the rule will be placed.
+     */
+    position?:
+      | RuleEditParams.ForceConnectionCloseRule.BeforePosition
+      | RuleEditParams.ForceConnectionCloseRule.AfterPosition
+      | RuleEditParams.ForceConnectionCloseRule.IndexPosition;
+
+    /**
+     * Body param: An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RuleEditParams.ForceConnectionCloseRule.Ratelimit;
+
     /**
      * Body param: The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
+
+  export namespace ForceConnectionCloseRule {
+    /**
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface BeforePosition {
+      /**
+       * The ID of another rule to place the rule before. An empty value causes the rule
+       * to be placed at the top.
+       */
+      before?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface AfterPosition {
+      /**
+       * The ID of another rule to place the rule after. An empty value causes the rule
+       * to be placed at the bottom.
+       */
+      after?: string;
+    }
+
+    /**
+     * An object configuring where the rule will be placed.
+     */
+    export interface IndexPosition {
+      /**
+       * An index at which to place the rule, where index 1 is the first rule.
+       */
+      index?: number;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
+  }
 }
 
-export namespace Rules {
-  export import BlockRule = RulesAPI.BlockRule;
-  export import ChallengeRule = RulesAPI.ChallengeRule;
-  export import CompressResponseRule = RulesAPI.CompressResponseRule;
-  export import ExecuteRule = RulesAPI.ExecuteRule;
-  export import JSChallengeRule = RulesAPI.JSChallengeRule;
-  export import LogRule = RulesAPI.LogRule;
-  export import Logging = RulesAPI.Logging;
-  export import ManagedChallengeRule = RulesAPI.ManagedChallengeRule;
-  export import RedirectRule = RulesAPI.RedirectRule;
-  export import RewriteRule = RulesAPI.RewriteRule;
-  export import RewriteURIPart = RulesAPI.RewriteURIPart;
-  export import RouteRule = RulesAPI.RouteRule;
-  export import RulesetRule = RulesAPI.RulesetRule;
-  export import ScoreRule = RulesAPI.ScoreRule;
-  export import ServeErrorRule = RulesAPI.ServeErrorRule;
-  export import SetCacheSettingsRule = RulesAPI.SetCacheSettingsRule;
-  export import SetConfigRule = RulesAPI.SetConfigRule;
-  export import SkipRule = RulesAPI.SkipRule;
-  export import RuleCreateResponse = RulesAPI.RuleCreateResponse;
-  export import RuleDeleteResponse = RulesAPI.RuleDeleteResponse;
-  export import RuleEditResponse = RulesAPI.RuleEditResponse;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleDeleteParams = RulesAPI.RuleDeleteParams;
-  export import RuleEditParams = RulesAPI.RuleEditParams;
+export declare namespace Rules {
+  export {
+    type BlockRule as BlockRule,
+    type CompressResponseRule as CompressResponseRule,
+    type DDoSDynamicRule as DDoSDynamicRule,
+    type ExecuteRule as ExecuteRule,
+    type ForceConnectionCloseRule as ForceConnectionCloseRule,
+    type LogCustomFieldRule as LogCustomFieldRule,
+    type LogRule as LogRule,
+    type Logging as Logging,
+    type ManagedChallengeRule as ManagedChallengeRule,
+    type RedirectRule as RedirectRule,
+    type RewriteRule as RewriteRule,
+    type RewriteURIPart as RewriteURIPart,
+    type RouteRule as RouteRule,
+    type RulesetRule as RulesetRule,
+    type ScoreRule as ScoreRule,
+    type ServeErrorRule as ServeErrorRule,
+    type SetCacheSettingsRule as SetCacheSettingsRule,
+    type SetConfigRule as SetConfigRule,
+    type SkipRule as SkipRule,
+    type RuleCreateResponse as RuleCreateResponse,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    type RuleEditResponse as RuleEditResponse,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleEditParams as RuleEditParams,
+  };
 }
diff --git a/src/resources/rulesets/rulesets.ts b/src/resources/rulesets/rulesets.ts
index 76fb791314..5c5b604cba 100644
--- a/src/resources/rulesets/rulesets.ts
+++ b/src/resources/rulesets/rulesets.ts
@@ -3,10 +3,54 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import { CloudflareError } from '../../error';
+import { CloudflareError } from 'cloudflare/error';
 import * as RulesAPI from './rules';
+import {
+  BlockRule,
+  CompressResponseRule,
+  DDoSDynamicRule,
+  ExecuteRule,
+  ForceConnectionCloseRule,
+  LogCustomFieldRule,
+  LogRule,
+  Logging,
+  ManagedChallengeRule,
+  RedirectRule,
+  RewriteRule,
+  RewriteURIPart,
+  RouteRule,
+  RuleCreateParams,
+  RuleCreateResponse,
+  RuleDeleteParams,
+  RuleDeleteResponse,
+  RuleEditParams,
+  RuleEditResponse,
+  Rules,
+  RulesetRule,
+  ScoreRule,
+  ServeErrorRule,
+  SetCacheSettingsRule,
+  SetConfigRule,
+  SkipRule,
+} from './rules';
+import * as VersionsAPI from './versions';
+import {
+  VersionDeleteParams,
+  VersionGetParams,
+  VersionGetResponse,
+  VersionListParams,
+  VersionListResponse,
+  VersionListResponsesSinglePage,
+  Versions,
+} from './versions';
 import * as PhasesAPI from './phases/phases';
-import * as VersionsAPI from './versions/versions';
+import {
+  PhaseGetParams,
+  PhaseGetResponse,
+  PhaseUpdateParams,
+  PhaseUpdateResponse,
+  Phases,
+} from './phases/phases';
 import { SinglePage } from '../../pagination';
 
 export class Rulesets extends APIResource {
@@ -229,14 +273,14 @@ export type Phase =
   | 'http_request_redirect'
   | 'http_request_sanitize'
   | 'http_request_sbfm'
-  | 'http_request_select_configuration'
   | 'http_request_transform'
   | 'http_response_compression'
   | 'http_response_firewall_managed'
   | 'http_response_headers_transform'
   | 'magic_transit'
   | 'magic_transit_ids_managed'
-  | 'magic_transit_managed';
+  | 'magic_transit_managed'
+  | 'magic_transit_ratelimit';
 
 /**
  * The phase of the ruleset.
@@ -257,14 +301,14 @@ export type PhaseParam =
   | 'http_request_redirect'
   | 'http_request_sanitize'
   | 'http_request_sbfm'
-  | 'http_request_select_configuration'
   | 'http_request_transform'
   | 'http_response_compression'
   | 'http_response_firewall_managed'
   | 'http_response_headers_transform'
   | 'magic_transit'
   | 'magic_transit_ids_managed'
-  | 'magic_transit_managed';
+  | 'magic_transit_managed'
+  | 'magic_transit_ratelimit';
 
 /**
  * A ruleset object.
@@ -330,10 +374,10 @@ export interface RulesetCreateResponse {
    */
   rules: Array<
     | RulesAPI.BlockRule
-    | RulesAPI.ChallengeRule
+    | RulesetCreateResponse.RulesetsChallengeRule
     | RulesAPI.CompressResponseRule
     | RulesAPI.ExecuteRule
-    | RulesAPI.JSChallengeRule
+    | RulesetCreateResponse.RulesetsJSChallengeRule
     | RulesAPI.LogRule
     | RulesAPI.ManagedChallengeRule
     | RulesAPI.RedirectRule
@@ -344,9 +388,9 @@ export interface RulesetCreateResponse {
     | RulesAPI.SetConfigRule
     | RulesAPI.SkipRule
     | RulesAPI.SetCacheSettingsRule
-    | RulesetCreateResponse.RulesetsLogCustomFieldRule
-    | RulesetCreateResponse.RulesetsDDoSDynamicRule
-    | RulesetCreateResponse.RulesetsForceConnectionCloseRule
+    | RulesAPI.LogCustomFieldRule
+    | RulesAPI.DDoSDynamicRule
+    | RulesAPI.ForceConnectionCloseRule
   >;
 
   /**
@@ -361,7 +405,7 @@ export interface RulesetCreateResponse {
 }
 
 export namespace RulesetCreateResponse {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -380,12 +424,12 @@ export namespace RulesetCreateResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * The categories of the rule.
@@ -402,6 +446,11 @@ export namespace RulesetCreateResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -412,67 +461,86 @@ export namespace RulesetCreateResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
       /**
-       * The cookie fields to log.
+       * Expression that selects the password used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      password_expression: string;
 
       /**
-       * The request fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The response fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      requests_per_period?: number;
 
       /**
-       * The request field to log.
+       * Defines if ratelimit counting is only done when an origin is reached.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      requests_to_origin?: boolean;
 
       /**
-       * The response field to log.
+       * The score threshold per period for which the action will be executed the first
+       * time.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -491,7 +559,7 @@ export namespace RulesetCreateResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -513,6 +581,11 @@ export namespace RulesetCreateResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -524,66 +597,82 @@ export namespace RulesetCreateResponse {
     logging?: RulesAPI.Logging;
 
     /**
-     * The reference of the rule (the rule ID by default).
+     * An object configuring the rule's ratelimit behavior.
      */
-    ref?: string;
-  }
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
 
-  export interface RulesetsForceConnectionCloseRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * The reference of the rule (the rule ID by default).
      */
-    last_updated: string;
+    ref?: string;
+  }
 
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The version of the rule.
+     * Configure checks for exposed credentials.
      */
-    version: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The unique ID of the rule.
-     */
-    id?: string;
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The action to perform when the rule matches.
+     * An object configuring the rule's ratelimit behavior.
      */
-    action?: 'force_connection_close';
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * The parameters configuring the rule's action.
-     */
-    action_parameters?: unknown;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -621,10 +710,10 @@ export interface RulesetUpdateResponse {
    */
   rules: Array<
     | RulesAPI.BlockRule
-    | RulesAPI.ChallengeRule
+    | RulesetUpdateResponse.RulesetsChallengeRule
     | RulesAPI.CompressResponseRule
     | RulesAPI.ExecuteRule
-    | RulesAPI.JSChallengeRule
+    | RulesetUpdateResponse.RulesetsJSChallengeRule
     | RulesAPI.LogRule
     | RulesAPI.ManagedChallengeRule
     | RulesAPI.RedirectRule
@@ -635,9 +724,9 @@ export interface RulesetUpdateResponse {
     | RulesAPI.SetConfigRule
     | RulesAPI.SkipRule
     | RulesAPI.SetCacheSettingsRule
-    | RulesetUpdateResponse.RulesetsLogCustomFieldRule
-    | RulesetUpdateResponse.RulesetsDDoSDynamicRule
-    | RulesetUpdateResponse.RulesetsForceConnectionCloseRule
+    | RulesAPI.LogCustomFieldRule
+    | RulesAPI.DDoSDynamicRule
+    | RulesAPI.ForceConnectionCloseRule
   >;
 
   /**
@@ -652,7 +741,7 @@ export interface RulesetUpdateResponse {
 }
 
 export namespace RulesetUpdateResponse {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -671,12 +760,12 @@ export namespace RulesetUpdateResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * The categories of the rule.
@@ -693,6 +782,11 @@ export namespace RulesetUpdateResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -703,67 +797,86 @@ export namespace RulesetUpdateResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
       /**
-       * The cookie fields to log.
+       * Expression that selects the password used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      password_expression: string;
 
       /**
-       * The request fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The response fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
+
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      mitigation_timeout?: number;
 
       /**
-       * The request field to log.
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      requests_per_period?: number;
 
       /**
-       * The response field to log.
+       * Defines if ratelimit counting is only done when an origin is reached.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -782,7 +895,7 @@ export namespace RulesetUpdateResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -804,6 +917,11 @@ export namespace RulesetUpdateResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -814,67 +932,83 @@ export namespace RulesetUpdateResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export interface RulesetsForceConnectionCloseRule {
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * Configure checks for exposed credentials.
      */
-    last_updated: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The version of the rule.
-     */
-    version: string;
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The unique ID of the rule.
+     * An object configuring the rule's ratelimit behavior.
      */
-    id?: string;
-
-    /**
-     * The action to perform when the rule matches.
-     */
-    action?: 'force_connection_close';
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * The parameters configuring the rule's action.
-     */
-    action_parameters?: unknown;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -952,10 +1086,10 @@ export interface RulesetGetResponse {
    */
   rules: Array<
     | RulesAPI.BlockRule
-    | RulesAPI.ChallengeRule
+    | RulesetGetResponse.RulesetsChallengeRule
     | RulesAPI.CompressResponseRule
     | RulesAPI.ExecuteRule
-    | RulesAPI.JSChallengeRule
+    | RulesetGetResponse.RulesetsJSChallengeRule
     | RulesAPI.LogRule
     | RulesAPI.ManagedChallengeRule
     | RulesAPI.RedirectRule
@@ -966,9 +1100,9 @@ export interface RulesetGetResponse {
     | RulesAPI.SetConfigRule
     | RulesAPI.SkipRule
     | RulesAPI.SetCacheSettingsRule
-    | RulesetGetResponse.RulesetsLogCustomFieldRule
-    | RulesetGetResponse.RulesetsDDoSDynamicRule
-    | RulesetGetResponse.RulesetsForceConnectionCloseRule
+    | RulesAPI.LogCustomFieldRule
+    | RulesAPI.DDoSDynamicRule
+    | RulesAPI.ForceConnectionCloseRule
   >;
 
   /**
@@ -983,7 +1117,7 @@ export interface RulesetGetResponse {
 }
 
 export namespace RulesetGetResponse {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -1002,12 +1136,12 @@ export namespace RulesetGetResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * The categories of the rule.
@@ -1024,6 +1158,11 @@ export namespace RulesetGetResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -1034,67 +1173,86 @@ export namespace RulesetGetResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
       /**
-       * The cookie fields to log.
+       * Expression that selects the password used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      password_expression: string;
 
       /**
-       * The request fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The response fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      characteristics: Array<string>;
+
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      counting_expression?: string;
 
       /**
-       * The request field to log.
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      mitigation_timeout?: number;
 
       /**
-       * The response field to log.
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -1113,7 +1271,7 @@ export namespace RulesetGetResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -1135,6 +1293,11 @@ export namespace RulesetGetResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -1146,66 +1309,82 @@ export namespace RulesetGetResponse {
     logging?: RulesAPI.Logging;
 
     /**
-     * The reference of the rule (the rule ID by default).
+     * An object configuring the rule's ratelimit behavior.
      */
-    ref?: string;
-  }
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
 
-  export interface RulesetsForceConnectionCloseRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * The reference of the rule (the rule ID by default).
      */
-    last_updated: string;
+    ref?: string;
+  }
 
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The version of the rule.
+     * Configure checks for exposed credentials.
      */
-    version: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The unique ID of the rule.
-     */
-    id?: string;
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The action to perform when the rule matches.
+     * An object configuring the rule's ratelimit behavior.
      */
-    action?: 'force_connection_close';
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * The parameters configuring the rule's action.
-     */
-    action_parameters?: unknown;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -1230,10 +1409,10 @@ export interface RulesetCreateParams {
    */
   rules: Array<
     | RulesAPI.BlockRuleParam
-    | RulesAPI.ChallengeRuleParam
+    | RulesetCreateParams.RulesetsChallengeRule
     | RulesAPI.CompressResponseRuleParam
     | RulesAPI.ExecuteRuleParam
-    | RulesAPI.JSChallengeRuleParam
+    | RulesetCreateParams.RulesetsJSChallengeRule
     | RulesAPI.LogRuleParam
     | RulesAPI.ManagedChallengeRuleParam
     | RulesAPI.RedirectRuleParam
@@ -1244,9 +1423,9 @@ export interface RulesetCreateParams {
     | RulesAPI.SetConfigRuleParam
     | RulesAPI.SkipRuleParam
     | RulesAPI.SetCacheSettingsRuleParam
-    | RulesetCreateParams.RulesetsLogCustomFieldRule
-    | RulesetCreateParams.RulesetsDDoSDynamicRule
-    | RulesetCreateParams.RulesetsForceConnectionCloseRule
+    | RulesAPI.LogCustomFieldRuleParam
+    | RulesAPI.DDoSDynamicRuleParam
+    | RulesAPI.ForceConnectionCloseRuleParam
   >;
 
   /**
@@ -1268,7 +1447,7 @@ export interface RulesetCreateParams {
 }
 
 export namespace RulesetCreateParams {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The unique ID of the rule.
      */
@@ -1277,12 +1456,12 @@ export namespace RulesetCreateParams {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * An informative description of the rule.
@@ -1294,6 +1473,11 @@ export namespace RulesetCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -1304,67 +1488,86 @@ export namespace RulesetCreateParams {
      */
     logging?: RulesAPI.LoggingParam;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
       /**
-       * The cookie fields to log.
+       * Expression that selects the password used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      password_expression: string;
 
       /**
-       * The request fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The response fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      characteristics: Array<string>;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * Period in seconds over which the counter is being incremented.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      period: 10 | 60 | 600 | 3600;
 
       /**
-       * The request field to log.
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      counting_expression?: string;
 
       /**
-       * The response field to log.
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The unique ID of the rule.
      */
@@ -1373,7 +1576,7 @@ export namespace RulesetCreateParams {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -1390,6 +1593,11 @@ export namespace RulesetCreateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -1400,52 +1608,83 @@ export namespace RulesetCreateParams {
      */
     logging?: RulesAPI.LoggingParam;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export interface RulesetsForceConnectionCloseRule {
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The unique ID of the rule.
+     * Configure checks for exposed credentials.
      */
-    id?: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The action to perform when the rule matches.
-     */
-    action?: 'force_connection_close';
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The parameters configuring the rule's action.
+     * An object configuring the rule's ratelimit behavior.
      */
-    action_parameters?: unknown;
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.LoggingParam;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -1455,10 +1694,10 @@ export interface RulesetUpdateParams {
    */
   rules: Array<
     | RulesAPI.BlockRuleParam
-    | RulesAPI.ChallengeRuleParam
+    | RulesetUpdateParams.RulesetsChallengeRule
     | RulesAPI.CompressResponseRuleParam
     | RulesAPI.ExecuteRuleParam
-    | RulesAPI.JSChallengeRuleParam
+    | RulesetUpdateParams.RulesetsJSChallengeRule
     | RulesAPI.LogRuleParam
     | RulesAPI.ManagedChallengeRuleParam
     | RulesAPI.RedirectRuleParam
@@ -1469,9 +1708,9 @@ export interface RulesetUpdateParams {
     | RulesAPI.SetConfigRuleParam
     | RulesAPI.SkipRuleParam
     | RulesAPI.SetCacheSettingsRuleParam
-    | RulesetUpdateParams.RulesetsLogCustomFieldRule
-    | RulesetUpdateParams.RulesetsDDoSDynamicRule
-    | RulesetUpdateParams.RulesetsForceConnectionCloseRule
+    | RulesAPI.LogCustomFieldRuleParam
+    | RulesAPI.DDoSDynamicRuleParam
+    | RulesAPI.ForceConnectionCloseRuleParam
   >;
 
   /**
@@ -1508,7 +1747,7 @@ export interface RulesetUpdateParams {
 }
 
 export namespace RulesetUpdateParams {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The unique ID of the rule.
      */
@@ -1517,12 +1756,12 @@ export namespace RulesetUpdateParams {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * An informative description of the rule.
@@ -1534,6 +1773,11 @@ export namespace RulesetUpdateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -1544,67 +1788,86 @@ export namespace RulesetUpdateParams {
      */
     logging?: RulesAPI.LoggingParam;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
      */
-    export interface ActionParameters {
+    export interface ExposedCredentialCheck {
       /**
-       * The cookie fields to log.
+       * Expression that selects the password used in the credentials check.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      password_expression: string;
 
       /**
-       * The request fields to log.
+       * Expression that selects the user ID used in the credentials check.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      username_expression: string;
+    }
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    export interface Ratelimit {
       /**
-       * The response fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      characteristics: Array<string>;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * Period in seconds over which the counter is being incremented.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      period: 10 | 60 | 600 | 3600;
 
       /**
-       * The request field to log.
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      counting_expression?: string;
 
       /**
-       * The response field to log.
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      mitigation_timeout?: number;
+
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
+
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The unique ID of the rule.
      */
@@ -1613,7 +1876,7 @@ export namespace RulesetUpdateParams {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -1630,6 +1893,11 @@ export namespace RulesetUpdateParams {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -1640,52 +1908,83 @@ export namespace RulesetUpdateParams {
      */
     logging?: RulesAPI.LoggingParam;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export interface RulesetsForceConnectionCloseRule {
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The unique ID of the rule.
+     * Configure checks for exposed credentials.
      */
-    id?: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The action to perform when the rule matches.
-     */
-    action?: 'force_connection_close';
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The parameters configuring the rule's action.
+     * An object configuring the rule's ratelimit behavior.
      */
-    action_parameters?: unknown;
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.LoggingParam;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
+
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -1725,42 +2024,56 @@ export interface RulesetGetParams {
   zone_id?: string;
 }
 
-export namespace Rulesets {
-  export import Phases = PhasesAPI.Phases;
-  export import PhaseUpdateResponse = PhasesAPI.PhaseUpdateResponse;
-  export import PhaseGetResponse = PhasesAPI.PhaseGetResponse;
-  export import PhaseUpdateParams = PhasesAPI.PhaseUpdateParams;
-  export import PhaseGetParams = PhasesAPI.PhaseGetParams;
-  export import Rules = RulesAPI.Rules;
-  export import BlockRule = RulesAPI.BlockRule;
-  export import ChallengeRule = RulesAPI.ChallengeRule;
-  export import CompressResponseRule = RulesAPI.CompressResponseRule;
-  export import ExecuteRule = RulesAPI.ExecuteRule;
-  export import JSChallengeRule = RulesAPI.JSChallengeRule;
-  export import LogRule = RulesAPI.LogRule;
-  export import Logging = RulesAPI.Logging;
-  export import ManagedChallengeRule = RulesAPI.ManagedChallengeRule;
-  export import RedirectRule = RulesAPI.RedirectRule;
-  export import RewriteRule = RulesAPI.RewriteRule;
-  export import RewriteURIPart = RulesAPI.RewriteURIPart;
-  export import RouteRule = RulesAPI.RouteRule;
-  export import RulesetRule = RulesAPI.RulesetRule;
-  export import ScoreRule = RulesAPI.ScoreRule;
-  export import ServeErrorRule = RulesAPI.ServeErrorRule;
-  export import SetCacheSettingsRule = RulesAPI.SetCacheSettingsRule;
-  export import SetConfigRule = RulesAPI.SetConfigRule;
-  export import SkipRule = RulesAPI.SkipRule;
-  export import RuleCreateResponse = RulesAPI.RuleCreateResponse;
-  export import RuleDeleteResponse = RulesAPI.RuleDeleteResponse;
-  export import RuleEditResponse = RulesAPI.RuleEditResponse;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleDeleteParams = RulesAPI.RuleDeleteParams;
-  export import RuleEditParams = RulesAPI.RuleEditParams;
-  export import Versions = VersionsAPI.Versions;
-  export import VersionListResponse = VersionsAPI.VersionListResponse;
-  export import VersionGetResponse = VersionsAPI.VersionGetResponse;
-  export import VersionListResponsesSinglePage = VersionsAPI.VersionListResponsesSinglePage;
-  export import VersionListParams = VersionsAPI.VersionListParams;
-  export import VersionDeleteParams = VersionsAPI.VersionDeleteParams;
-  export import VersionGetParams = VersionsAPI.VersionGetParams;
+Rulesets.Phases = Phases;
+Rulesets.Rules = Rules;
+Rulesets.Versions = Versions;
+Rulesets.VersionListResponsesSinglePage = VersionListResponsesSinglePage;
+
+export declare namespace Rulesets {
+  export {
+    Phases as Phases,
+    type PhaseUpdateResponse as PhaseUpdateResponse,
+    type PhaseGetResponse as PhaseGetResponse,
+    type PhaseUpdateParams as PhaseUpdateParams,
+    type PhaseGetParams as PhaseGetParams,
+  };
+
+  export {
+    Rules as Rules,
+    type BlockRule as BlockRule,
+    type CompressResponseRule as CompressResponseRule,
+    type DDoSDynamicRule as DDoSDynamicRule,
+    type ExecuteRule as ExecuteRule,
+    type ForceConnectionCloseRule as ForceConnectionCloseRule,
+    type LogCustomFieldRule as LogCustomFieldRule,
+    type LogRule as LogRule,
+    type Logging as Logging,
+    type ManagedChallengeRule as ManagedChallengeRule,
+    type RedirectRule as RedirectRule,
+    type RewriteRule as RewriteRule,
+    type RewriteURIPart as RewriteURIPart,
+    type RouteRule as RouteRule,
+    type RulesetRule as RulesetRule,
+    type ScoreRule as ScoreRule,
+    type ServeErrorRule as ServeErrorRule,
+    type SetCacheSettingsRule as SetCacheSettingsRule,
+    type SetConfigRule as SetConfigRule,
+    type SkipRule as SkipRule,
+    type RuleCreateResponse as RuleCreateResponse,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    type RuleEditResponse as RuleEditResponse,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleEditParams as RuleEditParams,
+  };
+
+  export {
+    Versions as Versions,
+    type VersionListResponse as VersionListResponse,
+    type VersionGetResponse as VersionGetResponse,
+    VersionListResponsesSinglePage as VersionListResponsesSinglePage,
+    type VersionListParams as VersionListParams,
+    type VersionDeleteParams as VersionDeleteParams,
+    type VersionGetParams as VersionGetParams,
+  };
 }
diff --git a/src/resources/rulesets/versions/versions.ts b/src/resources/rulesets/versions.ts
similarity index 64%
rename from src/resources/rulesets/versions/versions.ts
rename to src/resources/rulesets/versions.ts
index ec39873bac..b2b121911d 100644
--- a/src/resources/rulesets/versions/versions.ts
+++ b/src/resources/rulesets/versions.ts
@@ -1,18 +1,14 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../resource';
-import { isRequestOptions } from '../../../core';
-import * as Core from '../../../core';
-import { CloudflareError } from '../../../error';
-import * as VersionsAPI from './versions';
-import * as RulesAPI from '../rules';
-import * as RulesetsAPI from '../rulesets';
-import * as ByTagAPI from './by-tag';
-import { SinglePage } from '../../../pagination';
+import { APIResource } from '../../resource';
+import { isRequestOptions } from '../../core';
+import * as Core from '../../core';
+import { CloudflareError } from 'cloudflare/error';
+import * as RulesAPI from './rules';
+import * as RulesetsAPI from './rulesets';
+import { SinglePage } from '../../pagination';
 
 export class Versions extends APIResource {
-  byTag: ByTagAPI.ByTag = new ByTagAPI.ByTag(this._client);
-
   /**
    * Fetches the versions of an account or zone ruleset.
    */
@@ -224,10 +220,10 @@ export interface VersionGetResponse {
    */
   rules: Array<
     | RulesAPI.BlockRule
-    | RulesAPI.ChallengeRule
+    | VersionGetResponse.RulesetsChallengeRule
     | RulesAPI.CompressResponseRule
     | RulesAPI.ExecuteRule
-    | RulesAPI.JSChallengeRule
+    | VersionGetResponse.RulesetsJSChallengeRule
     | RulesAPI.LogRule
     | RulesAPI.ManagedChallengeRule
     | RulesAPI.RedirectRule
@@ -238,9 +234,9 @@ export interface VersionGetResponse {
     | RulesAPI.SetConfigRule
     | RulesAPI.SkipRule
     | RulesAPI.SetCacheSettingsRule
-    | VersionGetResponse.RulesetsLogCustomFieldRule
-    | VersionGetResponse.RulesetsDDoSDynamicRule
-    | VersionGetResponse.RulesetsForceConnectionCloseRule
+    | RulesAPI.LogCustomFieldRule
+    | RulesAPI.DDoSDynamicRule
+    | RulesAPI.ForceConnectionCloseRule
   >;
 
   /**
@@ -255,7 +251,7 @@ export interface VersionGetResponse {
 }
 
 export namespace VersionGetResponse {
-  export interface RulesetsLogCustomFieldRule {
+  export interface RulesetsChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -274,12 +270,12 @@ export namespace VersionGetResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'log_custom_field';
+    action?: 'challenge';
 
     /**
      * The parameters configuring the rule's action.
      */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
+    action_parameters?: unknown;
 
     /**
      * The categories of the rule.
@@ -296,6 +292,11 @@ export namespace VersionGetResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -306,67 +307,86 @@ export namespace VersionGetResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export namespace RulesetsLogCustomFieldRule {
+  export namespace RulesetsChallengeRule {
     /**
-     * The parameters configuring the rule's action.
+     * Configure checks for exposed credentials.
+     */
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
+
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
+
+    /**
+     * An object configuring the rule's ratelimit behavior.
      */
-    export interface ActionParameters {
+    export interface Ratelimit {
       /**
-       * The cookie fields to log.
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
        */
-      cookie_fields?: Array<ActionParameters.CookieField>;
+      characteristics: Array<string>;
 
       /**
-       * The request fields to log.
+       * Period in seconds over which the counter is being incremented.
        */
-      request_fields?: Array<ActionParameters.RequestField>;
+      period: 10 | 60 | 600 | 3600;
 
       /**
-       * The response fields to log.
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
        */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
+      counting_expression?: string;
+
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    export namespace ActionParameters {
       /**
-       * The cookie field to log.
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
        */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      requests_per_period?: number;
 
       /**
-       * The request field to log.
+       * Defines if ratelimit counting is only done when an origin is reached.
        */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      requests_to_origin?: boolean;
 
       /**
-       * The response field to log.
+       * The score threshold per period for which the action will be executed the first
+       * time.
        */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
+      score_per_period?: number;
+
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
     }
   }
 
-  export interface RulesetsDDoSDynamicRule {
+  export interface RulesetsJSChallengeRule {
     /**
      * The timestamp of when the rule was last modified.
      */
@@ -385,7 +405,7 @@ export namespace VersionGetResponse {
     /**
      * The action to perform when the rule matches.
      */
-    action?: 'ddos_dynamic';
+    action?: 'js_challenge';
 
     /**
      * The parameters configuring the rule's action.
@@ -407,6 +427,11 @@ export namespace VersionGetResponse {
      */
     enabled?: boolean;
 
+    /**
+     * Configure checks for exposed credentials.
+     */
+    exposed_credential_check?: RulesetsJSChallengeRule.ExposedCredentialCheck;
+
     /**
      * The expression defining which traffic will match the rule.
      */
@@ -417,67 +442,83 @@ export namespace VersionGetResponse {
      */
     logging?: RulesAPI.Logging;
 
+    /**
+     * An object configuring the rule's ratelimit behavior.
+     */
+    ratelimit?: RulesetsJSChallengeRule.Ratelimit;
+
     /**
      * The reference of the rule (the rule ID by default).
      */
     ref?: string;
   }
 
-  export interface RulesetsForceConnectionCloseRule {
+  export namespace RulesetsJSChallengeRule {
     /**
-     * The timestamp of when the rule was last modified.
+     * Configure checks for exposed credentials.
      */
-    last_updated: string;
+    export interface ExposedCredentialCheck {
+      /**
+       * Expression that selects the password used in the credentials check.
+       */
+      password_expression: string;
 
-    /**
-     * The version of the rule.
-     */
-    version: string;
+      /**
+       * Expression that selects the user ID used in the credentials check.
+       */
+      username_expression: string;
+    }
 
     /**
-     * The unique ID of the rule.
+     * An object configuring the rule's ratelimit behavior.
      */
-    id?: string;
-
-    /**
-     * The action to perform when the rule matches.
-     */
-    action?: 'force_connection_close';
+    export interface Ratelimit {
+      /**
+       * Characteristics of the request on which the ratelimiter counter will be
+       * incremented.
+       */
+      characteristics: Array<string>;
 
-    /**
-     * The parameters configuring the rule's action.
-     */
-    action_parameters?: unknown;
+      /**
+       * Period in seconds over which the counter is being incremented.
+       */
+      period: 10 | 60 | 600 | 3600;
 
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
+      /**
+       * Defines when the ratelimit counter should be incremented. It is optional and
+       * defaults to the same as the rule's expression.
+       */
+      counting_expression?: string;
 
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
+      /**
+       * Period of time in seconds after which the action will be disabled following its
+       * first execution.
+       */
+      mitigation_timeout?: number;
 
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
+      /**
+       * The threshold of requests per period after which the action will be executed for
+       * the first time.
+       */
+      requests_per_period?: number;
 
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
+      /**
+       * Defines if ratelimit counting is only done when an origin is reached.
+       */
+      requests_to_origin?: boolean;
 
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
+      /**
+       * The score threshold per period for which the action will be executed the first
+       * time.
+       */
+      score_per_period?: number;
 
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
+      /**
+       * The response header name provided by the origin which should contain the score
+       * to increment ratelimit counter on.
+       */
+      score_response_header_name?: string;
+    }
   }
 }
 
@@ -517,14 +558,15 @@ export interface VersionGetParams {
   zone_id?: string;
 }
 
-export namespace Versions {
-  export import VersionListResponse = VersionsAPI.VersionListResponse;
-  export import VersionGetResponse = VersionsAPI.VersionGetResponse;
-  export import VersionListResponsesSinglePage = VersionsAPI.VersionListResponsesSinglePage;
-  export import VersionListParams = VersionsAPI.VersionListParams;
-  export import VersionDeleteParams = VersionsAPI.VersionDeleteParams;
-  export import VersionGetParams = VersionsAPI.VersionGetParams;
-  export import ByTag = ByTagAPI.ByTag;
-  export import ByTagGetResponse = ByTagAPI.ByTagGetResponse;
-  export import ByTagGetParams = ByTagAPI.ByTagGetParams;
+Versions.VersionListResponsesSinglePage = VersionListResponsesSinglePage;
+
+export declare namespace Versions {
+  export {
+    type VersionListResponse as VersionListResponse,
+    type VersionGetResponse as VersionGetResponse,
+    VersionListResponsesSinglePage as VersionListResponsesSinglePage,
+    type VersionListParams as VersionListParams,
+    type VersionDeleteParams as VersionDeleteParams,
+    type VersionGetParams as VersionGetParams,
+  };
 }
diff --git a/src/resources/rulesets/versions/by-tag.ts b/src/resources/rulesets/versions/by-tag.ts
deleted file mode 100644
index 603178ea11..0000000000
--- a/src/resources/rulesets/versions/by-tag.ts
+++ /dev/null
@@ -1,331 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../resource';
-import * as Core from '../../../core';
-import * as ByTagAPI from './by-tag';
-import * as RulesAPI from '../rules';
-import * as RulesetsAPI from '../rulesets';
-
-export class ByTag extends APIResource {
-  /**
-   * Fetches the rules of a managed account ruleset version for a given tag.
-   */
-  get(
-    rulesetId: string,
-    rulesetVersion: string,
-    ruleTag: string,
-    params: ByTagGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<ByTagGetResponse> {
-    const { account_id } = params;
-    return (
-      this._client.get(
-        `/accounts/${account_id}/rulesets/${rulesetId}/versions/${rulesetVersion}/by_tag/${ruleTag}`,
-        options,
-      ) as Core.APIPromise<{ result: ByTagGetResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-/**
- * A ruleset object.
- */
-export interface ByTagGetResponse {
-  /**
-   * The unique ID of the ruleset.
-   */
-  id: string;
-
-  /**
-   * The kind of the ruleset.
-   */
-  kind: RulesetsAPI.Kind;
-
-  /**
-   * The timestamp of when the ruleset was last modified.
-   */
-  last_updated: string;
-
-  /**
-   * The human-readable name of the ruleset.
-   */
-  name: string;
-
-  /**
-   * The phase of the ruleset.
-   */
-  phase: RulesetsAPI.Phase;
-
-  /**
-   * The list of rules in the ruleset.
-   */
-  rules: Array<
-    | RulesAPI.BlockRule
-    | RulesAPI.ChallengeRule
-    | RulesAPI.CompressResponseRule
-    | RulesAPI.ExecuteRule
-    | RulesAPI.JSChallengeRule
-    | RulesAPI.LogRule
-    | RulesAPI.ManagedChallengeRule
-    | RulesAPI.RedirectRule
-    | RulesAPI.RewriteRule
-    | RulesAPI.RouteRule
-    | RulesAPI.ScoreRule
-    | RulesAPI.ServeErrorRule
-    | RulesAPI.SetConfigRule
-    | RulesAPI.SkipRule
-    | RulesAPI.SetCacheSettingsRule
-    | ByTagGetResponse.RulesetsLogCustomFieldRule
-    | ByTagGetResponse.RulesetsDDoSDynamicRule
-    | ByTagGetResponse.RulesetsForceConnectionCloseRule
-  >;
-
-  /**
-   * The version of the ruleset.
-   */
-  version: string;
-
-  /**
-   * An informative description of the ruleset.
-   */
-  description?: string;
-}
-
-export namespace ByTagGetResponse {
-  export interface RulesetsLogCustomFieldRule {
-    /**
-     * The timestamp of when the rule was last modified.
-     */
-    last_updated: string;
-
-    /**
-     * The version of the rule.
-     */
-    version: string;
-
-    /**
-     * The unique ID of the rule.
-     */
-    id?: string;
-
-    /**
-     * The action to perform when the rule matches.
-     */
-    action?: 'log_custom_field';
-
-    /**
-     * The parameters configuring the rule's action.
-     */
-    action_parameters?: RulesetsLogCustomFieldRule.ActionParameters;
-
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
-
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
-
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
-
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
-
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
-
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
-  }
-
-  export namespace RulesetsLogCustomFieldRule {
-    /**
-     * The parameters configuring the rule's action.
-     */
-    export interface ActionParameters {
-      /**
-       * The cookie fields to log.
-       */
-      cookie_fields?: Array<ActionParameters.CookieField>;
-
-      /**
-       * The request fields to log.
-       */
-      request_fields?: Array<ActionParameters.RequestField>;
-
-      /**
-       * The response fields to log.
-       */
-      response_fields?: Array<ActionParameters.ResponseField>;
-    }
-
-    export namespace ActionParameters {
-      /**
-       * The cookie field to log.
-       */
-      export interface CookieField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
-
-      /**
-       * The request field to log.
-       */
-      export interface RequestField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
-
-      /**
-       * The response field to log.
-       */
-      export interface ResponseField {
-        /**
-         * The name of the field.
-         */
-        name: string;
-      }
-    }
-  }
-
-  export interface RulesetsDDoSDynamicRule {
-    /**
-     * The timestamp of when the rule was last modified.
-     */
-    last_updated: string;
-
-    /**
-     * The version of the rule.
-     */
-    version: string;
-
-    /**
-     * The unique ID of the rule.
-     */
-    id?: string;
-
-    /**
-     * The action to perform when the rule matches.
-     */
-    action?: 'ddos_dynamic';
-
-    /**
-     * The parameters configuring the rule's action.
-     */
-    action_parameters?: unknown;
-
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
-
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
-
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
-
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
-
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
-
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
-  }
-
-  export interface RulesetsForceConnectionCloseRule {
-    /**
-     * The timestamp of when the rule was last modified.
-     */
-    last_updated: string;
-
-    /**
-     * The version of the rule.
-     */
-    version: string;
-
-    /**
-     * The unique ID of the rule.
-     */
-    id?: string;
-
-    /**
-     * The action to perform when the rule matches.
-     */
-    action?: 'force_connection_close';
-
-    /**
-     * The parameters configuring the rule's action.
-     */
-    action_parameters?: unknown;
-
-    /**
-     * The categories of the rule.
-     */
-    categories?: Array<string>;
-
-    /**
-     * An informative description of the rule.
-     */
-    description?: string;
-
-    /**
-     * Whether the rule should be executed.
-     */
-    enabled?: boolean;
-
-    /**
-     * The expression defining which traffic will match the rule.
-     */
-    expression?: string;
-
-    /**
-     * An object configuring the rule's logging behavior.
-     */
-    logging?: RulesAPI.Logging;
-
-    /**
-     * The reference of the rule (the rule ID by default).
-     */
-    ref?: string;
-  }
-}
-
-export interface ByTagGetParams {
-  /**
-   * The unique ID of the account.
-   */
-  account_id: string;
-}
-
-export namespace ByTag {
-  export import ByTagGetResponse = ByTagAPI.ByTagGetResponse;
-  export import ByTagGetParams = ByTagAPI.ByTagGetParams;
-}
diff --git a/src/resources/rulesets/versions/index.ts b/src/resources/rulesets/versions/index.ts
deleted file mode 100644
index b5ad4ccbba..0000000000
--- a/src/resources/rulesets/versions/index.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { ByTagGetResponse, ByTagGetParams, ByTag } from './by-tag';
-export {
-  VersionListResponse,
-  VersionGetResponse,
-  VersionListParams,
-  VersionDeleteParams,
-  VersionGetParams,
-  VersionListResponsesSinglePage,
-  Versions,
-} from './versions';
diff --git a/src/resources/rum/index.ts b/src/resources/rum/index.ts
index 7db789fa80..3cebab350d 100644
--- a/src/resources/rum/index.ts
+++ b/src/resources/rum/index.ts
@@ -2,23 +2,25 @@
 
 export { RUM } from './rum';
 export {
-  RUMRule,
-  RuleListResponse,
-  RuleDeleteResponse,
-  RuleCreateParams,
-  RuleUpdateParams,
-  RuleListParams,
-  RuleDeleteParams,
   Rules,
+  type RUMRule,
+  type RuleListResponse,
+  type RuleDeleteResponse,
+  type RuleBulkCreateResponse,
+  type RuleCreateParams,
+  type RuleUpdateParams,
+  type RuleListParams,
+  type RuleDeleteParams,
+  type RuleBulkCreateParams,
 } from './rules';
 export {
-  Site,
-  SiteInfoDeleteResponse,
-  SiteInfoCreateParams,
-  SiteInfoUpdateParams,
-  SiteInfoListParams,
-  SiteInfoDeleteParams,
-  SiteInfoGetParams,
   SitesV4PagePaginationArray,
   SiteInfo,
+  type Site,
+  type SiteInfoDeleteResponse,
+  type SiteInfoCreateParams,
+  type SiteInfoUpdateParams,
+  type SiteInfoListParams,
+  type SiteInfoDeleteParams,
+  type SiteInfoGetParams,
 } from './site-info';
diff --git a/src/resources/rum/rules.ts b/src/resources/rum/rules.ts
index b91e5ad8e9..b3f2ac7e0e 100644
--- a/src/resources/rum/rules.ts
+++ b/src/resources/rum/rules.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as RulesAPI from './rules';
 
 export class Rules extends APIResource {
   /**
@@ -73,6 +72,23 @@ export class Rules extends APIResource {
       ) as Core.APIPromise<{ result: RuleDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
+
+  /**
+   * Modifies one or more rules in a Web Analytics ruleset with a single request.
+   */
+  bulkCreate(
+    rulesetId: string,
+    params: RuleBulkCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RuleBulkCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/rum/v2/${rulesetId}/rules`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: RuleBulkCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
 }
 
 export interface RUMRule {
@@ -143,6 +159,36 @@ export interface RuleDeleteResponse {
   id?: string;
 }
 
+export interface RuleBulkCreateResponse {
+  /**
+   * A list of rules.
+   */
+  rules?: Array<RUMRule>;
+
+  ruleset?: RuleBulkCreateResponse.Ruleset;
+}
+
+export namespace RuleBulkCreateResponse {
+  export interface Ruleset {
+    /**
+     * The Web Analytics ruleset identifier.
+     */
+    id?: string;
+
+    /**
+     * Whether the ruleset is enabled.
+     */
+    enabled?: boolean;
+
+    zone_name?: string;
+
+    /**
+     * The zone identifier.
+     */
+    zone_tag?: string;
+  }
+}
+
 export interface RuleCreateParams {
   /**
    * Path param: Identifier
@@ -211,12 +257,50 @@ export interface RuleDeleteParams {
   account_id: string;
 }
 
-export namespace Rules {
-  export import RUMRule = RulesAPI.RUMRule;
-  export import RuleListResponse = RulesAPI.RuleListResponse;
-  export import RuleDeleteResponse = RulesAPI.RuleDeleteResponse;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleDeleteParams = RulesAPI.RuleDeleteParams;
+export interface RuleBulkCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: A list of rule identifiers to delete.
+   */
+  delete_rules?: Array<string>;
+
+  /**
+   * Body param: A list of rules to create or update.
+   */
+  rules?: Array<RuleBulkCreateParams.Rule>;
+}
+
+export namespace RuleBulkCreateParams {
+  export interface Rule {
+    /**
+     * The Web Analytics rule identifier.
+     */
+    id?: string;
+
+    host?: string;
+
+    inclusive?: boolean;
+
+    is_paused?: boolean;
+
+    paths?: Array<string>;
+  }
+}
+
+export declare namespace Rules {
+  export {
+    type RUMRule as RUMRule,
+    type RuleListResponse as RuleListResponse,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    type RuleBulkCreateResponse as RuleBulkCreateResponse,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleBulkCreateParams as RuleBulkCreateParams,
+  };
 }
diff --git a/src/resources/rum/rum.ts b/src/resources/rum/rum.ts
index 379996b3a1..9a1989e73c 100644
--- a/src/resources/rum/rum.ts
+++ b/src/resources/rum/rum.ts
@@ -2,29 +2,63 @@
 
 import { APIResource } from '../../resource';
 import * as RulesAPI from './rules';
+import {
+  RUMRule,
+  RuleBulkCreateParams,
+  RuleBulkCreateResponse,
+  RuleCreateParams,
+  RuleDeleteParams,
+  RuleDeleteResponse,
+  RuleListParams,
+  RuleListResponse,
+  RuleUpdateParams,
+  Rules,
+} from './rules';
 import * as SiteInfoAPI from './site-info';
+import {
+  Site,
+  SiteInfo,
+  SiteInfoCreateParams,
+  SiteInfoDeleteParams,
+  SiteInfoDeleteResponse,
+  SiteInfoGetParams,
+  SiteInfoListParams,
+  SiteInfoUpdateParams,
+  SitesV4PagePaginationArray,
+} from './site-info';
 
 export class RUM extends APIResource {
   siteInfo: SiteInfoAPI.SiteInfo = new SiteInfoAPI.SiteInfo(this._client);
   rules: RulesAPI.Rules = new RulesAPI.Rules(this._client);
 }
 
-export namespace RUM {
-  export import SiteInfo = SiteInfoAPI.SiteInfo;
-  export import Site = SiteInfoAPI.Site;
-  export import SiteInfoDeleteResponse = SiteInfoAPI.SiteInfoDeleteResponse;
-  export import SitesV4PagePaginationArray = SiteInfoAPI.SitesV4PagePaginationArray;
-  export import SiteInfoCreateParams = SiteInfoAPI.SiteInfoCreateParams;
-  export import SiteInfoUpdateParams = SiteInfoAPI.SiteInfoUpdateParams;
-  export import SiteInfoListParams = SiteInfoAPI.SiteInfoListParams;
-  export import SiteInfoDeleteParams = SiteInfoAPI.SiteInfoDeleteParams;
-  export import SiteInfoGetParams = SiteInfoAPI.SiteInfoGetParams;
-  export import Rules = RulesAPI.Rules;
-  export import RUMRule = RulesAPI.RUMRule;
-  export import RuleListResponse = RulesAPI.RuleListResponse;
-  export import RuleDeleteResponse = RulesAPI.RuleDeleteResponse;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleDeleteParams = RulesAPI.RuleDeleteParams;
+RUM.SiteInfo = SiteInfo;
+RUM.SitesV4PagePaginationArray = SitesV4PagePaginationArray;
+RUM.Rules = Rules;
+
+export declare namespace RUM {
+  export {
+    SiteInfo as SiteInfo,
+    type Site as Site,
+    type SiteInfoDeleteResponse as SiteInfoDeleteResponse,
+    SitesV4PagePaginationArray as SitesV4PagePaginationArray,
+    type SiteInfoCreateParams as SiteInfoCreateParams,
+    type SiteInfoUpdateParams as SiteInfoUpdateParams,
+    type SiteInfoListParams as SiteInfoListParams,
+    type SiteInfoDeleteParams as SiteInfoDeleteParams,
+    type SiteInfoGetParams as SiteInfoGetParams,
+  };
+
+  export {
+    Rules as Rules,
+    type RUMRule as RUMRule,
+    type RuleListResponse as RuleListResponse,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    type RuleBulkCreateResponse as RuleBulkCreateResponse,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleBulkCreateParams as RuleBulkCreateParams,
+  };
 }
diff --git a/src/resources/rum/site-info.ts b/src/resources/rum/site-info.ts
index 8a871cdfe0..0e1bb50e26 100644
--- a/src/resources/rum/site-info.ts
+++ b/src/resources/rum/site-info.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SiteInfoAPI from './site-info';
 import * as RulesAPI from './rules';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
@@ -209,13 +208,17 @@ export interface SiteInfoGetParams {
   account_id: string;
 }
 
-export namespace SiteInfo {
-  export import Site = SiteInfoAPI.Site;
-  export import SiteInfoDeleteResponse = SiteInfoAPI.SiteInfoDeleteResponse;
-  export import SitesV4PagePaginationArray = SiteInfoAPI.SitesV4PagePaginationArray;
-  export import SiteInfoCreateParams = SiteInfoAPI.SiteInfoCreateParams;
-  export import SiteInfoUpdateParams = SiteInfoAPI.SiteInfoUpdateParams;
-  export import SiteInfoListParams = SiteInfoAPI.SiteInfoListParams;
-  export import SiteInfoDeleteParams = SiteInfoAPI.SiteInfoDeleteParams;
-  export import SiteInfoGetParams = SiteInfoAPI.SiteInfoGetParams;
+SiteInfo.SitesV4PagePaginationArray = SitesV4PagePaginationArray;
+
+export declare namespace SiteInfo {
+  export {
+    type Site as Site,
+    type SiteInfoDeleteResponse as SiteInfoDeleteResponse,
+    SitesV4PagePaginationArray as SitesV4PagePaginationArray,
+    type SiteInfoCreateParams as SiteInfoCreateParams,
+    type SiteInfoUpdateParams as SiteInfoUpdateParams,
+    type SiteInfoListParams as SiteInfoListParams,
+    type SiteInfoDeleteParams as SiteInfoDeleteParams,
+    type SiteInfoGetParams as SiteInfoGetParams,
+  };
 }
diff --git a/src/resources/secondary-dns/index.ts b/src/resources/secondary-dns/index.ts
deleted file mode 100644
index 8bf7098c70..0000000000
--- a/src/resources/secondary-dns/index.ts
+++ /dev/null
@@ -1,68 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export {
-  ACL,
-  ACLDeleteResponse,
-  ACLCreateParams,
-  ACLUpdateParams,
-  ACLListParams,
-  ACLDeleteParams,
-  ACLGetParams,
-  ACLsSinglePage,
-  ACLs,
-} from './acls';
-export {
-  DisableTransfer,
-  EnableTransfer,
-  Outgoing,
-  OutgoingStatus,
-  OutgoingCreateResponse,
-  OutgoingUpdateResponse,
-  OutgoingDeleteResponse,
-  OutgoingForceNotifyResponse,
-  OutgoingGetResponse,
-  OutgoingCreateParams,
-  OutgoingUpdateParams,
-  OutgoingDeleteParams,
-  OutgoingDisableParams,
-  OutgoingEnableParams,
-  OutgoingForceNotifyParams,
-  OutgoingGetParams,
-  OutgoingResource,
-} from './outgoing/index';
-export { ForceAXFR, ForceAXFRCreateParams, ForceAXFRResource } from './force-axfr';
-export {
-  Incoming,
-  IncomingCreateResponse,
-  IncomingUpdateResponse,
-  IncomingDeleteResponse,
-  IncomingGetResponse,
-  IncomingCreateParams,
-  IncomingUpdateParams,
-  IncomingDeleteParams,
-  IncomingGetParams,
-  IncomingResource,
-} from './incoming';
-export {
-  Peer,
-  PeerDeleteResponse,
-  PeerCreateParams,
-  PeerUpdateParams,
-  PeerListParams,
-  PeerDeleteParams,
-  PeerGetParams,
-  PeersSinglePage,
-  Peers,
-} from './peers';
-export { SecondaryDNS } from './secondary-dns';
-export {
-  TSIG,
-  TSIGDeleteResponse,
-  TSIGCreateParams,
-  TSIGUpdateParams,
-  TSIGListParams,
-  TSIGDeleteParams,
-  TSIGGetParams,
-  TSIGsSinglePage,
-  TSIGs,
-} from './tsigs';
diff --git a/src/resources/secondary-dns/outgoing/index.ts b/src/resources/secondary-dns/outgoing/index.ts
deleted file mode 100644
index 029bf48f18..0000000000
--- a/src/resources/secondary-dns/outgoing/index.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export {
-  DisableTransfer,
-  EnableTransfer,
-  Outgoing,
-  OutgoingStatus,
-  OutgoingCreateResponse,
-  OutgoingUpdateResponse,
-  OutgoingDeleteResponse,
-  OutgoingForceNotifyResponse,
-  OutgoingGetResponse,
-  OutgoingCreateParams,
-  OutgoingUpdateParams,
-  OutgoingDeleteParams,
-  OutgoingDisableParams,
-  OutgoingEnableParams,
-  OutgoingForceNotifyParams,
-  OutgoingGetParams,
-  OutgoingResource,
-} from './outgoing';
-export { StatusGetParams, Status } from './status';
diff --git a/src/resources/secondary-dns/secondary-dns.ts b/src/resources/secondary-dns/secondary-dns.ts
deleted file mode 100644
index 7a730b3597..0000000000
--- a/src/resources/secondary-dns/secondary-dns.ts
+++ /dev/null
@@ -1,78 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../resource';
-import * as ACLsAPI from './acls';
-import * as ForceAXFRAPI from './force-axfr';
-import * as IncomingAPI from './incoming';
-import * as PeersAPI from './peers';
-import * as TSIGsAPI from './tsigs';
-import * as OutgoingAPI from './outgoing/outgoing';
-
-export class SecondaryDNS extends APIResource {
-  forceAXFR: ForceAXFRAPI.ForceAXFRResource = new ForceAXFRAPI.ForceAXFRResource(this._client);
-  incoming: IncomingAPI.IncomingResource = new IncomingAPI.IncomingResource(this._client);
-  outgoing: OutgoingAPI.OutgoingResource = new OutgoingAPI.OutgoingResource(this._client);
-  acls: ACLsAPI.ACLs = new ACLsAPI.ACLs(this._client);
-  peers: PeersAPI.Peers = new PeersAPI.Peers(this._client);
-  tsigs: TSIGsAPI.TSIGs = new TSIGsAPI.TSIGs(this._client);
-}
-
-export namespace SecondaryDNS {
-  export import ForceAXFRResource = ForceAXFRAPI.ForceAXFRResource;
-  export import ForceAXFR = ForceAXFRAPI.ForceAXFR;
-  export import ForceAXFRCreateParams = ForceAXFRAPI.ForceAXFRCreateParams;
-  export import IncomingResource = IncomingAPI.IncomingResource;
-  export import Incoming = IncomingAPI.Incoming;
-  export import IncomingCreateResponse = IncomingAPI.IncomingCreateResponse;
-  export import IncomingUpdateResponse = IncomingAPI.IncomingUpdateResponse;
-  export import IncomingDeleteResponse = IncomingAPI.IncomingDeleteResponse;
-  export import IncomingGetResponse = IncomingAPI.IncomingGetResponse;
-  export import IncomingCreateParams = IncomingAPI.IncomingCreateParams;
-  export import IncomingUpdateParams = IncomingAPI.IncomingUpdateParams;
-  export import IncomingDeleteParams = IncomingAPI.IncomingDeleteParams;
-  export import IncomingGetParams = IncomingAPI.IncomingGetParams;
-  export import OutgoingResource = OutgoingAPI.OutgoingResource;
-  export import DisableTransfer = OutgoingAPI.DisableTransfer;
-  export import EnableTransfer = OutgoingAPI.EnableTransfer;
-  export import Outgoing = OutgoingAPI.Outgoing;
-  export import OutgoingStatus = OutgoingAPI.OutgoingStatus;
-  export import OutgoingCreateResponse = OutgoingAPI.OutgoingCreateResponse;
-  export import OutgoingUpdateResponse = OutgoingAPI.OutgoingUpdateResponse;
-  export import OutgoingDeleteResponse = OutgoingAPI.OutgoingDeleteResponse;
-  export import OutgoingForceNotifyResponse = OutgoingAPI.OutgoingForceNotifyResponse;
-  export import OutgoingGetResponse = OutgoingAPI.OutgoingGetResponse;
-  export import OutgoingCreateParams = OutgoingAPI.OutgoingCreateParams;
-  export import OutgoingUpdateParams = OutgoingAPI.OutgoingUpdateParams;
-  export import OutgoingDeleteParams = OutgoingAPI.OutgoingDeleteParams;
-  export import OutgoingDisableParams = OutgoingAPI.OutgoingDisableParams;
-  export import OutgoingEnableParams = OutgoingAPI.OutgoingEnableParams;
-  export import OutgoingForceNotifyParams = OutgoingAPI.OutgoingForceNotifyParams;
-  export import OutgoingGetParams = OutgoingAPI.OutgoingGetParams;
-  export import ACLs = ACLsAPI.ACLs;
-  export import ACL = ACLsAPI.ACL;
-  export import ACLDeleteResponse = ACLsAPI.ACLDeleteResponse;
-  export import ACLsSinglePage = ACLsAPI.ACLsSinglePage;
-  export import ACLCreateParams = ACLsAPI.ACLCreateParams;
-  export import ACLUpdateParams = ACLsAPI.ACLUpdateParams;
-  export import ACLListParams = ACLsAPI.ACLListParams;
-  export import ACLDeleteParams = ACLsAPI.ACLDeleteParams;
-  export import ACLGetParams = ACLsAPI.ACLGetParams;
-  export import Peers = PeersAPI.Peers;
-  export import Peer = PeersAPI.Peer;
-  export import PeerDeleteResponse = PeersAPI.PeerDeleteResponse;
-  export import PeersSinglePage = PeersAPI.PeersSinglePage;
-  export import PeerCreateParams = PeersAPI.PeerCreateParams;
-  export import PeerUpdateParams = PeersAPI.PeerUpdateParams;
-  export import PeerListParams = PeersAPI.PeerListParams;
-  export import PeerDeleteParams = PeersAPI.PeerDeleteParams;
-  export import PeerGetParams = PeersAPI.PeerGetParams;
-  export import TSIGs = TSIGsAPI.TSIGs;
-  export import TSIG = TSIGsAPI.TSIG;
-  export import TSIGDeleteResponse = TSIGsAPI.TSIGDeleteResponse;
-  export import TSIGsSinglePage = TSIGsAPI.TSIGsSinglePage;
-  export import TSIGCreateParams = TSIGsAPI.TSIGCreateParams;
-  export import TSIGUpdateParams = TSIGsAPI.TSIGUpdateParams;
-  export import TSIGListParams = TSIGsAPI.TSIGListParams;
-  export import TSIGDeleteParams = TSIGsAPI.TSIGDeleteParams;
-  export import TSIGGetParams = TSIGsAPI.TSIGGetParams;
-}
diff --git a/src/resources/security-txt.ts b/src/resources/security-txt.ts
new file mode 100644
index 0000000000..a66d691325
--- /dev/null
+++ b/src/resources/security-txt.ts
@@ -0,0 +1,149 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../resource';
+import * as Core from '../core';
+import * as Shared from './shared';
+
+export class SecurityTXT extends APIResource {
+  /**
+   * Update security.txt
+   */
+  update(
+    params: SecurityTXTUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SecurityTXTUpdateResponse> {
+    const { zone_id, ...body } = params;
+    return this._client.put(`/zones/${zone_id}/security-center/securitytxt`, { body, ...options });
+  }
+
+  /**
+   * Delete security.txt
+   */
+  delete(
+    params: SecurityTXTDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SecurityTXTDeleteResponse> {
+    const { zone_id } = params;
+    return this._client.delete(`/zones/${zone_id}/security-center/securitytxt`, options);
+  }
+
+  /**
+   * Get security.txt
+   */
+  get(params: SecurityTXTGetParams, options?: Core.RequestOptions): Core.APIPromise<SecurityTXTGetResponse> {
+    const { zone_id } = params;
+    return (
+      this._client.get(`/zones/${zone_id}/security-center/securitytxt`, options) as Core.APIPromise<{
+        result: SecurityTXTGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface SecurityTXTUpdateResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+}
+
+export interface SecurityTXTDeleteResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+}
+
+export interface SecurityTXTGetResponse {
+  acknowledgments?: Array<string>;
+
+  canonical?: Array<string>;
+
+  contact?: Array<string>;
+
+  enabled?: boolean;
+
+  encryption?: Array<string>;
+
+  expires?: string;
+
+  hiring?: Array<string>;
+
+  policy?: Array<string>;
+
+  preferredLanguages?: string;
+}
+
+export interface SecurityTXTUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  acknowledgments?: Array<string>;
+
+  /**
+   * Body param:
+   */
+  canonical?: Array<string>;
+
+  /**
+   * Body param:
+   */
+  contact?: Array<string>;
+
+  /**
+   * Body param:
+   */
+  enabled?: boolean;
+
+  /**
+   * Body param:
+   */
+  encryption?: Array<string>;
+
+  /**
+   * Body param:
+   */
+  expires?: string;
+
+  /**
+   * Body param:
+   */
+  hiring?: Array<string>;
+
+  /**
+   * Body param:
+   */
+  policy?: Array<string>;
+
+  /**
+   * Body param:
+   */
+  preferredLanguages?: string;
+}
+
+export interface SecurityTXTDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface SecurityTXTGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
diff --git a/src/resources/shared.ts b/src/resources/shared.ts
index dc5b28b640..3feed67431 100644
--- a/src/resources/shared.ts
+++ b/src/resources/shared.ts
@@ -107,12 +107,12 @@ export namespace AuditLog {
 /**
  * The Certificate Authority that will issue the certificate
  */
-export type CertificateCA = 'digicert' | 'google' | 'lets_encrypt';
+export type CertificateCA = 'digicert' | 'google' | 'lets_encrypt' | 'ssl_com';
 
 /**
  * The Certificate Authority that will issue the certificate
  */
-export type CertificateCAParam = 'digicert' | 'google' | 'lets_encrypt';
+export type CertificateCAParam = 'digicert' | 'google' | 'lets_encrypt' | 'ssl_com';
 
 /**
  * Signature type desired on certificate ("origin-rsa" (rsa), "origin-ecc" (ecdsa),
@@ -274,9 +274,14 @@ export interface Member {
   id?: string;
 
   /**
-   * Roles assigned to this member.
+   * Access policy for the membership
    */
-  roles?: Array<Member.Role>;
+  policies?: Array<Member.Policy>;
+
+  /**
+   * Roles assigned to this Member.
+   */
+  roles?: Array<Role>;
 
   /**
    * A member's status in the account.
@@ -290,50 +295,125 @@ export interface Member {
 }
 
 export namespace Member {
-  export interface Role {
+  export interface Policy {
     /**
-     * Role identifier tag.
+     * Policy identifier.
      */
-    id: string;
+    id?: string;
 
     /**
-     * Description of role's permissions.
+     * Allow or deny operations against the resources.
      */
-    description: string;
+    access?: 'allow' | 'deny';
 
     /**
-     * Role name.
+     * A set of permission groups that are specified to the policy.
      */
-    name: string;
+    permission_groups?: Array<Policy.PermissionGroup>;
 
-    permissions: Role.Permissions;
+    /**
+     * A list of resource groups that the policy applies to.
+     */
+    resource_groups?: Array<Policy.ResourceGroup>;
   }
 
-  export namespace Role {
-    export interface Permissions {
-      analytics?: Shared.PermissionGrant;
-
-      billing?: Shared.PermissionGrant;
-
-      cache_purge?: Shared.PermissionGrant;
-
-      dns?: Shared.PermissionGrant;
-
-      dns_records?: Shared.PermissionGrant;
-
-      lb?: Shared.PermissionGrant;
-
-      logs?: Shared.PermissionGrant;
-
-      organization?: Shared.PermissionGrant;
+  export namespace Policy {
+    /**
+     * A named group of permissions that map to a group of operations against
+     * resources.
+     */
+    export interface PermissionGroup {
+      /**
+       * Identifier of the group.
+       */
+      id: string;
+
+      /**
+       * Attributes associated to the permission group.
+       */
+      meta?: PermissionGroup.Meta;
+
+      /**
+       * Name of the group.
+       */
+      name?: string;
+    }
 
-      ssl?: Shared.PermissionGrant;
+    export namespace PermissionGroup {
+      /**
+       * Attributes associated to the permission group.
+       */
+      export interface Meta {
+        key?: string;
 
-      waf?: Shared.PermissionGrant;
+        value?: string;
+      }
+    }
 
-      zone_settings?: Shared.PermissionGrant;
+    /**
+     * A group of scoped resources.
+     */
+    export interface ResourceGroup {
+      /**
+       * Identifier of the group.
+       */
+      id: string;
+
+      /**
+       * The scope associated to the resource group
+       */
+      scope: Array<ResourceGroup.Scope>;
+
+      /**
+       * Attributes associated to the resource group.
+       */
+      meta?: ResourceGroup.Meta;
+
+      /**
+       * Name of the resource group.
+       */
+      name?: string;
+    }
 
-      zones?: Shared.PermissionGrant;
+    export namespace ResourceGroup {
+      /**
+       * A scope is a combination of scope objects which provides additional context.
+       */
+      export interface Scope {
+        /**
+         * This is a combination of pre-defined resource name and identifier (like Account
+         * ID etc.)
+         */
+        key: string;
+
+        /**
+         * A list of scope objects for additional context.
+         */
+        objects: Array<Scope.Object>;
+      }
+
+      export namespace Scope {
+        /**
+         * A scope object represents any resource that can have actions applied against
+         * invite.
+         */
+        export interface Object {
+          /**
+           * This is a combination of pre-defined resource name and identifier (like Zone ID
+           * etc.)
+           */
+          key: string;
+        }
+      }
+
+      /**
+       * Attributes associated to the resource group.
+       */
+      export interface Meta {
+        key?: string;
+
+        value?: string;
+      }
     }
   }
 
@@ -405,6 +485,86 @@ export interface PermissionGrantParam {
   write?: boolean;
 }
 
+/**
+ * The rate plan applied to the subscription.
+ */
+export interface RatePlan {
+  /**
+   * The ID of the rate plan.
+   */
+  id?: string;
+
+  /**
+   * The currency applied to the rate plan subscription.
+   */
+  currency?: string;
+
+  /**
+   * Whether this rate plan is managed externally from Cloudflare.
+   */
+  externally_managed?: boolean;
+
+  /**
+   * Whether a rate plan is enterprise-based (or newly adopted term contract).
+   */
+  is_contract?: boolean;
+
+  /**
+   * The full name of the rate plan.
+   */
+  public_name?: string;
+
+  /**
+   * The scope that this rate plan applies to.
+   */
+  scope?: string;
+
+  /**
+   * The list of sets this rate plan applies to.
+   */
+  sets?: Array<string>;
+}
+
+/**
+ * The rate plan applied to the subscription.
+ */
+export interface RatePlanParam {
+  /**
+   * The ID of the rate plan.
+   */
+  id?: string;
+
+  /**
+   * The currency applied to the rate plan subscription.
+   */
+  currency?: string;
+
+  /**
+   * Whether this rate plan is managed externally from Cloudflare.
+   */
+  externally_managed?: boolean;
+
+  /**
+   * Whether a rate plan is enterprise-based (or newly adopted term contract).
+   */
+  is_contract?: boolean;
+
+  /**
+   * The full name of the rate plan.
+   */
+  public_name?: string;
+
+  /**
+   * The scope that this rate plan applies to.
+   */
+  scope?: string;
+
+  /**
+   * The list of sets this rate plan applies to.
+   */
+  sets?: Array<string>;
+}
+
 export interface ResponseInfo {
   code: number;
 
@@ -448,14 +608,46 @@ export interface Role {
   description: string;
 
   /**
-   * Role Name.
+   * Role name.
    */
   name: string;
 
+  permissions: Role.Permissions;
+}
+
+export namespace Role {
+  export interface Permissions {
+    analytics?: Shared.PermissionGrant;
+
+    billing?: Shared.PermissionGrant;
+
+    cache_purge?: Shared.PermissionGrant;
+
+    dns?: Shared.PermissionGrant;
+
+    dns_records?: Shared.PermissionGrant;
+
+    lb?: Shared.PermissionGrant;
+
+    logs?: Shared.PermissionGrant;
+
+    organization?: Shared.PermissionGrant;
+
+    ssl?: Shared.PermissionGrant;
+
+    waf?: Shared.PermissionGrant;
+
+    zone_settings?: Shared.PermissionGrant;
+
+    zones?: Shared.PermissionGrant;
+  }
+}
+
+export interface RoleParam {
   /**
-   * Access permissions for this User.
+   * Role identifier tag.
    */
-  permissions: Array<Permission>;
+  id: string;
 }
 
 /**
@@ -468,6 +660,281 @@ export type SortDirection = 'asc' | 'desc';
  */
 export type SortDirectionParam = 'asc' | 'desc';
 
+export interface Subscription {
+  /**
+   * Subscription identifier tag.
+   */
+  id?: string;
+
+  /**
+   * The monetary unit in which pricing information is displayed.
+   */
+  currency?: string;
+
+  /**
+   * The end of the current period and also when the next billing is due.
+   */
+  current_period_end?: string;
+
+  /**
+   * When the current billing period started. May match initial_period_start if this
+   * is the first period.
+   */
+  current_period_start?: string;
+
+  /**
+   * How often the subscription is renewed automatically.
+   */
+  frequency?: 'weekly' | 'monthly' | 'quarterly' | 'yearly';
+
+  /**
+   * The price of the subscription that will be billed, in US dollars.
+   */
+  price?: number;
+
+  /**
+   * The rate plan applied to the subscription.
+   */
+  rate_plan?: RatePlan;
+
+  /**
+   * The state that the subscription is in.
+   */
+  state?: 'Trial' | 'Provisioned' | 'Paid' | 'AwaitingPayment' | 'Cancelled' | 'Failed' | 'Expired';
+}
+
+/**
+ * A component value for a subscription.
+ */
+export interface SubscriptionComponent {
+  /**
+   * The default amount assigned.
+   */
+  default?: number;
+
+  /**
+   * The name of the component value.
+   */
+  name?: string;
+
+  /**
+   * The unit price for the component value.
+   */
+  price?: number;
+
+  /**
+   * The amount of the component value assigned.
+   */
+  value?: number;
+}
+
+/**
+ * A simple zone object. May have null properties if not a zone subscription.
+ */
+export interface SubscriptionZone {
+  /**
+   * Identifier
+   */
+  id?: string;
+
+  /**
+   * The domain name
+   */
+  name?: string;
+}
+
+export interface Token {
+  /**
+   * Token identifier tag.
+   */
+  id?: string;
+
+  condition?: Token.Condition;
+
+  /**
+   * The expiration time on or after which the JWT MUST NOT be accepted for
+   * processing.
+   */
+  expires_on?: string;
+
+  /**
+   * The time on which the token was created.
+   */
+  issued_on?: string;
+
+  /**
+   * Last time the token was used.
+   */
+  last_used_on?: string;
+
+  /**
+   * Last time the token was modified.
+   */
+  modified_on?: string;
+
+  /**
+   * Token name.
+   */
+  name?: string;
+
+  /**
+   * The time before which the token MUST NOT be accepted for processing.
+   */
+  not_before?: string;
+
+  /**
+   * List of access policies assigned to the token.
+   */
+  policies?: Array<TokenPolicy>;
+
+  /**
+   * Status of the token.
+   */
+  status?: 'active' | 'disabled' | 'expired';
+}
+
+export namespace Token {
+  export interface Condition {
+    /**
+     * Client IP restrictions.
+     */
+    request_ip?: Condition.RequestIP;
+  }
+
+  export namespace Condition {
+    /**
+     * Client IP restrictions.
+     */
+    export interface RequestIP {
+      /**
+       * List of IPv4/IPv6 CIDR addresses.
+       */
+      in?: Array<Shared.TokenConditionCIDRList>;
+
+      /**
+       * List of IPv4/IPv6 CIDR addresses.
+       */
+      not_in?: Array<Shared.TokenConditionCIDRList>;
+    }
+  }
+}
+
+/**
+ * IPv4/IPv6 CIDR.
+ */
+export type TokenConditionCIDRList = string;
+
+/**
+ * IPv4/IPv6 CIDR.
+ */
+export type TokenConditionCIDRListParam = string;
+
+export interface TokenPolicy {
+  /**
+   * Policy identifier.
+   */
+  id: string;
+
+  /**
+   * Allow or deny operations against the resources.
+   */
+  effect: 'allow' | 'deny';
+
+  /**
+   * A set of permission groups that are specified to the policy.
+   */
+  permission_groups: Array<TokenPolicy.PermissionGroup>;
+
+  /**
+   * A list of resource names that the policy applies to.
+   */
+  resources: Record<string, string>;
+}
+
+export namespace TokenPolicy {
+  /**
+   * A named group of permissions that map to a group of operations against
+   * resources.
+   */
+  export interface PermissionGroup {
+    /**
+     * Identifier of the group.
+     */
+    id: string;
+
+    /**
+     * Attributes associated to the permission group.
+     */
+    meta?: PermissionGroup.Meta;
+
+    /**
+     * Name of the group.
+     */
+    name?: string;
+  }
+
+  export namespace PermissionGroup {
+    /**
+     * Attributes associated to the permission group.
+     */
+    export interface Meta {
+      key?: string;
+
+      value?: string;
+    }
+  }
+}
+
+export interface TokenPolicyParam {
+  /**
+   * Allow or deny operations against the resources.
+   */
+  effect: 'allow' | 'deny';
+
+  /**
+   * A set of permission groups that are specified to the policy.
+   */
+  permission_groups: Array<TokenPolicyParam.PermissionGroup>;
+
+  /**
+   * A list of resource names that the policy applies to.
+   */
+  resources: Record<string, string>;
+}
+
+export namespace TokenPolicyParam {
+  /**
+   * A named group of permissions that map to a group of operations against
+   * resources.
+   */
+  export interface PermissionGroup {
+    /**
+     * Attributes associated to the permission group.
+     */
+    meta?: PermissionGroup.Meta;
+  }
+
+  export namespace PermissionGroup {
+    /**
+     * Attributes associated to the permission group.
+     */
+    export interface Meta {
+      key?: string;
+
+      value?: string;
+    }
+  }
+}
+
+/**
+ * The token value.
+ */
+export type TokenValue = string;
+
+export class MembersV4PagePaginationArray extends V4PagePaginationArray<Member> {}
+
 export class RolesSinglePage extends SinglePage<Role> {}
 
+export class TokensV4PagePaginationArray extends V4PagePaginationArray<Token> {}
+
 export class AuditLogsV4PagePaginationArray extends V4PagePaginationArray<AuditLog> {}
diff --git a/src/resources/snippets/content.ts b/src/resources/snippets/content.ts
index a2021c9486..464bcd13f1 100644
--- a/src/resources/snippets/content.ts
+++ b/src/resources/snippets/content.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ContentAPI from './content';
 import { type Response } from '../../_shims/index';
 
 export class Content extends APIResource {
@@ -17,6 +16,7 @@ export class Content extends APIResource {
     const { zone_id } = params;
     return this._client.get(`/zones/${zone_id}/snippets/${snippetName}/content`, {
       ...options,
+      headers: { Accept: 'multipart/form-data', ...options?.headers },
       __binaryResponse: true,
     });
   }
@@ -29,6 +29,6 @@ export interface ContentGetParams {
   zone_id: string;
 }
 
-export namespace Content {
-  export import ContentGetParams = ContentAPI.ContentGetParams;
+export declare namespace Content {
+  export { type ContentGetParams as ContentGetParams };
 }
diff --git a/src/resources/snippets/index.ts b/src/resources/snippets/index.ts
index ad2272b8a9..433fae26f0 100644
--- a/src/resources/snippets/index.ts
+++ b/src/resources/snippets/index.ts
@@ -1,12 +1,14 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { ContentGetParams, Content } from './content';
+export { Content, type ContentGetParams } from './content';
 export {
-  RuleUpdateResponse,
-  RuleListResponse,
-  RuleUpdateParams,
-  RuleListParams,
   RuleListResponsesSinglePage,
   Rules,
+  type RuleUpdateResponse,
+  type RuleListResponse,
+  type RuleDeleteResponse,
+  type RuleUpdateParams,
+  type RuleListParams,
+  type RuleDeleteParams,
 } from './rules';
 export { Snippets } from './snippets';
diff --git a/src/resources/snippets/rules.ts b/src/resources/snippets/rules.ts
index f0f259545e..7a1a45d41b 100644
--- a/src/resources/snippets/rules.ts
+++ b/src/resources/snippets/rules.ts
@@ -2,7 +2,7 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as RulesAPI from './rules';
+import * as Shared from '../shared';
 import { SinglePage } from '../../pagination';
 
 export class Rules extends APIResource {
@@ -32,6 +32,14 @@ export class Rules extends APIResource {
       options,
     );
   }
+
+  /**
+   * Delete All Rules
+   */
+  delete(params: RuleDeleteParams, options?: Core.RequestOptions): Core.APIPromise<RuleDeleteResponse> {
+    const { zone_id } = params;
+    return this._client.delete(`/zones/${zone_id}/snippets/snippet_rules`, options);
+  }
 }
 
 export class RuleListResponsesSinglePage extends SinglePage<RuleListResponse> {}
@@ -69,6 +77,17 @@ export interface RuleListResponse {
   snippet_name?: string;
 }
 
+export interface RuleDeleteResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+}
+
 export interface RuleUpdateParams {
   /**
    * Path param: Identifier
@@ -103,10 +122,23 @@ export interface RuleListParams {
   zone_id: string;
 }
 
-export namespace Rules {
-  export import RuleUpdateResponse = RulesAPI.RuleUpdateResponse;
-  export import RuleListResponse = RulesAPI.RuleListResponse;
-  export import RuleListResponsesSinglePage = RulesAPI.RuleListResponsesSinglePage;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
+export interface RuleDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+Rules.RuleListResponsesSinglePage = RuleListResponsesSinglePage;
+
+export declare namespace Rules {
+  export {
+    type RuleUpdateResponse as RuleUpdateResponse,
+    type RuleListResponse as RuleListResponse,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    RuleListResponsesSinglePage as RuleListResponsesSinglePage,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+  };
 }
diff --git a/src/resources/snippets/snippets.ts b/src/resources/snippets/snippets.ts
index d5525dd24e..311a500b3e 100644
--- a/src/resources/snippets/snippets.ts
+++ b/src/resources/snippets/snippets.ts
@@ -4,7 +4,18 @@ import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as Shared from '../shared';
 import * as ContentAPI from './content';
+import { Content, ContentGetParams } from './content';
 import * as RulesAPI from './rules';
+import {
+  RuleDeleteParams,
+  RuleDeleteResponse,
+  RuleListParams,
+  RuleListResponse,
+  RuleListResponsesSinglePage,
+  RuleUpdateParams,
+  RuleUpdateResponse,
+  Rules,
+} from './rules';
 import { SinglePage } from '../../pagination';
 
 export class Snippets extends APIResource {
@@ -148,13 +159,21 @@ export interface SnippetGetParams {
   zone_id: string;
 }
 
-export namespace Snippets {
-  export import Content = ContentAPI.Content;
-  export import ContentGetParams = ContentAPI.ContentGetParams;
-  export import Rules = RulesAPI.Rules;
-  export import RuleUpdateResponse = RulesAPI.RuleUpdateResponse;
-  export import RuleListResponse = RulesAPI.RuleListResponse;
-  export import RuleListResponsesSinglePage = RulesAPI.RuleListResponsesSinglePage;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
+Snippets.Content = Content;
+Snippets.Rules = Rules;
+Snippets.RuleListResponsesSinglePage = RuleListResponsesSinglePage;
+
+export declare namespace Snippets {
+  export { Content as Content, type ContentGetParams as ContentGetParams };
+
+  export {
+    Rules as Rules,
+    type RuleUpdateResponse as RuleUpdateResponse,
+    type RuleListResponse as RuleListResponse,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    RuleListResponsesSinglePage as RuleListResponsesSinglePage,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+  };
 }
diff --git a/src/resources/spectrum/analytics/aggregates/aggregates.ts b/src/resources/spectrum/analytics/aggregates/aggregates.ts
index 815bca4142..3da05b84e8 100644
--- a/src/resources/spectrum/analytics/aggregates/aggregates.ts
+++ b/src/resources/spectrum/analytics/aggregates/aggregates.ts
@@ -2,13 +2,18 @@
 
 import { APIResource } from '../../../../resource';
 import * as CurrentsAPI from './currents';
+import { CurrentGetParams, CurrentGetResponse, Currents } from './currents';
 
 export class Aggregates extends APIResource {
   currents: CurrentsAPI.Currents = new CurrentsAPI.Currents(this._client);
 }
 
-export namespace Aggregates {
-  export import Currents = CurrentsAPI.Currents;
-  export import CurrentGetResponse = CurrentsAPI.CurrentGetResponse;
-  export import CurrentGetParams = CurrentsAPI.CurrentGetParams;
+Aggregates.Currents = Currents;
+
+export declare namespace Aggregates {
+  export {
+    Currents as Currents,
+    type CurrentGetResponse as CurrentGetResponse,
+    type CurrentGetParams as CurrentGetParams,
+  };
 }
diff --git a/src/resources/spectrum/analytics/aggregates/currents.ts b/src/resources/spectrum/analytics/aggregates/currents.ts
index 4b30d28438..56402ece64 100644
--- a/src/resources/spectrum/analytics/aggregates/currents.ts
+++ b/src/resources/spectrum/analytics/aggregates/currents.ts
@@ -1,31 +1,17 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../../resource';
-import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as CurrentsAPI from './currents';
 
 export class Currents extends APIResource {
   /**
    * Retrieves analytics aggregated from the last minute of usage on Spectrum
    * applications underneath a given zone.
    */
-  get(
-    zone: string,
-    query?: CurrentGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<CurrentGetResponse>;
-  get(zone: string, options?: Core.RequestOptions): Core.APIPromise<CurrentGetResponse>;
-  get(
-    zone: string,
-    query: CurrentGetParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<CurrentGetResponse> {
-    if (isRequestOptions(query)) {
-      return this.get(zone, {}, query);
-    }
+  get(params: CurrentGetParams, options?: Core.RequestOptions): Core.APIPromise<CurrentGetResponse> {
+    const { zone_id, ...query } = params;
     return (
-      this._client.get(`/zones/${zone}/spectrum/analytics/aggregate/current`, {
+      this._client.get(`/zones/${zone_id}/spectrum/analytics/aggregate/current`, {
         query,
         ...options,
       }) as Core.APIPromise<{ result: CurrentGetResponse }>
@@ -33,28 +19,55 @@ export class Currents extends APIResource {
   }
 }
 
-export type CurrentGetResponse = Array<unknown>;
+export type CurrentGetResponse = Array<CurrentGetResponse.CurrentGetResponseItem>;
+
+export namespace CurrentGetResponse {
+  export interface CurrentGetResponseItem {
+    /**
+     * Application identifier.
+     */
+    appID: string;
+
+    /**
+     * Number of bytes sent
+     */
+    bytesEgress: number;
+
+    /**
+     * Number of bytes received
+     */
+    bytesIngress: number;
+
+    /**
+     * Number of connections
+     */
+    connections: number;
+
+    /**
+     * Average duration of connections
+     */
+    durationAvg: number;
+  }
+}
 
 export interface CurrentGetParams {
   /**
-   * Comma-delimited list of Spectrum Application Id(s). If provided, the response
-   * will be limited to Spectrum Application Id(s) that match.
+   * Path param: Identifier
    */
-  app_id_param?: string;
+  zone_id: string;
 
   /**
-   * Comma-delimited list of Spectrum Application Id(s). If provided, the response
-   * will be limited to Spectrum Application Id(s) that match.
+   * Query param: Comma-delimited list of Spectrum Application Id(s). If provided,
+   * the response will be limited to Spectrum Application Id(s) that match.
    */
   appID?: string;
 
   /**
-   * Co-location identifier.
+   * Query param: Co-location identifier.
    */
   colo_name?: string;
 }
 
-export namespace Currents {
-  export import CurrentGetResponse = CurrentsAPI.CurrentGetResponse;
-  export import CurrentGetParams = CurrentsAPI.CurrentGetParams;
+export declare namespace Currents {
+  export { type CurrentGetResponse as CurrentGetResponse, type CurrentGetParams as CurrentGetParams };
 }
diff --git a/src/resources/spectrum/analytics/aggregates/index.ts b/src/resources/spectrum/analytics/aggregates/index.ts
index 3dd0c41f32..e1e69abee4 100644
--- a/src/resources/spectrum/analytics/aggregates/index.ts
+++ b/src/resources/spectrum/analytics/aggregates/index.ts
@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Aggregates } from './aggregates';
-export { CurrentGetResponse, CurrentGetParams, Currents } from './currents';
+export { Currents, type CurrentGetResponse, type CurrentGetParams } from './currents';
diff --git a/src/resources/spectrum/analytics/analytics.ts b/src/resources/spectrum/analytics/analytics.ts
index 3981cfdf8d..7651ad430d 100644
--- a/src/resources/spectrum/analytics/analytics.ts
+++ b/src/resources/spectrum/analytics/analytics.ts
@@ -2,15 +2,20 @@
 
 import { APIResource } from '../../../resource';
 import * as AggregatesAPI from './aggregates/aggregates';
+import { Aggregates } from './aggregates/aggregates';
 import * as EventsAPI from './events/events';
+import { Dimension, Events } from './events/events';
 
 export class Analytics extends APIResource {
   aggregates: AggregatesAPI.Aggregates = new AggregatesAPI.Aggregates(this._client);
   events: EventsAPI.Events = new EventsAPI.Events(this._client);
 }
 
-export namespace Analytics {
-  export import Aggregates = AggregatesAPI.Aggregates;
-  export import Events = EventsAPI.Events;
-  export import Dimension = EventsAPI.Dimension;
+Analytics.Aggregates = Aggregates;
+Analytics.Events = Events;
+
+export declare namespace Analytics {
+  export { Aggregates as Aggregates };
+
+  export { Events as Events, type Dimension as Dimension };
 }
diff --git a/src/resources/spectrum/analytics/events/bytimes.ts b/src/resources/spectrum/analytics/events/bytimes.ts
index 95d570b8d4..8180edbc90 100644
--- a/src/resources/spectrum/analytics/events/bytimes.ts
+++ b/src/resources/spectrum/analytics/events/bytimes.ts
@@ -1,43 +1,165 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../../resource';
-import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as BytimesAPI from './bytimes';
 import * as EventsAPI from './events';
 
 export class Bytimes extends APIResource {
   /**
    * Retrieves a list of aggregate metrics grouped by time interval.
    */
-  get(
-    zone: string,
-    query?: BytimeGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<BytimeGetResponse | null>;
-  get(zone: string, options?: Core.RequestOptions): Core.APIPromise<BytimeGetResponse | null>;
-  get(
-    zone: string,
-    query: BytimeGetParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<BytimeGetResponse | null> {
-    if (isRequestOptions(query)) {
-      return this.get(zone, {}, query);
-    }
+  get(params: BytimeGetParams, options?: Core.RequestOptions): Core.APIPromise<BytimeGetResponse> {
+    const { zone_id, ...query } = params;
     return (
-      this._client.get(`/zones/${zone}/spectrum/analytics/events/bytime`, {
+      this._client.get(`/zones/${zone_id}/spectrum/analytics/events/bytime`, {
         query,
         ...options,
-      }) as Core.APIPromise<{ result: BytimeGetResponse | null }>
+      }) as Core.APIPromise<{ result: BytimeGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export type BytimeGetResponse = unknown | string;
+export interface BytimeGetResponse {
+  /**
+   * List of columns returned by the analytics query.
+   */
+  data: Array<BytimeGetResponse.Data>;
+
+  /**
+   * Number of seconds between current time and last processed event, i.e. how many
+   * seconds of data could be missing.
+   */
+  data_lag: number;
+
+  /**
+   * Maximum result for each selected metrics across all data.
+   */
+  max: Record<string, number>;
+
+  /**
+   * Minimum result for each selected metrics across all data.
+   */
+  min: Record<string, number>;
+
+  query: BytimeGetResponse.Query;
+
+  /**
+   * Total number of rows in the result.
+   */
+  rows: number;
+
+  /**
+   * Total result for each selected metrics across all data.
+   */
+  totals: Record<string, number>;
+
+  /**
+   * List of time interval buckets: [start, end]
+   */
+  time_intervals?: Array<Array<string>>;
+}
+
+export namespace BytimeGetResponse {
+  export interface Data {
+    dimensions?: Array<string>;
+
+    metrics?: Array<number> | Array<Array<number>>;
+  }
+
+  export interface Query {
+    /**
+     * Can be used to break down the data by given attributes. Options are:
+     *
+     * | Dimension | Name                          | Example                                                    |
+     * | --------- | ----------------------------- | ---------------------------------------------------------- |
+     * | event     | Connection Event              | connect, progress, disconnect, originError, clientFiltered |
+     * | appID     | Application ID                | 40d67c87c6cd4b889a4fd57805225e85                           |
+     * | coloName  | Colo Name                     | SFO                                                        |
+     * | ipVersion | IP version used by the client | 4, 6.                                                      |
+     */
+    dimensions?: Array<EventsAPI.Dimension>;
+
+    /**
+     * Used to filter rows by one or more dimensions. Filters can be combined using OR
+     * and AND boolean logic. AND takes precedence over OR in all the expressions. The
+     * OR operator is defined using a comma (,) or OR keyword surrounded by whitespace.
+     * The AND operator is defined using a semicolon (;) or AND keyword surrounded by
+     * whitespace. Note that the semicolon is a reserved character in URLs (rfc1738)
+     * and needs to be percent-encoded as %3B. Comparison options are:
+     *
+     * | Operator | Name                     | URL Encoded |
+     * | -------- | ------------------------ | ----------- |
+     * | ==       | Equals                   | %3D%3D      |
+     * | !=       | Does not equals          | !%3D        |
+     * | \>       | Greater Than             | %3E         |
+     * | \<       | Less Than                | %3C         |
+     * | \>=      | Greater than or equal to | %3E%3D      |
+     * | \<=      | Less than or equal to    | %3C%3D      |
+     */
+    filters?: string;
+
+    /**
+     * Limit number of returned metrics.
+     */
+    limit?: number;
+
+    /**
+     * One or more metrics to compute. Options are:
+     *
+     * | Metric         | Name                                | Example | Unit                  |
+     * | -------------- | ----------------------------------- | ------- | --------------------- |
+     * | count          | Count of total events               | 1000    | Count                 |
+     * | bytesIngress   | Sum of ingress bytes                | 1000    | Sum                   |
+     * | bytesEgress    | Sum of egress bytes                 | 1000    | Sum                   |
+     * | durationAvg    | Average connection duration         | 1.0     | Time in milliseconds  |
+     * | durationMedian | Median connection duration          | 1.0     | Time in milliseconds  |
+     * | duration90th   | 90th percentile connection duration | 1.0     | Time in milliseconds  |
+     * | duration99th   | 99th percentile connection duration | 1.0     | Time in milliseconds. |
+     */
+    metrics?: Array<
+      | 'count'
+      | 'bytesIngress'
+      | 'bytesEgress'
+      | 'durationAvg'
+      | 'durationMedian'
+      | 'duration90th'
+      | 'duration99th'
+    >;
+
+    /**
+     * Start of time interval to query, defaults to `until` - 6 hours. Timestamp must
+     * be in RFC3339 format and uses UTC unless otherwise specified.
+     */
+    since?: string;
+
+    /**
+     * The sort order for the result set; sort fields must be included in `metrics` or
+     * `dimensions`.
+     */
+    sort?: Array<string>;
+
+    /**
+     * End of time interval to query, defaults to current time. Timestamp must be in
+     * RFC3339 format and uses UTC unless otherwise specified.
+     */
+    until?: string;
+  }
+}
 
 export interface BytimeGetParams {
   /**
-   * Can be used to break down the data by given attributes. Options are:
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: Used to select time series resolution.
+   */
+  time_delta: 'year' | 'quarter' | 'month' | 'week' | 'day' | 'hour' | 'dekaminute' | 'minute';
+
+  /**
+   * Query param: Can be used to break down the data by given attributes. Options
+   * are:
    *
    * | Dimension | Name                          | Example                                                    |
    * | --------- | ----------------------------- | ---------------------------------------------------------- |
@@ -49,26 +171,27 @@ export interface BytimeGetParams {
   dimensions?: Array<EventsAPI.DimensionParam>;
 
   /**
-   * Used to filter rows by one or more dimensions. Filters can be combined using OR
-   * and AND boolean logic. AND takes precedence over OR in all the expressions. The
-   * OR operator is defined using a comma (,) or OR keyword surrounded by whitespace.
-   * The AND operator is defined using a semicolon (;) or AND keyword surrounded by
-   * whitespace. Note that the semicolon is a reserved character in URLs (rfc1738)
-   * and needs to be percent-encoded as %3B. Comparison options are:
+   * Query param: Used to filter rows by one or more dimensions. Filters can be
+   * combined using OR and AND boolean logic. AND takes precedence over OR in all the
+   * expressions. The OR operator is defined using a comma (,) or OR keyword
+   * surrounded by whitespace. The AND operator is defined using a semicolon (;) or
+   * AND keyword surrounded by whitespace. Note that the semicolon is a reserved
+   * character in URLs (rfc1738) and needs to be percent-encoded as %3B. Comparison
+   * options are:
    *
    * | Operator | Name                     | URL Encoded |
    * | -------- | ------------------------ | ----------- |
    * | ==       | Equals                   | %3D%3D      |
    * | !=       | Does not equals          | !%3D        |
-   * | >        | Greater Than             | %3E         |
-   * | <        | Less Than                | %3C         |
-   * | >=       | Greater than or equal to | %3E%3D      |
-   * | <=       | Less than or equal to    | %3C%3D .    |
+   * | \>       | Greater Than             | %3E         |
+   * | \<       | Less Than                | %3C         |
+   * | \>=      | Greater than or equal to | %3E%3D      |
+   * | \<=      | Less than or equal to    | %3C%3D      |
    */
   filters?: string;
 
   /**
-   * One or more metrics to compute. Options are:
+   * Query param: One or more metrics to compute. Options are:
    *
    * | Metric         | Name                                | Example | Unit                  |
    * | -------------- | ----------------------------------- | ------- | --------------------- |
@@ -91,30 +214,22 @@ export interface BytimeGetParams {
   >;
 
   /**
-   * Start of time interval to query, defaults to `until` - 6 hours. Timestamp must
-   * be in RFC3339 format and uses UTC unless otherwise specified.
+   * Query param:
    */
   since?: string;
 
   /**
-   * The sort order for the result set; sort fields must be included in `metrics` or
-   * `dimensions`.
-   */
-  sort?: Array<unknown>;
-
-  /**
-   * Used to select time series resolution.
+   * Query param: The sort order for the result set; sort fields must be included in
+   * `metrics` or `dimensions`.
    */
-  time_delta?: 'year' | 'quarter' | 'month' | 'week' | 'day' | 'hour' | 'dekaminute' | 'minute';
+  sort?: Array<string>;
 
   /**
-   * End of time interval to query, defaults to current time. Timestamp must be in
-   * RFC3339 format and uses UTC unless otherwise specified.
+   * Query param:
    */
   until?: string;
 }
 
-export namespace Bytimes {
-  export import BytimeGetResponse = BytimesAPI.BytimeGetResponse;
-  export import BytimeGetParams = BytimesAPI.BytimeGetParams;
+export declare namespace Bytimes {
+  export { type BytimeGetResponse as BytimeGetResponse, type BytimeGetParams as BytimeGetParams };
 }
diff --git a/src/resources/spectrum/analytics/events/events.ts b/src/resources/spectrum/analytics/events/events.ts
index ab7c699dc2..cf63853690 100644
--- a/src/resources/spectrum/analytics/events/events.ts
+++ b/src/resources/spectrum/analytics/events/events.ts
@@ -1,9 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../../resource';
-import * as EventsAPI from './events';
 import * as BytimesAPI from './bytimes';
+import { BytimeGetParams, BytimeGetResponse, Bytimes } from './bytimes';
 import * as SummariesAPI from './summaries';
+import { Summaries, SummaryGetParams, SummaryGetResponse } from './summaries';
 
 export class Events extends APIResource {
   bytimes: BytimesAPI.Bytimes = new BytimesAPI.Bytimes(this._client);
@@ -14,12 +15,21 @@ export type Dimension = 'event' | 'appID' | 'coloName' | 'ipVersion';
 
 export type DimensionParam = 'event' | 'appID' | 'coloName' | 'ipVersion';
 
-export namespace Events {
-  export import Dimension = EventsAPI.Dimension;
-  export import Bytimes = BytimesAPI.Bytimes;
-  export import BytimeGetResponse = BytimesAPI.BytimeGetResponse;
-  export import BytimeGetParams = BytimesAPI.BytimeGetParams;
-  export import Summaries = SummariesAPI.Summaries;
-  export import SummaryGetResponse = SummariesAPI.SummaryGetResponse;
-  export import SummaryGetParams = SummariesAPI.SummaryGetParams;
+Events.Bytimes = Bytimes;
+Events.Summaries = Summaries;
+
+export declare namespace Events {
+  export { type Dimension as Dimension };
+
+  export {
+    Bytimes as Bytimes,
+    type BytimeGetResponse as BytimeGetResponse,
+    type BytimeGetParams as BytimeGetParams,
+  };
+
+  export {
+    Summaries as Summaries,
+    type SummaryGetResponse as SummaryGetResponse,
+    type SummaryGetParams as SummaryGetParams,
+  };
 }
diff --git a/src/resources/spectrum/analytics/events/index.ts b/src/resources/spectrum/analytics/events/index.ts
index b78ac6e3de..6ba8f3d34b 100644
--- a/src/resources/spectrum/analytics/events/index.ts
+++ b/src/resources/spectrum/analytics/events/index.ts
@@ -1,5 +1,5 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { BytimeGetResponse, BytimeGetParams, Bytimes } from './bytimes';
-export { Dimension, Events } from './events';
-export { SummaryGetResponse, SummaryGetParams, Summaries } from './summaries';
+export { Bytimes, type BytimeGetResponse, type BytimeGetParams } from './bytimes';
+export { Events, type Dimension } from './events';
+export { Summaries, type SummaryGetResponse, type SummaryGetParams } from './summaries';
diff --git a/src/resources/spectrum/analytics/events/summaries.ts b/src/resources/spectrum/analytics/events/summaries.ts
index 5741729e79..d5268e679a 100644
--- a/src/resources/spectrum/analytics/events/summaries.ts
+++ b/src/resources/spectrum/analytics/events/summaries.ts
@@ -1,43 +1,160 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../../resource';
-import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import * as SummariesAPI from './summaries';
 import * as EventsAPI from './events';
 
 export class Summaries extends APIResource {
   /**
    * Retrieves a list of summarised aggregate metrics over a given time period.
    */
-  get(
-    zone: string,
-    query?: SummaryGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SummaryGetResponse | null>;
-  get(zone: string, options?: Core.RequestOptions): Core.APIPromise<SummaryGetResponse | null>;
-  get(
-    zone: string,
-    query: SummaryGetParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SummaryGetResponse | null> {
-    if (isRequestOptions(query)) {
-      return this.get(zone, {}, query);
-    }
+  get(params: SummaryGetParams, options?: Core.RequestOptions): Core.APIPromise<SummaryGetResponse> {
+    const { zone_id, ...query } = params;
     return (
-      this._client.get(`/zones/${zone}/spectrum/analytics/events/summary`, {
+      this._client.get(`/zones/${zone_id}/spectrum/analytics/events/summary`, {
         query,
         ...options,
-      }) as Core.APIPromise<{ result: SummaryGetResponse | null }>
+      }) as Core.APIPromise<{ result: SummaryGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export type SummaryGetResponse = unknown | string;
+export interface SummaryGetResponse {
+  /**
+   * List of columns returned by the analytics query.
+   */
+  data: Array<SummaryGetResponse.Data>;
+
+  /**
+   * Number of seconds between current time and last processed event, i.e. how many
+   * seconds of data could be missing.
+   */
+  data_lag: number;
+
+  /**
+   * Maximum result for each selected metrics across all data.
+   */
+  max: Record<string, number>;
+
+  /**
+   * Minimum result for each selected metrics across all data.
+   */
+  min: Record<string, number>;
+
+  query: SummaryGetResponse.Query;
+
+  /**
+   * Total number of rows in the result.
+   */
+  rows: number;
+
+  /**
+   * Total result for each selected metrics across all data.
+   */
+  totals: Record<string, number>;
+
+  /**
+   * List of time interval buckets: [start, end]
+   */
+  time_intervals?: Array<Array<string>>;
+}
+
+export namespace SummaryGetResponse {
+  export interface Data {
+    dimensions?: Array<string>;
+
+    metrics?: Array<number> | Array<Array<number>>;
+  }
+
+  export interface Query {
+    /**
+     * Can be used to break down the data by given attributes. Options are:
+     *
+     * | Dimension | Name                          | Example                                                    |
+     * | --------- | ----------------------------- | ---------------------------------------------------------- |
+     * | event     | Connection Event              | connect, progress, disconnect, originError, clientFiltered |
+     * | appID     | Application ID                | 40d67c87c6cd4b889a4fd57805225e85                           |
+     * | coloName  | Colo Name                     | SFO                                                        |
+     * | ipVersion | IP version used by the client | 4, 6.                                                      |
+     */
+    dimensions?: Array<EventsAPI.Dimension>;
+
+    /**
+     * Used to filter rows by one or more dimensions. Filters can be combined using OR
+     * and AND boolean logic. AND takes precedence over OR in all the expressions. The
+     * OR operator is defined using a comma (,) or OR keyword surrounded by whitespace.
+     * The AND operator is defined using a semicolon (;) or AND keyword surrounded by
+     * whitespace. Note that the semicolon is a reserved character in URLs (rfc1738)
+     * and needs to be percent-encoded as %3B. Comparison options are:
+     *
+     * | Operator | Name                     | URL Encoded |
+     * | -------- | ------------------------ | ----------- |
+     * | ==       | Equals                   | %3D%3D      |
+     * | !=       | Does not equals          | !%3D        |
+     * | \>       | Greater Than             | %3E         |
+     * | \<       | Less Than                | %3C         |
+     * | \>=      | Greater than or equal to | %3E%3D      |
+     * | \<=      | Less than or equal to    | %3C%3D      |
+     */
+    filters?: string;
+
+    /**
+     * Limit number of returned metrics.
+     */
+    limit?: number;
+
+    /**
+     * One or more metrics to compute. Options are:
+     *
+     * | Metric         | Name                                | Example | Unit                  |
+     * | -------------- | ----------------------------------- | ------- | --------------------- |
+     * | count          | Count of total events               | 1000    | Count                 |
+     * | bytesIngress   | Sum of ingress bytes                | 1000    | Sum                   |
+     * | bytesEgress    | Sum of egress bytes                 | 1000    | Sum                   |
+     * | durationAvg    | Average connection duration         | 1.0     | Time in milliseconds  |
+     * | durationMedian | Median connection duration          | 1.0     | Time in milliseconds  |
+     * | duration90th   | 90th percentile connection duration | 1.0     | Time in milliseconds  |
+     * | duration99th   | 99th percentile connection duration | 1.0     | Time in milliseconds. |
+     */
+    metrics?: Array<
+      | 'count'
+      | 'bytesIngress'
+      | 'bytesEgress'
+      | 'durationAvg'
+      | 'durationMedian'
+      | 'duration90th'
+      | 'duration99th'
+    >;
+
+    /**
+     * Start of time interval to query, defaults to `until` - 6 hours. Timestamp must
+     * be in RFC3339 format and uses UTC unless otherwise specified.
+     */
+    since?: string;
+
+    /**
+     * The sort order for the result set; sort fields must be included in `metrics` or
+     * `dimensions`.
+     */
+    sort?: Array<string>;
+
+    /**
+     * End of time interval to query, defaults to current time. Timestamp must be in
+     * RFC3339 format and uses UTC unless otherwise specified.
+     */
+    until?: string;
+  }
+}
 
 export interface SummaryGetParams {
   /**
-   * Can be used to break down the data by given attributes. Options are:
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Query param: Can be used to break down the data by given attributes. Options
+   * are:
    *
    * | Dimension | Name                          | Example                                                    |
    * | --------- | ----------------------------- | ---------------------------------------------------------- |
@@ -49,26 +166,27 @@ export interface SummaryGetParams {
   dimensions?: Array<EventsAPI.DimensionParam>;
 
   /**
-   * Used to filter rows by one or more dimensions. Filters can be combined using OR
-   * and AND boolean logic. AND takes precedence over OR in all the expressions. The
-   * OR operator is defined using a comma (,) or OR keyword surrounded by whitespace.
-   * The AND operator is defined using a semicolon (;) or AND keyword surrounded by
-   * whitespace. Note that the semicolon is a reserved character in URLs (rfc1738)
-   * and needs to be percent-encoded as %3B. Comparison options are:
+   * Query param: Used to filter rows by one or more dimensions. Filters can be
+   * combined using OR and AND boolean logic. AND takes precedence over OR in all the
+   * expressions. The OR operator is defined using a comma (,) or OR keyword
+   * surrounded by whitespace. The AND operator is defined using a semicolon (;) or
+   * AND keyword surrounded by whitespace. Note that the semicolon is a reserved
+   * character in URLs (rfc1738) and needs to be percent-encoded as %3B. Comparison
+   * options are:
    *
    * | Operator | Name                     | URL Encoded |
    * | -------- | ------------------------ | ----------- |
    * | ==       | Equals                   | %3D%3D      |
    * | !=       | Does not equals          | !%3D        |
-   * | >        | Greater Than             | %3E         |
-   * | <        | Less Than                | %3C         |
-   * | >=       | Greater than or equal to | %3E%3D      |
-   * | <=       | Less than or equal to    | %3C%3D .    |
+   * | \>       | Greater Than             | %3E         |
+   * | \<       | Less Than                | %3C         |
+   * | \>=      | Greater than or equal to | %3E%3D      |
+   * | \<=      | Less than or equal to    | %3C%3D      |
    */
   filters?: string;
 
   /**
-   * One or more metrics to compute. Options are:
+   * Query param: One or more metrics to compute. Options are:
    *
    * | Metric         | Name                                | Example | Unit                  |
    * | -------------- | ----------------------------------- | ------- | --------------------- |
@@ -91,25 +209,22 @@ export interface SummaryGetParams {
   >;
 
   /**
-   * Start of time interval to query, defaults to `until` - 6 hours. Timestamp must
-   * be in RFC3339 format and uses UTC unless otherwise specified.
+   * Query param:
    */
   since?: string;
 
   /**
-   * The sort order for the result set; sort fields must be included in `metrics` or
-   * `dimensions`.
+   * Query param: The sort order for the result set; sort fields must be included in
+   * `metrics` or `dimensions`.
    */
-  sort?: Array<unknown>;
+  sort?: Array<string>;
 
   /**
-   * End of time interval to query, defaults to current time. Timestamp must be in
-   * RFC3339 format and uses UTC unless otherwise specified.
+   * Query param:
    */
   until?: string;
 }
 
-export namespace Summaries {
-  export import SummaryGetResponse = SummariesAPI.SummaryGetResponse;
-  export import SummaryGetParams = SummariesAPI.SummaryGetParams;
+export declare namespace Summaries {
+  export { type SummaryGetResponse as SummaryGetResponse, type SummaryGetParams as SummaryGetParams };
 }
diff --git a/src/resources/spectrum/analytics/index.ts b/src/resources/spectrum/analytics/index.ts
index ead2c8761e..3aba748f04 100644
--- a/src/resources/spectrum/analytics/index.ts
+++ b/src/resources/spectrum/analytics/index.ts
@@ -2,4 +2,4 @@
 
 export { Aggregates } from './aggregates/index';
 export { Analytics } from './analytics';
-export { Dimension, Events } from './events/index';
+export { Events, type Dimension } from './events/index';
diff --git a/src/resources/spectrum/apps.ts b/src/resources/spectrum/apps.ts
index bfb4e748aa..1347befe22 100644
--- a/src/resources/spectrum/apps.ts
+++ b/src/resources/spectrum/apps.ts
@@ -1,9 +1,7 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
-import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as AppsAPI from './apps';
 import * as SpectrumAPI from './spectrum';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
@@ -12,14 +10,11 @@ export class Apps extends APIResource {
    * Creates a new Spectrum application from a configuration using a name for the
    * origin.
    */
-  create(
-    zone: string,
-    body: AppCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<AppCreateResponse | null> {
+  create(params: AppCreateParams, options?: Core.RequestOptions): Core.APIPromise<AppCreateResponse> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.post(`/zones/${zone}/spectrum/apps`, { body, ...options }) as Core.APIPromise<{
-        result: AppCreateResponse | null;
+      this._client.post(`/zones/${zone_id}/spectrum/apps`, { body, ...options }) as Core.APIPromise<{
+        result: AppCreateResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -29,14 +24,14 @@ export class Apps extends APIResource {
    * the origin.
    */
   update(
-    zone: string,
     appId: string,
-    body: AppUpdateParams,
+    params: AppUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<AppUpdateResponse | null> {
+  ): Core.APIPromise<AppUpdateResponse> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.put(`/zones/${zone}/spectrum/apps/${appId}`, { body, ...options }) as Core.APIPromise<{
-        result: AppUpdateResponse | null;
+      this._client.put(`/zones/${zone_id}/spectrum/apps/${appId}`, { body, ...options }) as Core.APIPromise<{
+        result: AppUpdateResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -45,23 +40,11 @@ export class Apps extends APIResource {
    * Retrieves a list of currently existing Spectrum applications inside a zone.
    */
   list(
-    zone: string,
-    query?: AppListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<AppListResponsesV4PagePaginationArray, AppListResponse>;
-  list(
-    zone: string,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<AppListResponsesV4PagePaginationArray, AppListResponse>;
-  list(
-    zone: string,
-    query: AppListParams | Core.RequestOptions = {},
+    params: AppListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<AppListResponsesV4PagePaginationArray, AppListResponse> {
-    if (isRequestOptions(query)) {
-      return this.list(zone, {}, query);
-    }
-    return this._client.getAPIList(`/zones/${zone}/spectrum/apps`, AppListResponsesV4PagePaginationArray, {
+    const { zone_id, ...query } = params;
+    return this._client.getAPIList(`/zones/${zone_id}/spectrum/apps`, AppListResponsesV4PagePaginationArray, {
       query,
       ...options,
     });
@@ -71,12 +54,13 @@ export class Apps extends APIResource {
    * Deletes a previously existing application.
    */
   delete(
-    zone: string,
     appId: string,
+    params: AppDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<AppDeleteResponse | null> {
+    const { zone_id } = params;
     return (
-      this._client.delete(`/zones/${zone}/spectrum/apps/${appId}`, options) as Core.APIPromise<{
+      this._client.delete(`/zones/${zone_id}/spectrum/apps/${appId}`, options) as Core.APIPromise<{
         result: AppDeleteResponse | null;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -85,9 +69,10 @@ export class Apps extends APIResource {
   /**
    * Gets the application configuration of a specific application inside a zone.
    */
-  get(zone: string, appId: string, options?: Core.RequestOptions): Core.APIPromise<AppGetResponse> {
+  get(appId: string, params: AppGetParams, options?: Core.RequestOptions): Core.APIPromise<AppGetResponse> {
+    const { zone_id } = params;
     return (
-      this._client.get(`/zones/${zone}/spectrum/apps/${appId}`, options) as Core.APIPromise<{
+      this._client.get(`/zones/${zone_id}/spectrum/apps/${appId}`, options) as Core.APIPromise<{
         result: AppGetResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -96,331 +81,770 @@ export class Apps extends APIResource {
 
 export class AppListResponsesV4PagePaginationArray extends V4PagePaginationArray<AppListResponse> {}
 
-export interface AppCreateResponse {
-  /**
-   * Application identifier.
-   */
-  id?: string;
-
-  /**
-   * Enables Argo Smart Routing for this application. Notes: Only available for TCP
-   * applications with traffic_type set to "direct".
-   */
-  argo_smart_routing?: boolean;
-
-  /**
-   * When the Application was created.
-   */
-  created_on?: string;
-
-  /**
-   * The name and type of DNS record for the Spectrum application.
-   */
-  dns?: SpectrumAPI.DNS;
-
-  /**
-   * The anycast edge IP configuration for the hostname of this application.
-   */
-  edge_ips?: SpectrumAPI.EdgeIPs;
-
-  /**
-   * Enables IP Access Rules for this application. Notes: Only available for TCP
-   * applications.
-   */
-  ip_firewall?: boolean;
-
-  /**
-   * When the Application was last modified.
-   */
-  modified_on?: string;
+export type AppCreateResponse =
+  | AppCreateResponse.SpectrumConfigAppConfig
+  | AppCreateResponse.SpectrumConfigPaygoAppConfig;
+
+export namespace AppCreateResponse {
+  export interface SpectrumConfigAppConfig {
+    /**
+     * App identifier.
+     */
+    id: string;
+
+    /**
+     * When the Application was created.
+     */
+    created_on: string;
+
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNS;
+
+    /**
+     * Enables IP Access Rules for this application. Notes: Only available for TCP
+     * applications.
+     */
+    ip_firewall: boolean;
+
+    /**
+     * When the Application was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * The port configuration at Cloudflare's edge. May specify a single port, for
+     * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+     */
+    protocol: string;
+
+    /**
+     * Enables Proxy Protocol to the origin. Refer to
+     * [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
+     * for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
+     * Proxy Protocol.
+     */
+    proxy_protocol: 'off' | 'v1' | 'v2' | 'simple';
+
+    /**
+     * The type of TLS termination associated with the application.
+     */
+    tls: 'off' | 'flexible' | 'full' | 'strict';
+
+    /**
+     * Determines how data travels from the edge to your origin. When set to "direct",
+     * Spectrum will send traffic directly to your origin, and the application's type
+     * is derived from the `protocol`. When set to "http" or "https", Spectrum will
+     * apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
+     * the application type matches this property exactly.
+     */
+    traffic_type: 'direct' | 'http' | 'https';
+
+    /**
+     * Enables Argo Smart Routing for this application. Notes: Only available for TCP
+     * applications with traffic_type set to "direct".
+     */
+    argo_smart_routing?: boolean;
+
+    /**
+     * The anycast edge IP configuration for the hostname of this application.
+     */
+    edge_ips?: SpectrumAPI.EdgeIPs;
+
+    /**
+     * List of origin IP addresses. Array may contain multiple IP addresses for load
+     * balancing.
+     */
+    origin_direct?: Array<string>;
+
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    origin_dns?: SpectrumAPI.OriginDNS;
+
+    /**
+     * The destination port at the origin. Only specified in conjunction with
+     * origin_dns. May use an integer to specify a single origin port, for example
+     * `1000`, or a string to specify a range of origin ports, for example
+     * `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
+     * range must match the number of ports specified in the "protocol" field.
+     */
+    origin_port?: SpectrumAPI.OriginPort;
+  }
 
-  /**
-   * The name and type of DNS record for the Spectrum application.
-   */
-  origin_dns?: SpectrumAPI.OriginDNS;
+  export interface SpectrumConfigPaygoAppConfig {
+    /**
+     * Identifier
+     */
+    id: string;
 
-  /**
-   * The destination port at the origin. Only specified in conjunction with
-   * origin_dns. May use an integer to specify a single origin port, for example
-   * `1000`, or a string to specify a range of origin ports, for example
-   * `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
-   * range must match the number of ports specified in the "protocol" field.
-   */
-  origin_port?: SpectrumAPI.OriginPort;
+    created_on: string;
 
-  /**
-   * The port configuration at Cloudflare’s edge. May specify a single port, for
-   * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
-   */
-  protocol?: string;
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNS;
 
-  /**
-   * Enables Proxy Protocol to the origin. Refer to
-   * [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
-   * for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
-   * Proxy Protocol.
-   */
-  proxy_protocol?: 'off' | 'v1' | 'v2' | 'simple';
+    modified_on: string;
 
-  /**
-   * The type of TLS termination associated with the application.
-   */
-  tls?: 'off' | 'flexible' | 'full' | 'strict';
+    /**
+     * The port configuration at Cloudflare's edge. May specify a single port, for
+     * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+     */
+    protocol: string;
 
-  /**
-   * Determines how data travels from the edge to your origin. When set to "direct",
-   * Spectrum will send traffic directly to your origin, and the application's type
-   * is derived from the `protocol`. When set to "http" or "https", Spectrum will
-   * apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
-   * the application type matches this property exactly.
-   */
-  traffic_type?: 'direct' | 'http' | 'https';
+    /**
+     * List of origin IP addresses. Array may contain multiple IP addresses for load
+     * balancing.
+     */
+    origin_direct?: Array<string>;
+  }
 }
 
-export interface AppUpdateResponse {
-  /**
-   * Application identifier.
-   */
-  id?: string;
+export type AppUpdateResponse =
+  | AppUpdateResponse.SpectrumConfigAppConfig
+  | AppUpdateResponse.SpectrumConfigPaygoAppConfig;
+
+export namespace AppUpdateResponse {
+  export interface SpectrumConfigAppConfig {
+    /**
+     * App identifier.
+     */
+    id: string;
+
+    /**
+     * When the Application was created.
+     */
+    created_on: string;
+
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNS;
+
+    /**
+     * Enables IP Access Rules for this application. Notes: Only available for TCP
+     * applications.
+     */
+    ip_firewall: boolean;
+
+    /**
+     * When the Application was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * The port configuration at Cloudflare's edge. May specify a single port, for
+     * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+     */
+    protocol: string;
+
+    /**
+     * Enables Proxy Protocol to the origin. Refer to
+     * [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
+     * for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
+     * Proxy Protocol.
+     */
+    proxy_protocol: 'off' | 'v1' | 'v2' | 'simple';
+
+    /**
+     * The type of TLS termination associated with the application.
+     */
+    tls: 'off' | 'flexible' | 'full' | 'strict';
+
+    /**
+     * Determines how data travels from the edge to your origin. When set to "direct",
+     * Spectrum will send traffic directly to your origin, and the application's type
+     * is derived from the `protocol`. When set to "http" or "https", Spectrum will
+     * apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
+     * the application type matches this property exactly.
+     */
+    traffic_type: 'direct' | 'http' | 'https';
+
+    /**
+     * Enables Argo Smart Routing for this application. Notes: Only available for TCP
+     * applications with traffic_type set to "direct".
+     */
+    argo_smart_routing?: boolean;
+
+    /**
+     * The anycast edge IP configuration for the hostname of this application.
+     */
+    edge_ips?: SpectrumAPI.EdgeIPs;
+
+    /**
+     * List of origin IP addresses. Array may contain multiple IP addresses for load
+     * balancing.
+     */
+    origin_direct?: Array<string>;
+
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    origin_dns?: SpectrumAPI.OriginDNS;
+
+    /**
+     * The destination port at the origin. Only specified in conjunction with
+     * origin_dns. May use an integer to specify a single origin port, for example
+     * `1000`, or a string to specify a range of origin ports, for example
+     * `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
+     * range must match the number of ports specified in the "protocol" field.
+     */
+    origin_port?: SpectrumAPI.OriginPort;
+  }
 
-  /**
-   * Enables Argo Smart Routing for this application. Notes: Only available for TCP
-   * applications with traffic_type set to "direct".
-   */
-  argo_smart_routing?: boolean;
+  export interface SpectrumConfigPaygoAppConfig {
+    /**
+     * Identifier
+     */
+    id: string;
 
-  /**
-   * When the Application was created.
-   */
-  created_on?: string;
+    created_on: string;
 
-  /**
-   * The name and type of DNS record for the Spectrum application.
-   */
-  dns?: SpectrumAPI.DNS;
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNS;
 
-  /**
-   * The anycast edge IP configuration for the hostname of this application.
-   */
-  edge_ips?: SpectrumAPI.EdgeIPs;
+    modified_on: string;
 
-  /**
-   * Enables IP Access Rules for this application. Notes: Only available for TCP
-   * applications.
-   */
-  ip_firewall?: boolean;
+    /**
+     * The port configuration at Cloudflare's edge. May specify a single port, for
+     * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+     */
+    protocol: string;
 
-  /**
-   * When the Application was last modified.
-   */
-  modified_on?: string;
+    /**
+     * List of origin IP addresses. Array may contain multiple IP addresses for load
+     * balancing.
+     */
+    origin_direct?: Array<string>;
+  }
+}
 
-  /**
-   * The name and type of DNS record for the Spectrum application.
-   */
-  origin_dns?: SpectrumAPI.OriginDNS;
+export type AppListResponse = Array<AppListResponse.UnionMember0> | Array<AppListResponse.UnionMember1>;
+
+export namespace AppListResponse {
+  export interface UnionMember0 {
+    /**
+     * App identifier.
+     */
+    id: string;
+
+    /**
+     * When the Application was created.
+     */
+    created_on: string;
+
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNS;
+
+    /**
+     * Enables IP Access Rules for this application. Notes: Only available for TCP
+     * applications.
+     */
+    ip_firewall: boolean;
+
+    /**
+     * When the Application was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * The port configuration at Cloudflare's edge. May specify a single port, for
+     * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+     */
+    protocol: string;
+
+    /**
+     * Enables Proxy Protocol to the origin. Refer to
+     * [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
+     * for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
+     * Proxy Protocol.
+     */
+    proxy_protocol: 'off' | 'v1' | 'v2' | 'simple';
+
+    /**
+     * The type of TLS termination associated with the application.
+     */
+    tls: 'off' | 'flexible' | 'full' | 'strict';
+
+    /**
+     * Determines how data travels from the edge to your origin. When set to "direct",
+     * Spectrum will send traffic directly to your origin, and the application's type
+     * is derived from the `protocol`. When set to "http" or "https", Spectrum will
+     * apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
+     * the application type matches this property exactly.
+     */
+    traffic_type: 'direct' | 'http' | 'https';
+
+    /**
+     * Enables Argo Smart Routing for this application. Notes: Only available for TCP
+     * applications with traffic_type set to "direct".
+     */
+    argo_smart_routing?: boolean;
+
+    /**
+     * The anycast edge IP configuration for the hostname of this application.
+     */
+    edge_ips?: SpectrumAPI.EdgeIPs;
+
+    /**
+     * List of origin IP addresses. Array may contain multiple IP addresses for load
+     * balancing.
+     */
+    origin_direct?: Array<string>;
+
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    origin_dns?: SpectrumAPI.OriginDNS;
+
+    /**
+     * The destination port at the origin. Only specified in conjunction with
+     * origin_dns. May use an integer to specify a single origin port, for example
+     * `1000`, or a string to specify a range of origin ports, for example
+     * `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
+     * range must match the number of ports specified in the "protocol" field.
+     */
+    origin_port?: SpectrumAPI.OriginPort;
+  }
 
-  /**
-   * The destination port at the origin. Only specified in conjunction with
-   * origin_dns. May use an integer to specify a single origin port, for example
-   * `1000`, or a string to specify a range of origin ports, for example
-   * `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
-   * range must match the number of ports specified in the "protocol" field.
-   */
-  origin_port?: SpectrumAPI.OriginPort;
+  export interface UnionMember1 {
+    /**
+     * Identifier
+     */
+    id: string;
 
-  /**
-   * The port configuration at Cloudflare’s edge. May specify a single port, for
-   * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
-   */
-  protocol?: string;
+    created_on: string;
 
-  /**
-   * Enables Proxy Protocol to the origin. Refer to
-   * [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
-   * for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
-   * Proxy Protocol.
-   */
-  proxy_protocol?: 'off' | 'v1' | 'v2' | 'simple';
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNS;
 
-  /**
-   * The type of TLS termination associated with the application.
-   */
-  tls?: 'off' | 'flexible' | 'full' | 'strict';
+    modified_on: string;
 
-  /**
-   * Determines how data travels from the edge to your origin. When set to "direct",
-   * Spectrum will send traffic directly to your origin, and the application's type
-   * is derived from the `protocol`. When set to "http" or "https", Spectrum will
-   * apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
-   * the application type matches this property exactly.
-   */
-  traffic_type?: 'direct' | 'http' | 'https';
-}
+    /**
+     * The port configuration at Cloudflare's edge. May specify a single port, for
+     * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+     */
+    protocol: string;
 
-export type AppListResponse = unknown;
+    /**
+     * List of origin IP addresses. Array may contain multiple IP addresses for load
+     * balancing.
+     */
+    origin_direct?: Array<string>;
+  }
+}
 
 export interface AppDeleteResponse {
   /**
-   * Application identifier.
+   * Identifier
    */
-  id?: string;
+  id: string;
 }
 
-export type AppGetResponse = unknown | string | null;
-
-export interface AppCreateParams {
-  /**
-   * The name and type of DNS record for the Spectrum application.
-   */
-  dns: SpectrumAPI.DNSParam;
-
-  /**
-   * The name and type of DNS record for the Spectrum application.
-   */
-  origin_dns: SpectrumAPI.OriginDNSParam;
-
-  /**
-   * The destination port at the origin. Only specified in conjunction with
-   * origin_dns. May use an integer to specify a single origin port, for example
-   * `1000`, or a string to specify a range of origin ports, for example
-   * `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
-   * range must match the number of ports specified in the "protocol" field.
-   */
-  origin_port: SpectrumAPI.OriginPortParam;
-
-  /**
-   * The port configuration at Cloudflare’s edge. May specify a single port, for
-   * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
-   */
-  protocol: string;
+export type AppGetResponse =
+  | AppGetResponse.SpectrumConfigAppConfig
+  | AppGetResponse.SpectrumConfigPaygoAppConfig;
+
+export namespace AppGetResponse {
+  export interface SpectrumConfigAppConfig {
+    /**
+     * App identifier.
+     */
+    id: string;
+
+    /**
+     * When the Application was created.
+     */
+    created_on: string;
+
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNS;
+
+    /**
+     * Enables IP Access Rules for this application. Notes: Only available for TCP
+     * applications.
+     */
+    ip_firewall: boolean;
+
+    /**
+     * When the Application was last modified.
+     */
+    modified_on: string;
+
+    /**
+     * The port configuration at Cloudflare's edge. May specify a single port, for
+     * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+     */
+    protocol: string;
+
+    /**
+     * Enables Proxy Protocol to the origin. Refer to
+     * [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
+     * for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
+     * Proxy Protocol.
+     */
+    proxy_protocol: 'off' | 'v1' | 'v2' | 'simple';
+
+    /**
+     * The type of TLS termination associated with the application.
+     */
+    tls: 'off' | 'flexible' | 'full' | 'strict';
+
+    /**
+     * Determines how data travels from the edge to your origin. When set to "direct",
+     * Spectrum will send traffic directly to your origin, and the application's type
+     * is derived from the `protocol`. When set to "http" or "https", Spectrum will
+     * apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
+     * the application type matches this property exactly.
+     */
+    traffic_type: 'direct' | 'http' | 'https';
+
+    /**
+     * Enables Argo Smart Routing for this application. Notes: Only available for TCP
+     * applications with traffic_type set to "direct".
+     */
+    argo_smart_routing?: boolean;
+
+    /**
+     * The anycast edge IP configuration for the hostname of this application.
+     */
+    edge_ips?: SpectrumAPI.EdgeIPs;
+
+    /**
+     * List of origin IP addresses. Array may contain multiple IP addresses for load
+     * balancing.
+     */
+    origin_direct?: Array<string>;
+
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    origin_dns?: SpectrumAPI.OriginDNS;
+
+    /**
+     * The destination port at the origin. Only specified in conjunction with
+     * origin_dns. May use an integer to specify a single origin port, for example
+     * `1000`, or a string to specify a range of origin ports, for example
+     * `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
+     * range must match the number of ports specified in the "protocol" field.
+     */
+    origin_port?: SpectrumAPI.OriginPort;
+  }
 
-  /**
-   * Enables Argo Smart Routing for this application. Notes: Only available for TCP
-   * applications with traffic_type set to "direct".
-   */
-  argo_smart_routing?: boolean;
+  export interface SpectrumConfigPaygoAppConfig {
+    /**
+     * Identifier
+     */
+    id: string;
 
-  /**
-   * The anycast edge IP configuration for the hostname of this application.
-   */
-  edge_ips?: SpectrumAPI.EdgeIPsParam;
+    created_on: string;
 
-  /**
-   * Enables IP Access Rules for this application. Notes: Only available for TCP
-   * applications.
-   */
-  ip_firewall?: boolean;
+    /**
+     * The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNS;
 
-  /**
-   * Enables Proxy Protocol to the origin. Refer to
-   * [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
-   * for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
-   * Proxy Protocol.
-   */
-  proxy_protocol?: 'off' | 'v1' | 'v2' | 'simple';
+    modified_on: string;
 
-  /**
-   * The type of TLS termination associated with the application.
-   */
-  tls?: 'off' | 'flexible' | 'full' | 'strict';
+    /**
+     * The port configuration at Cloudflare's edge. May specify a single port, for
+     * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
+     */
+    protocol: string;
 
-  /**
-   * Determines how data travels from the edge to your origin. When set to "direct",
-   * Spectrum will send traffic directly to your origin, and the application's type
-   * is derived from the `protocol`. When set to "http" or "https", Spectrum will
-   * apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
-   * the application type matches this property exactly.
-   */
-  traffic_type?: 'direct' | 'http' | 'https';
+    /**
+     * List of origin IP addresses. Array may contain multiple IP addresses for load
+     * balancing.
+     */
+    origin_direct?: Array<string>;
+  }
 }
 
-export interface AppUpdateParams {
-  /**
-   * The name and type of DNS record for the Spectrum application.
-   */
-  dns: SpectrumAPI.DNSParam;
-
-  /**
-   * The name and type of DNS record for the Spectrum application.
-   */
-  origin_dns: SpectrumAPI.OriginDNSParam;
-
-  /**
-   * The destination port at the origin. Only specified in conjunction with
-   * origin_dns. May use an integer to specify a single origin port, for example
-   * `1000`, or a string to specify a range of origin ports, for example
-   * `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
-   * range must match the number of ports specified in the "protocol" field.
-   */
-  origin_port: SpectrumAPI.OriginPortParam;
-
-  /**
-   * The port configuration at Cloudflare’s edge. May specify a single port, for
-   * example `"tcp/1000"`, or a range of ports, for example `"tcp/1000-2000"`.
-   */
-  protocol: string;
+export type AppCreateParams =
+  | AppCreateParams.SpectrumConfigAppConfig
+  | AppCreateParams.SpectrumConfigPaygoAppConfig;
+
+export declare namespace AppCreateParams {
+  export interface SpectrumConfigAppConfig {
+    /**
+     * Path param: Identifier
+     */
+    zone_id: string;
+
+    /**
+     * Body param: The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNSParam;
+
+    /**
+     * Body param: Enables IP Access Rules for this application. Notes: Only available
+     * for TCP applications.
+     */
+    ip_firewall: boolean;
+
+    /**
+     * Body param: The port configuration at Cloudflare's edge. May specify a single
+     * port, for example `"tcp/1000"`, or a range of ports, for example
+     * `"tcp/1000-2000"`.
+     */
+    protocol: string;
+
+    /**
+     * Body param: Enables Proxy Protocol to the origin. Refer to
+     * [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
+     * for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
+     * Proxy Protocol.
+     */
+    proxy_protocol: 'off' | 'v1' | 'v2' | 'simple';
+
+    /**
+     * Body param: The type of TLS termination associated with the application.
+     */
+    tls: 'off' | 'flexible' | 'full' | 'strict';
+
+    /**
+     * Body param: Determines how data travels from the edge to your origin. When set
+     * to "direct", Spectrum will send traffic directly to your origin, and the
+     * application's type is derived from the `protocol`. When set to "http" or
+     * "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
+     * traffic to your origin, and the application type matches this property exactly.
+     */
+    traffic_type: 'direct' | 'http' | 'https';
+
+    /**
+     * Body param: Enables Argo Smart Routing for this application. Notes: Only
+     * available for TCP applications with traffic_type set to "direct".
+     */
+    argo_smart_routing?: boolean;
+
+    /**
+     * Body param: The anycast edge IP configuration for the hostname of this
+     * application.
+     */
+    edge_ips?: SpectrumAPI.EdgeIPsParam;
+
+    /**
+     * Body param: List of origin IP addresses. Array may contain multiple IP addresses
+     * for load balancing.
+     */
+    origin_direct?: Array<string>;
+
+    /**
+     * Body param: The name and type of DNS record for the Spectrum application.
+     */
+    origin_dns?: SpectrumAPI.OriginDNSParam;
+
+    /**
+     * Body param: The destination port at the origin. Only specified in conjunction
+     * with origin_dns. May use an integer to specify a single origin port, for example
+     * `1000`, or a string to specify a range of origin ports, for example
+     * `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
+     * range must match the number of ports specified in the "protocol" field.
+     */
+    origin_port?: SpectrumAPI.OriginPortParam;
+  }
 
-  /**
-   * Enables Argo Smart Routing for this application. Notes: Only available for TCP
-   * applications with traffic_type set to "direct".
-   */
-  argo_smart_routing?: boolean;
+  export interface SpectrumConfigPaygoAppConfig {
+    /**
+     * Path param: Identifier
+     */
+    zone_id: string;
+
+    /**
+     * Body param: Identifier
+     */
+    id: string;
+
+    /**
+     * Body param: The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNSParam;
+
+    /**
+     * Body param: The port configuration at Cloudflare's edge. May specify a single
+     * port, for example `"tcp/1000"`, or a range of ports, for example
+     * `"tcp/1000-2000"`.
+     */
+    protocol: string;
+
+    /**
+     * Body param: List of origin IP addresses. Array may contain multiple IP addresses
+     * for load balancing.
+     */
+    origin_direct?: Array<string>;
+  }
+}
 
-  /**
-   * The anycast edge IP configuration for the hostname of this application.
-   */
-  edge_ips?: SpectrumAPI.EdgeIPsParam;
+export type AppUpdateParams =
+  | AppUpdateParams.SpectrumConfigAppConfig
+  | AppUpdateParams.SpectrumConfigPaygoAppConfig;
+
+export declare namespace AppUpdateParams {
+  export interface SpectrumConfigAppConfig {
+    /**
+     * Path param: Identifier
+     */
+    zone_id: string;
+
+    /**
+     * Body param: The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNSParam;
+
+    /**
+     * Body param: Enables IP Access Rules for this application. Notes: Only available
+     * for TCP applications.
+     */
+    ip_firewall: boolean;
+
+    /**
+     * Body param: The port configuration at Cloudflare's edge. May specify a single
+     * port, for example `"tcp/1000"`, or a range of ports, for example
+     * `"tcp/1000-2000"`.
+     */
+    protocol: string;
+
+    /**
+     * Body param: Enables Proxy Protocol to the origin. Refer to
+     * [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
+     * for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
+     * Proxy Protocol.
+     */
+    proxy_protocol: 'off' | 'v1' | 'v2' | 'simple';
+
+    /**
+     * Body param: The type of TLS termination associated with the application.
+     */
+    tls: 'off' | 'flexible' | 'full' | 'strict';
+
+    /**
+     * Body param: Determines how data travels from the edge to your origin. When set
+     * to "direct", Spectrum will send traffic directly to your origin, and the
+     * application's type is derived from the `protocol`. When set to "http" or
+     * "https", Spectrum will apply Cloudflare's HTTP/HTTPS features as it sends
+     * traffic to your origin, and the application type matches this property exactly.
+     */
+    traffic_type: 'direct' | 'http' | 'https';
+
+    /**
+     * Body param: Enables Argo Smart Routing for this application. Notes: Only
+     * available for TCP applications with traffic_type set to "direct".
+     */
+    argo_smart_routing?: boolean;
+
+    /**
+     * Body param: The anycast edge IP configuration for the hostname of this
+     * application.
+     */
+    edge_ips?: SpectrumAPI.EdgeIPsParam;
+
+    /**
+     * Body param: List of origin IP addresses. Array may contain multiple IP addresses
+     * for load balancing.
+     */
+    origin_direct?: Array<string>;
+
+    /**
+     * Body param: The name and type of DNS record for the Spectrum application.
+     */
+    origin_dns?: SpectrumAPI.OriginDNSParam;
+
+    /**
+     * Body param: The destination port at the origin. Only specified in conjunction
+     * with origin_dns. May use an integer to specify a single origin port, for example
+     * `1000`, or a string to specify a range of origin ports, for example
+     * `"1000-2000"`. Notes: If specifying a port range, the number of ports in the
+     * range must match the number of ports specified in the "protocol" field.
+     */
+    origin_port?: SpectrumAPI.OriginPortParam;
+  }
 
-  /**
-   * Enables IP Access Rules for this application. Notes: Only available for TCP
-   * applications.
-   */
-  ip_firewall?: boolean;
+  export interface SpectrumConfigPaygoAppConfig {
+    /**
+     * Path param: Identifier
+     */
+    zone_id: string;
+
+    /**
+     * Body param: Identifier
+     */
+    id: string;
+
+    /**
+     * Body param: The name and type of DNS record for the Spectrum application.
+     */
+    dns: SpectrumAPI.DNSParam;
+
+    /**
+     * Body param: The port configuration at Cloudflare's edge. May specify a single
+     * port, for example `"tcp/1000"`, or a range of ports, for example
+     * `"tcp/1000-2000"`.
+     */
+    protocol: string;
+
+    /**
+     * Body param: List of origin IP addresses. Array may contain multiple IP addresses
+     * for load balancing.
+     */
+    origin_direct?: Array<string>;
+  }
+}
 
+export interface AppListParams extends V4PagePaginationArrayParams {
   /**
-   * Enables Proxy Protocol to the origin. Refer to
-   * [Enable Proxy protocol](https://developers.cloudflare.com/spectrum/getting-started/proxy-protocol/)
-   * for implementation details on PROXY Protocol V1, PROXY Protocol V2, and Simple
-   * Proxy Protocol.
+   * Path param: Identifier
    */
-  proxy_protocol?: 'off' | 'v1' | 'v2' | 'simple';
+  zone_id: string;
 
   /**
-   * The type of TLS termination associated with the application.
+   * Query param: Sets the direction by which results are ordered.
    */
-  tls?: 'off' | 'flexible' | 'full' | 'strict';
+  direction?: 'asc' | 'desc';
 
   /**
-   * Determines how data travels from the edge to your origin. When set to "direct",
-   * Spectrum will send traffic directly to your origin, and the application's type
-   * is derived from the `protocol`. When set to "http" or "https", Spectrum will
-   * apply Cloudflare's HTTP/HTTPS features as it sends traffic to your origin, and
-   * the application type matches this property exactly.
+   * Query param: Application field by which results are ordered.
    */
-  traffic_type?: 'direct' | 'http' | 'https';
+  order?: 'protocol' | 'app_id' | 'created_on' | 'modified_on' | 'dns';
 }
 
-export interface AppListParams extends V4PagePaginationArrayParams {
+export interface AppDeleteParams {
   /**
-   * Sets the direction by which results are ordered.
+   * Identifier
    */
-  direction?: 'asc' | 'desc';
+  zone_id: string;
+}
 
+export interface AppGetParams {
   /**
-   * Application field by which results are ordered.
+   * Identifier
    */
-  order?: 'protocol' | 'app_id' | 'created_on' | 'modified_on' | 'dns';
+  zone_id: string;
 }
 
-export namespace Apps {
-  export import AppCreateResponse = AppsAPI.AppCreateResponse;
-  export import AppUpdateResponse = AppsAPI.AppUpdateResponse;
-  export import AppListResponse = AppsAPI.AppListResponse;
-  export import AppDeleteResponse = AppsAPI.AppDeleteResponse;
-  export import AppGetResponse = AppsAPI.AppGetResponse;
-  export import AppListResponsesV4PagePaginationArray = AppsAPI.AppListResponsesV4PagePaginationArray;
-  export import AppCreateParams = AppsAPI.AppCreateParams;
-  export import AppUpdateParams = AppsAPI.AppUpdateParams;
-  export import AppListParams = AppsAPI.AppListParams;
+Apps.AppListResponsesV4PagePaginationArray = AppListResponsesV4PagePaginationArray;
+
+export declare namespace Apps {
+  export {
+    type AppCreateResponse as AppCreateResponse,
+    type AppUpdateResponse as AppUpdateResponse,
+    type AppListResponse as AppListResponse,
+    type AppDeleteResponse as AppDeleteResponse,
+    type AppGetResponse as AppGetResponse,
+    AppListResponsesV4PagePaginationArray as AppListResponsesV4PagePaginationArray,
+    type AppCreateParams as AppCreateParams,
+    type AppUpdateParams as AppUpdateParams,
+    type AppListParams as AppListParams,
+    type AppDeleteParams as AppDeleteParams,
+    type AppGetParams as AppGetParams,
+  };
 }
diff --git a/src/resources/spectrum/index.ts b/src/resources/spectrum/index.ts
index 92a4dd4bea..ed182f1520 100644
--- a/src/resources/spectrum/index.ts
+++ b/src/resources/spectrum/index.ts
@@ -2,15 +2,17 @@
 
 export { Analytics } from './analytics/index';
 export {
-  AppCreateResponse,
-  AppUpdateResponse,
-  AppListResponse,
-  AppDeleteResponse,
-  AppGetResponse,
-  AppCreateParams,
-  AppUpdateParams,
-  AppListParams,
   AppListResponsesV4PagePaginationArray,
   Apps,
+  type AppCreateResponse,
+  type AppUpdateResponse,
+  type AppListResponse,
+  type AppDeleteResponse,
+  type AppGetResponse,
+  type AppCreateParams,
+  type AppUpdateParams,
+  type AppListParams,
+  type AppDeleteParams,
+  type AppGetParams,
 } from './apps';
 export { Spectrum } from './spectrum';
diff --git a/src/resources/spectrum/spectrum.ts b/src/resources/spectrum/spectrum.ts
index 27b0055b81..ebf735cf81 100644
--- a/src/resources/spectrum/spectrum.ts
+++ b/src/resources/spectrum/spectrum.ts
@@ -2,7 +2,22 @@
 
 import { APIResource } from '../../resource';
 import * as AppsAPI from './apps';
+import {
+  AppCreateParams,
+  AppCreateResponse,
+  AppDeleteParams,
+  AppDeleteResponse,
+  AppGetParams,
+  AppGetResponse,
+  AppListParams,
+  AppListResponse,
+  AppListResponsesV4PagePaginationArray,
+  AppUpdateParams,
+  AppUpdateResponse,
+  Apps,
+} from './apps';
 import * as AnalyticsAPI from './analytics/analytics';
+import { Analytics } from './analytics/analytics';
 
 export class Spectrum extends APIResource {
   analytics: AnalyticsAPI.Analytics = new AnalyticsAPI.Analytics(this._client);
@@ -42,10 +57,10 @@ export interface DNSParam {
 /**
  * The anycast edge IP configuration for the hostname of this application.
  */
-export type EdgeIPs = EdgeIPs.EyeballIPs | EdgeIPs.CustomerOwnedIPs;
+export type EdgeIPs = EdgeIPs.UnionMember0 | EdgeIPs.UnionMember1;
 
 export namespace EdgeIPs {
-  export interface EyeballIPs {
+  export interface UnionMember0 {
     /**
      * The IP versions supported for inbound connections on Spectrum anycast IPs.
      */
@@ -59,7 +74,7 @@ export namespace EdgeIPs {
     type?: 'dynamic';
   }
 
-  export interface CustomerOwnedIPs {
+  export interface UnionMember1 {
     /**
      * The array of customer owned IPs we broadcast via anycast for this hostname and
      * application.
@@ -78,10 +93,10 @@ export namespace EdgeIPs {
 /**
  * The anycast edge IP configuration for the hostname of this application.
  */
-export type EdgeIPsParam = EdgeIPsParam.EyeballIPs | EdgeIPsParam.CustomerOwnedIPs;
+export type EdgeIPsParam = EdgeIPsParam.UnionMember0 | EdgeIPsParam.UnionMember1;
 
 export namespace EdgeIPsParam {
-  export interface EyeballIPs {
+  export interface UnionMember0 {
     /**
      * The IP versions supported for inbound connections on Spectrum anycast IPs.
      */
@@ -95,7 +110,7 @@ export namespace EdgeIPsParam {
     type?: 'dynamic';
   }
 
-  export interface CustomerOwnedIPs {
+  export interface UnionMember1 {
     /**
      * The array of customer owned IPs we broadcast via anycast for this hostname and
      * application.
@@ -171,16 +186,25 @@ export type OriginPort = number | string;
  */
 export type OriginPortParam = number | string;
 
-export namespace Spectrum {
-  export import Analytics = AnalyticsAPI.Analytics;
-  export import Apps = AppsAPI.Apps;
-  export import AppCreateResponse = AppsAPI.AppCreateResponse;
-  export import AppUpdateResponse = AppsAPI.AppUpdateResponse;
-  export import AppListResponse = AppsAPI.AppListResponse;
-  export import AppDeleteResponse = AppsAPI.AppDeleteResponse;
-  export import AppGetResponse = AppsAPI.AppGetResponse;
-  export import AppListResponsesV4PagePaginationArray = AppsAPI.AppListResponsesV4PagePaginationArray;
-  export import AppCreateParams = AppsAPI.AppCreateParams;
-  export import AppUpdateParams = AppsAPI.AppUpdateParams;
-  export import AppListParams = AppsAPI.AppListParams;
+Spectrum.Analytics = Analytics;
+Spectrum.Apps = Apps;
+Spectrum.AppListResponsesV4PagePaginationArray = AppListResponsesV4PagePaginationArray;
+
+export declare namespace Spectrum {
+  export { Analytics as Analytics };
+
+  export {
+    Apps as Apps,
+    type AppCreateResponse as AppCreateResponse,
+    type AppUpdateResponse as AppUpdateResponse,
+    type AppListResponse as AppListResponse,
+    type AppDeleteResponse as AppDeleteResponse,
+    type AppGetResponse as AppGetResponse,
+    AppListResponsesV4PagePaginationArray as AppListResponsesV4PagePaginationArray,
+    type AppCreateParams as AppCreateParams,
+    type AppUpdateParams as AppUpdateParams,
+    type AppListParams as AppListParams,
+    type AppDeleteParams as AppDeleteParams,
+    type AppGetParams as AppGetParams,
+  };
 }
diff --git a/src/resources/speed/availabilities.ts b/src/resources/speed/availabilities.ts
index e74cc85c97..a756466e00 100644
--- a/src/resources/speed/availabilities.ts
+++ b/src/resources/speed/availabilities.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as AvailabilitiesAPI from './availabilities';
 import * as SpeedAPI from './speed';
 
 export class Availabilities extends APIResource {
@@ -24,7 +23,10 @@ export interface Availability {
 
   regions?: Array<SpeedAPI.LabeledRegion>;
 
-  regionsPerPlan?: unknown;
+  /**
+   * Available regions.
+   */
+  regionsPerPlan?: Availability.RegionsPerPlan;
 }
 
 export namespace Availability {
@@ -37,7 +39,7 @@ export namespace Availability {
     /**
      * The number of tests available per plan.
      */
-    quotasPerPlan?: Record<string, number>;
+    quotasPerPlan?: Quota.QuotasPerPlan;
 
     /**
      * The number of remaining schedules available.
@@ -52,7 +54,72 @@ export namespace Availability {
     /**
      * The number of schedules available per plan.
      */
-    scheduleQuotasPerPlan?: Record<string, number>;
+    scheduleQuotasPerPlan?: Quota.ScheduleQuotasPerPlan;
+  }
+
+  export namespace Quota {
+    /**
+     * The number of tests available per plan.
+     */
+    export interface QuotasPerPlan {
+      /**
+       * Counts per account plan.
+       */
+      value?: QuotasPerPlan.Value;
+    }
+
+    export namespace QuotasPerPlan {
+      /**
+       * Counts per account plan.
+       */
+      export interface Value {
+        business?: number;
+
+        enterprise?: number;
+
+        free?: number;
+
+        pro?: number;
+      }
+    }
+
+    /**
+     * The number of schedules available per plan.
+     */
+    export interface ScheduleQuotasPerPlan {
+      /**
+       * Counts per account plan.
+       */
+      value?: ScheduleQuotasPerPlan.Value;
+    }
+
+    export namespace ScheduleQuotasPerPlan {
+      /**
+       * Counts per account plan.
+       */
+      export interface Value {
+        business?: number;
+
+        enterprise?: number;
+
+        free?: number;
+
+        pro?: number;
+      }
+    }
+  }
+
+  /**
+   * Available regions.
+   */
+  export interface RegionsPerPlan {
+    business?: Array<SpeedAPI.LabeledRegion>;
+
+    enterprise?: Array<SpeedAPI.LabeledRegion>;
+
+    free?: Array<SpeedAPI.LabeledRegion>;
+
+    pro?: Array<SpeedAPI.LabeledRegion>;
   }
 }
 
@@ -63,7 +130,6 @@ export interface AvailabilityListParams {
   zone_id: string;
 }
 
-export namespace Availabilities {
-  export import Availability = AvailabilitiesAPI.Availability;
-  export import AvailabilityListParams = AvailabilitiesAPI.AvailabilityListParams;
+export declare namespace Availabilities {
+  export { type Availability as Availability, type AvailabilityListParams as AvailabilityListParams };
 }
diff --git a/src/resources/speed/index.ts b/src/resources/speed/index.ts
index 8ec4511be4..d0fdfe4e77 100644
--- a/src/resources/speed/index.ts
+++ b/src/resources/speed/index.ts
@@ -1,20 +1,20 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { Availability, AvailabilityListParams, Availabilities } from './availabilities';
+export { Availabilities, type Availability, type AvailabilityListParams } from './availabilities';
 export {
-  PageListResponse,
-  PageListParams,
-  PageTrendParams,
   PageListResponsesSinglePage,
   Pages,
+  type PageListResponse,
+  type PageListParams,
+  type PageTrendParams,
 } from './pages/index';
 export {
-  Schedule,
-  ScheduleCreateResponse,
-  ScheduleDeleteResponse,
-  ScheduleCreateParams,
-  ScheduleDeleteParams,
-  ScheduleGetParams,
   ScheduleResource,
+  type Schedule,
+  type ScheduleCreateResponse,
+  type ScheduleDeleteResponse,
+  type ScheduleCreateParams,
+  type ScheduleDeleteParams,
+  type ScheduleGetParams,
 } from './schedule';
 export { Speed } from './speed';
diff --git a/src/resources/speed/pages/index.ts b/src/resources/speed/pages/index.ts
index 670d3863fe..2b68fb9b92 100644
--- a/src/resources/speed/pages/index.ts
+++ b/src/resources/speed/pages/index.ts
@@ -1,19 +1,19 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  PageListResponse,
-  PageListParams,
-  PageTrendParams,
   PageListResponsesSinglePage,
   Pages,
+  type PageListResponse,
+  type PageListParams,
+  type PageTrendParams,
 } from './pages';
 export {
-  Test,
-  TestListResponse,
-  TestDeleteResponse,
-  TestCreateParams,
-  TestListParams,
-  TestDeleteParams,
-  TestGetParams,
+  TestsV4PagePaginationArray,
   Tests,
+  type Test,
+  type TestDeleteResponse,
+  type TestCreateParams,
+  type TestListParams,
+  type TestDeleteParams,
+  type TestGetParams,
 } from './tests';
diff --git a/src/resources/speed/pages/pages.ts b/src/resources/speed/pages/pages.ts
index 218cf99607..35c4684dba 100644
--- a/src/resources/speed/pages/pages.ts
+++ b/src/resources/speed/pages/pages.ts
@@ -2,9 +2,18 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as PagesAPI from './pages';
 import * as SpeedAPI from '../speed';
 import * as TestsAPI from './tests';
+import {
+  Test,
+  TestCreateParams,
+  TestDeleteParams,
+  TestDeleteResponse,
+  TestGetParams,
+  TestListParams,
+  Tests,
+  TestsV4PagePaginationArray,
+} from './tests';
 import { SinglePage } from '../../../pagination';
 
 export class Pages extends APIResource {
@@ -125,17 +134,26 @@ export interface PageTrendParams {
   end?: string;
 }
 
-export namespace Pages {
-  export import PageListResponse = PagesAPI.PageListResponse;
-  export import PageListResponsesSinglePage = PagesAPI.PageListResponsesSinglePage;
-  export import PageListParams = PagesAPI.PageListParams;
-  export import PageTrendParams = PagesAPI.PageTrendParams;
-  export import Tests = TestsAPI.Tests;
-  export import Test = TestsAPI.Test;
-  export import TestListResponse = TestsAPI.TestListResponse;
-  export import TestDeleteResponse = TestsAPI.TestDeleteResponse;
-  export import TestCreateParams = TestsAPI.TestCreateParams;
-  export import TestListParams = TestsAPI.TestListParams;
-  export import TestDeleteParams = TestsAPI.TestDeleteParams;
-  export import TestGetParams = TestsAPI.TestGetParams;
+Pages.PageListResponsesSinglePage = PageListResponsesSinglePage;
+Pages.Tests = Tests;
+Pages.TestsV4PagePaginationArray = TestsV4PagePaginationArray;
+
+export declare namespace Pages {
+  export {
+    type PageListResponse as PageListResponse,
+    PageListResponsesSinglePage as PageListResponsesSinglePage,
+    type PageListParams as PageListParams,
+    type PageTrendParams as PageTrendParams,
+  };
+
+  export {
+    Tests as Tests,
+    type Test as Test,
+    type TestDeleteResponse as TestDeleteResponse,
+    TestsV4PagePaginationArray as TestsV4PagePaginationArray,
+    type TestCreateParams as TestCreateParams,
+    type TestListParams as TestListParams,
+    type TestDeleteParams as TestDeleteParams,
+    type TestGetParams as TestGetParams,
+  };
 }
diff --git a/src/resources/speed/pages/tests.ts b/src/resources/speed/pages/tests.ts
index fe4fe4708e..2dcbfca15e 100644
--- a/src/resources/speed/pages/tests.ts
+++ b/src/resources/speed/pages/tests.ts
@@ -2,9 +2,8 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as TestsAPI from './tests';
-import * as Shared from '../../shared';
 import * as SpeedAPI from '../speed';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class Tests extends APIResource {
   /**
@@ -27,9 +26,13 @@ export class Tests extends APIResource {
     url: string,
     params: TestListParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<TestListResponse> {
+  ): Core.PagePromise<TestsV4PagePaginationArray, Test> {
     const { zone_id, ...query } = params;
-    return this._client.get(`/zones/${zone_id}/speed_api/pages/${url}/tests`, { query, ...options });
+    return this._client.getAPIList(
+      `/zones/${zone_id}/speed_api/pages/${url}/tests`,
+      TestsV4PagePaginationArray,
+      { query, ...options },
+    );
   }
 
   /**
@@ -69,6 +72,8 @@ export class Tests extends APIResource {
   }
 }
 
+export class TestsV4PagePaginationArray extends V4PagePaginationArray<Test> {}
+
 export interface Test {
   /**
    * UUID
@@ -103,31 +108,6 @@ export interface Test {
   url?: string;
 }
 
-export interface TestListResponse {
-  errors: Array<Shared.ResponseInfo>;
-
-  messages: Array<Shared.ResponseInfo>;
-
-  /**
-   * Whether the API call was successful.
-   */
-  success: boolean;
-
-  result_info?: TestListResponse.ResultInfo;
-}
-
-export namespace TestListResponse {
-  export interface ResultInfo {
-    count?: number;
-
-    page?: number;
-
-    per_page?: number;
-
-    total_count?: number;
-  }
-}
-
 export interface TestDeleteResponse {
   /**
    * Number of items affected.
@@ -168,22 +148,12 @@ export interface TestCreateParams {
     | 'us-west1';
 }
 
-export interface TestListParams {
+export interface TestListParams extends V4PagePaginationArrayParams {
   /**
    * Path param: Identifier
    */
   zone_id: string;
 
-  /**
-   * Query param:
-   */
-  page?: number;
-
-  /**
-   * Query param:
-   */
-  per_page?: number;
-
   /**
    * Query param: A test region.
    */
@@ -251,12 +221,16 @@ export interface TestGetParams {
   zone_id: string;
 }
 
-export namespace Tests {
-  export import Test = TestsAPI.Test;
-  export import TestListResponse = TestsAPI.TestListResponse;
-  export import TestDeleteResponse = TestsAPI.TestDeleteResponse;
-  export import TestCreateParams = TestsAPI.TestCreateParams;
-  export import TestListParams = TestsAPI.TestListParams;
-  export import TestDeleteParams = TestsAPI.TestDeleteParams;
-  export import TestGetParams = TestsAPI.TestGetParams;
+Tests.TestsV4PagePaginationArray = TestsV4PagePaginationArray;
+
+export declare namespace Tests {
+  export {
+    type Test as Test,
+    type TestDeleteResponse as TestDeleteResponse,
+    TestsV4PagePaginationArray as TestsV4PagePaginationArray,
+    type TestCreateParams as TestCreateParams,
+    type TestListParams as TestListParams,
+    type TestDeleteParams as TestDeleteParams,
+    type TestGetParams as TestGetParams,
+  };
 }
diff --git a/src/resources/speed/schedule.ts b/src/resources/speed/schedule.ts
index 49de866f2b..55aba278ad 100644
--- a/src/resources/speed/schedule.ts
+++ b/src/resources/speed/schedule.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ScheduleAPI from './schedule';
 import * as TestsAPI from './pages/tests';
 
 export class ScheduleResource extends APIResource {
@@ -210,11 +209,13 @@ export interface ScheduleGetParams {
     | 'us-west1';
 }
 
-export namespace ScheduleResource {
-  export import Schedule = ScheduleAPI.Schedule;
-  export import ScheduleCreateResponse = ScheduleAPI.ScheduleCreateResponse;
-  export import ScheduleDeleteResponse = ScheduleAPI.ScheduleDeleteResponse;
-  export import ScheduleCreateParams = ScheduleAPI.ScheduleCreateParams;
-  export import ScheduleDeleteParams = ScheduleAPI.ScheduleDeleteParams;
-  export import ScheduleGetParams = ScheduleAPI.ScheduleGetParams;
+export declare namespace ScheduleResource {
+  export {
+    type Schedule as Schedule,
+    type ScheduleCreateResponse as ScheduleCreateResponse,
+    type ScheduleDeleteResponse as ScheduleDeleteResponse,
+    type ScheduleCreateParams as ScheduleCreateParams,
+    type ScheduleDeleteParams as ScheduleDeleteParams,
+    type ScheduleGetParams as ScheduleGetParams,
+  };
 }
diff --git a/src/resources/speed/speed.ts b/src/resources/speed/speed.ts
index a4c930f26e..15067dd816 100644
--- a/src/resources/speed/speed.ts
+++ b/src/resources/speed/speed.ts
@@ -2,8 +2,25 @@
 
 import { APIResource } from '../../resource';
 import * as AvailabilitiesAPI from './availabilities';
+import { Availabilities, Availability, AvailabilityListParams } from './availabilities';
 import * as ScheduleAPI from './schedule';
+import {
+  Schedule,
+  ScheduleCreateParams,
+  ScheduleCreateResponse,
+  ScheduleDeleteParams,
+  ScheduleDeleteResponse,
+  ScheduleGetParams,
+  ScheduleResource,
+} from './schedule';
 import * as PagesAPI from './pages/pages';
+import {
+  PageListParams,
+  PageListResponse,
+  PageListResponsesSinglePage,
+  PageTrendParams,
+  Pages,
+} from './pages/pages';
 
 export class Speed extends APIResource {
   schedule: ScheduleAPI.ScheduleResource = new ScheduleAPI.ScheduleResource(this._client);
@@ -167,20 +184,33 @@ export interface Trend {
   tti?: Array<number | null>;
 }
 
-export namespace Speed {
-  export import ScheduleResource = ScheduleAPI.ScheduleResource;
-  export import Schedule = ScheduleAPI.Schedule;
-  export import ScheduleCreateResponse = ScheduleAPI.ScheduleCreateResponse;
-  export import ScheduleDeleteResponse = ScheduleAPI.ScheduleDeleteResponse;
-  export import ScheduleCreateParams = ScheduleAPI.ScheduleCreateParams;
-  export import ScheduleDeleteParams = ScheduleAPI.ScheduleDeleteParams;
-  export import ScheduleGetParams = ScheduleAPI.ScheduleGetParams;
-  export import Availabilities = AvailabilitiesAPI.Availabilities;
-  export import Availability = AvailabilitiesAPI.Availability;
-  export import AvailabilityListParams = AvailabilitiesAPI.AvailabilityListParams;
-  export import Pages = PagesAPI.Pages;
-  export import PageListResponse = PagesAPI.PageListResponse;
-  export import PageListResponsesSinglePage = PagesAPI.PageListResponsesSinglePage;
-  export import PageListParams = PagesAPI.PageListParams;
-  export import PageTrendParams = PagesAPI.PageTrendParams;
+Speed.ScheduleResource = ScheduleResource;
+Speed.Availabilities = Availabilities;
+Speed.Pages = Pages;
+Speed.PageListResponsesSinglePage = PageListResponsesSinglePage;
+
+export declare namespace Speed {
+  export {
+    ScheduleResource as ScheduleResource,
+    type Schedule as Schedule,
+    type ScheduleCreateResponse as ScheduleCreateResponse,
+    type ScheduleDeleteResponse as ScheduleDeleteResponse,
+    type ScheduleCreateParams as ScheduleCreateParams,
+    type ScheduleDeleteParams as ScheduleDeleteParams,
+    type ScheduleGetParams as ScheduleGetParams,
+  };
+
+  export {
+    Availabilities as Availabilities,
+    type Availability as Availability,
+    type AvailabilityListParams as AvailabilityListParams,
+  };
+
+  export {
+    Pages as Pages,
+    type PageListResponse as PageListResponse,
+    PageListResponsesSinglePage as PageListResponsesSinglePage,
+    type PageListParams as PageListParams,
+    type PageTrendParams as PageTrendParams,
+  };
 }
diff --git a/src/resources/ssl/analyze.ts b/src/resources/ssl/analyze.ts
index 6028577546..fe1ab850e1 100644
--- a/src/resources/ssl/analyze.ts
+++ b/src/resources/ssl/analyze.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as AnalyzeAPI from './analyze';
 import * as CustomHostnamesAPI from '../custom-hostnames/custom-hostnames';
 
 export class Analyze extends APIResource {
@@ -20,7 +19,7 @@ export class Analyze extends APIResource {
   }
 }
 
-export type AnalyzeCreateResponse = unknown | string | null;
+export type AnalyzeCreateResponse = unknown;
 
 export interface AnalyzeCreateParams {
   /**
@@ -42,7 +41,9 @@ export interface AnalyzeCreateParams {
   certificate?: string;
 }
 
-export namespace Analyze {
-  export import AnalyzeCreateResponse = AnalyzeAPI.AnalyzeCreateResponse;
-  export import AnalyzeCreateParams = AnalyzeAPI.AnalyzeCreateParams;
+export declare namespace Analyze {
+  export {
+    type AnalyzeCreateResponse as AnalyzeCreateResponse,
+    type AnalyzeCreateParams as AnalyzeCreateParams,
+  };
 }
diff --git a/src/resources/ssl/certificate-packs/certificate-packs.ts b/src/resources/ssl/certificate-packs/certificate-packs.ts
index 5fde94b931..58c94ba795 100644
--- a/src/resources/ssl/certificate-packs/certificate-packs.ts
+++ b/src/resources/ssl/certificate-packs/certificate-packs.ts
@@ -2,15 +2,29 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as CertificatePacksAPI from './certificate-packs';
-import * as OrderAPI from './order';
 import * as QuotaAPI from './quota';
+import { Quota, QuotaGetParams, QuotaGetResponse } from './quota';
 import { SinglePage } from '../../../pagination';
 
 export class CertificatePacks extends APIResource {
-  order: OrderAPI.Order = new OrderAPI.Order(this._client);
   quota: QuotaAPI.Quota = new QuotaAPI.Quota(this._client);
 
+  /**
+   * For a given zone, order an advanced certificate pack.
+   */
+  create(
+    params: CertificatePackCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CertificatePackCreateResponse> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.post(`/zones/${zone_id}/ssl/certificate_packs/order`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: CertificatePackCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * For a given zone, list all active certificate packs.
    */
@@ -44,19 +58,19 @@ export class CertificatePacks extends APIResource {
   }
 
   /**
-   * For a given zone, restart validation for an advanced certificate pack. This is
-   * only a validation operation for a Certificate Pack in a validation_timed_out
-   * status.
+   * For a given zone, restart validation or add cloudflare branding for an advanced
+   * certificate pack. The former is only a validation operation for a Certificate
+   * Pack in a validation_timed_out status.
    */
   edit(
     certificatePackId: string,
     params: CertificatePackEditParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<CertificatePackEditResponse> {
-    const { zone_id, body } = params;
+    const { zone_id, ...body } = params;
     return (
       this._client.patch(`/zones/${zone_id}/ssl/certificate_packs/${certificatePackId}`, {
-        body: body,
+        body,
         ...options,
       }) as Core.APIPromise<{ result: CertificatePackEditResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -127,6 +141,52 @@ export type Status =
  */
 export type ValidationMethod = 'http' | 'cname' | 'txt';
 
+export interface CertificatePackCreateResponse {
+  /**
+   * Identifier
+   */
+  id?: string;
+
+  /**
+   * Certificate Authority selected for the order. For information on any certificate
+   * authority specific details or restrictions
+   * [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
+   */
+  certificate_authority?: 'google' | 'lets_encrypt' | 'ssl_com';
+
+  /**
+   * Whether or not to add Cloudflare Branding for the order. This will add a
+   * subdomain of sni.cloudflaressl.com as the Common Name if set to true.
+   */
+  cloudflare_branding?: boolean;
+
+  /**
+   * Comma separated list of valid host names for the certificate packs. Must contain
+   * the zone apex, may not contain more than 50 hosts, and may not be empty.
+   */
+  hosts?: Array<Host>;
+
+  /**
+   * Status of certificate pack.
+   */
+  status?: Status;
+
+  /**
+   * Type of certificate pack.
+   */
+  type?: 'advanced';
+
+  /**
+   * Validation Method selected for the order.
+   */
+  validation_method?: 'txt' | 'http' | 'email';
+
+  /**
+   * Validity Days selected for the order.
+   */
+  validity_days?: 14 | 30 | 90 | 365;
+}
+
 export type CertificatePackListResponse = unknown;
 
 export interface CertificatePackDeleteResponse {
@@ -147,11 +207,11 @@ export interface CertificatePackEditResponse {
    * authority specific details or restrictions
    * [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
    */
-  certificate_authority?: 'google' | 'lets_encrypt';
+  certificate_authority?: 'google' | 'lets_encrypt' | 'ssl_com';
 
   /**
-   * Whether or not to add Cloudflare Branding for the order. This will add
-   * sni.cloudflaressl.com as the Common Name if set true.
+   * Whether or not to add Cloudflare Branding for the order. This will add a
+   * subdomain of sni.cloudflaressl.com as the Common Name if set to true.
    */
   cloudflare_branding?: boolean;
 
@@ -182,7 +242,49 @@ export interface CertificatePackEditResponse {
   validity_days?: 14 | 30 | 90 | 365;
 }
 
-export type CertificatePackGetResponse = unknown | string | null;
+export type CertificatePackGetResponse = unknown;
+
+export interface CertificatePackCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: Certificate Authority selected for the order. For information on any
+   * certificate authority specific details or restrictions
+   * [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
+   */
+  certificate_authority: 'google' | 'lets_encrypt' | 'ssl_com';
+
+  /**
+   * Body param: Comma separated list of valid host names for the certificate packs.
+   * Must contain the zone apex, may not contain more than 50 hosts, and may not be
+   * empty.
+   */
+  hosts: Array<HostParam>;
+
+  /**
+   * Body param: Type of certificate pack.
+   */
+  type: 'advanced';
+
+  /**
+   * Body param: Validation Method selected for the order.
+   */
+  validation_method: 'txt' | 'http' | 'email';
+
+  /**
+   * Body param: Validity Days selected for the order.
+   */
+  validity_days: 14 | 30 | 90 | 365;
+
+  /**
+   * Body param: Whether or not to add Cloudflare Branding for the order. This will
+   * add a subdomain of sni.cloudflaressl.com as the Common Name if set to true.
+   */
+  cloudflare_branding?: boolean;
+}
 
 export interface CertificatePackListParams {
   /**
@@ -210,9 +312,10 @@ export interface CertificatePackEditParams {
   zone_id: string;
 
   /**
-   * Body param:
+   * Body param: Whether or not to add Cloudflare Branding for the order. This will
+   * add a subdomain of sni.cloudflaressl.com as the Common Name if set to true.
    */
-  body: unknown;
+  cloudflare_branding?: boolean;
 }
 
 export interface CertificatePackGetParams {
@@ -222,24 +325,27 @@ export interface CertificatePackGetParams {
   zone_id: string;
 }
 
-export namespace CertificatePacks {
-  export import Host = CertificatePacksAPI.Host;
-  export import RequestValidity = CertificatePacksAPI.RequestValidity;
-  export import Status = CertificatePacksAPI.Status;
-  export import ValidationMethod = CertificatePacksAPI.ValidationMethod;
-  export import CertificatePackListResponse = CertificatePacksAPI.CertificatePackListResponse;
-  export import CertificatePackDeleteResponse = CertificatePacksAPI.CertificatePackDeleteResponse;
-  export import CertificatePackEditResponse = CertificatePacksAPI.CertificatePackEditResponse;
-  export import CertificatePackGetResponse = CertificatePacksAPI.CertificatePackGetResponse;
-  export import CertificatePackListResponsesSinglePage = CertificatePacksAPI.CertificatePackListResponsesSinglePage;
-  export import CertificatePackListParams = CertificatePacksAPI.CertificatePackListParams;
-  export import CertificatePackDeleteParams = CertificatePacksAPI.CertificatePackDeleteParams;
-  export import CertificatePackEditParams = CertificatePacksAPI.CertificatePackEditParams;
-  export import CertificatePackGetParams = CertificatePacksAPI.CertificatePackGetParams;
-  export import Order = OrderAPI.Order;
-  export import OrderCreateResponse = OrderAPI.OrderCreateResponse;
-  export import OrderCreateParams = OrderAPI.OrderCreateParams;
-  export import Quota = QuotaAPI.Quota;
-  export import QuotaGetResponse = QuotaAPI.QuotaGetResponse;
-  export import QuotaGetParams = QuotaAPI.QuotaGetParams;
+CertificatePacks.CertificatePackListResponsesSinglePage = CertificatePackListResponsesSinglePage;
+CertificatePacks.Quota = Quota;
+
+export declare namespace CertificatePacks {
+  export {
+    type Host as Host,
+    type RequestValidity as RequestValidity,
+    type Status as Status,
+    type ValidationMethod as ValidationMethod,
+    type CertificatePackCreateResponse as CertificatePackCreateResponse,
+    type CertificatePackListResponse as CertificatePackListResponse,
+    type CertificatePackDeleteResponse as CertificatePackDeleteResponse,
+    type CertificatePackEditResponse as CertificatePackEditResponse,
+    type CertificatePackGetResponse as CertificatePackGetResponse,
+    CertificatePackListResponsesSinglePage as CertificatePackListResponsesSinglePage,
+    type CertificatePackCreateParams as CertificatePackCreateParams,
+    type CertificatePackListParams as CertificatePackListParams,
+    type CertificatePackDeleteParams as CertificatePackDeleteParams,
+    type CertificatePackEditParams as CertificatePackEditParams,
+    type CertificatePackGetParams as CertificatePackGetParams,
+  };
+
+  export { Quota as Quota, type QuotaGetResponse as QuotaGetResponse, type QuotaGetParams as QuotaGetParams };
 }
diff --git a/src/resources/ssl/certificate-packs/index.ts b/src/resources/ssl/certificate-packs/index.ts
index d2ba8a3596..78584a384f 100644
--- a/src/resources/ssl/certificate-packs/index.ts
+++ b/src/resources/ssl/certificate-packs/index.ts
@@ -1,20 +1,21 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Host,
-  RequestValidity,
-  Status,
-  ValidationMethod,
-  CertificatePackListResponse,
-  CertificatePackDeleteResponse,
-  CertificatePackEditResponse,
-  CertificatePackGetResponse,
-  CertificatePackListParams,
-  CertificatePackDeleteParams,
-  CertificatePackEditParams,
-  CertificatePackGetParams,
   CertificatePackListResponsesSinglePage,
   CertificatePacks,
+  type Host,
+  type RequestValidity,
+  type Status,
+  type ValidationMethod,
+  type CertificatePackCreateResponse,
+  type CertificatePackListResponse,
+  type CertificatePackDeleteResponse,
+  type CertificatePackEditResponse,
+  type CertificatePackGetResponse,
+  type CertificatePackCreateParams,
+  type CertificatePackListParams,
+  type CertificatePackDeleteParams,
+  type CertificatePackEditParams,
+  type CertificatePackGetParams,
 } from './certificate-packs';
-export { OrderCreateResponse, OrderCreateParams, Order } from './order';
-export { QuotaGetResponse, QuotaGetParams, Quota } from './quota';
+export { Quota, type QuotaGetResponse, type QuotaGetParams } from './quota';
diff --git a/src/resources/ssl/certificate-packs/order.ts b/src/resources/ssl/certificate-packs/order.ts
deleted file mode 100644
index 894341ce70..0000000000
--- a/src/resources/ssl/certificate-packs/order.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../resource';
-import * as Core from '../../../core';
-import * as OrderAPI from './order';
-import * as CertificatePacksAPI from './certificate-packs';
-
-export class Order extends APIResource {
-  /**
-   * For a given zone, order an advanced certificate pack.
-   */
-  create(params: OrderCreateParams, options?: Core.RequestOptions): Core.APIPromise<OrderCreateResponse> {
-    const { zone_id, ...body } = params;
-    return (
-      this._client.post(`/zones/${zone_id}/ssl/certificate_packs/order`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: OrderCreateResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export interface OrderCreateResponse {
-  /**
-   * Identifier
-   */
-  id?: string;
-
-  /**
-   * Certificate Authority selected for the order. For information on any certificate
-   * authority specific details or restrictions
-   * [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
-   */
-  certificate_authority?: 'google' | 'lets_encrypt';
-
-  /**
-   * Whether or not to add Cloudflare Branding for the order. This will add
-   * sni.cloudflaressl.com as the Common Name if set true.
-   */
-  cloudflare_branding?: boolean;
-
-  /**
-   * Comma separated list of valid host names for the certificate packs. Must contain
-   * the zone apex, may not contain more than 50 hosts, and may not be empty.
-   */
-  hosts?: Array<CertificatePacksAPI.Host>;
-
-  /**
-   * Status of certificate pack.
-   */
-  status?: CertificatePacksAPI.Status;
-
-  /**
-   * Type of certificate pack.
-   */
-  type?: 'advanced';
-
-  /**
-   * Validation Method selected for the order.
-   */
-  validation_method?: 'txt' | 'http' | 'email';
-
-  /**
-   * Validity Days selected for the order.
-   */
-  validity_days?: 14 | 30 | 90 | 365;
-}
-
-export interface OrderCreateParams {
-  /**
-   * Path param: Identifier
-   */
-  zone_id: string;
-
-  /**
-   * Body param: Certificate Authority selected for the order. For information on any
-   * certificate authority specific details or restrictions
-   * [see this page for more details.](https://developers.cloudflare.com/ssl/reference/certificate-authorities)
-   */
-  certificate_authority: 'google' | 'lets_encrypt';
-
-  /**
-   * Body param: Comma separated list of valid host names for the certificate packs.
-   * Must contain the zone apex, may not contain more than 50 hosts, and may not be
-   * empty.
-   */
-  hosts: Array<CertificatePacksAPI.HostParam>;
-
-  /**
-   * Body param: Type of certificate pack.
-   */
-  type: 'advanced';
-
-  /**
-   * Body param: Validation Method selected for the order.
-   */
-  validation_method: 'txt' | 'http' | 'email';
-
-  /**
-   * Body param: Validity Days selected for the order.
-   */
-  validity_days: 14 | 30 | 90 | 365;
-
-  /**
-   * Body param: Whether or not to add Cloudflare Branding for the order. This will
-   * add sni.cloudflaressl.com as the Common Name if set true.
-   */
-  cloudflare_branding?: boolean;
-}
-
-export namespace Order {
-  export import OrderCreateResponse = OrderAPI.OrderCreateResponse;
-  export import OrderCreateParams = OrderAPI.OrderCreateParams;
-}
diff --git a/src/resources/ssl/certificate-packs/quota.ts b/src/resources/ssl/certificate-packs/quota.ts
index 3eb67e5315..206f628361 100644
--- a/src/resources/ssl/certificate-packs/quota.ts
+++ b/src/resources/ssl/certificate-packs/quota.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as QuotaAPI from './quota';
 
 export class Quota extends APIResource {
   /**
@@ -43,7 +42,6 @@ export interface QuotaGetParams {
   zone_id: string;
 }
 
-export namespace Quota {
-  export import QuotaGetResponse = QuotaAPI.QuotaGetResponse;
-  export import QuotaGetParams = QuotaAPI.QuotaGetParams;
+export declare namespace Quota {
+  export { type QuotaGetResponse as QuotaGetResponse, type QuotaGetParams as QuotaGetParams };
 }
diff --git a/src/resources/ssl/index.ts b/src/resources/ssl/index.ts
index 65df5f4166..84bfc662a2 100644
--- a/src/resources/ssl/index.ts
+++ b/src/resources/ssl/index.ts
@@ -1,30 +1,32 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { AnalyzeCreateResponse, AnalyzeCreateParams, Analyze } from './analyze';
+export { Analyze, type AnalyzeCreateResponse, type AnalyzeCreateParams } from './analyze';
 export {
-  Host,
-  RequestValidity,
-  Status,
-  ValidationMethod,
-  CertificatePackListResponse,
-  CertificatePackDeleteResponse,
-  CertificatePackEditResponse,
-  CertificatePackGetResponse,
-  CertificatePackListParams,
-  CertificatePackDeleteParams,
-  CertificatePackEditParams,
-  CertificatePackGetParams,
   CertificatePackListResponsesSinglePage,
   CertificatePacks,
+  type Host,
+  type RequestValidity,
+  type Status,
+  type ValidationMethod,
+  type CertificatePackCreateResponse,
+  type CertificatePackListResponse,
+  type CertificatePackDeleteResponse,
+  type CertificatePackEditResponse,
+  type CertificatePackGetResponse,
+  type CertificatePackCreateParams,
+  type CertificatePackListParams,
+  type CertificatePackDeleteParams,
+  type CertificatePackEditParams,
+  type CertificatePackGetParams,
 } from './certificate-packs/index';
-export { RecommendationGetResponse, Recommendations } from './recommendations';
+export { Recommendations, type RecommendationGetResponse } from './recommendations';
 export { SSL } from './ssl';
 export { Universal } from './universal/index';
 export {
-  Verification,
-  VerificationEditResponse,
-  VerificationGetResponse,
-  VerificationEditParams,
-  VerificationGetParams,
   VerificationResource,
+  type Verification,
+  type VerificationEditResponse,
+  type VerificationGetResponse,
+  type VerificationEditParams,
+  type VerificationGetParams,
 } from './verification';
diff --git a/src/resources/ssl/recommendations.ts b/src/resources/ssl/recommendations.ts
index 5de8755659..18d2f55971 100644
--- a/src/resources/ssl/recommendations.ts
+++ b/src/resources/ssl/recommendations.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as RecommendationsAPI from './recommendations';
 
 export class Recommendations extends APIResource {
   /**
@@ -31,6 +30,6 @@ export interface RecommendationGetResponse {
   value?: 'flexible' | 'full' | 'strict';
 }
 
-export namespace Recommendations {
-  export import RecommendationGetResponse = RecommendationsAPI.RecommendationGetResponse;
+export declare namespace Recommendations {
+  export { type RecommendationGetResponse as RecommendationGetResponse };
 }
diff --git a/src/resources/ssl/ssl.ts b/src/resources/ssl/ssl.ts
index f0b563ed37..ca01db919c 100644
--- a/src/resources/ssl/ssl.ts
+++ b/src/resources/ssl/ssl.ts
@@ -2,10 +2,39 @@
 
 import { APIResource } from '../../resource';
 import * as AnalyzeAPI from './analyze';
+import { Analyze, AnalyzeCreateParams, AnalyzeCreateResponse } from './analyze';
 import * as RecommendationsAPI from './recommendations';
+import { RecommendationGetResponse, Recommendations } from './recommendations';
 import * as VerificationAPI from './verification';
+import {
+  Verification,
+  VerificationEditParams,
+  VerificationEditResponse,
+  VerificationGetParams,
+  VerificationGetResponse,
+  VerificationResource,
+} from './verification';
 import * as CertificatePacksAPI from './certificate-packs/certificate-packs';
+import {
+  CertificatePackCreateParams,
+  CertificatePackCreateResponse,
+  CertificatePackDeleteParams,
+  CertificatePackDeleteResponse,
+  CertificatePackEditParams,
+  CertificatePackEditResponse,
+  CertificatePackGetParams,
+  CertificatePackGetResponse,
+  CertificatePackListParams,
+  CertificatePackListResponse,
+  CertificatePackListResponsesSinglePage,
+  CertificatePacks,
+  Host,
+  RequestValidity,
+  Status,
+  ValidationMethod,
+} from './certificate-packs/certificate-packs';
 import * as UniversalAPI from './universal/universal';
+import { Universal } from './universal/universal';
 
 export class SSL extends APIResource {
   analyze: AnalyzeAPI.Analyze = new AnalyzeAPI.Analyze(this._client);
@@ -17,31 +46,49 @@ export class SSL extends APIResource {
   verification: VerificationAPI.VerificationResource = new VerificationAPI.VerificationResource(this._client);
 }
 
-export namespace SSL {
-  export import Analyze = AnalyzeAPI.Analyze;
-  export import AnalyzeCreateResponse = AnalyzeAPI.AnalyzeCreateResponse;
-  export import AnalyzeCreateParams = AnalyzeAPI.AnalyzeCreateParams;
-  export import CertificatePacks = CertificatePacksAPI.CertificatePacks;
-  export import Host = CertificatePacksAPI.Host;
-  export import RequestValidity = CertificatePacksAPI.RequestValidity;
-  export import Status = CertificatePacksAPI.Status;
-  export import ValidationMethod = CertificatePacksAPI.ValidationMethod;
-  export import CertificatePackListResponse = CertificatePacksAPI.CertificatePackListResponse;
-  export import CertificatePackDeleteResponse = CertificatePacksAPI.CertificatePackDeleteResponse;
-  export import CertificatePackEditResponse = CertificatePacksAPI.CertificatePackEditResponse;
-  export import CertificatePackGetResponse = CertificatePacksAPI.CertificatePackGetResponse;
-  export import CertificatePackListResponsesSinglePage = CertificatePacksAPI.CertificatePackListResponsesSinglePage;
-  export import CertificatePackListParams = CertificatePacksAPI.CertificatePackListParams;
-  export import CertificatePackDeleteParams = CertificatePacksAPI.CertificatePackDeleteParams;
-  export import CertificatePackEditParams = CertificatePacksAPI.CertificatePackEditParams;
-  export import CertificatePackGetParams = CertificatePacksAPI.CertificatePackGetParams;
-  export import Recommendations = RecommendationsAPI.Recommendations;
-  export import RecommendationGetResponse = RecommendationsAPI.RecommendationGetResponse;
-  export import Universal = UniversalAPI.Universal;
-  export import VerificationResource = VerificationAPI.VerificationResource;
-  export import Verification = VerificationAPI.Verification;
-  export import VerificationEditResponse = VerificationAPI.VerificationEditResponse;
-  export import VerificationGetResponse = VerificationAPI.VerificationGetResponse;
-  export import VerificationEditParams = VerificationAPI.VerificationEditParams;
-  export import VerificationGetParams = VerificationAPI.VerificationGetParams;
+SSL.Analyze = Analyze;
+SSL.CertificatePacks = CertificatePacks;
+SSL.CertificatePackListResponsesSinglePage = CertificatePackListResponsesSinglePage;
+SSL.Recommendations = Recommendations;
+SSL.Universal = Universal;
+SSL.VerificationResource = VerificationResource;
+
+export declare namespace SSL {
+  export {
+    Analyze as Analyze,
+    type AnalyzeCreateResponse as AnalyzeCreateResponse,
+    type AnalyzeCreateParams as AnalyzeCreateParams,
+  };
+
+  export {
+    CertificatePacks as CertificatePacks,
+    type Host as Host,
+    type RequestValidity as RequestValidity,
+    type Status as Status,
+    type ValidationMethod as ValidationMethod,
+    type CertificatePackCreateResponse as CertificatePackCreateResponse,
+    type CertificatePackListResponse as CertificatePackListResponse,
+    type CertificatePackDeleteResponse as CertificatePackDeleteResponse,
+    type CertificatePackEditResponse as CertificatePackEditResponse,
+    type CertificatePackGetResponse as CertificatePackGetResponse,
+    CertificatePackListResponsesSinglePage as CertificatePackListResponsesSinglePage,
+    type CertificatePackCreateParams as CertificatePackCreateParams,
+    type CertificatePackListParams as CertificatePackListParams,
+    type CertificatePackDeleteParams as CertificatePackDeleteParams,
+    type CertificatePackEditParams as CertificatePackEditParams,
+    type CertificatePackGetParams as CertificatePackGetParams,
+  };
+
+  export { Recommendations as Recommendations, type RecommendationGetResponse as RecommendationGetResponse };
+
+  export { Universal as Universal };
+
+  export {
+    VerificationResource as VerificationResource,
+    type Verification as Verification,
+    type VerificationEditResponse as VerificationEditResponse,
+    type VerificationGetResponse as VerificationGetResponse,
+    type VerificationEditParams as VerificationEditParams,
+    type VerificationGetParams as VerificationGetParams,
+  };
 }
diff --git a/src/resources/ssl/universal/index.ts b/src/resources/ssl/universal/index.ts
index 48571da9ae..ed26396eca 100644
--- a/src/resources/ssl/universal/index.ts
+++ b/src/resources/ssl/universal/index.ts
@@ -1,4 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export {
+  Settings,
+  type UniversalSSLSettings,
+  type SettingEditParams,
+  type SettingGetParams,
+} from './settings';
 export { Universal } from './universal';
-export { UniversalSSLSettings, SettingEditParams, SettingGetParams, Settings } from './settings';
diff --git a/src/resources/ssl/universal/settings.ts b/src/resources/ssl/universal/settings.ts
index 6f46c80431..5de5ae0034 100644
--- a/src/resources/ssl/universal/settings.ts
+++ b/src/resources/ssl/universal/settings.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as SettingsAPI from './settings';
 
 export class Settings extends APIResource {
   /**
@@ -105,8 +104,10 @@ export interface SettingGetParams {
   zone_id: string;
 }
 
-export namespace Settings {
-  export import UniversalSSLSettings = SettingsAPI.UniversalSSLSettings;
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
+export declare namespace Settings {
+  export {
+    type UniversalSSLSettings as UniversalSSLSettings,
+    type SettingEditParams as SettingEditParams,
+    type SettingGetParams as SettingGetParams,
+  };
 }
diff --git a/src/resources/ssl/universal/universal.ts b/src/resources/ssl/universal/universal.ts
index 6d2db0ea1b..92576ff69b 100644
--- a/src/resources/ssl/universal/universal.ts
+++ b/src/resources/ssl/universal/universal.ts
@@ -2,14 +2,19 @@
 
 import { APIResource } from '../../../resource';
 import * as SettingsAPI from './settings';
+import { SettingEditParams, SettingGetParams, Settings, UniversalSSLSettings } from './settings';
 
 export class Universal extends APIResource {
   settings: SettingsAPI.Settings = new SettingsAPI.Settings(this._client);
 }
 
-export namespace Universal {
-  export import Settings = SettingsAPI.Settings;
-  export import UniversalSSLSettings = SettingsAPI.UniversalSSLSettings;
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
+Universal.Settings = Settings;
+
+export declare namespace Universal {
+  export {
+    Settings as Settings,
+    type UniversalSSLSettings as UniversalSSLSettings,
+    type SettingEditParams as SettingEditParams,
+    type SettingGetParams as SettingGetParams,
+  };
 }
diff --git a/src/resources/ssl/verification.ts b/src/resources/ssl/verification.ts
index d54f7f6745..70b4c0495d 100644
--- a/src/resources/ssl/verification.ts
+++ b/src/resources/ssl/verification.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as VerificationAPI from './verification';
 import * as CertificatePacksAPI from './certificate-packs/certificate-packs';
 
 export class VerificationResource extends APIResource {
@@ -147,10 +146,12 @@ export interface VerificationGetParams {
   retry?: true;
 }
 
-export namespace VerificationResource {
-  export import Verification = VerificationAPI.Verification;
-  export import VerificationEditResponse = VerificationAPI.VerificationEditResponse;
-  export import VerificationGetResponse = VerificationAPI.VerificationGetResponse;
-  export import VerificationEditParams = VerificationAPI.VerificationEditParams;
-  export import VerificationGetParams = VerificationAPI.VerificationGetParams;
+export declare namespace VerificationResource {
+  export {
+    type Verification as Verification,
+    type VerificationEditResponse as VerificationEditResponse,
+    type VerificationGetResponse as VerificationGetResponse,
+    type VerificationEditParams as VerificationEditParams,
+    type VerificationGetParams as VerificationGetParams,
+  };
 }
diff --git a/src/resources/storage/index.ts b/src/resources/storage/index.ts
deleted file mode 100644
index 8509672e8d..0000000000
--- a/src/resources/storage/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { Components, Schema, AnalyticsListParams, AnalyticsStoredParams, Analytics } from './analytics';
-export { Storage } from './storage';
diff --git a/src/resources/storage/storage.ts b/src/resources/storage/storage.ts
deleted file mode 100644
index 4c8e515c96..0000000000
--- a/src/resources/storage/storage.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../resource';
-import * as AnalyticsAPI from './analytics';
-
-export class Storage extends APIResource {
-  analytics: AnalyticsAPI.Analytics = new AnalyticsAPI.Analytics(this._client);
-}
-
-export namespace Storage {
-  export import Analytics = AnalyticsAPI.Analytics;
-  export import Components = AnalyticsAPI.Components;
-  export import Schema = AnalyticsAPI.Schema;
-  export import AnalyticsListParams = AnalyticsAPI.AnalyticsListParams;
-  export import AnalyticsStoredParams = AnalyticsAPI.AnalyticsStoredParams;
-}
diff --git a/src/resources/stream/audio-tracks.ts b/src/resources/stream/audio-tracks.ts
index b3470c6cfb..9c240e5e1d 100644
--- a/src/resources/stream/audio-tracks.ts
+++ b/src/resources/stream/audio-tracks.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as AudioTracksAPI from './audio-tracks';
 
 export class AudioTracks extends APIResource {
   /**
@@ -102,7 +101,7 @@ export interface Audio {
   uid?: string;
 }
 
-export type AudioTrackDeleteResponse = unknown | string;
+export type AudioTrackDeleteResponse = string;
 
 export type AudioTrackGetResponse = Array<Audio>;
 
@@ -160,12 +159,14 @@ export interface AudioTrackGetParams {
   account_id: string;
 }
 
-export namespace AudioTracks {
-  export import Audio = AudioTracksAPI.Audio;
-  export import AudioTrackDeleteResponse = AudioTracksAPI.AudioTrackDeleteResponse;
-  export import AudioTrackGetResponse = AudioTracksAPI.AudioTrackGetResponse;
-  export import AudioTrackDeleteParams = AudioTracksAPI.AudioTrackDeleteParams;
-  export import AudioTrackCopyParams = AudioTracksAPI.AudioTrackCopyParams;
-  export import AudioTrackEditParams = AudioTracksAPI.AudioTrackEditParams;
-  export import AudioTrackGetParams = AudioTracksAPI.AudioTrackGetParams;
+export declare namespace AudioTracks {
+  export {
+    type Audio as Audio,
+    type AudioTrackDeleteResponse as AudioTrackDeleteResponse,
+    type AudioTrackGetResponse as AudioTrackGetResponse,
+    type AudioTrackDeleteParams as AudioTrackDeleteParams,
+    type AudioTrackCopyParams as AudioTrackCopyParams,
+    type AudioTrackEditParams as AudioTrackEditParams,
+    type AudioTrackGetParams as AudioTrackGetParams,
+  };
 }
diff --git a/src/resources/stream/captions/captions.ts b/src/resources/stream/captions/captions.ts
index 28130b2c23..7e06ed2830 100644
--- a/src/resources/stream/captions/captions.ts
+++ b/src/resources/stream/captions/captions.ts
@@ -2,8 +2,15 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as CaptionsAPI from './captions';
 import * as LanguageAPI from './language/language';
+import {
+  Language,
+  LanguageCreateParams,
+  LanguageDeleteParams,
+  LanguageDeleteResponse,
+  LanguageGetParams,
+  LanguageUpdateParams,
+} from './language/language';
 
 export class Captions extends APIResource {
   language: LanguageAPI.Language = new LanguageAPI.Language(this._client);
@@ -56,14 +63,21 @@ export interface CaptionGetParams {
   account_id: string;
 }
 
-export namespace Captions {
-  export import Caption = CaptionsAPI.Caption;
-  export import CaptionGetResponse = CaptionsAPI.CaptionGetResponse;
-  export import CaptionGetParams = CaptionsAPI.CaptionGetParams;
-  export import Language = LanguageAPI.Language;
-  export import LanguageDeleteResponse = LanguageAPI.LanguageDeleteResponse;
-  export import LanguageCreateParams = LanguageAPI.LanguageCreateParams;
-  export import LanguageUpdateParams = LanguageAPI.LanguageUpdateParams;
-  export import LanguageDeleteParams = LanguageAPI.LanguageDeleteParams;
-  export import LanguageGetParams = LanguageAPI.LanguageGetParams;
+Captions.Language = Language;
+
+export declare namespace Captions {
+  export {
+    type Caption as Caption,
+    type CaptionGetResponse as CaptionGetResponse,
+    type CaptionGetParams as CaptionGetParams,
+  };
+
+  export {
+    Language as Language,
+    type LanguageDeleteResponse as LanguageDeleteResponse,
+    type LanguageCreateParams as LanguageCreateParams,
+    type LanguageUpdateParams as LanguageUpdateParams,
+    type LanguageDeleteParams as LanguageDeleteParams,
+    type LanguageGetParams as LanguageGetParams,
+  };
 }
diff --git a/src/resources/stream/captions/index.ts b/src/resources/stream/captions/index.ts
index 3612dc392f..4913ba6861 100644
--- a/src/resources/stream/captions/index.ts
+++ b/src/resources/stream/captions/index.ts
@@ -1,11 +1,11 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { Caption, CaptionGetResponse, CaptionGetParams, Captions } from './captions';
+export { Captions, type Caption, type CaptionGetResponse, type CaptionGetParams } from './captions';
 export {
-  LanguageDeleteResponse,
-  LanguageCreateParams,
-  LanguageUpdateParams,
-  LanguageDeleteParams,
-  LanguageGetParams,
   Language,
+  type LanguageDeleteResponse,
+  type LanguageCreateParams,
+  type LanguageUpdateParams,
+  type LanguageDeleteParams,
+  type LanguageGetParams,
 } from './language/index';
diff --git a/src/resources/stream/captions/language/index.ts b/src/resources/stream/captions/language/index.ts
index e61c046c2a..7dd0024568 100644
--- a/src/resources/stream/captions/language/index.ts
+++ b/src/resources/stream/captions/language/index.ts
@@ -1,11 +1,11 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  LanguageDeleteResponse,
-  LanguageCreateParams,
-  LanguageUpdateParams,
-  LanguageDeleteParams,
-  LanguageGetParams,
   Language,
+  type LanguageDeleteResponse,
+  type LanguageCreateParams,
+  type LanguageUpdateParams,
+  type LanguageDeleteParams,
+  type LanguageGetParams,
 } from './language';
-export { VttGetResponse, VttGetParams, Vtt } from './vtt';
+export { Vtt, type VttGetResponse, type VttGetParams } from './vtt';
diff --git a/src/resources/stream/captions/language/language.ts b/src/resources/stream/captions/language/language.ts
index 5e52175a09..534384f68e 100644
--- a/src/resources/stream/captions/language/language.ts
+++ b/src/resources/stream/captions/language/language.ts
@@ -2,9 +2,9 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as LanguageAPI from './language';
 import * as CaptionsAPI from '../captions';
 import * as VttAPI from './vtt';
+import { Vtt, VttGetParams, VttGetResponse } from './vtt';
 
 export class Language extends APIResource {
   vtt: VttAPI.Vtt = new VttAPI.Vtt(this._client);
@@ -118,13 +118,16 @@ export interface LanguageGetParams {
   account_id: string;
 }
 
-export namespace Language {
-  export import LanguageDeleteResponse = LanguageAPI.LanguageDeleteResponse;
-  export import LanguageCreateParams = LanguageAPI.LanguageCreateParams;
-  export import LanguageUpdateParams = LanguageAPI.LanguageUpdateParams;
-  export import LanguageDeleteParams = LanguageAPI.LanguageDeleteParams;
-  export import LanguageGetParams = LanguageAPI.LanguageGetParams;
-  export import Vtt = VttAPI.Vtt;
-  export import VttGetResponse = VttAPI.VttGetResponse;
-  export import VttGetParams = VttAPI.VttGetParams;
+Language.Vtt = Vtt;
+
+export declare namespace Language {
+  export {
+    type LanguageDeleteResponse as LanguageDeleteResponse,
+    type LanguageCreateParams as LanguageCreateParams,
+    type LanguageUpdateParams as LanguageUpdateParams,
+    type LanguageDeleteParams as LanguageDeleteParams,
+    type LanguageGetParams as LanguageGetParams,
+  };
+
+  export { Vtt as Vtt, type VttGetResponse as VttGetResponse, type VttGetParams as VttGetParams };
 }
diff --git a/src/resources/stream/captions/language/vtt.ts b/src/resources/stream/captions/language/vtt.ts
index 4d4d4fd9d4..383be63f74 100644
--- a/src/resources/stream/captions/language/vtt.ts
+++ b/src/resources/stream/captions/language/vtt.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as VttAPI from './vtt';
 
 export class Vtt extends APIResource {
   /**
@@ -31,7 +30,6 @@ export interface VttGetParams {
   account_id: string;
 }
 
-export namespace Vtt {
-  export import VttGetResponse = VttAPI.VttGetResponse;
-  export import VttGetParams = VttAPI.VttGetParams;
+export declare namespace Vtt {
+  export { type VttGetResponse as VttGetResponse, type VttGetParams as VttGetParams };
 }
diff --git a/src/resources/stream/clip.ts b/src/resources/stream/clip.ts
index 6e348b738d..5fbdf439c7 100644
--- a/src/resources/stream/clip.ts
+++ b/src/resources/stream/clip.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ClipAPI from './clip';
 import * as StreamAPI from './stream';
 
 export class ClipResource extends APIResource {
@@ -193,7 +192,6 @@ export namespace ClipCreateParams {
   }
 }
 
-export namespace ClipResource {
-  export import Clip = ClipAPI.Clip;
-  export import ClipCreateParams = ClipAPI.ClipCreateParams;
+export declare namespace ClipResource {
+  export { type Clip as Clip, type ClipCreateParams as ClipCreateParams };
 }
diff --git a/src/resources/stream/copy.ts b/src/resources/stream/copy.ts
index 12d97cb0e9..6c9729dce9 100644
--- a/src/resources/stream/copy.ts
+++ b/src/resources/stream/copy.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as CopyAPI from './copy';
 import * as StreamAPI from './stream';
 
 export class Copy extends APIResource {
@@ -114,6 +113,6 @@ export namespace CopyCreateParams {
   }
 }
 
-export namespace Copy {
-  export import CopyCreateParams = CopyAPI.CopyCreateParams;
+export declare namespace Copy {
+  export { type CopyCreateParams as CopyCreateParams };
 }
diff --git a/src/resources/stream/direct-upload.ts b/src/resources/stream/direct-upload.ts
index bf11a9d420..7a53eb0121 100644
--- a/src/resources/stream/direct-upload.ts
+++ b/src/resources/stream/direct-upload.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as DirectUploadAPI from './direct-upload';
 import * as StreamAPI from './stream';
 import * as WatermarksAPI from './watermarks';
 
@@ -131,7 +130,9 @@ export namespace DirectUploadCreateParams {
   }
 }
 
-export namespace DirectUpload {
-  export import DirectUploadCreateResponse = DirectUploadAPI.DirectUploadCreateResponse;
-  export import DirectUploadCreateParams = DirectUploadAPI.DirectUploadCreateParams;
+export declare namespace DirectUpload {
+  export {
+    type DirectUploadCreateResponse as DirectUploadCreateResponse,
+    type DirectUploadCreateParams as DirectUploadCreateParams,
+  };
 }
diff --git a/src/resources/stream/downloads.ts b/src/resources/stream/downloads.ts
index 127495e4c6..6917473c94 100644
--- a/src/resources/stream/downloads.ts
+++ b/src/resources/stream/downloads.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as DownloadsAPI from './downloads';
 
 export class Downloads extends APIResource {
   /**
@@ -56,11 +55,11 @@ export class Downloads extends APIResource {
   }
 }
 
-export type DownloadCreateResponse = unknown | string | null;
+export type DownloadCreateResponse = unknown;
 
-export type DownloadDeleteResponse = unknown | string;
+export type DownloadDeleteResponse = string;
 
-export type DownloadGetResponse = unknown | string | null;
+export type DownloadGetResponse = unknown;
 
 export interface DownloadCreateParams {
   /**
@@ -88,11 +87,13 @@ export interface DownloadGetParams {
   account_id: string;
 }
 
-export namespace Downloads {
-  export import DownloadCreateResponse = DownloadsAPI.DownloadCreateResponse;
-  export import DownloadDeleteResponse = DownloadsAPI.DownloadDeleteResponse;
-  export import DownloadGetResponse = DownloadsAPI.DownloadGetResponse;
-  export import DownloadCreateParams = DownloadsAPI.DownloadCreateParams;
-  export import DownloadDeleteParams = DownloadsAPI.DownloadDeleteParams;
-  export import DownloadGetParams = DownloadsAPI.DownloadGetParams;
+export declare namespace Downloads {
+  export {
+    type DownloadCreateResponse as DownloadCreateResponse,
+    type DownloadDeleteResponse as DownloadDeleteResponse,
+    type DownloadGetResponse as DownloadGetResponse,
+    type DownloadCreateParams as DownloadCreateParams,
+    type DownloadDeleteParams as DownloadDeleteParams,
+    type DownloadGetParams as DownloadGetParams,
+  };
 }
diff --git a/src/resources/stream/embed.ts b/src/resources/stream/embed.ts
index e954c40d0f..a533536b5b 100644
--- a/src/resources/stream/embed.ts
+++ b/src/resources/stream/embed.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as EmbedAPI from './embed';
 
 export class Embed extends APIResource {
   /**
@@ -12,10 +11,7 @@ export class Embed extends APIResource {
    */
   get(identifier: string, params: EmbedGetParams, options?: Core.RequestOptions): Core.APIPromise<string> {
     const { account_id } = params;
-    return this._client.get(`/accounts/${account_id}/stream/${identifier}/embed`, {
-      ...options,
-      headers: { Accept: 'application/json', ...options?.headers },
-    });
+    return this._client.get(`/accounts/${account_id}/stream/${identifier}/embed`, options);
   }
 }
 
@@ -28,7 +24,6 @@ export interface EmbedGetParams {
   account_id: string;
 }
 
-export namespace Embed {
-  export import EmbedGetResponse = EmbedAPI.EmbedGetResponse;
-  export import EmbedGetParams = EmbedAPI.EmbedGetParams;
+export declare namespace Embed {
+  export { type EmbedGetResponse as EmbedGetResponse, type EmbedGetParams as EmbedGetParams };
 }
diff --git a/src/resources/stream/index.ts b/src/resources/stream/index.ts
index 5a5ede9df3..02eedb3b09 100644
--- a/src/resources/stream/index.ts
+++ b/src/resources/stream/index.ts
@@ -1,66 +1,70 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Audio,
-  AudioTrackDeleteResponse,
-  AudioTrackGetResponse,
-  AudioTrackDeleteParams,
-  AudioTrackCopyParams,
-  AudioTrackEditParams,
-  AudioTrackGetParams,
   AudioTracks,
+  type Audio,
+  type AudioTrackDeleteResponse,
+  type AudioTrackGetResponse,
+  type AudioTrackDeleteParams,
+  type AudioTrackCopyParams,
+  type AudioTrackEditParams,
+  type AudioTrackGetParams,
 } from './audio-tracks';
-export { Caption, CaptionGetResponse, CaptionGetParams, Captions } from './captions/index';
-export { Clip, ClipCreateParams, ClipResource } from './clip';
-export { CopyCreateParams, Copy } from './copy';
-export { DirectUploadCreateResponse, DirectUploadCreateParams, DirectUpload } from './direct-upload';
+export { Captions, type Caption, type CaptionGetResponse, type CaptionGetParams } from './captions/index';
+export { ClipResource, type Clip, type ClipCreateParams } from './clip';
+export { Copy, type CopyCreateParams } from './copy';
+export {
+  DirectUpload,
+  type DirectUploadCreateResponse,
+  type DirectUploadCreateParams,
+} from './direct-upload';
 export {
-  DownloadCreateResponse,
-  DownloadDeleteResponse,
-  DownloadGetResponse,
-  DownloadCreateParams,
-  DownloadDeleteParams,
-  DownloadGetParams,
   Downloads,
+  type DownloadCreateResponse,
+  type DownloadDeleteResponse,
+  type DownloadGetResponse,
+  type DownloadCreateParams,
+  type DownloadDeleteParams,
+  type DownloadGetParams,
 } from './downloads';
-export { EmbedGetResponse, EmbedGetParams, Embed } from './embed';
+export { Embed, type EmbedGetResponse, type EmbedGetParams } from './embed';
 export {
   Keys,
-  KeyDeleteResponse,
-  KeyGetResponse,
-  KeyCreateParams,
-  KeyDeleteParams,
-  KeyGetParams,
+  type KeyDeleteResponse,
+  type KeyGetResponse,
+  type KeyCreateParams,
+  type KeyDeleteParams,
+  type KeyGetParams,
 } from './keys';
 export {
-  LiveInput,
-  LiveInputListResponse,
-  LiveInputCreateParams,
-  LiveInputUpdateParams,
-  LiveInputListParams,
-  LiveInputDeleteParams,
-  LiveInputGetParams,
   LiveInputs,
+  type LiveInput,
+  type LiveInputListResponse,
+  type LiveInputCreateParams,
+  type LiveInputUpdateParams,
+  type LiveInputListParams,
+  type LiveInputDeleteParams,
+  type LiveInputGetParams,
 } from './live-inputs/index';
 export { Stream } from './stream';
-export { TokenCreateResponse, TokenCreateParams, Token } from './token';
-export { VideoStorageUsageResponse, VideoStorageUsageParams, Videos } from './videos';
+export { Token, type TokenCreateResponse, type TokenCreateParams } from './token';
+export { Videos, type VideoStorageUsageResponse, type VideoStorageUsageParams } from './videos';
 export {
-  Watermark,
-  WatermarkDeleteResponse,
-  WatermarkCreateParams,
-  WatermarkListParams,
-  WatermarkDeleteParams,
-  WatermarkGetParams,
   WatermarksSinglePage,
   Watermarks,
+  type Watermark,
+  type WatermarkDeleteResponse,
+  type WatermarkCreateParams,
+  type WatermarkListParams,
+  type WatermarkDeleteParams,
+  type WatermarkGetParams,
 } from './watermarks';
 export {
-  WebhookUpdateResponse,
-  WebhookDeleteResponse,
-  WebhookGetResponse,
-  WebhookUpdateParams,
-  WebhookDeleteParams,
-  WebhookGetParams,
   Webhooks,
+  type WebhookUpdateResponse,
+  type WebhookDeleteResponse,
+  type WebhookGetResponse,
+  type WebhookUpdateParams,
+  type WebhookDeleteParams,
+  type WebhookGetParams,
 } from './webhooks';
diff --git a/src/resources/stream/keys.ts b/src/resources/stream/keys.ts
index 35eb711547..671926d5a8 100644
--- a/src/resources/stream/keys.ts
+++ b/src/resources/stream/keys.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as KeysAPI from './keys';
 
 export class Keys extends APIResource {
   /**
@@ -71,7 +70,7 @@ export interface Keys {
   pem?: string;
 }
 
-export type KeyDeleteResponse = unknown | string;
+export type KeyDeleteResponse = string;
 
 export type KeyGetResponse = Array<KeyGetResponse.KeyGetResponseItem>;
 
@@ -115,11 +114,13 @@ export interface KeyGetParams {
   account_id: string;
 }
 
-export namespace Keys {
-  export import Keys = KeysAPI.Keys;
-  export import KeyDeleteResponse = KeysAPI.KeyDeleteResponse;
-  export import KeyGetResponse = KeysAPI.KeyGetResponse;
-  export import KeyCreateParams = KeysAPI.KeyCreateParams;
-  export import KeyDeleteParams = KeysAPI.KeyDeleteParams;
-  export import KeyGetParams = KeysAPI.KeyGetParams;
+export declare namespace Keys {
+  export {
+    type Keys as Keys,
+    type KeyDeleteResponse as KeyDeleteResponse,
+    type KeyGetResponse as KeyGetResponse,
+    type KeyCreateParams as KeyCreateParams,
+    type KeyDeleteParams as KeyDeleteParams,
+    type KeyGetParams as KeyGetParams,
+  };
 }
diff --git a/src/resources/stream/live-inputs/index.ts b/src/resources/stream/live-inputs/index.ts
index 51836e60f8..14c700b624 100644
--- a/src/resources/stream/live-inputs/index.ts
+++ b/src/resources/stream/live-inputs/index.ts
@@ -1,21 +1,21 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  LiveInput,
-  LiveInputListResponse,
-  LiveInputCreateParams,
-  LiveInputUpdateParams,
-  LiveInputListParams,
-  LiveInputDeleteParams,
-  LiveInputGetParams,
   LiveInputs,
+  type LiveInput,
+  type LiveInputListResponse,
+  type LiveInputCreateParams,
+  type LiveInputUpdateParams,
+  type LiveInputListParams,
+  type LiveInputDeleteParams,
+  type LiveInputGetParams,
 } from './live-inputs';
 export {
-  Output,
-  OutputCreateParams,
-  OutputUpdateParams,
-  OutputListParams,
-  OutputDeleteParams,
   OutputsSinglePage,
   Outputs,
+  type Output,
+  type OutputCreateParams,
+  type OutputUpdateParams,
+  type OutputListParams,
+  type OutputDeleteParams,
 } from './outputs';
diff --git a/src/resources/stream/live-inputs/live-inputs.ts b/src/resources/stream/live-inputs/live-inputs.ts
index d1fc3af944..c82b9366c8 100644
--- a/src/resources/stream/live-inputs/live-inputs.ts
+++ b/src/resources/stream/live-inputs/live-inputs.ts
@@ -2,8 +2,16 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as LiveInputsAPI from './live-inputs';
 import * as OutputsAPI from './outputs';
+import {
+  Output,
+  OutputCreateParams,
+  OutputDeleteParams,
+  OutputListParams,
+  OutputUpdateParams,
+  Outputs,
+  OutputsSinglePage,
+} from './outputs';
 
 export class LiveInputs extends APIResource {
   outputs: OutputsAPI.Outputs = new OutputsAPI.Outputs(this._client);
@@ -187,6 +195,12 @@ export namespace LiveInput {
      */
     allowedOrigins?: Array<string>;
 
+    /**
+     * Disables reporting the number of live viewers when this property is set to
+     * `true`.
+     */
+    hideLiveViewerCount?: boolean;
+
     /**
      * Specifies the recording behavior for the live input. Set this value to `off` to
      * prevent a recording. Set the value to `automatic` to begin a recording and
@@ -396,6 +410,12 @@ export namespace LiveInputCreateParams {
      */
     allowedOrigins?: Array<string>;
 
+    /**
+     * Disables reporting the number of live viewers when this property is set to
+     * `true`.
+     */
+    hideLiveViewerCount?: boolean;
+
     /**
      * Specifies the recording behavior for the live input. Set this value to `off` to
      * prevent a recording. Set the value to `automatic` to begin a recording and
@@ -467,6 +487,12 @@ export namespace LiveInputUpdateParams {
      */
     allowedOrigins?: Array<string>;
 
+    /**
+     * Disables reporting the number of live viewers when this property is set to
+     * `true`.
+     */
+    hideLiveViewerCount?: boolean;
+
     /**
      * Specifies the recording behavior for the live input. Set this value to `off` to
      * prevent a recording. Set the value to `automatic` to begin a recording and
@@ -517,19 +543,27 @@ export interface LiveInputGetParams {
   account_id: string;
 }
 
-export namespace LiveInputs {
-  export import LiveInput = LiveInputsAPI.LiveInput;
-  export import LiveInputListResponse = LiveInputsAPI.LiveInputListResponse;
-  export import LiveInputCreateParams = LiveInputsAPI.LiveInputCreateParams;
-  export import LiveInputUpdateParams = LiveInputsAPI.LiveInputUpdateParams;
-  export import LiveInputListParams = LiveInputsAPI.LiveInputListParams;
-  export import LiveInputDeleteParams = LiveInputsAPI.LiveInputDeleteParams;
-  export import LiveInputGetParams = LiveInputsAPI.LiveInputGetParams;
-  export import Outputs = OutputsAPI.Outputs;
-  export import Output = OutputsAPI.Output;
-  export import OutputsSinglePage = OutputsAPI.OutputsSinglePage;
-  export import OutputCreateParams = OutputsAPI.OutputCreateParams;
-  export import OutputUpdateParams = OutputsAPI.OutputUpdateParams;
-  export import OutputListParams = OutputsAPI.OutputListParams;
-  export import OutputDeleteParams = OutputsAPI.OutputDeleteParams;
+LiveInputs.Outputs = Outputs;
+LiveInputs.OutputsSinglePage = OutputsSinglePage;
+
+export declare namespace LiveInputs {
+  export {
+    type LiveInput as LiveInput,
+    type LiveInputListResponse as LiveInputListResponse,
+    type LiveInputCreateParams as LiveInputCreateParams,
+    type LiveInputUpdateParams as LiveInputUpdateParams,
+    type LiveInputListParams as LiveInputListParams,
+    type LiveInputDeleteParams as LiveInputDeleteParams,
+    type LiveInputGetParams as LiveInputGetParams,
+  };
+
+  export {
+    Outputs as Outputs,
+    type Output as Output,
+    OutputsSinglePage as OutputsSinglePage,
+    type OutputCreateParams as OutputCreateParams,
+    type OutputUpdateParams as OutputUpdateParams,
+    type OutputListParams as OutputListParams,
+    type OutputDeleteParams as OutputDeleteParams,
+  };
 }
diff --git a/src/resources/stream/live-inputs/outputs.ts b/src/resources/stream/live-inputs/outputs.ts
index 8c4374d29e..65a723ea5d 100644
--- a/src/resources/stream/live-inputs/outputs.ts
+++ b/src/resources/stream/live-inputs/outputs.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as OutputsAPI from './outputs';
 import { SinglePage } from '../../../pagination';
 
 export class Outputs extends APIResource {
@@ -160,11 +159,15 @@ export interface OutputDeleteParams {
   account_id: string;
 }
 
-export namespace Outputs {
-  export import Output = OutputsAPI.Output;
-  export import OutputsSinglePage = OutputsAPI.OutputsSinglePage;
-  export import OutputCreateParams = OutputsAPI.OutputCreateParams;
-  export import OutputUpdateParams = OutputsAPI.OutputUpdateParams;
-  export import OutputListParams = OutputsAPI.OutputListParams;
-  export import OutputDeleteParams = OutputsAPI.OutputDeleteParams;
+Outputs.OutputsSinglePage = OutputsSinglePage;
+
+export declare namespace Outputs {
+  export {
+    type Output as Output,
+    OutputsSinglePage as OutputsSinglePage,
+    type OutputCreateParams as OutputCreateParams,
+    type OutputUpdateParams as OutputUpdateParams,
+    type OutputListParams as OutputListParams,
+    type OutputDeleteParams as OutputDeleteParams,
+  };
 }
diff --git a/src/resources/stream/stream.ts b/src/resources/stream/stream.ts
index b4e4aa782c..04f9303015 100644
--- a/src/resources/stream/stream.ts
+++ b/src/resources/stream/stream.ts
@@ -3,18 +3,81 @@
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as AudioTracksAPI from './audio-tracks';
+import {
+  Audio,
+  AudioTrackCopyParams,
+  AudioTrackDeleteParams,
+  AudioTrackDeleteResponse,
+  AudioTrackEditParams,
+  AudioTrackGetParams,
+  AudioTrackGetResponse,
+  AudioTracks,
+} from './audio-tracks';
 import * as ClipAPI from './clip';
+import { Clip, ClipCreateParams, ClipResource } from './clip';
 import * as CopyAPI from './copy';
+import { Copy, CopyCreateParams } from './copy';
 import * as DirectUploadAPI from './direct-upload';
+import { DirectUpload, DirectUploadCreateParams, DirectUploadCreateResponse } from './direct-upload';
 import * as DownloadsAPI from './downloads';
+import {
+  DownloadCreateParams,
+  DownloadCreateResponse,
+  DownloadDeleteParams,
+  DownloadDeleteResponse,
+  DownloadGetParams,
+  DownloadGetResponse,
+  Downloads,
+} from './downloads';
 import * as EmbedAPI from './embed';
+import { Embed, EmbedGetParams, EmbedGetResponse } from './embed';
 import * as KeysAPI from './keys';
+import {
+  KeyCreateParams,
+  KeyDeleteParams,
+  KeyDeleteResponse,
+  KeyGetParams,
+  KeyGetResponse,
+  Keys,
+} from './keys';
 import * as TokenAPI from './token';
+import { Token, TokenCreateParams, TokenCreateResponse } from './token';
 import * as VideosAPI from './videos';
+import { VideoStorageUsageParams, VideoStorageUsageResponse, Videos } from './videos';
 import * as WatermarksAPI from './watermarks';
+import {
+  Watermark,
+  WatermarkCreateParams,
+  WatermarkDeleteParams,
+  WatermarkDeleteResponse,
+  WatermarkGetParams,
+  WatermarkListParams,
+  Watermarks,
+  WatermarksSinglePage,
+} from './watermarks';
 import * as WebhooksAPI from './webhooks';
+import {
+  WebhookDeleteParams,
+  WebhookDeleteResponse,
+  WebhookGetParams,
+  WebhookGetResponse,
+  WebhookUpdateParams,
+  WebhookUpdateResponse,
+  Webhooks,
+} from './webhooks';
 import * as CaptionsAPI from './captions/captions';
+import { Caption, CaptionGetParams, CaptionGetResponse, Captions } from './captions/captions';
 import * as LiveInputsAPI from './live-inputs/live-inputs';
+import {
+  LiveInput,
+  LiveInputCreateParams,
+  LiveInputDeleteParams,
+  LiveInputGetParams,
+  LiveInputListParams,
+  LiveInputListResponse,
+  LiveInputUpdateParams,
+  LiveInputs,
+} from './live-inputs/live-inputs';
 import { SinglePage } from '../../pagination';
 
 export class Stream extends APIResource {
@@ -85,6 +148,19 @@ export class Stream extends APIResource {
     });
   }
 
+  /**
+   * Edit details for a single video.
+   */
+  edit(identifier: string, params: StreamEditParams, options?: Core.RequestOptions): Core.APIPromise<Video> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/stream/${identifier}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: Video }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Fetches details for a single video.
    */
@@ -388,6 +464,69 @@ export interface StreamDeleteParams {
   account_id: string;
 }
 
+export interface StreamEditParams {
+  /**
+   * Path param: The account identifier tag.
+   */
+  account_id: string;
+
+  /**
+   * Body param: Lists the origins allowed to display the video. Enter allowed origin
+   * domains in an array and use `*` for wildcard subdomains. Empty arrays allow the
+   * video to be viewed on any origin.
+   */
+  allowedOrigins?: Array<AllowedOriginsParam>;
+
+  /**
+   * Body param: A user-defined identifier for the media creator.
+   */
+  creator?: string;
+
+  /**
+   * Body param: The maximum duration in seconds for a video upload. Can be set for a
+   * video that is not yet uploaded to limit its duration. Uploads that exceed the
+   * specified duration will fail during processing. A value of `-1` means the value
+   * is unknown.
+   */
+  maxDurationSeconds?: number;
+
+  /**
+   * Body param: A user modifiable key-value store used to reference other systems of
+   * record for managing videos.
+   */
+  meta?: unknown;
+
+  /**
+   * Body param: Indicates whether the video can be a accessed using the UID. When
+   * set to `true`, a signed token must be generated with a signing key to view the
+   * video.
+   */
+  requireSignedURLs?: boolean;
+
+  /**
+   * Body param: Indicates the date and time at which the video will be deleted. Omit
+   * the field to indicate no change, or include with a `null` value to remove an
+   * existing scheduled deletion. If specified, must be at least 30 days from upload
+   * time.
+   */
+  scheduledDeletion?: string;
+
+  /**
+   * Body param: The timestamp for a thumbnail image calculated as a percentage value
+   * of the video's duration. To convert from a second-wise timestamp to a
+   * percentage, divide the desired timestamp by the total duration of the video. If
+   * this value is not set, the default thumbnail image is taken from 0s of the
+   * video.
+   */
+  thumbnailTimestampPct?: number;
+
+  /**
+   * Body param: The date and time when the video upload URL is no longer valid for
+   * direct user uploads.
+   */
+  uploadExpiry?: string;
+}
+
 export interface StreamGetParams {
   /**
    * The account identifier tag.
@@ -395,70 +534,111 @@ export interface StreamGetParams {
   account_id: string;
 }
 
-export namespace Stream {
-  export import AudioTracks = AudioTracksAPI.AudioTracks;
-  export import Audio = AudioTracksAPI.Audio;
-  export import AudioTrackDeleteResponse = AudioTracksAPI.AudioTrackDeleteResponse;
-  export import AudioTrackGetResponse = AudioTracksAPI.AudioTrackGetResponse;
-  export import AudioTrackDeleteParams = AudioTracksAPI.AudioTrackDeleteParams;
-  export import AudioTrackCopyParams = AudioTracksAPI.AudioTrackCopyParams;
-  export import AudioTrackEditParams = AudioTracksAPI.AudioTrackEditParams;
-  export import AudioTrackGetParams = AudioTracksAPI.AudioTrackGetParams;
-  export import Videos = VideosAPI.Videos;
-  export import VideoStorageUsageResponse = VideosAPI.VideoStorageUsageResponse;
-  export import VideoStorageUsageParams = VideosAPI.VideoStorageUsageParams;
-  export import ClipResource = ClipAPI.ClipResource;
-  export import Clip = ClipAPI.Clip;
-  export import ClipCreateParams = ClipAPI.ClipCreateParams;
-  export import Copy = CopyAPI.Copy;
-  export import CopyCreateParams = CopyAPI.CopyCreateParams;
-  export import DirectUpload = DirectUploadAPI.DirectUpload;
-  export import DirectUploadCreateResponse = DirectUploadAPI.DirectUploadCreateResponse;
-  export import DirectUploadCreateParams = DirectUploadAPI.DirectUploadCreateParams;
-  export import Keys = KeysAPI.Keys;
-  export import KeyDeleteResponse = KeysAPI.KeyDeleteResponse;
-  export import KeyGetResponse = KeysAPI.KeyGetResponse;
-  export import KeyCreateParams = KeysAPI.KeyCreateParams;
-  export import KeyDeleteParams = KeysAPI.KeyDeleteParams;
-  export import KeyGetParams = KeysAPI.KeyGetParams;
-  export import LiveInputs = LiveInputsAPI.LiveInputs;
-  export import LiveInput = LiveInputsAPI.LiveInput;
-  export import LiveInputListResponse = LiveInputsAPI.LiveInputListResponse;
-  export import LiveInputCreateParams = LiveInputsAPI.LiveInputCreateParams;
-  export import LiveInputUpdateParams = LiveInputsAPI.LiveInputUpdateParams;
-  export import LiveInputListParams = LiveInputsAPI.LiveInputListParams;
-  export import LiveInputDeleteParams = LiveInputsAPI.LiveInputDeleteParams;
-  export import LiveInputGetParams = LiveInputsAPI.LiveInputGetParams;
-  export import Watermarks = WatermarksAPI.Watermarks;
-  export import Watermark = WatermarksAPI.Watermark;
-  export import WatermarkDeleteResponse = WatermarksAPI.WatermarkDeleteResponse;
-  export import WatermarksSinglePage = WatermarksAPI.WatermarksSinglePage;
-  export import WatermarkCreateParams = WatermarksAPI.WatermarkCreateParams;
-  export import WatermarkListParams = WatermarksAPI.WatermarkListParams;
-  export import WatermarkDeleteParams = WatermarksAPI.WatermarkDeleteParams;
-  export import WatermarkGetParams = WatermarksAPI.WatermarkGetParams;
-  export import Webhooks = WebhooksAPI.Webhooks;
-  export import WebhookUpdateResponse = WebhooksAPI.WebhookUpdateResponse;
-  export import WebhookDeleteResponse = WebhooksAPI.WebhookDeleteResponse;
-  export import WebhookGetResponse = WebhooksAPI.WebhookGetResponse;
-  export import WebhookUpdateParams = WebhooksAPI.WebhookUpdateParams;
-  export import WebhookDeleteParams = WebhooksAPI.WebhookDeleteParams;
-  export import WebhookGetParams = WebhooksAPI.WebhookGetParams;
-  export import Captions = CaptionsAPI.Captions;
-  export import Caption = CaptionsAPI.Caption;
-  export import CaptionGetResponse = CaptionsAPI.CaptionGetResponse;
-  export import CaptionGetParams = CaptionsAPI.CaptionGetParams;
-  export import Downloads = DownloadsAPI.Downloads;
-  export import DownloadCreateResponse = DownloadsAPI.DownloadCreateResponse;
-  export import DownloadDeleteResponse = DownloadsAPI.DownloadDeleteResponse;
-  export import DownloadGetResponse = DownloadsAPI.DownloadGetResponse;
-  export import DownloadCreateParams = DownloadsAPI.DownloadCreateParams;
-  export import DownloadDeleteParams = DownloadsAPI.DownloadDeleteParams;
-  export import DownloadGetParams = DownloadsAPI.DownloadGetParams;
-  export import Embed = EmbedAPI.Embed;
-  export import EmbedGetResponse = EmbedAPI.EmbedGetResponse;
-  export import EmbedGetParams = EmbedAPI.EmbedGetParams;
-  export import Token = TokenAPI.Token;
-  export import TokenCreateResponse = TokenAPI.TokenCreateResponse;
-  export import TokenCreateParams = TokenAPI.TokenCreateParams;
+Stream.AudioTracks = AudioTracks;
+Stream.Videos = Videos;
+Stream.ClipResource = ClipResource;
+Stream.Copy = Copy;
+Stream.DirectUpload = DirectUpload;
+Stream.LiveInputs = LiveInputs;
+Stream.Watermarks = Watermarks;
+Stream.WatermarksSinglePage = WatermarksSinglePage;
+Stream.Webhooks = Webhooks;
+Stream.Captions = Captions;
+Stream.Downloads = Downloads;
+Stream.Embed = Embed;
+Stream.Token = Token;
+
+export declare namespace Stream {
+  export {
+    AudioTracks as AudioTracks,
+    type Audio as Audio,
+    type AudioTrackDeleteResponse as AudioTrackDeleteResponse,
+    type AudioTrackGetResponse as AudioTrackGetResponse,
+    type AudioTrackDeleteParams as AudioTrackDeleteParams,
+    type AudioTrackCopyParams as AudioTrackCopyParams,
+    type AudioTrackEditParams as AudioTrackEditParams,
+    type AudioTrackGetParams as AudioTrackGetParams,
+  };
+
+  export {
+    Videos as Videos,
+    type VideoStorageUsageResponse as VideoStorageUsageResponse,
+    type VideoStorageUsageParams as VideoStorageUsageParams,
+  };
+
+  export { ClipResource as ClipResource, type Clip as Clip, type ClipCreateParams as ClipCreateParams };
+
+  export { Copy as Copy, type CopyCreateParams as CopyCreateParams };
+
+  export {
+    DirectUpload as DirectUpload,
+    type DirectUploadCreateResponse as DirectUploadCreateResponse,
+    type DirectUploadCreateParams as DirectUploadCreateParams,
+  };
+
+  export {
+    type Keys as Keys,
+    type KeyDeleteResponse as KeyDeleteResponse,
+    type KeyGetResponse as KeyGetResponse,
+    type KeyCreateParams as KeyCreateParams,
+    type KeyDeleteParams as KeyDeleteParams,
+    type KeyGetParams as KeyGetParams,
+  };
+
+  export {
+    LiveInputs as LiveInputs,
+    type LiveInput as LiveInput,
+    type LiveInputListResponse as LiveInputListResponse,
+    type LiveInputCreateParams as LiveInputCreateParams,
+    type LiveInputUpdateParams as LiveInputUpdateParams,
+    type LiveInputListParams as LiveInputListParams,
+    type LiveInputDeleteParams as LiveInputDeleteParams,
+    type LiveInputGetParams as LiveInputGetParams,
+  };
+
+  export {
+    Watermarks as Watermarks,
+    type Watermark as Watermark,
+    type WatermarkDeleteResponse as WatermarkDeleteResponse,
+    WatermarksSinglePage as WatermarksSinglePage,
+    type WatermarkCreateParams as WatermarkCreateParams,
+    type WatermarkListParams as WatermarkListParams,
+    type WatermarkDeleteParams as WatermarkDeleteParams,
+    type WatermarkGetParams as WatermarkGetParams,
+  };
+
+  export {
+    Webhooks as Webhooks,
+    type WebhookUpdateResponse as WebhookUpdateResponse,
+    type WebhookDeleteResponse as WebhookDeleteResponse,
+    type WebhookGetResponse as WebhookGetResponse,
+    type WebhookUpdateParams as WebhookUpdateParams,
+    type WebhookDeleteParams as WebhookDeleteParams,
+    type WebhookGetParams as WebhookGetParams,
+  };
+
+  export {
+    Captions as Captions,
+    type Caption as Caption,
+    type CaptionGetResponse as CaptionGetResponse,
+    type CaptionGetParams as CaptionGetParams,
+  };
+
+  export {
+    Downloads as Downloads,
+    type DownloadCreateResponse as DownloadCreateResponse,
+    type DownloadDeleteResponse as DownloadDeleteResponse,
+    type DownloadGetResponse as DownloadGetResponse,
+    type DownloadCreateParams as DownloadCreateParams,
+    type DownloadDeleteParams as DownloadDeleteParams,
+    type DownloadGetParams as DownloadGetParams,
+  };
+
+  export { Embed as Embed, type EmbedGetResponse as EmbedGetResponse, type EmbedGetParams as EmbedGetParams };
+
+  export {
+    Token as Token,
+    type TokenCreateResponse as TokenCreateResponse,
+    type TokenCreateParams as TokenCreateParams,
+  };
 }
diff --git a/src/resources/stream/token.ts b/src/resources/stream/token.ts
index db75774c10..402007baea 100644
--- a/src/resources/stream/token.ts
+++ b/src/resources/stream/token.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as TokenAPI from './token';
 
 export class Token extends APIResource {
   /**
@@ -112,7 +111,6 @@ export namespace TokenCreateParams {
   }
 }
 
-export namespace Token {
-  export import TokenCreateResponse = TokenAPI.TokenCreateResponse;
-  export import TokenCreateParams = TokenAPI.TokenCreateParams;
+export declare namespace Token {
+  export { type TokenCreateResponse as TokenCreateResponse, type TokenCreateParams as TokenCreateParams };
 }
diff --git a/src/resources/stream/videos.ts b/src/resources/stream/videos.ts
index a80d901369..e9268fbf3a 100644
--- a/src/resources/stream/videos.ts
+++ b/src/resources/stream/videos.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as VideosAPI from './videos';
 
 export class Videos extends APIResource {
   /**
@@ -56,7 +55,9 @@ export interface VideoStorageUsageParams {
   creator?: string;
 }
 
-export namespace Videos {
-  export import VideoStorageUsageResponse = VideosAPI.VideoStorageUsageResponse;
-  export import VideoStorageUsageParams = VideosAPI.VideoStorageUsageParams;
+export declare namespace Videos {
+  export {
+    type VideoStorageUsageResponse as VideoStorageUsageResponse,
+    type VideoStorageUsageParams as VideoStorageUsageParams,
+  };
 }
diff --git a/src/resources/stream/watermarks.ts b/src/resources/stream/watermarks.ts
index c05fbdcf9b..7fd1af6024 100644
--- a/src/resources/stream/watermarks.ts
+++ b/src/resources/stream/watermarks.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as WatermarksAPI from './watermarks';
 import { SinglePage } from '../../pagination';
 
 export class Watermarks extends APIResource {
@@ -139,7 +138,7 @@ export interface Watermark {
   width?: number;
 }
 
-export type WatermarkDeleteResponse = unknown | string;
+export type WatermarkDeleteResponse = string;
 
 export interface WatermarkCreateParams {
   /**
@@ -209,12 +208,16 @@ export interface WatermarkGetParams {
   account_id: string;
 }
 
-export namespace Watermarks {
-  export import Watermark = WatermarksAPI.Watermark;
-  export import WatermarkDeleteResponse = WatermarksAPI.WatermarkDeleteResponse;
-  export import WatermarksSinglePage = WatermarksAPI.WatermarksSinglePage;
-  export import WatermarkCreateParams = WatermarksAPI.WatermarkCreateParams;
-  export import WatermarkListParams = WatermarksAPI.WatermarkListParams;
-  export import WatermarkDeleteParams = WatermarksAPI.WatermarkDeleteParams;
-  export import WatermarkGetParams = WatermarksAPI.WatermarkGetParams;
+Watermarks.WatermarksSinglePage = WatermarksSinglePage;
+
+export declare namespace Watermarks {
+  export {
+    type Watermark as Watermark,
+    type WatermarkDeleteResponse as WatermarkDeleteResponse,
+    WatermarksSinglePage as WatermarksSinglePage,
+    type WatermarkCreateParams as WatermarkCreateParams,
+    type WatermarkListParams as WatermarkListParams,
+    type WatermarkDeleteParams as WatermarkDeleteParams,
+    type WatermarkGetParams as WatermarkGetParams,
+  };
 }
diff --git a/src/resources/stream/webhooks.ts b/src/resources/stream/webhooks.ts
index 6f778e3d76..b1ea6a54f9 100644
--- a/src/resources/stream/webhooks.ts
+++ b/src/resources/stream/webhooks.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as WebhooksAPI from './webhooks';
 
 export class Webhooks extends APIResource {
   /**
@@ -42,11 +41,11 @@ export class Webhooks extends APIResource {
   }
 }
 
-export type WebhookUpdateResponse = unknown | string | null;
+export type WebhookUpdateResponse = unknown;
 
-export type WebhookDeleteResponse = unknown | string;
+export type WebhookDeleteResponse = string;
 
-export type WebhookGetResponse = unknown | string | null;
+export type WebhookGetResponse = unknown;
 
 export interface WebhookUpdateParams {
   /**
@@ -74,11 +73,13 @@ export interface WebhookGetParams {
   account_id: string;
 }
 
-export namespace Webhooks {
-  export import WebhookUpdateResponse = WebhooksAPI.WebhookUpdateResponse;
-  export import WebhookDeleteResponse = WebhooksAPI.WebhookDeleteResponse;
-  export import WebhookGetResponse = WebhooksAPI.WebhookGetResponse;
-  export import WebhookUpdateParams = WebhooksAPI.WebhookUpdateParams;
-  export import WebhookDeleteParams = WebhooksAPI.WebhookDeleteParams;
-  export import WebhookGetParams = WebhooksAPI.WebhookGetParams;
+export declare namespace Webhooks {
+  export {
+    type WebhookUpdateResponse as WebhookUpdateResponse,
+    type WebhookDeleteResponse as WebhookDeleteResponse,
+    type WebhookGetResponse as WebhookGetResponse,
+    type WebhookUpdateParams as WebhookUpdateParams,
+    type WebhookDeleteParams as WebhookDeleteParams,
+    type WebhookGetParams as WebhookGetParams,
+  };
 }
diff --git a/src/resources/subscriptions.ts b/src/resources/subscriptions.ts
deleted file mode 100644
index ef3adeaf45..0000000000
--- a/src/resources/subscriptions.ts
+++ /dev/null
@@ -1,162 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../resource';
-import * as Core from '../core';
-import * as UserSubscriptionsAPI from './user/subscriptions';
-import { SubscriptionsSinglePage } from './user/subscriptions';
-
-export class Subscriptions extends APIResource {
-  /**
-   * Create a zone subscription, either plan or add-ons.
-   */
-  create(
-    identifier: string,
-    body: SubscriptionCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SubscriptionCreateResponse> {
-    return (
-      this._client.post(`/zones/${identifier}/subscription`, { body, ...options }) as Core.APIPromise<{
-        result: SubscriptionCreateResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Updates an account subscription.
-   */
-  update(
-    accountIdentifier: string,
-    subscriptionIdentifier: string,
-    body: SubscriptionUpdateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SubscriptionUpdateResponse> {
-    return (
-      this._client.put(`/accounts/${accountIdentifier}/subscriptions/${subscriptionIdentifier}`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: SubscriptionUpdateResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Lists all of an account's subscriptions.
-   */
-  list(
-    accountIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<SubscriptionsSinglePage, UserSubscriptionsAPI.Subscription> {
-    return this._client.getAPIList(
-      `/accounts/${accountIdentifier}/subscriptions`,
-      SubscriptionsSinglePage,
-      options,
-    );
-  }
-
-  /**
-   * Deletes an account's subscription.
-   */
-  delete(
-    accountIdentifier: string,
-    subscriptionIdentifier: string,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SubscriptionDeleteResponse> {
-    return (
-      this._client.delete(
-        `/accounts/${accountIdentifier}/subscriptions/${subscriptionIdentifier}`,
-        options,
-      ) as Core.APIPromise<{ result: SubscriptionDeleteResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Lists zone subscription details.
-   */
-  get(identifier: string, options?: Core.RequestOptions): Core.APIPromise<SubscriptionGetResponse> {
-    return (
-      this._client.get(`/zones/${identifier}/subscription`, options) as Core.APIPromise<{
-        result: SubscriptionGetResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export type SubscriptionCreateResponse = unknown | string | null;
-
-export type SubscriptionUpdateResponse = unknown | string | null;
-
-export interface SubscriptionDeleteResponse {
-  /**
-   * Subscription identifier tag.
-   */
-  subscription_id?: string;
-}
-
-export type SubscriptionGetResponse = unknown | string | null;
-
-export interface SubscriptionCreateParams {
-  app?: SubscriptionCreateParams.App;
-
-  /**
-   * The list of add-ons subscribed to.
-   */
-  component_values?: Array<UserSubscriptionsAPI.SubscriptionComponentParam>;
-
-  /**
-   * How often the subscription is renewed automatically.
-   */
-  frequency?: 'weekly' | 'monthly' | 'quarterly' | 'yearly';
-
-  /**
-   * The rate plan applied to the subscription.
-   */
-  rate_plan?: UserSubscriptionsAPI.RatePlanParam;
-
-  /**
-   * A simple zone object. May have null properties if not a zone subscription.
-   */
-  zone?: UserSubscriptionsAPI.SubscriptionZoneParam;
-}
-
-export namespace SubscriptionCreateParams {
-  export interface App {
-    /**
-     * app install id.
-     */
-    install_id?: string;
-  }
-}
-
-export interface SubscriptionUpdateParams {
-  app?: SubscriptionUpdateParams.App;
-
-  /**
-   * The list of add-ons subscribed to.
-   */
-  component_values?: Array<UserSubscriptionsAPI.SubscriptionComponentParam>;
-
-  /**
-   * How often the subscription is renewed automatically.
-   */
-  frequency?: 'weekly' | 'monthly' | 'quarterly' | 'yearly';
-
-  /**
-   * The rate plan applied to the subscription.
-   */
-  rate_plan?: UserSubscriptionsAPI.RatePlanParam;
-
-  /**
-   * A simple zone object. May have null properties if not a zone subscription.
-   */
-  zone?: UserSubscriptionsAPI.SubscriptionZoneParam;
-}
-
-export namespace SubscriptionUpdateParams {
-  export interface App {
-    /**
-     * app install id.
-     */
-    install_id?: string;
-  }
-}
-
-export { SubscriptionsSinglePage };
diff --git a/src/resources/turnstile/index.ts b/src/resources/turnstile/index.ts
new file mode 100644
index 0000000000..c0a03a53ec
--- /dev/null
+++ b/src/resources/turnstile/index.ts
@@ -0,0 +1,16 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Turnstile } from './turnstile';
+export {
+  WidgetListResponsesV4PagePaginationArray,
+  Widgets,
+  type Widget,
+  type WidgetDomain,
+  type WidgetListResponse,
+  type WidgetCreateParams,
+  type WidgetUpdateParams,
+  type WidgetListParams,
+  type WidgetDeleteParams,
+  type WidgetGetParams,
+  type WidgetRotateSecretParams,
+} from './widgets';
diff --git a/src/resources/turnstile/turnstile.ts b/src/resources/turnstile/turnstile.ts
new file mode 100644
index 0000000000..9af09e56d4
--- /dev/null
+++ b/src/resources/turnstile/turnstile.ts
@@ -0,0 +1,40 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as WidgetsAPI from './widgets';
+import {
+  Widget,
+  WidgetCreateParams,
+  WidgetDeleteParams,
+  WidgetDomain,
+  WidgetGetParams,
+  WidgetListParams,
+  WidgetListResponse,
+  WidgetListResponsesV4PagePaginationArray,
+  WidgetRotateSecretParams,
+  WidgetUpdateParams,
+  Widgets,
+} from './widgets';
+
+export class Turnstile extends APIResource {
+  widgets: WidgetsAPI.Widgets = new WidgetsAPI.Widgets(this._client);
+}
+
+Turnstile.Widgets = Widgets;
+Turnstile.WidgetListResponsesV4PagePaginationArray = WidgetListResponsesV4PagePaginationArray;
+
+export declare namespace Turnstile {
+  export {
+    Widgets as Widgets,
+    type Widget as Widget,
+    type WidgetDomain as WidgetDomain,
+    type WidgetListResponse as WidgetListResponse,
+    WidgetListResponsesV4PagePaginationArray as WidgetListResponsesV4PagePaginationArray,
+    type WidgetCreateParams as WidgetCreateParams,
+    type WidgetUpdateParams as WidgetUpdateParams,
+    type WidgetListParams as WidgetListParams,
+    type WidgetDeleteParams as WidgetDeleteParams,
+    type WidgetGetParams as WidgetGetParams,
+    type WidgetRotateSecretParams as WidgetRotateSecretParams,
+  };
+}
diff --git a/src/resources/challenges/widgets.ts b/src/resources/turnstile/widgets.ts
similarity index 90%
rename from src/resources/challenges/widgets.ts
rename to src/resources/turnstile/widgets.ts
index d145291a3b..6dd503cca9 100644
--- a/src/resources/challenges/widgets.ts
+++ b/src/resources/turnstile/widgets.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as WidgetsAPI from './widgets';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class Widgets extends APIResource {
@@ -127,6 +126,11 @@ export interface Widget {
 
   domains: Array<WidgetDomain>;
 
+  /**
+   * Return the Ephemeral ID in /siteverify (ENT only).
+   */
+  ephemeral_id: boolean;
+
   /**
    * Widget Mode
    */
@@ -200,6 +204,11 @@ export interface WidgetListResponse {
 
   domains: Array<WidgetDomain>;
 
+  /**
+   * Return the Ephemeral ID in /siteverify (ENT only).
+   */
+  ephemeral_id: boolean;
+
   /**
    * Widget Mode
    */
@@ -289,6 +298,11 @@ export interface WidgetCreateParams {
    */
   clearance_level?: 'no_clearance' | 'jschallenge' | 'managed' | 'interactive';
 
+  /**
+   * Body param: Return the Ephemeral ID in /siteverify (ENT only).
+   */
+  ephemeral_id?: boolean;
+
   /**
    * Body param: Do not show any Cloudflare branding on the widget (ENT only).
    */
@@ -336,6 +350,11 @@ export interface WidgetUpdateParams {
    */
   clearance_level?: 'no_clearance' | 'jschallenge' | 'managed' | 'interactive';
 
+  /**
+   * Body param: Return the Ephemeral ID in /siteverify (ENT only).
+   */
+  ephemeral_id?: boolean;
+
   /**
    * Body param: Do not show any Cloudflare branding on the widget (ENT only).
    */
@@ -387,15 +406,19 @@ export interface WidgetRotateSecretParams {
   invalidate_immediately?: boolean;
 }
 
-export namespace Widgets {
-  export import Widget = WidgetsAPI.Widget;
-  export import WidgetDomain = WidgetsAPI.WidgetDomain;
-  export import WidgetListResponse = WidgetsAPI.WidgetListResponse;
-  export import WidgetListResponsesV4PagePaginationArray = WidgetsAPI.WidgetListResponsesV4PagePaginationArray;
-  export import WidgetCreateParams = WidgetsAPI.WidgetCreateParams;
-  export import WidgetUpdateParams = WidgetsAPI.WidgetUpdateParams;
-  export import WidgetListParams = WidgetsAPI.WidgetListParams;
-  export import WidgetDeleteParams = WidgetsAPI.WidgetDeleteParams;
-  export import WidgetGetParams = WidgetsAPI.WidgetGetParams;
-  export import WidgetRotateSecretParams = WidgetsAPI.WidgetRotateSecretParams;
+Widgets.WidgetListResponsesV4PagePaginationArray = WidgetListResponsesV4PagePaginationArray;
+
+export declare namespace Widgets {
+  export {
+    type Widget as Widget,
+    type WidgetDomain as WidgetDomain,
+    type WidgetListResponse as WidgetListResponse,
+    WidgetListResponsesV4PagePaginationArray as WidgetListResponsesV4PagePaginationArray,
+    type WidgetCreateParams as WidgetCreateParams,
+    type WidgetUpdateParams as WidgetUpdateParams,
+    type WidgetListParams as WidgetListParams,
+    type WidgetDeleteParams as WidgetDeleteParams,
+    type WidgetGetParams as WidgetGetParams,
+    type WidgetRotateSecretParams as WidgetRotateSecretParams,
+  };
 }
diff --git a/src/resources/url-normalization.ts b/src/resources/url-normalization.ts
index 8b781adf3a..aeacf93fd7 100644
--- a/src/resources/url-normalization.ts
+++ b/src/resources/url-normalization.ts
@@ -5,72 +5,104 @@ import * as Core from '../core';
 
 export class URLNormalization extends APIResource {
   /**
-   * Updates the URL normalization settings.
+   * Updates the URL Normalization settings.
    */
   update(
     params: URLNormalizationUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<URLNormalizationUpdateResponse> {
     const { zone_id, ...body } = params;
-    return this._client.put(`/zones/${zone_id}/url_normalization`, { body, ...options });
+    return (
+      this._client.put(`/zones/${zone_id}/url_normalization`, { body, ...options }) as Core.APIPromise<{
+        result: URLNormalizationUpdateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Fetches the current URL normalization settings.
+   * Deletes the URL Normalization settings.
+   */
+  delete(params: URLNormalizationDeleteParams, options?: Core.RequestOptions): Core.APIPromise<void> {
+    const { zone_id } = params;
+    return this._client.delete(`/zones/${zone_id}/url_normalization`, {
+      ...options,
+      headers: { Accept: '*/*', ...options?.headers },
+    });
+  }
+
+  /**
+   * Fetches the current URL Normalization settings.
    */
   get(
     params: URLNormalizationGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<URLNormalizationGetResponse> {
     const { zone_id } = params;
-    return this._client.get(`/zones/${zone_id}/url_normalization`, options);
+    return (
+      this._client.get(`/zones/${zone_id}/url_normalization`, options) as Core.APIPromise<{
+        result: URLNormalizationGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
   }
 }
 
+/**
+ * A result.
+ */
 export interface URLNormalizationUpdateResponse {
   /**
    * The scope of the URL normalization.
    */
-  scope?: string;
+  scope: 'incoming' | 'both';
 
   /**
    * The type of URL normalization performed by Cloudflare.
    */
-  type?: string;
+  type: 'cloudflare' | 'rfc3986';
 }
 
+/**
+ * A result.
+ */
 export interface URLNormalizationGetResponse {
   /**
    * The scope of the URL normalization.
    */
-  scope?: string;
+  scope: 'incoming' | 'both';
 
   /**
    * The type of URL normalization performed by Cloudflare.
    */
-  type?: string;
+  type: 'cloudflare' | 'rfc3986';
 }
 
 export interface URLNormalizationUpdateParams {
   /**
-   * Path param: Identifier
+   * Path param: The unique ID of the zone.
    */
   zone_id: string;
 
   /**
    * Body param: The scope of the URL normalization.
    */
-  scope?: string;
+  scope: 'incoming' | 'both';
 
   /**
    * Body param: The type of URL normalization performed by Cloudflare.
    */
-  type?: string;
+  type: 'cloudflare' | 'rfc3986';
+}
+
+export interface URLNormalizationDeleteParams {
+  /**
+   * The unique ID of the zone.
+   */
+  zone_id: string;
 }
 
 export interface URLNormalizationGetParams {
   /**
-   * Identifier
+   * The unique ID of the zone.
    */
   zone_id: string;
 }
diff --git a/src/resources/url-scanner/index.ts b/src/resources/url-scanner/index.ts
index b797d001ec..4e37faf6a5 100644
--- a/src/resources/url-scanner/index.ts
+++ b/src/resources/url-scanner/index.ts
@@ -1,14 +1,20 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { URLScanner } from './url-scanner';
+export { Responses, type ResponseGetResponse, type ResponseGetParams } from './responses';
 export {
-  URLScannerDomain,
-  URLScannerTask,
-  ScanCreateResponse,
-  ScanGetResponse,
-  ScanHarResponse,
-  ScanCreateParams,
-  ScanGetParams,
-  ScanScreenshotParams,
   Scans,
+  type ScanCreateResponse,
+  type ScanListResponse,
+  type ScanBulkCreateResponse,
+  type ScanDOMResponse,
+  type ScanGetResponse,
+  type ScanHARResponse,
+  type ScanCreateParams,
+  type ScanListParams,
+  type ScanBulkCreateParams,
+  type ScanDOMParams,
+  type ScanGetParams,
+  type ScanHARParams,
+  type ScanScreenshotParams,
 } from './scans';
+export { URLScanner } from './url-scanner';
diff --git a/src/resources/url-scanner/responses.ts b/src/resources/url-scanner/responses.ts
new file mode 100644
index 0000000000..5318702126
--- /dev/null
+++ b/src/resources/url-scanner/responses.ts
@@ -0,0 +1,34 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+
+export class Responses extends APIResource {
+  /**
+   * Returns the raw response of the network request. If HTML, a plain text response
+   * will be returned.
+   */
+  get(responseId: string, params: ResponseGetParams, options?: Core.RequestOptions): Core.APIPromise<string> {
+    const { account_id } = params;
+    return this._client.get(`/accounts/${account_id}/urlscanner/v2/responses/${responseId}`, {
+      ...options,
+      headers: { Accept: 'text/plain', ...options?.headers },
+    });
+  }
+}
+
+/**
+ * Web resource or image.
+ */
+export type ResponseGetResponse = string;
+
+export interface ResponseGetParams {
+  /**
+   * Account ID.
+   */
+  account_id: string;
+}
+
+export declare namespace Responses {
+  export { type ResponseGetResponse as ResponseGetResponse, type ResponseGetParams as ResponseGetParams };
+}
diff --git a/src/resources/url-scanner/scans.ts b/src/resources/url-scanner/scans.ts
index 13e34bce5f..922ce2570d 100644
--- a/src/resources/url-scanner/scans.ts
+++ b/src/resources/url-scanner/scans.ts
@@ -1,191 +1,599 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
-import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as ScansAPI from './scans';
-import * as TopAPI from '../radar/http/top';
 import { type Response as FetchResponse } from '../../_shims/index';
 
 export class Scans extends APIResource {
   /**
-   * Submit a URL to scan. You can also set some options, like the visibility level
-   * and custom headers. Accounts are limited to 1 new scan every 10 seconds and 8000
-   * per month. If you need more, please reach out.
+   * Submit a URL to scan. Check limits at
+   * https://developers.cloudflare.com/security-center/investigate/scan-limits/.
    */
-  create(
-    accountId: string,
-    body: ScanCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<ScanCreateResponse> {
+  create(params: ScanCreateParams, options?: Core.RequestOptions): Core.APIPromise<ScanCreateResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${accountId}/urlscanner/scan`, { body, ...options }) as Core.APIPromise<{
-        result: ScanCreateResponse;
-      }>
+      this._client.post(`/accounts/${account_id}/urlscanner/v2/scan`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: ScanCreateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Get URL scan by uuid
+   * Use a subset of ElasticSearch Query syntax to filter scans. Some example
+   * queries:<br/> <br/>- 'page.domain:microsoft AND verdicts.malicious:true AND NOT
+   * page.domain:microsoft.com': malicious scans whose hostname starts with
+   * "microsoft".<br/>- 'apikey:me AND date:[2024-01 TO 2024-10]': my scans from 2024
+   * January to 2024 October.<br/>- 'page.domain:(blogspot OR www.blogspot)':
+   * Searches for scans whose main domain starts with "blogspot" or with
+   * "www.blogspot"<br/>- 'date:>now-7d AND path:okta-sign-in.min.js: scans from the
+   * last 7 days with any request path that ends with "okta-sign-in.min.js"<br/>-
+   * 'page.asn:AS24940 AND hash:xxx': Websites hosted in AS24940 where a resource
+   * with the given hash was downloaded.
    */
-  get(
-    accountId: string,
-    scanId: string,
-    query?: ScanGetParams,
+  list(params: ScanListParams, options?: Core.RequestOptions): Core.APIPromise<ScanListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.get(`/accounts/${account_id}/urlscanner/v2/search`, { query, ...options });
+  }
+
+  /**
+   * Submit URLs to scan. Check limits at
+   * https://developers.cloudflare.com/security-center/investigate/scan-limits/ and
+   * take into account scans submitted in bulk have lower priority and may take
+   * longer to finish.
+   */
+  bulkCreate(
+    params: ScanBulkCreateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ScanGetResponse>;
-  get(accountId: string, scanId: string, options?: Core.RequestOptions): Core.APIPromise<ScanGetResponse>;
+  ): Core.APIPromise<ScanBulkCreateResponse> {
+    const { account_id, body } = params;
+    return this._client.post(`/accounts/${account_id}/urlscanner/v2/bulk`, { body: body, ...options });
+  }
+
+  /**
+   * Returns a plain text response, with the scan's DOM content as rendered by
+   * Chrome.
+   */
+  dom(scanId: string, params: ScanDOMParams, options?: Core.RequestOptions): Core.APIPromise<string> {
+    const { account_id } = params;
+    return this._client.get(`/accounts/${account_id}/urlscanner/v2/dom/${scanId}`, {
+      ...options,
+      headers: { Accept: 'text/plain', ...options?.headers },
+    });
+  }
+
+  /**
+   * Get URL scan by uuid
+   */
   get(
-    accountId: string,
     scanId: string,
-    query: ScanGetParams | Core.RequestOptions = {},
+    params: ScanGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<ScanGetResponse> {
-    if (isRequestOptions(query)) {
-      return this.get(accountId, scanId, {}, query);
-    }
-    return (
-      this._client.get(`/accounts/${accountId}/urlscanner/scan/${scanId}`, {
-        query,
-        ...options,
-      }) as Core.APIPromise<{ result: ScanGetResponse }>
-    )._thenUnwrap((obj) => obj.result);
+    const { account_id } = params;
+    return this._client.get(`/accounts/${account_id}/urlscanner/v2/result/${scanId}`, options);
   }
 
   /**
    * Get a URL scan's HAR file. See HAR spec at
    * http://www.softwareishard.com/blog/har-12-spec/.
    */
-  har(accountId: string, scanId: string, options?: Core.RequestOptions): Core.APIPromise<ScanHarResponse> {
-    return (
-      this._client.get(`/accounts/${accountId}/urlscanner/scan/${scanId}/har`, options) as Core.APIPromise<{
-        result: ScanHarResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
+  har(
+    scanId: string,
+    params: ScanHARParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ScanHARResponse> {
+    const { account_id } = params;
+    return this._client.get(`/accounts/${account_id}/urlscanner/v2/har/${scanId}`, options);
   }
 
   /**
    * Get scan's screenshot by resolution (desktop/mobile/tablet).
    */
   screenshot(
-    accountId: string,
-    scanId: string,
-    query?: ScanScreenshotParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<FetchResponse>;
-  screenshot(
-    accountId: string,
-    scanId: string,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<FetchResponse>;
-  screenshot(
-    accountId: string,
     scanId: string,
-    query: ScanScreenshotParams | Core.RequestOptions = {},
+    params: ScanScreenshotParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<FetchResponse> {
-    if (isRequestOptions(query)) {
-      return this.screenshot(accountId, scanId, {}, query);
-    }
-    return this._client.get(`/accounts/${accountId}/urlscanner/scan/${scanId}/screenshot`, {
+    const { account_id, ...query } = params;
+    return this._client.get(`/accounts/${account_id}/urlscanner/v2/screenshots/${scanId}.png`, {
       query,
       ...options,
+      headers: { Accept: 'image/png', ...options?.headers },
       __binaryResponse: true,
     });
   }
 }
 
-export interface URLScannerDomain {
-  id: number;
-
-  name: string;
+/**
+ * URL to report.
+ */
+export type ScanCreateResponse = string;
 
-  super_category_id?: number;
+export interface ScanListResponse {
+  results: Array<ScanListResponse.Result>;
 }
 
-export interface URLScannerTask {
-  effectiveUrl: string;
+export namespace ScanListResponse {
+  export interface Result {
+    _id: string;
 
-  errors: Array<URLScannerTask.Error>;
+    page: Result.Page;
 
-  location: string;
+    result: string;
 
-  region: string;
+    stats: Result.Stats;
 
-  status: string;
+    task: Result.Task;
 
-  success: boolean;
+    verdicts: Result.Verdicts;
+  }
 
-  time: string;
+  export namespace Result {
+    export interface Page {
+      asn: string;
 
-  url: string;
+      country: string;
 
-  uuid: string;
+      ip: string;
 
-  visibility: string;
-}
+      url: string;
+    }
+
+    export interface Stats {
+      dataLength: number;
+
+      requests: number;
+
+      uniqCountries: number;
+
+      uniqIPs: number;
+    }
+
+    export interface Task {
+      time: string;
+
+      url: string;
 
-export namespace URLScannerTask {
-  export interface Error {
-    message: string;
+      uuid: string;
+
+      visibility: string;
+    }
+
+    export interface Verdicts {
+      malicious: boolean;
+    }
   }
 }
 
-export interface ScanCreateResponse {
-  /**
-   * Time when url was submitted for scanning.
-   */
-  time: string;
+export type ScanBulkCreateResponse = Array<ScanBulkCreateResponse.ScanBulkCreateResponseItem>;
 
-  /**
-   * Canonical form of submitted URL. Use this if you want to later search by URL.
-   */
-  url: string;
+export namespace ScanBulkCreateResponse {
+  export interface ScanBulkCreateResponseItem {
+    /**
+     * URL to api report.
+     */
+    api: string;
 
-  /**
-   * Scan ID.
-   */
-  uuid: string;
+    /**
+     * URL to report.
+     */
+    result: string;
 
-  /**
-   * Submitted visibility status.
-   */
-  visibility: string;
+    /**
+     * Submitted URL
+     */
+    url: string;
+
+    /**
+     * Scan ID.
+     */
+    uuid: string;
+
+    /**
+     * Submitted visibility status.
+     */
+    visibility: string;
+
+    options?: ScanBulkCreateResponseItem.Options;
+  }
+
+  export namespace ScanBulkCreateResponseItem {
+    export interface Options {
+      useragent?: string;
+    }
+  }
 }
 
+/**
+ * HTML of webpage.
+ */
+export type ScanDOMResponse = string;
+
 export interface ScanGetResponse {
-  scan: ScanGetResponse.Scan;
+  data: ScanGetResponse.Data;
+
+  lists: ScanGetResponse.Lists;
+
+  meta: ScanGetResponse.Meta;
+
+  page: ScanGetResponse.Page;
+
+  scanner: ScanGetResponse.Scanner;
+
+  stats: ScanGetResponse.Stats;
+
+  task: ScanGetResponse.Task;
+
+  verdicts: ScanGetResponse.Verdicts;
 }
 
 export namespace ScanGetResponse {
-  export interface Scan {
-    certificates: Array<Scan.Certificate>;
+  export interface Data {
+    console: Array<Data.Console>;
 
-    geo: Scan.Geo;
+    cookies: Array<Data.Cookie>;
 
-    meta: Scan.Meta;
+    globals: Array<Data.Global>;
 
-    page: Scan.Page;
+    links: Array<Data.Link>;
 
-    performance: Array<Scan.Performance>;
+    performance: Array<Data.Performance>;
 
-    task: Scan.Task;
+    requests: Array<Data.Request>;
+  }
 
-    verdicts: Scan.Verdicts;
+  export namespace Data {
+    export interface Console {
+      message: Console.Message;
+    }
 
-    /**
-     * Dictionary of Autonomous System Numbers where ASN's are the keys
-     */
-    asns?: Scan.ASNs;
+    export namespace Console {
+      export interface Message {
+        level: string;
+
+        source: string;
+
+        text: string;
+
+        url: string;
+      }
+    }
+
+    export interface Cookie {
+      domain: string;
+
+      expires: number;
+
+      httpOnly: boolean;
+
+      name: string;
+
+      path: string;
+
+      priority: string;
+
+      sameParty: boolean;
+
+      secure: boolean;
+
+      session: boolean;
+
+      size: number;
+
+      sourcePort: number;
+
+      sourceScheme: string;
+
+      value: string;
+    }
+
+    export interface Global {
+      prop: string;
+
+      type: string;
+    }
+
+    export interface Link {
+      href: string;
+
+      text: string;
+    }
+
+    export interface Performance {
+      duration: number;
+
+      entryType: string;
+
+      name: string;
+
+      startTime: number;
+    }
+
+    export interface Request {
+      request: Request.Request;
+
+      response: Request.Response;
+
+      requests?: Array<Request.RequestItem>;
+    }
+
+    export namespace Request {
+      export interface Request {
+        documentURL: string;
+
+        hasUserGesture: boolean;
+
+        initiator: Request.Initiator;
+
+        redirectHasExtraInfo: boolean;
+
+        request: Request.Request;
+
+        requestId: string;
+
+        type: string;
+
+        wallTime: number;
+
+        frameId?: string;
+
+        loaderId?: string;
+
+        primaryRequest?: boolean;
+
+        redirectResponse?: Request.RedirectResponse;
+      }
+
+      export namespace Request {
+        export interface Initiator {
+          host: string;
+
+          type: string;
+
+          url: string;
+        }
+
+        export interface Request {
+          initialPriority: string;
+
+          isSameSite: boolean;
+
+          method: string;
+
+          mixedContentType: string;
+
+          referrerPolicy: string;
+
+          url: string;
+
+          headers?: unknown;
+        }
+
+        export interface RedirectResponse {
+          charset: string;
 
-    domains?: Scan.Domains;
+          mimeType: string;
 
-    ips?: Scan.IPs;
+          protocol: string;
 
-    links?: Scan.Links;
+          remoteIPAddress: string;
+
+          remotePort: number;
+
+          securityHeaders: Array<RedirectResponse.SecurityHeader>;
+
+          securityState: string;
+
+          status: number;
+
+          statusText: string;
+
+          url: string;
+
+          headers?: unknown;
+        }
+
+        export namespace RedirectResponse {
+          export interface SecurityHeader {
+            name: string;
+
+            value: string;
+          }
+        }
+      }
+
+      export interface Response {
+        asn: Response.ASN;
+
+        dataLength: number;
+
+        encodedDataLength: number;
+
+        geoip: Response.Geoip;
+
+        hasExtraInfo: boolean;
+
+        requestId: string;
+
+        response: Response.Response;
+
+        size: number;
+
+        type: string;
+
+        contentAvailable?: boolean;
+
+        hash?: string;
+      }
+
+      export namespace Response {
+        export interface ASN {
+          asn: string;
+
+          country: string;
+
+          description: string;
+
+          ip: string;
+
+          name: string;
+
+          org: string;
+        }
+
+        export interface Geoip {
+          city: string;
+
+          country: string;
+
+          country_name: string;
+
+          geonameId: string;
+
+          ll: Array<unknown>;
+
+          region: string;
+        }
+
+        export interface Response {
+          charset: string;
+
+          mimeType: string;
+
+          protocol: string;
+
+          remoteIPAddress: string;
+
+          remotePort: number;
+
+          securityDetails: Response.SecurityDetails;
+
+          securityHeaders: Array<Response.SecurityHeader>;
+
+          securityState: string;
+
+          status: number;
+
+          statusText: string;
+
+          url: string;
+
+          headers?: unknown;
+        }
+
+        export namespace Response {
+          export interface SecurityDetails {
+            certificateId: number;
+
+            certificateTransparencyCompliance: string;
+
+            cipher: string;
+
+            encryptedClientHello: boolean;
+
+            issuer: string;
+
+            keyExchange: string;
+
+            keyExchangeGroup: string;
+
+            protocol: string;
+
+            sanList: Array<string>;
+
+            serverSignatureAlgorithm: number;
+
+            subjectName: string;
+
+            validFrom: number;
+
+            validTo: number;
+          }
+
+          export interface SecurityHeader {
+            name: string;
+
+            value: string;
+          }
+        }
+      }
+
+      export interface RequestItem {
+        documentURL: string;
+
+        frameId: string;
+
+        hasUserGesture: boolean;
+
+        initiator: RequestItem.Initiator;
+
+        loaderId: string;
+
+        redirectHasExtraInfo: boolean;
+
+        request: RequestItem.Request;
+
+        requestId: string;
+
+        type: string;
+
+        wallTime: number;
+      }
+
+      export namespace RequestItem {
+        export interface Initiator {
+          type: string;
+        }
+
+        export interface Request {
+          headers: Request.Headers;
+
+          initialPriority: string;
+
+          isSameSite: boolean;
+
+          method: string;
+
+          mixedContentType: string;
+
+          referrerPolicy: string;
+
+          url: string;
+        }
+
+        export namespace Request {
+          export interface Headers {
+            name: string;
+          }
+        }
+      }
+    }
+  }
+
+  export interface Lists {
+    asns: Array<string>;
+
+    certificates: Array<Lists.Certificate>;
+
+    continents: Array<string>;
+
+    countries: Array<string>;
+
+    domains: Array<string>;
+
+    hashes: Array<string>;
+
+    ips: Array<string>;
+
+    linkDomains: Array<string>;
+
+    servers: Array<string>;
+
+    urls: Array<string>;
   }
 
-  export namespace Scan {
+  export namespace Lists {
     export interface Certificate {
       issuer: string;
 
@@ -195,677 +603,786 @@ export namespace ScanGetResponse {
 
       validTo: number;
     }
+  }
 
-    export interface Geo {
-      /**
-       * GeoIP continent location
-       */
-      continents: Array<string>;
+  export interface Meta {
+    processors: Meta.Processors;
+  }
 
-      /**
-       * GeoIP country location
-       */
-      locations: Array<string>;
-    }
+  export namespace Meta {
+    export interface Processors {
+      asn: Processors.ASN;
+
+      dns: Processors.DNS;
+
+      domainCategories: Processors.DomainCategories;
+
+      geoip: Processors.Geoip;
 
-    export interface Meta {
-      processors: Meta.Processors;
+      phishing: Processors.Phishing;
+
+      radarRank: Processors.RadarRank;
+
+      wappa: Processors.Wappa;
+
+      urlCategories?: Processors.URLCategories;
     }
 
-    export namespace Meta {
-      export interface Processors {
-        categories: Processors.Categories;
+    export namespace Processors {
+      export interface ASN {
+        data: Array<ASN.Data>;
+      }
+
+      export namespace ASN {
+        export interface Data {
+          asn: string;
+
+          country: string;
+
+          description: string;
 
-        phishing: Array<string>;
+          ip: string;
 
-        rank: Processors.Rank;
+          name: string;
+        }
+      }
 
-        tech: Array<Processors.Tech>;
+      export interface DNS {
+        data: Array<DNS.Data>;
       }
 
-      export namespace Processors {
-        export interface Categories {
-          content: Array<ScansAPI.URLScannerDomain>;
+      export namespace DNS {
+        export interface Data {
+          address: string;
+
+          dnssec_valid: boolean;
+
+          name: string;
 
-          risks: Array<Categories.Risk>;
+          type: string;
         }
+      }
 
-        export namespace Categories {
-          export interface Risk {
-            id: number;
+      export interface DomainCategories {
+        data: Array<DomainCategories.Data>;
+      }
 
-            name: string;
+      export namespace DomainCategories {
+        export interface Data {
+          inherited: unknown;
 
-            super_category_id: number;
+          isPrimary: boolean;
+
+          name: string;
+        }
+      }
+
+      export interface Geoip {
+        data: Array<Geoip.Data>;
+      }
+
+      export namespace Geoip {
+        export interface Data {
+          geoip: Data.Geoip;
+
+          ip: string;
+        }
+
+        export namespace Data {
+          export interface Geoip {
+            city: string;
+
+            country: string;
+
+            country_name: string;
+
+            ll: Array<number>;
+
+            region: string;
           }
         }
+      }
+
+      export interface Phishing {
+        data: Array<string>;
+      }
+
+      export interface RadarRank {
+        data: Array<RadarRank.Data>;
+      }
 
-        export interface Rank {
+      export namespace RadarRank {
+        export interface Data {
           bucket: string;
 
-          name: string;
+          hostname: string;
 
-          /**
-           * Rank in the Global Radar Rank, if set. See more at
-           * https://blog.cloudflare.com/radar-domain-rankings/
-           */
           rank?: number;
         }
+      }
 
-        export interface Tech {
-          categories: Array<Tech.Category>;
+      export interface Wappa {
+        data: Array<Wappa.Data>;
+      }
 
-          confidence: number;
+      export namespace Wappa {
+        export interface Data {
+          app: string;
 
-          evidence: Tech.Evidence;
+          categories: Array<Data.Category>;
 
-          icon: string;
+          confidence: Array<Data.Confidence>;
 
-          name: string;
+          confidenceTotal: number;
 
-          slug: string;
+          icon: string;
 
           website: string;
-
-          description?: string;
         }
 
-        export namespace Tech {
+        export namespace Data {
           export interface Category {
-            id: number;
-
-            groups: Array<number>;
-
             name: string;
 
             priority: number;
-
-            slug: string;
           }
 
-          export interface Evidence {
-            impliedBy: Array<string>;
+          export interface Confidence {
+            confidence: number;
 
-            patterns: Array<Evidence.Pattern>;
-          }
-
-          export namespace Evidence {
-            export interface Pattern {
-              confidence: number;
-
-              excludes: Array<string>;
-
-              implies: Array<string>;
-
-              match: string;
-
-              /**
-               * Header or Cookie name when set
-               */
-              name: string;
-
-              regex: string;
-
-              type: string;
+            name: string;
 
-              value: string;
+            pattern: string;
 
-              version: string;
-            }
+            patternType: string;
           }
         }
       }
-    }
 
-    export interface Page {
-      asn: string;
+      export interface URLCategories {
+        data: Array<URLCategories.Data>;
+      }
 
-      asnLocationAlpha2: string;
+      export namespace URLCategories {
+        export interface Data {
+          content: Array<Data.Content>;
 
-      asnname: string;
+          inherited: Data.Inherited;
 
-      console: Array<Page.Console>;
+          name: string;
 
-      cookies: Array<Page.Cookie>;
+          risks: Array<Data.Risk>;
+        }
 
-      country: string;
+        export namespace Data {
+          export interface Content {
+            id: number;
 
-      countryLocationAlpha2: string;
+            name: string;
 
-      domain: string;
+            super_category_id: number;
+          }
 
-      headers: Array<TopAPI.Browser>;
+          export interface Inherited {
+            content: Array<Inherited.Content>;
 
-      ip: string;
+            from: string;
 
-      js: Page.JS;
+            risks: Array<Inherited.Risk>;
+          }
 
-      securityViolations: Array<Page.SecurityViolation>;
+          export namespace Inherited {
+            export interface Content {
+              id: number;
 
-      status: number;
+              name: string;
 
-      subdivision1Name: string;
+              super_category_id: number;
+            }
 
-      subdivision2name: string;
+            export interface Risk {
+              id: number;
 
-      url: string;
-    }
+              name: string;
 
-    export namespace Page {
-      export interface Console {
-        category: string;
+              super_category_id: number;
+            }
+          }
 
-        text: string;
+          export interface Risk {
+            id: number;
 
-        type: string;
+            name: string;
 
-        url?: string;
+            super_category_id: number;
+          }
+        }
       }
+    }
+  }
 
-      export interface Cookie {
-        domain: string;
-
-        expires: number;
-
-        httpOnly: boolean;
-
-        name: string;
-
-        path: string;
-
-        sameParty: boolean;
+  export interface Page {
+    apexDomain: string;
 
-        secure: boolean;
+    asn: string;
 
-        session: boolean;
+    asnname: string;
 
-        size: number;
+    city: string;
 
-        sourcePort: number;
+    country: string;
 
-        sourceScheme: string;
+    domain: string;
 
-        value: string;
+    ip: string;
 
-        priority?: string;
-      }
+    mimeType: string;
 
-      export interface JS {
-        variables: Array<JS.Variable>;
-      }
+    server: string;
 
-      export namespace JS {
-        export interface Variable {
-          name: string;
+    status: string;
 
-          type: string;
-        }
-      }
+    title: string;
 
-      export interface SecurityViolation {
-        category: string;
+    tlsAgeDays: number;
 
-        text: string;
+    tlsIssuer: string;
 
-        url: string;
-      }
-    }
+    tlsValidDays: number;
 
-    export interface Performance {
-      connectEnd: number;
+    tlsValidFrom: string;
 
-      connectStart: number;
+    url: string;
 
-      decodedBodySize: number;
+    screenshot?: Page.Screenshot;
+  }
 
-      domainLookupEnd: number;
+  export namespace Page {
+    export interface Screenshot {
+      dhash: string;
 
-      domainLookupStart: number;
+      mm3Hash: number;
 
-      domComplete: number;
+      name: string;
 
-      domContentLoadedEventEnd: number;
+      phash: string;
+    }
+  }
 
-      domContentLoadedEventStart: number;
+  export interface Scanner {
+    colo: string;
 
-      domInteractive: number;
+    country: string;
+  }
 
-      duration: number;
+  export interface Stats {
+    domainStats: Array<Stats.DomainStat>;
 
-      encodedBodySize: number;
+    ipStats: Array<Stats.IPStat>;
 
-      entryType: string;
+    IPv6Percentage: number;
 
-      fetchStart: number;
+    malicious: number;
 
-      initiatorType: string;
+    protocolStats: Array<Stats.ProtocolStat>;
 
-      loadEventEnd: number;
+    resourceStats: Array<Stats.ResourceStat>;
 
-      loadEventStart: number;
+    securePercentage: number;
 
-      name: string;
+    secureRequests: number;
 
-      nextHopProtocol: string;
+    serverStats: Array<Stats.ServerStat>;
 
-      redirectCount: number;
+    tlsStats: Array<Stats.TLSStat>;
 
-      redirectEnd: number;
+    totalLinks: number;
 
-      redirectStart: number;
+    uniqASNs: number;
 
-      requestStart: number;
+    uniqCountries: number;
+  }
 
-      responseEnd: number;
+  export namespace Stats {
+    export interface DomainStat {
+      count: number;
 
-      responseStart: number;
+      countries: Array<string>;
 
-      secureConnectionStart: number;
+      domain: string;
 
-      startTime: number;
+      encodedSize: number;
 
-      transferSize: number;
+      index: number;
 
-      type: string;
+      initiators: Array<string>;
 
-      unloadEventEnd: number;
+      ips: Array<string>;
 
-      unloadEventStart: number;
+      redirects: number;
 
-      workerStart: number;
+      size: number;
     }
 
-    export interface Task {
-      /**
-       * Submitter location
-       */
-      clientLocation: string;
+    export interface IPStat {
+      asn: IPStat.ASN;
 
-      clientType: 'Site' | 'Automatic' | 'Api';
+      countries: Array<string>;
 
-      /**
-       * URL of the primary request, after all HTTP redirects
-       */
-      effectiveUrl: string;
+      domains: Array<string>;
 
-      errors: Array<Task.Error>;
+      encodedSize: number;
 
-      scannedFrom: Task.ScannedFrom;
+      geoip: IPStat.Geoip;
 
-      status: 'Queued' | 'InProgress' | 'InPostProcessing' | 'Finished';
+      index: number;
 
-      success: boolean;
+      ip: string;
 
-      time: string;
+      ipv6: boolean;
 
-      timeEnd: string;
+      redirects: number;
 
-      /**
-       * Submitted URL
-       */
-      url: string;
+      requests: number;
 
-      /**
-       * Scan ID
-       */
-      uuid: string;
+      size: number;
 
-      visibility: 'Public' | 'Unlisted';
+      count?: number;
     }
 
-    export namespace Task {
-      export interface Error {
-        message: string;
-      }
+    export namespace IPStat {
+      export interface ASN {
+        asn: string;
 
-      export interface ScannedFrom {
-        /**
-         * IATA code of Cloudflare datacenter
-         */
-        colo: string;
-      }
-    }
+        country: string;
 
-    export interface Verdicts {
-      overall: Verdicts.Overall;
-    }
+        description: string;
 
-    export namespace Verdicts {
-      export interface Overall {
-        categories: Array<Overall.Category>;
+        ip: string;
 
-        /**
-         * At least one of our subsystems marked the site as potentially malicious at the
-         * time of the scan.
-         */
-        malicious: boolean;
+        name: string;
 
-        phishing: Array<string>;
+        org: string;
       }
 
-      export namespace Overall {
-        export interface Category {
-          id: number;
+      export interface Geoip {
+        city: string;
 
-          name: string;
+        country: string;
 
-          super_category_id: number;
-        }
+        country_name: string;
+
+        ll: Array<number>;
+
+        region: string;
       }
     }
 
-    /**
-     * Dictionary of Autonomous System Numbers where ASN's are the keys
-     */
-    export interface ASNs {
-      /**
-       * ASN's contacted
-       */
-      asn?: ASNs.ASN;
-    }
+    export interface ProtocolStat {
+      count: number;
 
-    export namespace ASNs {
-      /**
-       * ASN's contacted
-       */
-      export interface ASN {
-        asn: string;
+      countries: Array<string>;
 
-        description: string;
+      encodedSize: number;
 
-        location_alpha2: string;
+      ips: Array<string>;
 
-        name: string;
+      protocol: string;
 
-        org_name: string;
-      }
+      size: number;
     }
 
-    export interface Domains {
-      'example.com'?: Domains.ExampleCom;
-    }
+    export interface ResourceStat {
+      compression: number;
 
-    export namespace Domains {
-      export interface ExampleCom {
-        categories: ExampleCom.Categories;
+      count: number;
 
-        dns: Array<ExampleCom.DNS>;
+      countries: Array<string>;
 
-        name: string;
+      encodedSize: number;
 
-        rank: ExampleCom.Rank;
+      ips: Array<string>;
 
-        type: string;
-      }
+      percentage: number;
 
-      export namespace ExampleCom {
-        export interface Categories {
-          inherited: Categories.Inherited;
+      size: number;
 
-          content?: Array<ScansAPI.URLScannerDomain>;
+      type: string;
+    }
 
-          risks?: Array<ScansAPI.URLScannerDomain>;
-        }
+    export interface ServerStat {
+      count: number;
 
-        export namespace Categories {
-          export interface Inherited {
-            content?: Array<ScansAPI.URLScannerDomain>;
+      countries: Array<string>;
 
-            from?: string;
+      encodedSize: number;
 
-            risks?: Array<ScansAPI.URLScannerDomain>;
-          }
-        }
+      ips: Array<string>;
 
-        export interface DNS {
-          address: string;
+      server: string;
 
-          dnssec_valid: boolean;
+      size: number;
+    }
 
-          name: string;
+    export interface TLSStat {
+      count: number;
 
-          type: string;
-        }
+      countries: Array<string>;
 
-        export interface Rank {
-          bucket: string;
+      encodedSize: number;
 
-          name: string;
+      ips: Array<string>;
 
-          /**
-           * Rank in the Global Radar Rank, if set. See more at
-           * https://blog.cloudflare.com/radar-domain-rankings/
-           */
-          rank?: number;
-        }
-      }
+      protocols: TLSStat.Protocols;
+
+      securityState: string;
+
+      size: number;
     }
 
-    export interface IPs {
-      ip?: IPs.IP;
+    export namespace TLSStat {
+      export interface Protocols {
+        'TLS 1.3 / AES_128_GCM': number;
+      }
     }
+  }
 
-    export namespace IPs {
-      export interface IP {
-        asn: string;
+  export interface Task {
+    apexDomain: string;
 
-        asnDescription: string;
+    domain: string;
 
-        asnLocationAlpha2: string;
+    domURL: string;
 
-        asnName: string;
+    method: string;
 
-        asnOrgName: string;
+    options: Task.Options;
 
-        continent: string;
+    reportURL: string;
 
-        geonameId: string;
+    screenshotURL: string;
 
-        ip: string;
+    source: string;
 
-        ipVersion: string;
+    success: boolean;
 
-        latitude: string;
+    time: string;
 
-        locationAlpha2: string;
+    url: string;
 
-        locationName: string;
+    uuid: string;
 
-        longitude: string;
+    visibility: string;
+  }
 
-        subdivision1Name: string;
+  export namespace Task {
+    export interface Options {
+      /**
+       * Custom headers set.
+       */
+      customHeaders?: unknown;
 
-        subdivision2Name: string;
-      }
+      screenshotsResolutions?: Array<string>;
     }
+  }
 
-    export interface Links {
-      link?: Links.Link;
-    }
+  export interface Verdicts {
+    overall: Verdicts.Overall;
+  }
 
-    export namespace Links {
-      export interface Link {
-        /**
-         * Outgoing link detected in the DOM
-         */
-        href: string;
+  export namespace Verdicts {
+    export interface Overall {
+      categories: Array<string>;
 
-        text: string;
-      }
+      hasVerdicts: boolean;
+
+      malicious: boolean;
+
+      tags: Array<string>;
     }
   }
 }
 
-export interface ScanHarResponse {
-  har: ScanHarResponse.Har;
+export interface ScanHARResponse {
+  log: ScanHARResponse.Log;
 }
 
-export namespace ScanHarResponse {
-  export interface Har {
-    log: Har.Log;
-  }
+export namespace ScanHARResponse {
+  export interface Log {
+    creator: Log.Creator;
+
+    entries: Array<Log.Entry>;
 
-  export namespace Har {
-    export interface Log {
-      creator: Log.Creator;
+    pages: Array<Log.Page>;
+
+    version: string;
+  }
 
-      entries: Array<Log.Entry>;
+  export namespace Log {
+    export interface Creator {
+      comment: string;
 
-      pages: Array<Log.Page>;
+      name: string;
 
       version: string;
     }
 
-    export namespace Log {
-      export interface Creator {
-        comment: string;
-
-        name: string;
+    export interface Entry {
+      _initialPriority: string;
 
-        version: string;
-      }
+      _initiator_type: string;
 
-      export interface Entry {
-        _initialPriority: string;
+      _priority: string;
 
-        _initiator_type: string;
+      _requestId: string;
 
-        _priority: string;
+      _requestTime: number;
 
-        _requestId: string;
+      _resourceType: string;
 
-        _requestTime: number;
+      cache: unknown;
 
-        _resourceType: string;
+      connection: string;
 
-        cache: unknown;
+      pageref: string;
 
-        connection: string;
+      request: Entry.Request;
 
-        pageref: string;
+      response: Entry.Response;
 
-        request: Entry.Request;
+      serverIPAddress: string;
 
-        response: Entry.Response;
+      startedDateTime: string;
 
-        serverIPAddress: string;
+      time: number;
+    }
 
-        startedDateTime: string;
+    export namespace Entry {
+      export interface Request {
+        bodySize: number;
 
-        time: number;
-      }
+        headers: Array<Request.Header>;
 
-      export namespace Entry {
-        export interface Request {
-          bodySize: number;
+        headersSize: number;
 
-          headers: Array<TopAPI.Browser>;
+        httpVersion: string;
 
-          headersSize: number;
+        method: string;
 
-          httpVersion: string;
+        url: string;
+      }
 
-          method: string;
+      export namespace Request {
+        export interface Header {
+          name: string;
 
-          url: string;
+          value: string;
         }
+      }
 
-        export interface Response {
-          _transferSize: number;
+      export interface Response {
+        _transferSize: number;
 
-          bodySize: number;
+        bodySize: number;
 
-          content: Response.Content;
+        content: Response.Content;
 
-          headers: Array<TopAPI.Browser>;
+        headers: Array<Response.Header>;
 
-          headersSize: number;
+        headersSize: number;
 
-          httpVersion: string;
+        httpVersion: string;
 
-          redirectURL: string;
+        redirectURL: string;
 
-          status: number;
+        status: number;
 
-          statusText: string;
-        }
+        statusText: string;
+      }
 
-        export namespace Response {
-          export interface Content {
-            mimeType: string;
+      export namespace Response {
+        export interface Content {
+          mimeType: string;
 
-            size: number;
+          size: number;
 
-            compression?: number;
-          }
+          compression?: number;
+        }
+
+        export interface Header {
+          name: string;
+
+          value: string;
         }
       }
+    }
 
-      export interface Page {
-        id: string;
+    export interface Page {
+      id: string;
 
-        pageTimings: Page.PageTimings;
+      pageTimings: Page.PageTimings;
 
-        startedDateTime: string;
+      startedDateTime: string;
 
-        title: string;
-      }
+      title: string;
+    }
 
-      export namespace Page {
-        export interface PageTimings {
-          onContentLoad: number;
+    export namespace Page {
+      export interface PageTimings {
+        onContentLoad: number;
 
-          onLoad: number;
-        }
+        onLoad: number;
       }
     }
   }
 }
 
 export interface ScanCreateParams {
+  /**
+   * Path param: Account ID.
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
   url: string;
 
   /**
-   * Set custom headers
+   * Body param:
+   */
+  customagent?: string;
+
+  /**
+   * Body param: Set custom headers.
    */
   customHeaders?: Record<string, string>;
 
   /**
-   * Take multiple screenshots targeting different device types
+   * Body param:
+   */
+  referer?: string;
+
+  /**
+   * Body param: Take multiple screenshots targeting different device types.
    */
   screenshotsResolutions?: Array<'desktop' | 'mobile' | 'tablet'>;
 
   /**
-   * The option `Public` means it will be included in listings like recent scans and
-   * search results. `Unlisted` means it will not be included in the aforementioned
-   * listings, users will need to have the scan's ID to access it. A a scan will be
-   * automatically marked as unlisted if it fails, if it contains potential PII or
-   * other sensitive material.
+   * Body param: The option `Public` means it will be included in listings like
+   * recent scans and search results. `Unlisted` means it will not be included in the
+   * aforementioned listings, users will need to have the scan's ID to access it. A a
+   * scan will be automatically marked as unlisted if it fails, if it contains
+   * potential PII or other sensitive material.
    */
   visibility?: 'Public' | 'Unlisted';
 }
 
+export interface ScanListParams {
+  /**
+   * Path param: Account ID.
+   */
+  account_id: string;
+
+  /**
+   * Query param: Filter scans
+   */
+  q?: string;
+
+  /**
+   * Query param: Limit the number of objects in the response.
+   */
+  size?: number;
+}
+
+export interface ScanBulkCreateParams {
+  /**
+   * Path param: Account ID.
+   */
+  account_id: string;
+
+  /**
+   * Body param: List of urls to scan (up to a 100).
+   */
+  body: Array<ScanBulkCreateParams.Body>;
+}
+
+export namespace ScanBulkCreateParams {
+  export interface Body {
+    url: string;
+
+    customagent?: string;
+
+    /**
+     * Set custom headers.
+     */
+    customHeaders?: Record<string, string>;
+
+    referer?: string;
+
+    /**
+     * Take multiple screenshots targeting different device types.
+     */
+    screenshotsResolutions?: Array<'desktop' | 'mobile' | 'tablet'>;
+
+    /**
+     * The option `Public` means it will be included in listings like recent scans and
+     * search results. `Unlisted` means it will not be included in the aforementioned
+     * listings, users will need to have the scan's ID to access it. A a scan will be
+     * automatically marked as unlisted if it fails, if it contains potential PII or
+     * other sensitive material.
+     */
+    visibility?: 'Public' | 'Unlisted';
+  }
+}
+
+export interface ScanDOMParams {
+  /**
+   * Account ID.
+   */
+  account_id: string;
+}
+
 export interface ScanGetParams {
   /**
-   * Whether to return full report (scan summary and network log).
+   * Account ID.
+   */
+  account_id: string;
+}
+
+export interface ScanHARParams {
+  /**
+   * Account ID.
    */
-  full?: boolean;
+  account_id: string;
 }
 
 export interface ScanScreenshotParams {
   /**
-   * Target device type
+   * Path param: Account ID.
+   */
+  account_id: string;
+
+  /**
+   * Query param: Target device type.
    */
   resolution?: 'desktop' | 'mobile' | 'tablet';
 }
 
-export namespace Scans {
-  export import URLScannerDomain = ScansAPI.URLScannerDomain;
-  export import URLScannerTask = ScansAPI.URLScannerTask;
-  export import ScanCreateResponse = ScansAPI.ScanCreateResponse;
-  export import ScanGetResponse = ScansAPI.ScanGetResponse;
-  export import ScanHarResponse = ScansAPI.ScanHarResponse;
-  export import ScanCreateParams = ScansAPI.ScanCreateParams;
-  export import ScanGetParams = ScansAPI.ScanGetParams;
-  export import ScanScreenshotParams = ScansAPI.ScanScreenshotParams;
+export declare namespace Scans {
+  export {
+    type ScanCreateResponse as ScanCreateResponse,
+    type ScanListResponse as ScanListResponse,
+    type ScanBulkCreateResponse as ScanBulkCreateResponse,
+    type ScanDOMResponse as ScanDOMResponse,
+    type ScanGetResponse as ScanGetResponse,
+    type ScanHARResponse as ScanHARResponse,
+    type ScanCreateParams as ScanCreateParams,
+    type ScanListParams as ScanListParams,
+    type ScanBulkCreateParams as ScanBulkCreateParams,
+    type ScanDOMParams as ScanDOMParams,
+    type ScanGetParams as ScanGetParams,
+    type ScanHARParams as ScanHARParams,
+    type ScanScreenshotParams as ScanScreenshotParams,
+  };
 }
diff --git a/src/resources/url-scanner/url-scanner.ts b/src/resources/url-scanner/url-scanner.ts
index 1fe11bbe35..eb626cfc0e 100644
--- a/src/resources/url-scanner/url-scanner.ts
+++ b/src/resources/url-scanner/url-scanner.ts
@@ -1,182 +1,91 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
-import { isRequestOptions } from '../../core';
-import * as Core from '../../core';
+import * as ResponsesAPI from './responses';
+import { ResponseGetParams, ResponseGetResponse, Responses } from './responses';
 import * as ScansAPI from './scans';
+import {
+  ScanBulkCreateParams,
+  ScanBulkCreateResponse,
+  ScanCreateParams,
+  ScanCreateResponse,
+  ScanDOMParams,
+  ScanDOMResponse,
+  ScanGetParams,
+  ScanGetResponse,
+  ScanHARParams,
+  ScanHARResponse,
+  ScanListParams,
+  ScanListResponse,
+  ScanScreenshotParams,
+  Scans,
+} from './scans';
 
 export class URLScanner extends APIResource {
+  responses: ResponsesAPI.Responses = new ResponsesAPI.Responses(this._client);
   scans: ScansAPI.Scans = new ScansAPI.Scans(this._client);
-
-  /**
-   * Search scans by date and webpages' requests, including full URL (after
-   * redirects), hostname, and path. <br/> A successful scan will appear in search
-   * results a few minutes after finishing but may take much longer if the system in
-   * under load. By default, only successfully completed scans will appear in search
-   * results, unless searching by `scanId`. Please take into account that older scans
-   * may be removed from the search index at an unspecified time.
-   */
-  scan(
-    accountId: string,
-    query?: URLScannerScanParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<URLScannerScanResponse>;
-  scan(accountId: string, options?: Core.RequestOptions): Core.APIPromise<URLScannerScanResponse>;
-  scan(
-    accountId: string,
-    query: URLScannerScanParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<URLScannerScanResponse> {
-    if (isRequestOptions(query)) {
-      return this.scan(accountId, {}, query);
-    }
-    return (
-      this._client.get(`/accounts/${accountId}/urlscanner/scan`, { query, ...options }) as Core.APIPromise<{
-        result: URLScannerScanResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
 }
 
-export interface URLScannerScanResponse {
-  tasks: Array<URLScannerScanResponse.Task>;
+export interface URLScannerDomain {
+  id: number;
+
+  name: string;
+
+  super_category_id?: number;
 }
 
-export namespace URLScannerScanResponse {
-  export interface Task {
-    /**
-     * Alpha-2 country code
-     */
-    country: string;
-
-    /**
-     * Whether scan was successful or not
-     */
-    success: boolean;
-
-    /**
-     * When scan was submitted (UTC)
-     */
-    time: string;
-
-    /**
-     * Scan url (after redirects)
-     */
-    url: string;
-
-    /**
-     * Scan id
-     */
-    uuid: string;
-
-    /**
-     * Visibility status.
-     */
-    visibility: string;
-  }
+export interface URLScannerTask {
+  effectiveUrl: string;
+
+  errors: Array<URLScannerTask.Error>;
+
+  location: string;
+
+  region: string;
+
+  status: string;
+
+  success: boolean;
+
+  time: string;
+
+  url: string;
+
+  uuid: string;
+
+  visibility: string;
 }
 
-export interface URLScannerScanParams {
-  /**
-   * Return only scans created by account.
-   */
-  account_scans?: boolean;
-
-  /**
-   * Filter scans by Autonomous System Number (ASN) of _any_ request made by the
-   * webpage.
-   */
-  asn?: string;
-
-  /**
-   * Filter scans requested before date (inclusive).
-   */
-  date_end?: string;
-
-  /**
-   * Filter scans requested after date (inclusive).
-   */
-  date_start?: string;
-
-  /**
-   * Filter scans by hash of any html/js/css request made by the webpage.
-   */
-  hash?: string;
-
-  /**
-   * Filter scans by hostname of _any_ request made by the webpage.
-   */
-  hostname?: string;
-
-  /**
-   * Filter scans by IP address (IPv4 or IPv6) of _any_ request made by the webpage.
-   */
-  ip?: string;
-
-  /**
-   * Filter scans by malicious verdict.
-   */
-  is_malicious?: boolean;
-
-  /**
-   * Limit the number of objects in the response.
-   */
-  limit?: number;
-
-  /**
-   * Pagination cursor to get the next set of results.
-   */
-  next_cursor?: string;
-
-  /**
-   * Filter scans by main page Autonomous System Number (ASN).
-   */
-  page_asn?: string;
-
-  /**
-   * Filter scans by main page hostname (domain of effective URL).
-   */
-  page_hostname?: string;
-
-  /**
-   * Filter scans by main page IP address (IPv4 or IPv6).
-   */
-  page_ip?: string;
-
-  /**
-   * Filter scans by exact match of effective URL path (also supports suffix search).
-   */
-  page_path?: string;
-
-  /**
-   * Filter scans by submitted or scanned URL
-   */
-  page_url?: string;
-
-  /**
-   * Filter scans by url path of _any_ request made by the webpage.
-   */
-  path?: string;
-
-  /**
-   * Scan uuid
-   */
-  scanId?: string;
-
-  /**
-   * Filter scans by URL of _any_ request made by the webpage
-   */
-  url?: string;
+export namespace URLScannerTask {
+  export interface Error {
+    message: string;
+  }
 }
 
-export namespace URLScanner {
-  export import Scans = ScansAPI.Scans;
-  export import URLScannerDomain = ScansAPI.URLScannerDomain;
-  export import URLScannerTask = ScansAPI.URLScannerTask;
-  export import ScanCreateResponse = ScansAPI.ScanCreateResponse;
-  export import ScanGetResponse = ScansAPI.ScanGetResponse;
-  export import ScanHarResponse = ScansAPI.ScanHarResponse;
-  export import ScanCreateParams = ScansAPI.ScanCreateParams;
-  export import ScanGetParams = ScansAPI.ScanGetParams;
-  export import ScanScreenshotParams = ScansAPI.ScanScreenshotParams;
+URLScanner.Responses = Responses;
+URLScanner.Scans = Scans;
+
+export declare namespace URLScanner {
+  export {
+    Responses as Responses,
+    type ResponseGetResponse as ResponseGetResponse,
+    type ResponseGetParams as ResponseGetParams,
+  };
+
+  export {
+    Scans as Scans,
+    type ScanCreateResponse as ScanCreateResponse,
+    type ScanListResponse as ScanListResponse,
+    type ScanBulkCreateResponse as ScanBulkCreateResponse,
+    type ScanDOMResponse as ScanDOMResponse,
+    type ScanGetResponse as ScanGetResponse,
+    type ScanHARResponse as ScanHARResponse,
+    type ScanCreateParams as ScanCreateParams,
+    type ScanListParams as ScanListParams,
+    type ScanBulkCreateParams as ScanBulkCreateParams,
+    type ScanDOMParams as ScanDOMParams,
+    type ScanGetParams as ScanGetParams,
+    type ScanHARParams as ScanHARParams,
+    type ScanScreenshotParams as ScanScreenshotParams,
+  };
 }
diff --git a/src/resources/user/audit-logs.ts b/src/resources/user/audit-logs.ts
index 8df82e0d24..eca75c1ed2 100644
--- a/src/resources/user/audit-logs.ts
+++ b/src/resources/user/audit-logs.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as AuditLogsAPI from './audit-logs';
 import * as Shared from '../shared';
 import { AuditLogsV4PagePaginationArray } from '../shared';
 import { type V4PagePaginationArrayParams } from '../../pagination';
@@ -40,10 +39,10 @@ export interface AuditLogListParams extends V4PagePaginationArrayParams {
   actor?: AuditLogListParams.Actor;
 
   /**
-   * Limits the returned results to logs older than the specified date. This can be a
-   * date string `2019-04-30` or an absolute timestamp that conforms to RFC3339.
+   * Limits the returned results to logs older than the specified date. A `full-date`
+   * that conforms to RFC3339.
    */
-  before?: string;
+  before?: string | string;
 
   /**
    * Changes the direction of the chronological sorting.
@@ -61,10 +60,10 @@ export interface AuditLogListParams extends V4PagePaginationArrayParams {
   hide_user_logs?: boolean;
 
   /**
-   * Limits the returned results to logs newer than the specified date. This can be a
-   * date string `2019-04-30` or an absolute timestamp that conforms to RFC3339.
+   * Limits the returned results to logs newer than the specified date. A `full-date`
+   * that conforms to RFC3339.
    */
-  since?: string;
+  since?: string | string;
 
   zone?: AuditLogListParams.Zone;
 }
@@ -98,8 +97,8 @@ export namespace AuditLogListParams {
   }
 }
 
-export namespace AuditLogs {
-  export import AuditLogListParams = AuditLogsAPI.AuditLogListParams;
+export declare namespace AuditLogs {
+  export { type AuditLogListParams as AuditLogListParams };
 }
 
 export { AuditLogsV4PagePaginationArray };
diff --git a/src/resources/user/billing/billing.ts b/src/resources/user/billing/billing.ts
index ba0a998297..ed334ab48c 100644
--- a/src/resources/user/billing/billing.ts
+++ b/src/resources/user/billing/billing.ts
@@ -2,18 +2,26 @@
 
 import { APIResource } from '../../../resource';
 import * as HistoryAPI from './history';
+import { BillingHistoriesV4PagePaginationArray, BillingHistory, History, HistoryListParams } from './history';
 import * as ProfileAPI from './profile';
+import { Profile, ProfileGetResponse } from './profile';
 
 export class Billing extends APIResource {
   history: HistoryAPI.History = new HistoryAPI.History(this._client);
   profile: ProfileAPI.Profile = new ProfileAPI.Profile(this._client);
 }
 
-export namespace Billing {
-  export import History = HistoryAPI.History;
-  export import BillingHistory = HistoryAPI.BillingHistory;
-  export import BillingHistoriesV4PagePaginationArray = HistoryAPI.BillingHistoriesV4PagePaginationArray;
-  export import HistoryListParams = HistoryAPI.HistoryListParams;
-  export import Profile = ProfileAPI.Profile;
-  export import ProfileGetResponse = ProfileAPI.ProfileGetResponse;
+Billing.History = History;
+Billing.BillingHistoriesV4PagePaginationArray = BillingHistoriesV4PagePaginationArray;
+Billing.Profile = Profile;
+
+export declare namespace Billing {
+  export {
+    History as History,
+    type BillingHistory as BillingHistory,
+    BillingHistoriesV4PagePaginationArray as BillingHistoriesV4PagePaginationArray,
+    type HistoryListParams as HistoryListParams,
+  };
+
+  export { Profile as Profile, type ProfileGetResponse as ProfileGetResponse };
 }
diff --git a/src/resources/user/billing/history.ts b/src/resources/user/billing/history.ts
index 4c47962653..be56734902 100644
--- a/src/resources/user/billing/history.ts
+++ b/src/resources/user/billing/history.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as HistoryAPI from './history';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class History extends APIResource {
@@ -74,7 +73,7 @@ export interface BillingHistory {
 
 export namespace BillingHistory {
   export interface Zone {
-    name?: unknown;
+    name?: string;
   }
 }
 
@@ -84,11 +83,6 @@ export interface HistoryListParams extends V4PagePaginationArrayParams {
    */
   action?: string;
 
-  /**
-   * When the billing item was created.
-   */
-  occured_at?: string;
-
   /**
    * When the billing item was created.
    */
@@ -97,7 +91,7 @@ export interface HistoryListParams extends V4PagePaginationArrayParams {
   /**
    * Field to order billing history by.
    */
-  order?: 'type' | 'occured_at' | 'action';
+  order?: 'type' | 'occurred_at' | 'action';
 
   /**
    * The billing item type.
@@ -105,8 +99,12 @@ export interface HistoryListParams extends V4PagePaginationArrayParams {
   type?: string;
 }
 
-export namespace History {
-  export import BillingHistory = HistoryAPI.BillingHistory;
-  export import BillingHistoriesV4PagePaginationArray = HistoryAPI.BillingHistoriesV4PagePaginationArray;
-  export import HistoryListParams = HistoryAPI.HistoryListParams;
+History.BillingHistoriesV4PagePaginationArray = BillingHistoriesV4PagePaginationArray;
+
+export declare namespace History {
+  export {
+    type BillingHistory as BillingHistory,
+    BillingHistoriesV4PagePaginationArray as BillingHistoriesV4PagePaginationArray,
+    type HistoryListParams as HistoryListParams,
+  };
 }
diff --git a/src/resources/user/billing/index.ts b/src/resources/user/billing/index.ts
index 9888fe3a59..eee8a2fe5a 100644
--- a/src/resources/user/billing/index.ts
+++ b/src/resources/user/billing/index.ts
@@ -1,5 +1,10 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export { Billing } from './billing';
-export { BillingHistory, HistoryListParams, BillingHistoriesV4PagePaginationArray, History } from './history';
-export { ProfileGetResponse, Profile } from './profile';
+export {
+  BillingHistoriesV4PagePaginationArray,
+  History,
+  type BillingHistory,
+  type HistoryListParams,
+} from './history';
+export { Profile, type ProfileGetResponse } from './profile';
diff --git a/src/resources/user/billing/profile.ts b/src/resources/user/billing/profile.ts
index afaff28422..b6a6a89a74 100644
--- a/src/resources/user/billing/profile.ts
+++ b/src/resources/user/billing/profile.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ProfileAPI from './profile';
 
 export class Profile extends APIResource {
   /**
@@ -15,8 +14,89 @@ export class Profile extends APIResource {
   }
 }
 
-export type ProfileGetResponse = unknown | string | null;
+export interface ProfileGetResponse {
+  /**
+   * Billing item identifier tag.
+   */
+  id?: string;
+
+  account_type?: string;
+
+  address?: string;
+
+  address2?: string;
+
+  balance?: string;
+
+  card_expiry_month?: number;
+
+  card_expiry_year?: number;
+
+  card_number?: string;
+
+  city?: string;
+
+  company?: string;
+
+  country?: string;
+
+  created_on?: string;
+
+  device_data?: string;
+
+  edited_on?: string;
+
+  enterprise_billing_email?: string;
+
+  enterprise_primary_email?: string;
+
+  first_name?: string;
+
+  is_partner?: boolean;
+
+  last_name?: string;
+
+  next_bill_date?: string;
+
+  payment_address?: string;
+
+  payment_address2?: string;
+
+  payment_city?: string;
+
+  payment_country?: string;
+
+  payment_email?: string;
+
+  payment_first_name?: string;
+
+  payment_gateway?: string;
+
+  payment_last_name?: string;
+
+  payment_nonce?: string;
+
+  payment_state?: string;
+
+  payment_zipcode?: string;
+
+  primary_email?: string;
+
+  state?: string;
+
+  tax_id_type?: string;
+
+  telephone?: string;
+
+  use_legacy?: boolean;
+
+  validation_code?: string;
+
+  vat?: string;
+
+  zipcode?: string;
+}
 
-export namespace Profile {
-  export import ProfileGetResponse = ProfileAPI.ProfileGetResponse;
+export declare namespace Profile {
+  export { type ProfileGetResponse as ProfileGetResponse };
 }
diff --git a/src/resources/user/index.ts b/src/resources/user/index.ts
index 9e6f89fc0a..ee6b078bde 100644
--- a/src/resources/user/index.ts
+++ b/src/resources/user/index.ts
@@ -1,51 +1,30 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { AuditLogListParams, AuditLogs } from './audit-logs';
+export { AuditLogs, type AuditLogListParams } from './audit-logs';
 export { Billing } from './billing/index';
+export { InvitesSinglePage, Invites, type Invite, type InviteEditParams } from './invites';
 export {
-  CIDRList,
-  Policy,
-  Token,
-  TokenCreateResponse,
-  TokenUpdateResponse,
-  TokenListResponse,
-  TokenDeleteResponse,
-  TokenGetResponse,
-  TokenVerifyResponse,
-  TokenCreateParams,
-  TokenUpdateParams,
-  TokenListParams,
-  TokenListResponsesV4PagePaginationArray,
-  Tokens,
-} from './tokens/index';
-export {
-  Invite,
-  InviteEditResponse,
-  InviteGetResponse,
-  InviteEditParams,
-  InvitesSinglePage,
-  Invites,
-} from './invites';
-export {
-  Organization,
-  OrganizationDeleteResponse,
-  OrganizationGetResponse,
-  OrganizationListParams,
   OrganizationsV4PagePaginationArray,
   Organizations,
+  type Organization,
+  type OrganizationDeleteResponse,
+  type OrganizationGetResponse,
+  type OrganizationListParams,
 } from './organizations';
 export {
-  RatePlan,
-  Subscription,
-  SubscriptionComponent,
-  SubscriptionZone,
-  SubscriptionUpdateResponse,
-  SubscriptionDeleteResponse,
-  SubscriptionEditResponse,
-  SubscriptionGetResponse,
-  SubscriptionUpdateParams,
-  SubscriptionEditParams,
-  SubscriptionsSinglePage,
   Subscriptions,
+  type SubscriptionUpdateResponse,
+  type SubscriptionDeleteResponse,
+  type SubscriptionGetResponse,
+  type SubscriptionUpdateParams,
 } from './subscriptions';
+export {
+  Tokens,
+  type TokenCreateResponse,
+  type TokenDeleteResponse,
+  type TokenVerifyResponse,
+  type TokenCreateParams,
+  type TokenUpdateParams,
+  type TokenListParams,
+} from './tokens/index';
 export { User } from './user';
diff --git a/src/resources/user/invites.ts b/src/resources/user/invites.ts
index d955678eb1..48ee5f675e 100644
--- a/src/resources/user/invites.ts
+++ b/src/resources/user/invites.ts
@@ -2,8 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as InvitesAPI from './invites';
-import * as Shared from '../shared';
 import { SinglePage } from '../../pagination';
 
 export class Invites extends APIResource {
@@ -17,14 +15,10 @@ export class Invites extends APIResource {
   /**
    * Responds to an invitation.
    */
-  edit(
-    inviteId: string,
-    body: InviteEditParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<InviteEditResponse> {
+  edit(inviteId: string, body: InviteEditParams, options?: Core.RequestOptions): Core.APIPromise<Invite> {
     return (
       this._client.patch(`/user/invites/${inviteId}`, { body, ...options }) as Core.APIPromise<{
-        result: InviteEditResponse;
+        result: Invite;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -32,9 +26,9 @@ export class Invites extends APIResource {
   /**
    * Gets the details of an invitation.
    */
-  get(inviteId: string, options?: Core.RequestOptions): Core.APIPromise<InviteGetResponse> {
+  get(inviteId: string, options?: Core.RequestOptions): Core.APIPromise<Invite> {
     return (
-      this._client.get(`/user/invites/${inviteId}`, options) as Core.APIPromise<{ result: InviteGetResponse }>
+      this._client.get(`/user/invites/${inviteId}`, options) as Core.APIPromise<{ result: Invite }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -77,15 +71,17 @@ export interface Invite {
    */
   invited_on?: string;
 
+  organization_is_enforcing_twofactor?: boolean;
+
   /**
    * Organization name.
    */
   organization_name?: string;
 
   /**
-   * Roles to be assigned to this user.
+   * List of role names the membership has for this account.
    */
-  roles?: Array<Shared.Role>;
+  roles?: Array<string>;
 
   /**
    * Current status of the invitation.
@@ -93,10 +89,6 @@ export interface Invite {
   status?: 'pending' | 'accepted' | 'rejected' | 'expired';
 }
 
-export type InviteEditResponse = unknown;
-
-export type InviteGetResponse = unknown;
-
 export interface InviteEditParams {
   /**
    * Status of your response to the invitation (rejected or accepted).
@@ -104,10 +96,12 @@ export interface InviteEditParams {
   status: 'accepted' | 'rejected';
 }
 
-export namespace Invites {
-  export import Invite = InvitesAPI.Invite;
-  export import InviteEditResponse = InvitesAPI.InviteEditResponse;
-  export import InviteGetResponse = InvitesAPI.InviteGetResponse;
-  export import InvitesSinglePage = InvitesAPI.InvitesSinglePage;
-  export import InviteEditParams = InvitesAPI.InviteEditParams;
+Invites.InvitesSinglePage = InvitesSinglePage;
+
+export declare namespace Invites {
+  export {
+    type Invite as Invite,
+    InvitesSinglePage as InvitesSinglePage,
+    type InviteEditParams as InviteEditParams,
+  };
 }
diff --git a/src/resources/user/organizations.ts b/src/resources/user/organizations.ts
index 204af2e213..bb39bcd758 100644
--- a/src/resources/user/organizations.ts
+++ b/src/resources/user/organizations.ts
@@ -3,7 +3,6 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import * as OrganizationsAPI from './organizations';
 import * as Shared from '../shared';
 import * as MembersAPI from '../accounts/members';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
@@ -114,10 +113,14 @@ export interface OrganizationListParams extends V4PagePaginationArrayParams {
   status?: 'member' | 'invited';
 }
 
-export namespace Organizations {
-  export import Organization = OrganizationsAPI.Organization;
-  export import OrganizationDeleteResponse = OrganizationsAPI.OrganizationDeleteResponse;
-  export import OrganizationGetResponse = OrganizationsAPI.OrganizationGetResponse;
-  export import OrganizationsV4PagePaginationArray = OrganizationsAPI.OrganizationsV4PagePaginationArray;
-  export import OrganizationListParams = OrganizationsAPI.OrganizationListParams;
+Organizations.OrganizationsV4PagePaginationArray = OrganizationsV4PagePaginationArray;
+
+export declare namespace Organizations {
+  export {
+    type Organization as Organization,
+    type OrganizationDeleteResponse as OrganizationDeleteResponse,
+    type OrganizationGetResponse as OrganizationGetResponse,
+    OrganizationsV4PagePaginationArray as OrganizationsV4PagePaginationArray,
+    type OrganizationListParams as OrganizationListParams,
+  };
 }
diff --git a/src/resources/user/subscriptions.ts b/src/resources/user/subscriptions.ts
index f7fc6e73bd..ee77ec9929 100644
--- a/src/resources/user/subscriptions.ts
+++ b/src/resources/user/subscriptions.ts
@@ -2,8 +2,7 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SubscriptionsAPI from './subscriptions';
-import { SinglePage } from '../../pagination';
+import * as Shared from '../shared';
 
 export class Subscriptions extends APIResource {
   /**
@@ -28,21 +27,6 @@ export class Subscriptions extends APIResource {
     return this._client.delete(`/user/subscriptions/${identifier}`, options);
   }
 
-  /**
-   * Updates zone subscriptions, either plan or add-ons.
-   */
-  edit(
-    identifier: string,
-    body: SubscriptionEditParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SubscriptionEditResponse> {
-    return (
-      this._client.put(`/zones/${identifier}/subscription`, { body, ...options }) as Core.APIPromise<{
-        result: SubscriptionEditResponse;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
   /**
    * Lists all of a user's subscriptions.
    */
@@ -55,222 +39,6 @@ export class Subscriptions extends APIResource {
   }
 }
 
-export class SubscriptionsSinglePage extends SinglePage<Subscription> {}
-
-/**
- * The rate plan applied to the subscription.
- */
-export interface RatePlan {
-  /**
-   * The ID of the rate plan.
-   */
-  id?: string;
-
-  /**
-   * The currency applied to the rate plan subscription.
-   */
-  currency?: string;
-
-  /**
-   * Whether this rate plan is managed externally from Cloudflare.
-   */
-  externally_managed?: boolean;
-
-  /**
-   * Whether a rate plan is enterprise-based (or newly adopted term contract).
-   */
-  is_contract?: boolean;
-
-  /**
-   * The full name of the rate plan.
-   */
-  public_name?: string;
-
-  /**
-   * The scope that this rate plan applies to.
-   */
-  scope?: string;
-
-  /**
-   * The list of sets this rate plan applies to.
-   */
-  sets?: Array<string>;
-}
-
-/**
- * The rate plan applied to the subscription.
- */
-export interface RatePlanParam {
-  /**
-   * The ID of the rate plan.
-   */
-  id?: string;
-
-  /**
-   * The currency applied to the rate plan subscription.
-   */
-  currency?: string;
-
-  /**
-   * Whether this rate plan is managed externally from Cloudflare.
-   */
-  externally_managed?: boolean;
-
-  /**
-   * Whether a rate plan is enterprise-based (or newly adopted term contract).
-   */
-  is_contract?: boolean;
-
-  /**
-   * The full name of the rate plan.
-   */
-  public_name?: string;
-
-  /**
-   * The scope that this rate plan applies to.
-   */
-  scope?: string;
-
-  /**
-   * The list of sets this rate plan applies to.
-   */
-  sets?: Array<string>;
-}
-
-export interface Subscription {
-  /**
-   * Subscription identifier tag.
-   */
-  id?: string;
-
-  app?: Subscription.App;
-
-  /**
-   * The list of add-ons subscribed to.
-   */
-  component_values?: Array<SubscriptionComponent>;
-
-  /**
-   * The monetary unit in which pricing information is displayed.
-   */
-  currency?: string;
-
-  /**
-   * The end of the current period and also when the next billing is due.
-   */
-  current_period_end?: string;
-
-  /**
-   * When the current billing period started. May match initial_period_start if this
-   * is the first period.
-   */
-  current_period_start?: string;
-
-  /**
-   * How often the subscription is renewed automatically.
-   */
-  frequency?: 'weekly' | 'monthly' | 'quarterly' | 'yearly';
-
-  /**
-   * The price of the subscription that will be billed, in US dollars.
-   */
-  price?: number;
-
-  /**
-   * The rate plan applied to the subscription.
-   */
-  rate_plan?: RatePlan;
-
-  /**
-   * The state that the subscription is in.
-   */
-  state?: 'Trial' | 'Provisioned' | 'Paid' | 'AwaitingPayment' | 'Cancelled' | 'Failed' | 'Expired';
-
-  /**
-   * A simple zone object. May have null properties if not a zone subscription.
-   */
-  zone?: SubscriptionZone;
-}
-
-export namespace Subscription {
-  export interface App {
-    /**
-     * app install id.
-     */
-    install_id?: string;
-  }
-}
-
-/**
- * A component value for a subscription.
- */
-export interface SubscriptionComponent {
-  /**
-   * The default amount assigned.
-   */
-  default?: number;
-
-  /**
-   * The name of the component value.
-   */
-  name?: string;
-
-  /**
-   * The unit price for the component value.
-   */
-  price?: number;
-
-  /**
-   * The amount of the component value assigned.
-   */
-  value?: number;
-}
-
-/**
- * A component value for a subscription.
- */
-export interface SubscriptionComponentParam {
-  /**
-   * The default amount assigned.
-   */
-  default?: number;
-
-  /**
-   * The name of the component value.
-   */
-  name?: string;
-
-  /**
-   * The unit price for the component value.
-   */
-  price?: number;
-
-  /**
-   * The amount of the component value assigned.
-   */
-  value?: number;
-}
-
-/**
- * A simple zone object. May have null properties if not a zone subscription.
- */
-export interface SubscriptionZone {
-  /**
-   * Identifier
-   */
-  id?: string;
-
-  /**
-   * The domain name
-   */
-  name?: string;
-}
-
-/**
- * A simple zone object. May have null properties if not a zone subscription.
- */
-export interface SubscriptionZoneParam {}
-
 export type SubscriptionUpdateResponse = unknown | string | null;
 
 export interface SubscriptionDeleteResponse {
@@ -280,18 +48,9 @@ export interface SubscriptionDeleteResponse {
   subscription_id?: string;
 }
 
-export type SubscriptionEditResponse = unknown | string | null;
-
-export type SubscriptionGetResponse = Array<Subscription>;
+export type SubscriptionGetResponse = Array<Shared.Subscription>;
 
 export interface SubscriptionUpdateParams {
-  app?: SubscriptionUpdateParams.App;
-
-  /**
-   * The list of add-ons subscribed to.
-   */
-  component_values?: Array<SubscriptionComponentParam>;
-
   /**
    * How often the subscription is renewed automatically.
    */
@@ -300,65 +59,14 @@ export interface SubscriptionUpdateParams {
   /**
    * The rate plan applied to the subscription.
    */
-  rate_plan?: RatePlanParam;
-
-  /**
-   * A simple zone object. May have null properties if not a zone subscription.
-   */
-  zone?: SubscriptionZoneParam;
-}
-
-export namespace SubscriptionUpdateParams {
-  export interface App {
-    /**
-     * app install id.
-     */
-    install_id?: string;
-  }
-}
-
-export interface SubscriptionEditParams {
-  app?: SubscriptionEditParams.App;
-
-  /**
-   * The list of add-ons subscribed to.
-   */
-  component_values?: Array<SubscriptionComponentParam>;
-
-  /**
-   * How often the subscription is renewed automatically.
-   */
-  frequency?: 'weekly' | 'monthly' | 'quarterly' | 'yearly';
-
-  /**
-   * The rate plan applied to the subscription.
-   */
-  rate_plan?: RatePlanParam;
-
-  /**
-   * A simple zone object. May have null properties if not a zone subscription.
-   */
-  zone?: SubscriptionZoneParam;
-}
-
-export namespace SubscriptionEditParams {
-  export interface App {
-    /**
-     * app install id.
-     */
-    install_id?: string;
-  }
+  rate_plan?: Shared.RatePlanParam;
 }
 
-export namespace Subscriptions {
-  export import RatePlan = SubscriptionsAPI.RatePlan;
-  export import Subscription = SubscriptionsAPI.Subscription;
-  export import SubscriptionComponent = SubscriptionsAPI.SubscriptionComponent;
-  export import SubscriptionZone = SubscriptionsAPI.SubscriptionZone;
-  export import SubscriptionUpdateResponse = SubscriptionsAPI.SubscriptionUpdateResponse;
-  export import SubscriptionDeleteResponse = SubscriptionsAPI.SubscriptionDeleteResponse;
-  export import SubscriptionEditResponse = SubscriptionsAPI.SubscriptionEditResponse;
-  export import SubscriptionGetResponse = SubscriptionsAPI.SubscriptionGetResponse;
-  export import SubscriptionUpdateParams = SubscriptionsAPI.SubscriptionUpdateParams;
-  export import SubscriptionEditParams = SubscriptionsAPI.SubscriptionEditParams;
+export declare namespace Subscriptions {
+  export {
+    type SubscriptionUpdateResponse as SubscriptionUpdateResponse,
+    type SubscriptionDeleteResponse as SubscriptionDeleteResponse,
+    type SubscriptionGetResponse as SubscriptionGetResponse,
+    type SubscriptionUpdateParams as SubscriptionUpdateParams,
+  };
 }
diff --git a/src/resources/user/tokens/index.ts b/src/resources/user/tokens/index.ts
index 120c42ef41..2c4a8edb0b 100644
--- a/src/resources/user/tokens/index.ts
+++ b/src/resources/user/tokens/index.ts
@@ -1,24 +1,17 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  CIDRList,
-  Policy,
-  Token,
-  TokenCreateResponse,
-  TokenUpdateResponse,
-  TokenListResponse,
-  TokenDeleteResponse,
-  TokenGetResponse,
-  TokenVerifyResponse,
-  TokenCreateParams,
-  TokenUpdateParams,
-  TokenListParams,
-  TokenListResponsesV4PagePaginationArray,
-  Tokens,
-} from './tokens';
-export {
-  PermissionGroupListResponse,
   PermissionGroupListResponsesSinglePage,
   PermissionGroups,
+  type PermissionGroupListResponse,
 } from './permission-groups';
-export { Value, ValueUpdateParams, ValueResource } from './value';
+export {
+  Tokens,
+  type TokenCreateResponse,
+  type TokenDeleteResponse,
+  type TokenVerifyResponse,
+  type TokenCreateParams,
+  type TokenUpdateParams,
+  type TokenListParams,
+} from './tokens';
+export { Value, type ValueUpdateParams } from './value';
diff --git a/src/resources/user/tokens/permission-groups.ts b/src/resources/user/tokens/permission-groups.ts
index 074d8d0e71..b7381eec6b 100644
--- a/src/resources/user/tokens/permission-groups.ts
+++ b/src/resources/user/tokens/permission-groups.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as PermissionGroupsAPI from './permission-groups';
 import { SinglePage } from '../../../pagination';
 
 export class PermissionGroups extends APIResource {
@@ -24,7 +23,11 @@ export class PermissionGroupListResponsesSinglePage extends SinglePage<Permissio
 
 export type PermissionGroupListResponse = unknown;
 
-export namespace PermissionGroups {
-  export import PermissionGroupListResponse = PermissionGroupsAPI.PermissionGroupListResponse;
-  export import PermissionGroupListResponsesSinglePage = PermissionGroupsAPI.PermissionGroupListResponsesSinglePage;
+PermissionGroups.PermissionGroupListResponsesSinglePage = PermissionGroupListResponsesSinglePage;
+
+export declare namespace PermissionGroups {
+  export {
+    type PermissionGroupListResponse as PermissionGroupListResponse,
+    PermissionGroupListResponsesSinglePage as PermissionGroupListResponsesSinglePage,
+  };
 }
diff --git a/src/resources/user/tokens/tokens.ts b/src/resources/user/tokens/tokens.ts
index e9523f88a4..2c0390c96f 100644
--- a/src/resources/user/tokens/tokens.ts
+++ b/src/resources/user/tokens/tokens.ts
@@ -3,16 +3,23 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as TokensAPI from './tokens';
+import * as Shared from '../../shared';
+import { TokensV4PagePaginationArray } from '../../shared';
 import * as PermissionGroupsAPI from './permission-groups';
+import {
+  PermissionGroupListResponse,
+  PermissionGroupListResponsesSinglePage,
+  PermissionGroups,
+} from './permission-groups';
 import * as ValueAPI from './value';
-import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
+import { Value, ValueUpdateParams } from './value';
+import { type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class Tokens extends APIResource {
   permissionGroups: PermissionGroupsAPI.PermissionGroups = new PermissionGroupsAPI.PermissionGroups(
     this._client,
   );
-  value: ValueAPI.ValueResource = new ValueAPI.ValueResource(this._client);
+  value: ValueAPI.Value = new ValueAPI.Value(this._client);
 
   /**
    * Create a new access token.
@@ -29,13 +36,13 @@ export class Tokens extends APIResource {
    * Update an existing token.
    */
   update(
-    tokenId: unknown,
+    tokenId: string,
     body: TokenUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<TokenUpdateResponse> {
+  ): Core.APIPromise<Shared.Token> {
     return (
       this._client.put(`/user/tokens/${tokenId}`, { body, ...options }) as Core.APIPromise<{
-        result: TokenUpdateResponse;
+        result: Shared.Token;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -46,27 +53,22 @@ export class Tokens extends APIResource {
   list(
     query?: TokenListParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<TokenListResponsesV4PagePaginationArray, TokenListResponse>;
-  list(
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<TokenListResponsesV4PagePaginationArray, TokenListResponse>;
+  ): Core.PagePromise<TokensV4PagePaginationArray, Shared.Token>;
+  list(options?: Core.RequestOptions): Core.PagePromise<TokensV4PagePaginationArray, Shared.Token>;
   list(
     query: TokenListParams | Core.RequestOptions = {},
     options?: Core.RequestOptions,
-  ): Core.PagePromise<TokenListResponsesV4PagePaginationArray, TokenListResponse> {
+  ): Core.PagePromise<TokensV4PagePaginationArray, Shared.Token> {
     if (isRequestOptions(query)) {
       return this.list({}, query);
     }
-    return this._client.getAPIList('/user/tokens', TokenListResponsesV4PagePaginationArray, {
-      query,
-      ...options,
-    });
+    return this._client.getAPIList('/user/tokens', TokensV4PagePaginationArray, { query, ...options });
   }
 
   /**
    * Destroy a token.
    */
-  delete(tokenId: unknown, options?: Core.RequestOptions): Core.APIPromise<TokenDeleteResponse | null> {
+  delete(tokenId: string, options?: Core.RequestOptions): Core.APIPromise<TokenDeleteResponse | null> {
     return (
       this._client.delete(`/user/tokens/${tokenId}`, options) as Core.APIPromise<{
         result: TokenDeleteResponse | null;
@@ -77,9 +79,9 @@ export class Tokens extends APIResource {
   /**
    * Get information about a specific token.
    */
-  get(tokenId: unknown, options?: Core.RequestOptions): Core.APIPromise<TokenGetResponse> {
+  get(tokenId: string, options?: Core.RequestOptions): Core.APIPromise<Shared.Token> {
     return (
-      this._client.get(`/user/tokens/${tokenId}`, options) as Core.APIPromise<{ result: TokenGetResponse }>
+      this._client.get(`/user/tokens/${tokenId}`, options) as Core.APIPromise<{ result: Shared.Token }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -93,139 +95,62 @@ export class Tokens extends APIResource {
   }
 }
 
-export class TokenListResponsesV4PagePaginationArray extends V4PagePaginationArray<TokenListResponse> {}
-
-/**
- * IPv4/IPv6 CIDR.
- */
-export type CIDRList = string;
-
-/**
- * IPv4/IPv6 CIDR.
- */
-export type CIDRListParam = string;
-
-export interface Policy {
-  /**
-   * Policy identifier.
-   */
-  id: string;
-
-  /**
-   * Allow or deny operations against the resources.
-   */
-  effect: 'allow' | 'deny';
-
+export interface TokenCreateResponse {
   /**
-   * A set of permission groups that are specified to the policy.
+   * Token identifier tag.
    */
-  permission_groups: Array<Policy.PermissionGroup>;
+  id?: string;
 
-  /**
-   * A list of resource names that the policy applies to.
-   */
-  resources: unknown;
-}
+  condition?: TokenCreateResponse.Condition;
 
-export namespace Policy {
   /**
-   * A named group of permissions that map to a group of operations against
-   * resources.
-   */
-  export interface PermissionGroup {
-    /**
-     * Identifier of the group.
-     */
-    id: string;
-
-    /**
-     * Attributes associated to the permission group.
-     */
-    meta?: unknown;
-
-    /**
-     * Name of the group.
-     */
-    name?: string;
-  }
-}
-
-export interface PolicyParam {
-  /**
-   * Allow or deny operations against the resources.
+   * The expiration time on or after which the JWT MUST NOT be accepted for
+   * processing.
    */
-  effect: 'allow' | 'deny';
+  expires_on?: string;
 
   /**
-   * A set of permission groups that are specified to the policy.
+   * The time on which the token was created.
    */
-  permission_groups: Array<PolicyParam.PermissionGroup>;
+  issued_on?: string;
 
   /**
-   * A list of resource names that the policy applies to.
+   * Last time the token was used.
    */
-  resources: unknown;
-}
+  last_used_on?: string;
 
-export namespace PolicyParam {
   /**
-   * A named group of permissions that map to a group of operations against
-   * resources.
+   * Last time the token was modified.
    */
-  export interface PermissionGroup {
-    /**
-     * Attributes associated to the permission group.
-     */
-    meta?: unknown;
-  }
-}
+  modified_on?: string;
 
-export interface Token {
   /**
-   * Token identifier tag.
+   * Token name.
    */
-  id: string;
+  name?: string;
 
   /**
-   * Token name.
+   * The time before which the token MUST NOT be accepted for processing.
    */
-  name: string;
+  not_before?: string;
 
   /**
    * List of access policies assigned to the token.
    */
-  policies: Array<Policy>;
+  policies?: Array<Shared.TokenPolicy>;
 
   /**
    * Status of the token.
    */
-  status: 'active' | 'disabled' | 'expired';
-
-  condition?: Token.Condition;
-
-  /**
-   * The expiration time on or after which the JWT MUST NOT be accepted for
-   * processing.
-   */
-  expires_on?: string;
-
-  /**
-   * The time on which the token was created.
-   */
-  issued_on?: string;
-
-  /**
-   * Last time the token was modified.
-   */
-  modified_on?: string;
+  status?: 'active' | 'disabled' | 'expired';
 
   /**
-   * The time before which the token MUST NOT be accepted for processing.
+   * The token value.
    */
-  not_before?: string;
+  value?: Shared.TokenValue;
 }
 
-export namespace Token {
+export namespace TokenCreateResponse {
   export interface Condition {
     /**
      * Client IP restrictions.
@@ -241,27 +166,16 @@ export namespace Token {
       /**
        * List of IPv4/IPv6 CIDR addresses.
        */
-      in?: Array<TokensAPI.CIDRList>;
+      in?: Array<Shared.TokenConditionCIDRList>;
 
       /**
        * List of IPv4/IPv6 CIDR addresses.
        */
-      not_in?: Array<TokensAPI.CIDRList>;
+      not_in?: Array<Shared.TokenConditionCIDRList>;
     }
   }
 }
 
-export interface TokenCreateResponse {
-  /**
-   * The token value.
-   */
-  value?: ValueAPI.Value;
-}
-
-export type TokenUpdateResponse = unknown;
-
-export type TokenListResponse = unknown;
-
 export interface TokenDeleteResponse {
   /**
    * Identifier
@@ -269,8 +183,6 @@ export interface TokenDeleteResponse {
   id: string;
 }
 
-export type TokenGetResponse = unknown;
-
 export interface TokenVerifyResponse {
   /**
    * Token identifier tag.
@@ -303,7 +215,7 @@ export interface TokenCreateParams {
   /**
    * List of access policies assigned to the token.
    */
-  policies: Array<PolicyParam>;
+  policies: Array<Shared.TokenPolicyParam>;
 
   condition?: TokenCreateParams.Condition;
 
@@ -335,44 +247,44 @@ export namespace TokenCreateParams {
       /**
        * List of IPv4/IPv6 CIDR addresses.
        */
-      in?: Array<TokensAPI.CIDRListParam>;
+      in?: Array<Shared.TokenConditionCIDRListParam>;
 
       /**
        * List of IPv4/IPv6 CIDR addresses.
        */
-      not_in?: Array<TokensAPI.CIDRListParam>;
+      not_in?: Array<Shared.TokenConditionCIDRListParam>;
     }
   }
 }
 
 export interface TokenUpdateParams {
+  condition?: TokenUpdateParams.Condition;
+
   /**
-   * Token name.
+   * The expiration time on or after which the JWT MUST NOT be accepted for
+   * processing.
    */
-  name: string;
+  expires_on?: string;
 
   /**
-   * List of access policies assigned to the token.
+   * Token name.
    */
-  policies: Array<PolicyParam>;
+  name?: string;
 
   /**
-   * Status of the token.
+   * The time before which the token MUST NOT be accepted for processing.
    */
-  status: 'active' | 'disabled' | 'expired';
-
-  condition?: TokenUpdateParams.Condition;
+  not_before?: string;
 
   /**
-   * The expiration time on or after which the JWT MUST NOT be accepted for
-   * processing.
+   * List of access policies assigned to the token.
    */
-  expires_on?: string;
+  policies?: Array<Shared.TokenPolicyParam>;
 
   /**
-   * The time before which the token MUST NOT be accepted for processing.
+   * Status of the token.
    */
-  not_before?: string;
+  status?: 'active' | 'disabled' | 'expired';
 }
 
 export namespace TokenUpdateParams {
@@ -391,12 +303,12 @@ export namespace TokenUpdateParams {
       /**
        * List of IPv4/IPv6 CIDR addresses.
        */
-      in?: Array<TokensAPI.CIDRListParam>;
+      in?: Array<Shared.TokenConditionCIDRListParam>;
 
       /**
        * List of IPv4/IPv6 CIDR addresses.
        */
-      not_in?: Array<TokensAPI.CIDRListParam>;
+      not_in?: Array<Shared.TokenConditionCIDRListParam>;
     }
   }
 }
@@ -408,24 +320,27 @@ export interface TokenListParams extends V4PagePaginationArrayParams {
   direction?: 'asc' | 'desc';
 }
 
-export namespace Tokens {
-  export import CIDRList = TokensAPI.CIDRList;
-  export import Policy = TokensAPI.Policy;
-  export import Token = TokensAPI.Token;
-  export import TokenCreateResponse = TokensAPI.TokenCreateResponse;
-  export import TokenUpdateResponse = TokensAPI.TokenUpdateResponse;
-  export import TokenListResponse = TokensAPI.TokenListResponse;
-  export import TokenDeleteResponse = TokensAPI.TokenDeleteResponse;
-  export import TokenGetResponse = TokensAPI.TokenGetResponse;
-  export import TokenVerifyResponse = TokensAPI.TokenVerifyResponse;
-  export import TokenListResponsesV4PagePaginationArray = TokensAPI.TokenListResponsesV4PagePaginationArray;
-  export import TokenCreateParams = TokensAPI.TokenCreateParams;
-  export import TokenUpdateParams = TokensAPI.TokenUpdateParams;
-  export import TokenListParams = TokensAPI.TokenListParams;
-  export import PermissionGroups = PermissionGroupsAPI.PermissionGroups;
-  export import PermissionGroupListResponse = PermissionGroupsAPI.PermissionGroupListResponse;
-  export import PermissionGroupListResponsesSinglePage = PermissionGroupsAPI.PermissionGroupListResponsesSinglePage;
-  export import ValueResource = ValueAPI.ValueResource;
-  export import Value = ValueAPI.Value;
-  export import ValueUpdateParams = ValueAPI.ValueUpdateParams;
+Tokens.PermissionGroups = PermissionGroups;
+Tokens.PermissionGroupListResponsesSinglePage = PermissionGroupListResponsesSinglePage;
+Tokens.Value = Value;
+
+export declare namespace Tokens {
+  export {
+    type TokenCreateResponse as TokenCreateResponse,
+    type TokenDeleteResponse as TokenDeleteResponse,
+    type TokenVerifyResponse as TokenVerifyResponse,
+    type TokenCreateParams as TokenCreateParams,
+    type TokenUpdateParams as TokenUpdateParams,
+    type TokenListParams as TokenListParams,
+  };
+
+  export {
+    PermissionGroups as PermissionGroups,
+    type PermissionGroupListResponse as PermissionGroupListResponse,
+    PermissionGroupListResponsesSinglePage as PermissionGroupListResponsesSinglePage,
+  };
+
+  export { Value as Value, type ValueUpdateParams as ValueUpdateParams };
 }
+
+export { TokensV4PagePaginationArray };
diff --git a/src/resources/user/tokens/value.ts b/src/resources/user/tokens/value.ts
index 7c5838e79d..fcee09da3c 100644
--- a/src/resources/user/tokens/value.ts
+++ b/src/resources/user/tokens/value.ts
@@ -2,29 +2,27 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ValueAPI from './value';
+import * as Shared from '../../shared';
 
-export class ValueResource extends APIResource {
+export class Value extends APIResource {
   /**
    * Roll the token secret.
    */
-  update(tokenId: unknown, body: ValueUpdateParams, options?: Core.RequestOptions): Core.APIPromise<Value> {
+  update(
+    tokenId: string,
+    body: ValueUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<Shared.TokenValue> {
     return (
       this._client.put(`/user/tokens/${tokenId}/value`, { body, ...options }) as Core.APIPromise<{
-        result: Value;
+        result: Shared.TokenValue;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-/**
- * The token value.
- */
-export type Value = string;
-
 export type ValueUpdateParams = unknown;
 
-export namespace ValueResource {
-  export import Value = ValueAPI.Value;
-  export import ValueUpdateParams = ValueAPI.ValueUpdateParams;
+export declare namespace Value {
+  export { type ValueUpdateParams as ValueUpdateParams };
 }
diff --git a/src/resources/user/user.ts b/src/resources/user/user.ts
index f4734e687c..d7a1590abc 100644
--- a/src/resources/user/user.ts
+++ b/src/resources/user/user.ts
@@ -3,11 +3,38 @@
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as AuditLogsAPI from './audit-logs';
+import { AuditLogListParams, AuditLogs } from './audit-logs';
 import * as InvitesAPI from './invites';
+import { Invite, InviteEditParams, Invites, InvitesSinglePage } from './invites';
 import * as OrganizationsAPI from './organizations';
+import {
+  Organization,
+  OrganizationDeleteResponse,
+  OrganizationGetResponse,
+  OrganizationListParams,
+  Organizations,
+  OrganizationsV4PagePaginationArray,
+} from './organizations';
 import * as SubscriptionsAPI from './subscriptions';
+import {
+  SubscriptionDeleteResponse,
+  SubscriptionGetResponse,
+  SubscriptionUpdateParams,
+  SubscriptionUpdateResponse,
+  Subscriptions,
+} from './subscriptions';
 import * as BillingAPI from './billing/billing';
+import { Billing } from './billing/billing';
 import * as TokensAPI from './tokens/tokens';
+import {
+  TokenCreateParams,
+  TokenCreateResponse,
+  TokenDeleteResponse,
+  TokenListParams,
+  TokenUpdateParams,
+  TokenVerifyResponse,
+  Tokens,
+} from './tokens/tokens';
 
 export class User extends APIResource {
   auditLogs: AuditLogsAPI.AuditLogs = new AuditLogsAPI.AuditLogs(this._client);
@@ -67,45 +94,51 @@ export interface UserEditParams {
   zipcode?: string | null;
 }
 
-export namespace User {
-  export import AuditLogs = AuditLogsAPI.AuditLogs;
-  export import AuditLogListParams = AuditLogsAPI.AuditLogListParams;
-  export import Billing = BillingAPI.Billing;
-  export import Invites = InvitesAPI.Invites;
-  export import Invite = InvitesAPI.Invite;
-  export import InviteEditResponse = InvitesAPI.InviteEditResponse;
-  export import InviteGetResponse = InvitesAPI.InviteGetResponse;
-  export import InvitesSinglePage = InvitesAPI.InvitesSinglePage;
-  export import InviteEditParams = InvitesAPI.InviteEditParams;
-  export import Organizations = OrganizationsAPI.Organizations;
-  export import Organization = OrganizationsAPI.Organization;
-  export import OrganizationDeleteResponse = OrganizationsAPI.OrganizationDeleteResponse;
-  export import OrganizationGetResponse = OrganizationsAPI.OrganizationGetResponse;
-  export import OrganizationsV4PagePaginationArray = OrganizationsAPI.OrganizationsV4PagePaginationArray;
-  export import OrganizationListParams = OrganizationsAPI.OrganizationListParams;
-  export import Subscriptions = SubscriptionsAPI.Subscriptions;
-  export import RatePlan = SubscriptionsAPI.RatePlan;
-  export import Subscription = SubscriptionsAPI.Subscription;
-  export import SubscriptionComponent = SubscriptionsAPI.SubscriptionComponent;
-  export import SubscriptionZone = SubscriptionsAPI.SubscriptionZone;
-  export import SubscriptionUpdateResponse = SubscriptionsAPI.SubscriptionUpdateResponse;
-  export import SubscriptionDeleteResponse = SubscriptionsAPI.SubscriptionDeleteResponse;
-  export import SubscriptionEditResponse = SubscriptionsAPI.SubscriptionEditResponse;
-  export import SubscriptionGetResponse = SubscriptionsAPI.SubscriptionGetResponse;
-  export import SubscriptionUpdateParams = SubscriptionsAPI.SubscriptionUpdateParams;
-  export import SubscriptionEditParams = SubscriptionsAPI.SubscriptionEditParams;
-  export import Tokens = TokensAPI.Tokens;
-  export import CIDRList = TokensAPI.CIDRList;
-  export import Policy = TokensAPI.Policy;
-  export import Token = TokensAPI.Token;
-  export import TokenCreateResponse = TokensAPI.TokenCreateResponse;
-  export import TokenUpdateResponse = TokensAPI.TokenUpdateResponse;
-  export import TokenListResponse = TokensAPI.TokenListResponse;
-  export import TokenDeleteResponse = TokensAPI.TokenDeleteResponse;
-  export import TokenGetResponse = TokensAPI.TokenGetResponse;
-  export import TokenVerifyResponse = TokensAPI.TokenVerifyResponse;
-  export import TokenListResponsesV4PagePaginationArray = TokensAPI.TokenListResponsesV4PagePaginationArray;
-  export import TokenCreateParams = TokensAPI.TokenCreateParams;
-  export import TokenUpdateParams = TokensAPI.TokenUpdateParams;
-  export import TokenListParams = TokensAPI.TokenListParams;
+User.AuditLogs = AuditLogs;
+User.Billing = Billing;
+User.Invites = Invites;
+User.InvitesSinglePage = InvitesSinglePage;
+User.Organizations = Organizations;
+User.OrganizationsV4PagePaginationArray = OrganizationsV4PagePaginationArray;
+User.Subscriptions = Subscriptions;
+User.Tokens = Tokens;
+
+export declare namespace User {
+  export { AuditLogs as AuditLogs, type AuditLogListParams as AuditLogListParams };
+
+  export { Billing as Billing };
+
+  export {
+    Invites as Invites,
+    type Invite as Invite,
+    InvitesSinglePage as InvitesSinglePage,
+    type InviteEditParams as InviteEditParams,
+  };
+
+  export {
+    Organizations as Organizations,
+    type Organization as Organization,
+    type OrganizationDeleteResponse as OrganizationDeleteResponse,
+    type OrganizationGetResponse as OrganizationGetResponse,
+    OrganizationsV4PagePaginationArray as OrganizationsV4PagePaginationArray,
+    type OrganizationListParams as OrganizationListParams,
+  };
+
+  export {
+    Subscriptions as Subscriptions,
+    type SubscriptionUpdateResponse as SubscriptionUpdateResponse,
+    type SubscriptionDeleteResponse as SubscriptionDeleteResponse,
+    type SubscriptionGetResponse as SubscriptionGetResponse,
+    type SubscriptionUpdateParams as SubscriptionUpdateParams,
+  };
+
+  export {
+    Tokens as Tokens,
+    type TokenCreateResponse as TokenCreateResponse,
+    type TokenDeleteResponse as TokenDeleteResponse,
+    type TokenVerifyResponse as TokenVerifyResponse,
+    type TokenCreateParams as TokenCreateParams,
+    type TokenUpdateParams as TokenUpdateParams,
+    type TokenListParams as TokenListParams,
+  };
 }
diff --git a/src/resources/vectorize/index.ts b/src/resources/vectorize/index.ts
index 594acdd5d2..46dbec5b50 100644
--- a/src/resources/vectorize/index.ts
+++ b/src/resources/vectorize/index.ts
@@ -1,25 +1,30 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  CreateIndex,
-  IndexDeleteVectorsByID,
-  IndexDimensionConfiguration,
-  IndexInsert,
-  IndexQuery,
-  IndexUpsert,
-  IndexDeleteResponse,
-  IndexGetByIDsResponse,
-  IndexCreateParams,
-  IndexUpdateParams,
-  IndexListParams,
-  IndexDeleteParams,
-  IndexDeleteByIDsParams,
-  IndexGetParams,
-  IndexGetByIDsParams,
-  IndexInsertParams,
-  IndexQueryParams,
-  IndexUpsertParams,
   CreateIndicesSinglePage,
   Indexes,
-} from './indexes';
+  type CreateIndex,
+  type IndexDeleteVectorsByID,
+  type IndexDimensionConfiguration,
+  type IndexInsert,
+  type IndexQuery,
+  type IndexUpsert,
+  type IndexDeleteResponse,
+  type IndexDeleteByIDsResponse,
+  type IndexGetByIDsResponse,
+  type IndexInfoResponse,
+  type IndexInsertResponse,
+  type IndexQueryResponse,
+  type IndexUpsertResponse,
+  type IndexCreateParams,
+  type IndexListParams,
+  type IndexDeleteParams,
+  type IndexDeleteByIDsParams,
+  type IndexGetParams,
+  type IndexGetByIDsParams,
+  type IndexInfoParams,
+  type IndexInsertParams,
+  type IndexQueryParams,
+  type IndexUpsertParams,
+} from './indexes/index';
 export { Vectorize } from './vectorize';
diff --git a/src/resources/vectorize/indexes/index.ts b/src/resources/vectorize/indexes/index.ts
new file mode 100644
index 0000000000..b6bc356155
--- /dev/null
+++ b/src/resources/vectorize/indexes/index.ts
@@ -0,0 +1,38 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  CreateIndicesSinglePage,
+  Indexes,
+  type CreateIndex,
+  type IndexDeleteVectorsByID,
+  type IndexDimensionConfiguration,
+  type IndexInsert,
+  type IndexQuery,
+  type IndexUpsert,
+  type IndexDeleteResponse,
+  type IndexDeleteByIDsResponse,
+  type IndexGetByIDsResponse,
+  type IndexInfoResponse,
+  type IndexInsertResponse,
+  type IndexQueryResponse,
+  type IndexUpsertResponse,
+  type IndexCreateParams,
+  type IndexListParams,
+  type IndexDeleteParams,
+  type IndexDeleteByIDsParams,
+  type IndexGetParams,
+  type IndexGetByIDsParams,
+  type IndexInfoParams,
+  type IndexInsertParams,
+  type IndexQueryParams,
+  type IndexUpsertParams,
+} from './indexes';
+export {
+  MetadataIndex,
+  type MetadataIndexCreateResponse,
+  type MetadataIndexListResponse,
+  type MetadataIndexDeleteResponse,
+  type MetadataIndexCreateParams,
+  type MetadataIndexListParams,
+  type MetadataIndexDeleteParams,
+} from './metadata-index';
diff --git a/src/resources/vectorize/indexes.ts b/src/resources/vectorize/indexes/indexes.ts
similarity index 55%
rename from src/resources/vectorize/indexes.ts
rename to src/resources/vectorize/indexes/indexes.ts
index 8eecf87f4e..dd094dece8 100644
--- a/src/resources/vectorize/indexes.ts
+++ b/src/resources/vectorize/indexes/indexes.ts
@@ -1,35 +1,29 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import * as Core from '../../core';
-import * as IndexesAPI from './indexes';
-import { SinglePage } from '../../pagination';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as MetadataIndexAPI from './metadata-index';
+import {
+  MetadataIndex,
+  MetadataIndexCreateParams,
+  MetadataIndexCreateResponse,
+  MetadataIndexDeleteParams,
+  MetadataIndexDeleteResponse,
+  MetadataIndexListParams,
+  MetadataIndexListResponse,
+} from './metadata-index';
+import { SinglePage } from '../../../pagination';
 
 export class Indexes extends APIResource {
+  metadataIndex: MetadataIndexAPI.MetadataIndex = new MetadataIndexAPI.MetadataIndex(this._client);
+
   /**
    * Creates and returns a new Vectorize Index.
    */
   create(params: IndexCreateParams, options?: Core.RequestOptions): Core.APIPromise<CreateIndex | null> {
     const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${account_id}/vectorize/indexes`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: CreateIndex | null }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Updates and returns the specified Vectorize Index.
-   */
-  update(
-    indexName: string,
-    params: IndexUpdateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<CreateIndex | null> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.put(`/accounts/${account_id}/vectorize/indexes/${indexName}`, {
+      this._client.post(`/accounts/${account_id}/vectorize/v2/indexes`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: CreateIndex | null }>
@@ -45,7 +39,7 @@ export class Indexes extends APIResource {
   ): Core.PagePromise<CreateIndicesSinglePage, CreateIndex> {
     const { account_id } = params;
     return this._client.getAPIList(
-      `/accounts/${account_id}/vectorize/indexes`,
+      `/accounts/${account_id}/vectorize/v2/indexes`,
       CreateIndicesSinglePage,
       options,
     );
@@ -58,13 +52,13 @@ export class Indexes extends APIResource {
     indexName: string,
     params: IndexDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<IndexDeleteResponse> {
+  ): Core.APIPromise<IndexDeleteResponse | null> {
     const { account_id } = params;
     return (
       this._client.delete(
-        `/accounts/${account_id}/vectorize/indexes/${indexName}`,
+        `/accounts/${account_id}/vectorize/v2/indexes/${indexName}`,
         options,
-      ) as Core.APIPromise<{ result: IndexDeleteResponse }>
+      ) as Core.APIPromise<{ result: IndexDeleteResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -75,13 +69,13 @@ export class Indexes extends APIResource {
     indexName: string,
     params: IndexDeleteByIDsParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<IndexDeleteVectorsByID | null> {
+  ): Core.APIPromise<IndexDeleteByIDsResponse | null> {
     const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${account_id}/vectorize/indexes/${indexName}/delete-by-ids`, {
+      this._client.post(`/accounts/${account_id}/vectorize/v2/indexes/${indexName}/delete_by_ids`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: IndexDeleteVectorsByID | null }>
+      }) as Core.APIPromise<{ result: IndexDeleteByIDsResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -95,9 +89,10 @@ export class Indexes extends APIResource {
   ): Core.APIPromise<CreateIndex | null> {
     const { account_id } = params;
     return (
-      this._client.get(`/accounts/${account_id}/vectorize/indexes/${indexName}`, options) as Core.APIPromise<{
-        result: CreateIndex | null;
-      }>
+      this._client.get(
+        `/accounts/${account_id}/vectorize/v2/indexes/${indexName}`,
+        options,
+      ) as Core.APIPromise<{ result: CreateIndex | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -111,7 +106,7 @@ export class Indexes extends APIResource {
   ): Core.APIPromise<IndexGetByIDsResponse | null> {
     const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${account_id}/vectorize/indexes/${indexName}/get-by-ids`, {
+      this._client.post(`/accounts/${account_id}/vectorize/v2/indexes/${indexName}/get_by_ids`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: IndexGetByIDsResponse | null }>
@@ -119,22 +114,40 @@ export class Indexes extends APIResource {
   }
 
   /**
-   * Inserts vectors into the specified index and returns the count of the vectors
-   * successfully inserted.
+   * Get information about a vectorize index.
+   */
+  info(
+    indexName: string,
+    params: IndexInfoParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<IndexInfoResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/vectorize/v2/indexes/${indexName}/info`,
+        options,
+      ) as Core.APIPromise<{ result: IndexInfoResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Inserts vectors into the specified index and returns a mutation id corresponding
+   * to the vectors enqueued for insertion.
    */
   insert(
     indexName: string,
     params: IndexInsertParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<IndexInsert | null> {
-    const { account_id, body } = params;
+  ): Core.APIPromise<IndexInsertResponse | null> {
+    const { account_id, body, 'unparsable-behavior': unparsableBehavior } = params;
     return (
-      this._client.post(`/accounts/${account_id}/vectorize/indexes/${indexName}/insert`, {
+      this._client.post(`/accounts/${account_id}/vectorize/v2/indexes/${indexName}/insert`, {
+        query: { 'unparsable-behavior': unparsableBehavior },
         body: body,
         ...options,
         headers: { 'Content-Type': 'application/x-ndjson', ...options?.headers },
         __binaryRequest: true,
-      }) as Core.APIPromise<{ result: IndexInsert | null }>
+      }) as Core.APIPromise<{ result: IndexInsertResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -145,33 +158,34 @@ export class Indexes extends APIResource {
     indexName: string,
     params: IndexQueryParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<IndexQuery | null> {
+  ): Core.APIPromise<IndexQueryResponse | null> {
     const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${account_id}/vectorize/indexes/${indexName}/query`, {
+      this._client.post(`/accounts/${account_id}/vectorize/v2/indexes/${indexName}/query`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: IndexQuery | null }>
+      }) as Core.APIPromise<{ result: IndexQueryResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
    * Upserts vectors into the specified index, creating them if they do not exist and
-   * returns the count of values and ids successfully inserted.
+   * returns a mutation id corresponding to the vectors enqueued for upsertion.
    */
   upsert(
     indexName: string,
     params: IndexUpsertParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<IndexUpsert | null> {
-    const { account_id, body } = params;
+  ): Core.APIPromise<IndexUpsertResponse | null> {
+    const { account_id, body, 'unparsable-behavior': unparsableBehavior } = params;
     return (
-      this._client.post(`/accounts/${account_id}/vectorize/indexes/${indexName}/upsert`, {
+      this._client.post(`/accounts/${account_id}/vectorize/v2/indexes/${indexName}/upsert`, {
+        query: { 'unparsable-behavior': unparsableBehavior },
         body: body,
         ...options,
         headers: { 'Content-Type': 'application/x-ndjson', ...options?.headers },
         __binaryRequest: true,
-      }) as Core.APIPromise<{ result: IndexUpsert | null }>
+      }) as Core.APIPromise<{ result: IndexUpsertResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -263,7 +277,7 @@ export interface IndexQuery {
 export namespace IndexQuery {
   export interface Match {
     /**
-     * Identifier
+     * Identifier for a Vector
      */
     id?: string;
 
@@ -290,13 +304,89 @@ export interface IndexUpsert {
   ids?: Array<string>;
 }
 
-export type IndexDeleteResponse = unknown | string | null;
+export type IndexDeleteResponse = unknown | string;
+
+export interface IndexDeleteByIDsResponse {
+  /**
+   * The unique identifier for the async mutation operation containing the changeset.
+   */
+  mutationId?: string;
+}
 
 /**
  * Array of vectors with matching ids.
  */
 export type IndexGetByIDsResponse = unknown;
 
+export interface IndexInfoResponse {
+  /**
+   * Specifies the number of dimensions for the index
+   */
+  dimensions?: number;
+
+  /**
+   * Specifies the timestamp the last mutation batch was processed as an ISO8601
+   * string.
+   */
+  processedUpToDatetime?: string | null;
+
+  /**
+   * The unique identifier for the async mutation operation containing the changeset.
+   */
+  processedUpToMutation?: string;
+
+  /**
+   * Specifies the number of vectors present in the index
+   */
+  vectorCount?: number;
+}
+
+export interface IndexInsertResponse {
+  /**
+   * The unique identifier for the async mutation operation containing the changeset.
+   */
+  mutationId?: string;
+}
+
+export interface IndexQueryResponse {
+  /**
+   * Specifies the count of vectors returned by the search
+   */
+  count?: number;
+
+  /**
+   * Array of vectors matched by the search
+   */
+  matches?: Array<IndexQueryResponse.Match>;
+}
+
+export namespace IndexQueryResponse {
+  export interface Match {
+    /**
+     * Identifier for a Vector
+     */
+    id?: string;
+
+    metadata?: unknown | null;
+
+    namespace?: string | null;
+
+    /**
+     * The score of the vector according to the index's distance metric
+     */
+    score?: number;
+
+    values?: Array<number> | null;
+  }
+}
+
+export interface IndexUpsertResponse {
+  /**
+   * The unique identifier for the async mutation operation containing the changeset.
+   */
+  mutationId?: string;
+}
+
 export interface IndexCreateParams {
   /**
    * Path param: Identifier
@@ -333,18 +423,6 @@ export namespace IndexCreateParams {
   }
 }
 
-export interface IndexUpdateParams {
-  /**
-   * Path param: Identifier
-   */
-  account_id: string;
-
-  /**
-   * Body param: Specifies the description of the index.
-   */
-  description: string;
-}
-
 export interface IndexListParams {
   /**
    * Identifier
@@ -392,6 +470,13 @@ export interface IndexGetByIDsParams {
   ids?: Array<string>;
 }
 
+export interface IndexInfoParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
 export interface IndexInsertParams {
   /**
    * Path param: Identifier
@@ -402,6 +487,11 @@ export interface IndexInsertParams {
    * Body param: ndjson file containing vectors to insert.
    */
   body: Core.Uploadable;
+
+  /**
+   * Query param: Behavior for ndjson parse failures.
+   */
+  'unparsable-behavior'?: 'error' | 'discard';
 }
 
 export interface IndexQueryParams {
@@ -421,9 +511,10 @@ export interface IndexQueryParams {
   filter?: unknown;
 
   /**
-   * Body param: Whether to return the metadata associated with the closest vectors.
+   * Body param: Whether to return no metadata, indexed metadata or all metadata
+   * associated with the closest vectors.
    */
-  returnMetadata?: boolean;
+  returnMetadata?: 'none' | 'indexed' | 'all';
 
   /**
    * Body param: Whether to return the values associated with the closest vectors.
@@ -446,26 +537,51 @@ export interface IndexUpsertParams {
    * Body param: ndjson file containing vectors to upsert.
    */
   body: Core.Uploadable;
+
+  /**
+   * Query param: Behavior for ndjson parse failures.
+   */
+  'unparsable-behavior'?: 'error' | 'discard';
 }
 
-export namespace Indexes {
-  export import CreateIndex = IndexesAPI.CreateIndex;
-  export import IndexDeleteVectorsByID = IndexesAPI.IndexDeleteVectorsByID;
-  export import IndexDimensionConfiguration = IndexesAPI.IndexDimensionConfiguration;
-  export import IndexInsert = IndexesAPI.IndexInsert;
-  export import IndexQuery = IndexesAPI.IndexQuery;
-  export import IndexUpsert = IndexesAPI.IndexUpsert;
-  export import IndexDeleteResponse = IndexesAPI.IndexDeleteResponse;
-  export import IndexGetByIDsResponse = IndexesAPI.IndexGetByIDsResponse;
-  export import CreateIndicesSinglePage = IndexesAPI.CreateIndicesSinglePage;
-  export import IndexCreateParams = IndexesAPI.IndexCreateParams;
-  export import IndexUpdateParams = IndexesAPI.IndexUpdateParams;
-  export import IndexListParams = IndexesAPI.IndexListParams;
-  export import IndexDeleteParams = IndexesAPI.IndexDeleteParams;
-  export import IndexDeleteByIDsParams = IndexesAPI.IndexDeleteByIDsParams;
-  export import IndexGetParams = IndexesAPI.IndexGetParams;
-  export import IndexGetByIDsParams = IndexesAPI.IndexGetByIDsParams;
-  export import IndexInsertParams = IndexesAPI.IndexInsertParams;
-  export import IndexQueryParams = IndexesAPI.IndexQueryParams;
-  export import IndexUpsertParams = IndexesAPI.IndexUpsertParams;
+Indexes.CreateIndicesSinglePage = CreateIndicesSinglePage;
+Indexes.MetadataIndex = MetadataIndex;
+
+export declare namespace Indexes {
+  export {
+    type CreateIndex as CreateIndex,
+    type IndexDeleteVectorsByID as IndexDeleteVectorsByID,
+    type IndexDimensionConfiguration as IndexDimensionConfiguration,
+    type IndexInsert as IndexInsert,
+    type IndexQuery as IndexQuery,
+    type IndexUpsert as IndexUpsert,
+    type IndexDeleteResponse as IndexDeleteResponse,
+    type IndexDeleteByIDsResponse as IndexDeleteByIDsResponse,
+    type IndexGetByIDsResponse as IndexGetByIDsResponse,
+    type IndexInfoResponse as IndexInfoResponse,
+    type IndexInsertResponse as IndexInsertResponse,
+    type IndexQueryResponse as IndexQueryResponse,
+    type IndexUpsertResponse as IndexUpsertResponse,
+    CreateIndicesSinglePage as CreateIndicesSinglePage,
+    type IndexCreateParams as IndexCreateParams,
+    type IndexListParams as IndexListParams,
+    type IndexDeleteParams as IndexDeleteParams,
+    type IndexDeleteByIDsParams as IndexDeleteByIDsParams,
+    type IndexGetParams as IndexGetParams,
+    type IndexGetByIDsParams as IndexGetByIDsParams,
+    type IndexInfoParams as IndexInfoParams,
+    type IndexInsertParams as IndexInsertParams,
+    type IndexQueryParams as IndexQueryParams,
+    type IndexUpsertParams as IndexUpsertParams,
+  };
+
+  export {
+    MetadataIndex as MetadataIndex,
+    type MetadataIndexCreateResponse as MetadataIndexCreateResponse,
+    type MetadataIndexListResponse as MetadataIndexListResponse,
+    type MetadataIndexDeleteResponse as MetadataIndexDeleteResponse,
+    type MetadataIndexCreateParams as MetadataIndexCreateParams,
+    type MetadataIndexListParams as MetadataIndexListParams,
+    type MetadataIndexDeleteParams as MetadataIndexDeleteParams,
+  };
 }
diff --git a/src/resources/vectorize/indexes/metadata-index.ts b/src/resources/vectorize/indexes/metadata-index.ts
new file mode 100644
index 0000000000..a5aea126d1
--- /dev/null
+++ b/src/resources/vectorize/indexes/metadata-index.ts
@@ -0,0 +1,139 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class MetadataIndex extends APIResource {
+  /**
+   * Enable metadata filtering based on metadata property. Limited to 10 properties.
+   */
+  create(
+    indexName: string,
+    params: MetadataIndexCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<MetadataIndexCreateResponse | null> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/vectorize/v2/indexes/${indexName}/metadata_index/create`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: MetadataIndexCreateResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List Metadata Indexes for the specified Vectorize Index.
+   */
+  list(
+    indexName: string,
+    params: MetadataIndexListParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<MetadataIndexListResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/vectorize/v2/indexes/${indexName}/metadata_index/list`,
+        options,
+      ) as Core.APIPromise<{ result: MetadataIndexListResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Allow Vectorize to delete the specified metadata index.
+   */
+  delete(
+    indexName: string,
+    params: MetadataIndexDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<MetadataIndexDeleteResponse | null> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/vectorize/v2/indexes/${indexName}/metadata_index/delete`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: MetadataIndexDeleteResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface MetadataIndexCreateResponse {
+  /**
+   * The unique identifier for the async mutation operation containing the changeset.
+   */
+  mutationId?: string;
+}
+
+export interface MetadataIndexListResponse {
+  /**
+   * Array of indexed metadata properties.
+   */
+  metadataIndexes?: Array<MetadataIndexListResponse.MetadataIndex>;
+}
+
+export namespace MetadataIndexListResponse {
+  export interface MetadataIndex {
+    /**
+     * Specifies the type of indexed metadata property.
+     */
+    indexType?: 'string' | 'number' | 'boolean';
+
+    /**
+     * Specifies the indexed metadata property.
+     */
+    propertyName?: string;
+  }
+}
+
+export interface MetadataIndexDeleteResponse {
+  /**
+   * The unique identifier for the async mutation operation containing the changeset.
+   */
+  mutationId?: string;
+}
+
+export interface MetadataIndexCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: Specifies the type of metadata property to index.
+   */
+  indexType: 'string' | 'number' | 'boolean';
+
+  /**
+   * Body param: Specifies the metadata property to index.
+   */
+  propertyName: string;
+}
+
+export interface MetadataIndexListParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface MetadataIndexDeleteParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: Specifies the metadata property for which the index must be deleted.
+   */
+  propertyName: string;
+}
+
+export declare namespace MetadataIndex {
+  export {
+    type MetadataIndexCreateResponse as MetadataIndexCreateResponse,
+    type MetadataIndexListResponse as MetadataIndexListResponse,
+    type MetadataIndexDeleteResponse as MetadataIndexDeleteResponse,
+    type MetadataIndexCreateParams as MetadataIndexCreateParams,
+    type MetadataIndexListParams as MetadataIndexListParams,
+    type MetadataIndexDeleteParams as MetadataIndexDeleteParams,
+  };
+}
diff --git a/src/resources/vectorize/vectorize.ts b/src/resources/vectorize/vectorize.ts
index 1f350e0ccb..31e47f7e52 100644
--- a/src/resources/vectorize/vectorize.ts
+++ b/src/resources/vectorize/vectorize.ts
@@ -1,31 +1,68 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../resource';
-import * as IndexesAPI from './indexes';
+import * as IndexesAPI from './indexes/indexes';
+import {
+  CreateIndex,
+  CreateIndicesSinglePage,
+  IndexCreateParams,
+  IndexDeleteByIDsParams,
+  IndexDeleteByIDsResponse,
+  IndexDeleteParams,
+  IndexDeleteResponse,
+  IndexDeleteVectorsByID,
+  IndexDimensionConfiguration,
+  IndexGetByIDsParams,
+  IndexGetByIDsResponse,
+  IndexGetParams,
+  IndexInfoParams,
+  IndexInfoResponse,
+  IndexInsert,
+  IndexInsertParams,
+  IndexInsertResponse,
+  IndexListParams,
+  IndexQuery,
+  IndexQueryParams,
+  IndexQueryResponse,
+  IndexUpsert,
+  IndexUpsertParams,
+  IndexUpsertResponse,
+  Indexes,
+} from './indexes/indexes';
 
 export class Vectorize extends APIResource {
   indexes: IndexesAPI.Indexes = new IndexesAPI.Indexes(this._client);
 }
 
-export namespace Vectorize {
-  export import Indexes = IndexesAPI.Indexes;
-  export import CreateIndex = IndexesAPI.CreateIndex;
-  export import IndexDeleteVectorsByID = IndexesAPI.IndexDeleteVectorsByID;
-  export import IndexDimensionConfiguration = IndexesAPI.IndexDimensionConfiguration;
-  export import IndexInsert = IndexesAPI.IndexInsert;
-  export import IndexQuery = IndexesAPI.IndexQuery;
-  export import IndexUpsert = IndexesAPI.IndexUpsert;
-  export import IndexDeleteResponse = IndexesAPI.IndexDeleteResponse;
-  export import IndexGetByIDsResponse = IndexesAPI.IndexGetByIDsResponse;
-  export import CreateIndicesSinglePage = IndexesAPI.CreateIndicesSinglePage;
-  export import IndexCreateParams = IndexesAPI.IndexCreateParams;
-  export import IndexUpdateParams = IndexesAPI.IndexUpdateParams;
-  export import IndexListParams = IndexesAPI.IndexListParams;
-  export import IndexDeleteParams = IndexesAPI.IndexDeleteParams;
-  export import IndexDeleteByIDsParams = IndexesAPI.IndexDeleteByIDsParams;
-  export import IndexGetParams = IndexesAPI.IndexGetParams;
-  export import IndexGetByIDsParams = IndexesAPI.IndexGetByIDsParams;
-  export import IndexInsertParams = IndexesAPI.IndexInsertParams;
-  export import IndexQueryParams = IndexesAPI.IndexQueryParams;
-  export import IndexUpsertParams = IndexesAPI.IndexUpsertParams;
+Vectorize.Indexes = Indexes;
+Vectorize.CreateIndicesSinglePage = CreateIndicesSinglePage;
+
+export declare namespace Vectorize {
+  export {
+    Indexes as Indexes,
+    type CreateIndex as CreateIndex,
+    type IndexDeleteVectorsByID as IndexDeleteVectorsByID,
+    type IndexDimensionConfiguration as IndexDimensionConfiguration,
+    type IndexInsert as IndexInsert,
+    type IndexQuery as IndexQuery,
+    type IndexUpsert as IndexUpsert,
+    type IndexDeleteResponse as IndexDeleteResponse,
+    type IndexDeleteByIDsResponse as IndexDeleteByIDsResponse,
+    type IndexGetByIDsResponse as IndexGetByIDsResponse,
+    type IndexInfoResponse as IndexInfoResponse,
+    type IndexInsertResponse as IndexInsertResponse,
+    type IndexQueryResponse as IndexQueryResponse,
+    type IndexUpsertResponse as IndexUpsertResponse,
+    CreateIndicesSinglePage as CreateIndicesSinglePage,
+    type IndexCreateParams as IndexCreateParams,
+    type IndexListParams as IndexListParams,
+    type IndexDeleteParams as IndexDeleteParams,
+    type IndexDeleteByIDsParams as IndexDeleteByIDsParams,
+    type IndexGetParams as IndexGetParams,
+    type IndexGetByIDsParams as IndexGetByIDsParams,
+    type IndexInfoParams as IndexInfoParams,
+    type IndexInsertParams as IndexInsertParams,
+    type IndexQueryParams as IndexQueryParams,
+    type IndexUpsertParams as IndexUpsertParams,
+  };
 }
diff --git a/src/resources/waiting-rooms/events/details.ts b/src/resources/waiting-rooms/events/details.ts
index 4f5479eb05..220630457e 100644
--- a/src/resources/waiting-rooms/events/details.ts
+++ b/src/resources/waiting-rooms/events/details.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as DetailsAPI from './details';
 
 export class Details extends APIResource {
   /**
@@ -184,8 +183,10 @@ export interface DetailGetParams {
   zone_id: string;
 }
 
-export namespace Details {
-  export import EventQuery = DetailsAPI.EventQuery;
-  export import DetailGetResponse = DetailsAPI.DetailGetResponse;
-  export import DetailGetParams = DetailsAPI.DetailGetParams;
+export declare namespace Details {
+  export {
+    type EventQuery as EventQuery,
+    type DetailGetResponse as DetailGetResponse,
+    type DetailGetParams as DetailGetParams,
+  };
 }
diff --git a/src/resources/waiting-rooms/events/events.ts b/src/resources/waiting-rooms/events/events.ts
index a18bf2616b..f3fe0719e7 100644
--- a/src/resources/waiting-rooms/events/events.ts
+++ b/src/resources/waiting-rooms/events/events.ts
@@ -2,9 +2,9 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as EventsAPI from './events';
 import * as DetailsAPI from './details';
-import { SinglePage } from '../../../pagination';
+import { DetailGetParams, DetailGetResponse, Details, EventQuery } from './details';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class Events extends APIResource {
   details: DetailsAPI.Details = new DetailsAPI.Details(this._client);
@@ -56,11 +56,11 @@ export class Events extends APIResource {
     waitingRoomId: string,
     params: EventListParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<EventsSinglePage, Event> {
+  ): Core.PagePromise<EventsV4PagePaginationArray, Event> {
     const { zone_id, ...query } = params;
     return this._client.getAPIList(
       `/zones/${zone_id}/waiting_rooms/${waitingRoomId}/events`,
-      EventsSinglePage,
+      EventsV4PagePaginationArray,
       { query, ...options },
     );
   }
@@ -120,7 +120,7 @@ export class Events extends APIResource {
   }
 }
 
-export class EventsSinglePage extends SinglePage<Event> {}
+export class EventsV4PagePaginationArray extends V4PagePaginationArray<Event> {}
 
 export interface Event {
   id?: string;
@@ -410,21 +410,11 @@ export interface EventUpdateParams {
   total_active_users?: number | null;
 }
 
-export interface EventListParams {
+export interface EventListParams extends V4PagePaginationArrayParams {
   /**
    * Path param: Identifier
    */
   zone_id: string;
-
-  /**
-   * Query param: Page number of paginated results.
-   */
-  page?: unknown;
-
-  /**
-   * Query param: Maximum number of results per page. Must be a multiple of 5.
-   */
-  per_page?: unknown;
 }
 
 export interface EventDeleteParams {
@@ -537,18 +527,26 @@ export interface EventGetParams {
   zone_id: string;
 }
 
-export namespace Events {
-  export import Event = EventsAPI.Event;
-  export import EventDeleteResponse = EventsAPI.EventDeleteResponse;
-  export import EventsSinglePage = EventsAPI.EventsSinglePage;
-  export import EventCreateParams = EventsAPI.EventCreateParams;
-  export import EventUpdateParams = EventsAPI.EventUpdateParams;
-  export import EventListParams = EventsAPI.EventListParams;
-  export import EventDeleteParams = EventsAPI.EventDeleteParams;
-  export import EventEditParams = EventsAPI.EventEditParams;
-  export import EventGetParams = EventsAPI.EventGetParams;
-  export import Details = DetailsAPI.Details;
-  export import EventQuery = DetailsAPI.EventQuery;
-  export import DetailGetResponse = DetailsAPI.DetailGetResponse;
-  export import DetailGetParams = DetailsAPI.DetailGetParams;
+Events.EventsV4PagePaginationArray = EventsV4PagePaginationArray;
+Events.Details = Details;
+
+export declare namespace Events {
+  export {
+    type Event as Event,
+    type EventDeleteResponse as EventDeleteResponse,
+    EventsV4PagePaginationArray as EventsV4PagePaginationArray,
+    type EventCreateParams as EventCreateParams,
+    type EventUpdateParams as EventUpdateParams,
+    type EventListParams as EventListParams,
+    type EventDeleteParams as EventDeleteParams,
+    type EventEditParams as EventEditParams,
+    type EventGetParams as EventGetParams,
+  };
+
+  export {
+    Details as Details,
+    type EventQuery as EventQuery,
+    type DetailGetResponse as DetailGetResponse,
+    type DetailGetParams as DetailGetParams,
+  };
 }
diff --git a/src/resources/waiting-rooms/events/index.ts b/src/resources/waiting-rooms/events/index.ts
index 12b872fcc4..b2feb8dbf1 100644
--- a/src/resources/waiting-rooms/events/index.ts
+++ b/src/resources/waiting-rooms/events/index.ts
@@ -1,15 +1,15 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export { Details, type EventQuery, type DetailGetResponse, type DetailGetParams } from './details';
 export {
-  Event,
-  EventDeleteResponse,
-  EventCreateParams,
-  EventUpdateParams,
-  EventListParams,
-  EventDeleteParams,
-  EventEditParams,
-  EventGetParams,
-  EventsSinglePage,
+  EventsV4PagePaginationArray,
   Events,
+  type Event,
+  type EventDeleteResponse,
+  type EventCreateParams,
+  type EventUpdateParams,
+  type EventListParams,
+  type EventDeleteParams,
+  type EventEditParams,
+  type EventGetParams,
 } from './events';
-export { EventQuery, DetailGetResponse, DetailGetParams, Details } from './details';
diff --git a/src/resources/waiting-rooms/index.ts b/src/resources/waiting-rooms/index.ts
index bf571e6dc1..88a9d504a8 100644
--- a/src/resources/waiting-rooms/index.ts
+++ b/src/resources/waiting-rooms/index.ts
@@ -1,41 +1,41 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Event,
-  EventDeleteResponse,
-  EventCreateParams,
-  EventUpdateParams,
-  EventListParams,
-  EventDeleteParams,
-  EventEditParams,
-  EventGetParams,
-  EventsSinglePage,
+  EventsV4PagePaginationArray,
   Events,
+  type Event,
+  type EventDeleteResponse,
+  type EventCreateParams,
+  type EventUpdateParams,
+  type EventListParams,
+  type EventDeleteParams,
+  type EventEditParams,
+  type EventGetParams,
 } from './events/index';
-export { PagePreviewResponse, PagePreviewParams, Page } from './page';
+export { Page, type PagePreviewResponse, type PagePreviewParams } from './page';
 export {
-  Setting,
-  SettingUpdateResponse,
-  SettingEditResponse,
-  SettingGetResponse,
-  SettingUpdateParams,
-  SettingEditParams,
-  SettingGetParams,
-  Settings,
-} from './settings';
-export { StatusGetResponse, StatusGetParams, Statuses } from './statuses';
-export {
-  WaitingRoomRule,
-  RuleCreateResponse,
-  RuleUpdateResponse,
-  RuleDeleteResponse,
-  RuleEditResponse,
-  RuleCreateParams,
-  RuleUpdateParams,
-  RuleListParams,
-  RuleDeleteParams,
-  RuleEditParams,
-  WaitingRoomRulesSinglePage,
   Rules,
+  type WaitingRoomRule,
+  type RuleCreateResponse,
+  type RuleUpdateResponse,
+  type RuleDeleteResponse,
+  type RuleEditResponse,
+  type RuleGetResponse,
+  type RuleCreateParams,
+  type RuleUpdateParams,
+  type RuleDeleteParams,
+  type RuleEditParams,
+  type RuleGetParams,
 } from './rules';
+export {
+  Settings,
+  type Setting,
+  type SettingUpdateResponse,
+  type SettingEditResponse,
+  type SettingGetResponse,
+  type SettingUpdateParams,
+  type SettingEditParams,
+  type SettingGetParams,
+} from './settings';
+export { Statuses, type StatusGetResponse, type StatusGetParams } from './statuses';
 export { WaitingRooms } from './waiting-rooms';
diff --git a/src/resources/waiting-rooms/page.ts b/src/resources/waiting-rooms/page.ts
index 11766979bb..0030687548 100644
--- a/src/resources/waiting-rooms/page.ts
+++ b/src/resources/waiting-rooms/page.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as PageAPI from './page';
 
 export class Page extends APIResource {
   /**
@@ -92,7 +91,6 @@ export interface PagePreviewParams {
   custom_html: string;
 }
 
-export namespace Page {
-  export import PagePreviewResponse = PageAPI.PagePreviewResponse;
-  export import PagePreviewParams = PageAPI.PagePreviewParams;
+export declare namespace Page {
+  export { type PagePreviewResponse as PagePreviewResponse, type PagePreviewParams as PagePreviewParams };
 }
diff --git a/src/resources/waiting-rooms/rules.ts b/src/resources/waiting-rooms/rules.ts
index 486a45ca44..5d2e2cacb3 100644
--- a/src/resources/waiting-rooms/rules.ts
+++ b/src/resources/waiting-rooms/rules.ts
@@ -2,8 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as RulesAPI from './rules';
-import { SinglePage } from '../../pagination';
 
 export class Rules extends APIResource {
   /**
@@ -14,13 +12,13 @@ export class Rules extends APIResource {
     waitingRoomId: string,
     params: RuleCreateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<RuleCreateResponse | null> {
-    const { zone_id, ...body } = params;
+  ): Core.APIPromise<RuleCreateResponse> {
+    const { zone_id, rules } = params;
     return (
       this._client.post(`/zones/${zone_id}/waiting_rooms/${waitingRoomId}/rules`, {
-        body,
+        body: rules,
         ...options,
-      }) as Core.APIPromise<{ result: RuleCreateResponse | null }>
+      }) as Core.APIPromise<{ result: RuleCreateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -32,32 +30,16 @@ export class Rules extends APIResource {
     waitingRoomId: string,
     params: RuleUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<RuleUpdateResponse | null> {
-    const { zone_id, body } = params;
+  ): Core.APIPromise<RuleUpdateResponse> {
+    const { zone_id, rules } = params;
     return (
       this._client.put(`/zones/${zone_id}/waiting_rooms/${waitingRoomId}/rules`, {
-        body: body,
+        body: rules,
         ...options,
-      }) as Core.APIPromise<{ result: RuleUpdateResponse | null }>
+      }) as Core.APIPromise<{ result: RuleUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
-  /**
-   * Lists rules for a waiting room.
-   */
-  list(
-    waitingRoomId: string,
-    params: RuleListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<WaitingRoomRulesSinglePage, WaitingRoomRule> {
-    const { zone_id } = params;
-    return this._client.getAPIList(
-      `/zones/${zone_id}/waiting_rooms/${waitingRoomId}/rules`,
-      WaitingRoomRulesSinglePage,
-      options,
-    );
-  }
-
   /**
    * Deletes a rule for a waiting room.
    */
@@ -66,13 +48,13 @@ export class Rules extends APIResource {
     ruleId: string,
     params: RuleDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<RuleDeleteResponse | null> {
+  ): Core.APIPromise<RuleDeleteResponse> {
     const { zone_id } = params;
     return (
       this._client.delete(
         `/zones/${zone_id}/waiting_rooms/${waitingRoomId}/rules/${ruleId}`,
         options,
-      ) as Core.APIPromise<{ result: RuleDeleteResponse | null }>
+      ) as Core.APIPromise<{ result: RuleDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -84,18 +66,32 @@ export class Rules extends APIResource {
     ruleId: string,
     params: RuleEditParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<RuleEditResponse | null> {
+  ): Core.APIPromise<RuleEditResponse> {
     const { zone_id, ...body } = params;
     return (
       this._client.patch(`/zones/${zone_id}/waiting_rooms/${waitingRoomId}/rules/${ruleId}`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: RuleEditResponse | null }>
+      }) as Core.APIPromise<{ result: RuleEditResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
-}
 
-export class WaitingRoomRulesSinglePage extends SinglePage<WaitingRoomRule> {}
+  /**
+   * Lists rules for a waiting room.
+   */
+  get(
+    waitingRoomId: string,
+    params: RuleGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RuleGetResponse> {
+    const { zone_id } = params;
+    return (
+      this._client.get(`/zones/${zone_id}/waiting_rooms/${waitingRoomId}/rules`, options) as Core.APIPromise<{
+        result: RuleGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
 
 export interface WaitingRoomRule {
   /**
@@ -139,6 +135,8 @@ export type RuleDeleteResponse = Array<WaitingRoomRule>;
 
 export type RuleEditResponse = Array<WaitingRoomRule>;
 
+export type RuleGetResponse = Array<WaitingRoomRule>;
+
 export interface RuleCreateParams {
   /**
    * Path param: Identifier
@@ -146,24 +144,33 @@ export interface RuleCreateParams {
   zone_id: string;
 
   /**
-   * Body param: The action to take when the expression matches.
+   * Body param:
    */
-  action: 'bypass_waiting_room';
+  rules: RuleCreateParams.Rules;
+}
 
-  /**
-   * Body param: Criteria defining when there is a match for the current rule.
-   */
-  expression: string;
+export namespace RuleCreateParams {
+  export interface Rules {
+    /**
+     * The action to take when the expression matches.
+     */
+    action: 'bypass_waiting_room';
 
-  /**
-   * Body param: The description of the rule.
-   */
-  description?: string;
+    /**
+     * Criteria defining when there is a match for the current rule.
+     */
+    expression: string;
 
-  /**
-   * Body param: When set to true, the rule is enabled.
-   */
-  enabled?: boolean;
+    /**
+     * The description of the rule.
+     */
+    description?: string;
+
+    /**
+     * When set to true, the rule is enabled.
+     */
+    enabled?: boolean;
+  }
 }
 
 export interface RuleUpdateParams {
@@ -175,11 +182,11 @@ export interface RuleUpdateParams {
   /**
    * Body param:
    */
-  body: Array<RuleUpdateParams.Body>;
+  rules: Array<RuleUpdateParams.Rule>;
 }
 
 export namespace RuleUpdateParams {
-  export interface Body {
+  export interface Rule {
     /**
      * The action to take when the expression matches.
      */
@@ -202,13 +209,6 @@ export namespace RuleUpdateParams {
   }
 }
 
-export interface RuleListParams {
-  /**
-   * Identifier
-   */
-  zone_id: string;
-}
-
 export interface RuleDeleteParams {
   /**
    * Identifier
@@ -276,16 +276,25 @@ export namespace RuleEditParams {
   }
 }
 
-export namespace Rules {
-  export import WaitingRoomRule = RulesAPI.WaitingRoomRule;
-  export import RuleCreateResponse = RulesAPI.RuleCreateResponse;
-  export import RuleUpdateResponse = RulesAPI.RuleUpdateResponse;
-  export import RuleDeleteResponse = RulesAPI.RuleDeleteResponse;
-  export import RuleEditResponse = RulesAPI.RuleEditResponse;
-  export import WaitingRoomRulesSinglePage = RulesAPI.WaitingRoomRulesSinglePage;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleDeleteParams = RulesAPI.RuleDeleteParams;
-  export import RuleEditParams = RulesAPI.RuleEditParams;
+export interface RuleGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export declare namespace Rules {
+  export {
+    type WaitingRoomRule as WaitingRoomRule,
+    type RuleCreateResponse as RuleCreateResponse,
+    type RuleUpdateResponse as RuleUpdateResponse,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    type RuleEditResponse as RuleEditResponse,
+    type RuleGetResponse as RuleGetResponse,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleEditParams as RuleEditParams,
+    type RuleGetParams as RuleGetParams,
+  };
 }
diff --git a/src/resources/waiting-rooms/settings.ts b/src/resources/waiting-rooms/settings.ts
index 2c9adb41bc..5361031b99 100644
--- a/src/resources/waiting-rooms/settings.ts
+++ b/src/resources/waiting-rooms/settings.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SettingsAPI from './settings';
 
 export class Settings extends APIResource {
   /**
@@ -116,12 +115,14 @@ export interface SettingGetParams {
   zone_id: string;
 }
 
-export namespace Settings {
-  export import Setting = SettingsAPI.Setting;
-  export import SettingUpdateResponse = SettingsAPI.SettingUpdateResponse;
-  export import SettingEditResponse = SettingsAPI.SettingEditResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingUpdateParams = SettingsAPI.SettingUpdateParams;
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
+export declare namespace Settings {
+  export {
+    type Setting as Setting,
+    type SettingUpdateResponse as SettingUpdateResponse,
+    type SettingEditResponse as SettingEditResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingUpdateParams as SettingUpdateParams,
+    type SettingEditParams as SettingEditParams,
+    type SettingGetParams as SettingGetParams,
+  };
 }
diff --git a/src/resources/waiting-rooms/statuses.ts b/src/resources/waiting-rooms/statuses.ts
index 45db017737..0eadfef67e 100644
--- a/src/resources/waiting-rooms/statuses.ts
+++ b/src/resources/waiting-rooms/statuses.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as StatusesAPI from './statuses';
 
 export class Statuses extends APIResource {
   /**
@@ -59,7 +58,6 @@ export interface StatusGetParams {
   zone_id: string;
 }
 
-export namespace Statuses {
-  export import StatusGetResponse = StatusesAPI.StatusGetResponse;
-  export import StatusGetParams = StatusesAPI.StatusGetParams;
+export declare namespace Statuses {
+  export { type StatusGetResponse as StatusGetResponse, type StatusGetParams as StatusGetParams };
 }
diff --git a/src/resources/waiting-rooms/waiting-rooms.ts b/src/resources/waiting-rooms/waiting-rooms.ts
index 29aa038e16..8d91d36282 100644
--- a/src/resources/waiting-rooms/waiting-rooms.ts
+++ b/src/resources/waiting-rooms/waiting-rooms.ts
@@ -3,11 +3,49 @@
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
 import * as PageAPI from './page';
+import { Page, PagePreviewParams, PagePreviewResponse } from './page';
 import * as RulesAPI from './rules';
+import {
+  RuleCreateParams,
+  RuleCreateResponse,
+  RuleDeleteParams,
+  RuleDeleteResponse,
+  RuleEditParams,
+  RuleEditResponse,
+  RuleGetParams,
+  RuleGetResponse,
+  RuleUpdateParams,
+  RuleUpdateResponse,
+  Rules,
+  WaitingRoomRule,
+} from './rules';
 import * as SettingsAPI from './settings';
+import {
+  Setting,
+  SettingEditParams,
+  SettingEditResponse,
+  SettingGetParams,
+  SettingGetResponse,
+  SettingUpdateParams,
+  SettingUpdateResponse,
+  Settings,
+} from './settings';
 import * as StatusesAPI from './statuses';
+import { StatusGetParams, StatusGetResponse, Statuses } from './statuses';
 import * as EventsAPI from './events/events';
-import { SinglePage } from '../../pagination';
+import {
+  Event,
+  EventCreateParams,
+  EventDeleteParams,
+  EventDeleteResponse,
+  EventEditParams,
+  EventGetParams,
+  EventListParams,
+  EventUpdateParams,
+  Events,
+  EventsV4PagePaginationArray,
+} from './events/events';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class WaitingRooms extends APIResource {
   page: PageAPI.Page = new PageAPI.Page(this._client);
@@ -51,9 +89,9 @@ export class WaitingRooms extends APIResource {
   list(
     params: WaitingRoomListParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<WaitingRoomsSinglePage, WaitingRoom> {
+  ): Core.PagePromise<WaitingRoomsV4PagePaginationArray, WaitingRoom> {
     const { zone_id, ...query } = params;
-    return this._client.getAPIList(`/zones/${zone_id}/waiting_rooms`, WaitingRoomsSinglePage, {
+    return this._client.getAPIList(`/zones/${zone_id}/waiting_rooms`, WaitingRoomsV4PagePaginationArray, {
       query,
       ...options,
     });
@@ -109,7 +147,7 @@ export class WaitingRooms extends APIResource {
   }
 }
 
-export class WaitingRoomsSinglePage extends SinglePage<WaitingRoom> {}
+export class WaitingRoomsV4PagePaginationArray extends V4PagePaginationArray<WaitingRoom> {}
 
 export interface AdditionalRoutes {
   /**
@@ -288,7 +326,28 @@ export interface Query {
     | 'tr-TR'
     | 'ar-EG'
     | 'ru-RU'
-    | 'fa-IR';
+    | 'fa-IR'
+    | 'bg-BG'
+    | 'hr-HR'
+    | 'cs-CZ'
+    | 'da-DK'
+    | 'fi-FI'
+    | 'lt-LT'
+    | 'ms-MY'
+    | 'nb-NO'
+    | 'ro-RO'
+    | 'el-GR'
+    | 'he-IL'
+    | 'hi-IN'
+    | 'hu-HU'
+    | 'sr-BA'
+    | 'sk-SK'
+    | 'sl-SI'
+    | 'sv-SE'
+    | 'tl-PH'
+    | 'th-TH'
+    | 'uk-UA'
+    | 'vi-VN';
 
   /**
    * A note that you can use to add more details about the waiting room.
@@ -304,6 +363,11 @@ export interface Query {
    */
   disable_session_renewal?: boolean;
 
+  /**
+   * A list of enabled origin commands.
+   */
+  enabled_origin_commands?: Array<'revoke'>;
+
   /**
    * Only available for the Waiting Room Advanced subscription. If `true`, requests
    * to the waiting room with the header `Accept: application/json` will receive a
@@ -516,6 +580,24 @@ export interface Query {
    * traffic will not go to the waiting room.
    */
   suspended?: boolean;
+
+  /**
+   * Which action to take when a bot is detected using Turnstile. `log` will have no
+   * impact on queueing behavior, simply keeping track of how many bots are detected
+   * in Waiting Room Analytics. `infinite_queue` will send bots to a false queueing
+   * state, where they will never reach your origin. `infinite_queue` requires
+   * Advanced Waiting Room.
+   */
+  turnstile_action?: 'log' | 'infinite_queue';
+
+  /**
+   * Which Turnstile widget type to use for detecting bot traffic. See
+   * [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+   * for the definitions of these widget types. Set to `off` to disable the Turnstile
+   * integration entirely. Setting this to anything other than `off` or `invisible`
+   * requires Advanced Waiting Room.
+   */
+  turnstile_mode?: 'off' | 'invisible' | 'visible_non_interactive' | 'visible_managed';
 }
 
 export interface WaitingRoom {
@@ -590,7 +672,28 @@ export interface WaitingRoom {
     | 'tr-TR'
     | 'ar-EG'
     | 'ru-RU'
-    | 'fa-IR';
+    | 'fa-IR'
+    | 'bg-BG'
+    | 'hr-HR'
+    | 'cs-CZ'
+    | 'da-DK'
+    | 'fi-FI'
+    | 'lt-LT'
+    | 'ms-MY'
+    | 'nb-NO'
+    | 'ro-RO'
+    | 'el-GR'
+    | 'he-IL'
+    | 'hi-IN'
+    | 'hu-HU'
+    | 'sr-BA'
+    | 'sk-SK'
+    | 'sl-SI'
+    | 'sv-SE'
+    | 'tl-PH'
+    | 'th-TH'
+    | 'uk-UA'
+    | 'vi-VN';
 
   /**
    * A note that you can use to add more details about the waiting room.
@@ -606,6 +709,11 @@ export interface WaitingRoom {
    */
   disable_session_renewal?: boolean;
 
+  /**
+   * A list of enabled origin commands.
+   */
+  enabled_origin_commands?: Array<'revoke'>;
+
   /**
    * The host name to which the waiting room will be applied (no wildcards). Please
    * do not include the scheme (http:// or https://). The host and path combination
@@ -861,6 +969,24 @@ export interface WaitingRoom {
    * around the world.
    */
   total_active_users?: number;
+
+  /**
+   * Which action to take when a bot is detected using Turnstile. `log` will have no
+   * impact on queueing behavior, simply keeping track of how many bots are detected
+   * in Waiting Room Analytics. `infinite_queue` will send bots to a false queueing
+   * state, where they will never reach your origin. `infinite_queue` requires
+   * Advanced Waiting Room.
+   */
+  turnstile_action?: 'log' | 'infinite_queue';
+
+  /**
+   * Which Turnstile widget type to use for detecting bot traffic. See
+   * [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+   * for the definitions of these widget types. Set to `off` to disable the Turnstile
+   * integration entirely. Setting this to anything other than `off` or `invisible`
+   * requires Advanced Waiting Room.
+   */
+  turnstile_mode?: 'off' | 'invisible' | 'visible_non_interactive' | 'visible_managed';
 }
 
 export interface WaitingRoomDeleteResponse {
@@ -973,7 +1099,28 @@ export interface WaitingRoomCreateParams {
     | 'tr-TR'
     | 'ar-EG'
     | 'ru-RU'
-    | 'fa-IR';
+    | 'fa-IR'
+    | 'bg-BG'
+    | 'hr-HR'
+    | 'cs-CZ'
+    | 'da-DK'
+    | 'fi-FI'
+    | 'lt-LT'
+    | 'ms-MY'
+    | 'nb-NO'
+    | 'ro-RO'
+    | 'el-GR'
+    | 'he-IL'
+    | 'hi-IN'
+    | 'hu-HU'
+    | 'sr-BA'
+    | 'sk-SK'
+    | 'sl-SI'
+    | 'sv-SE'
+    | 'tl-PH'
+    | 'th-TH'
+    | 'uk-UA'
+    | 'vi-VN';
 
   /**
    * Body param: A note that you can use to add more details about the waiting room.
@@ -989,6 +1136,11 @@ export interface WaitingRoomCreateParams {
    */
   disable_session_renewal?: boolean;
 
+  /**
+   * Body param: A list of enabled origin commands.
+   */
+  enabled_origin_commands?: Array<'revoke'>;
+
   /**
    * Body param: Only available for the Waiting Room Advanced subscription. If
    * `true`, requests to the waiting room with the header `Accept: application/json`
@@ -1202,6 +1354,24 @@ export interface WaitingRoomCreateParams {
    * `true`, the traffic will not go to the waiting room.
    */
   suspended?: boolean;
+
+  /**
+   * Body param: Which action to take when a bot is detected using Turnstile. `log`
+   * will have no impact on queueing behavior, simply keeping track of how many bots
+   * are detected in Waiting Room Analytics. `infinite_queue` will send bots to a
+   * false queueing state, where they will never reach your origin. `infinite_queue`
+   * requires Advanced Waiting Room.
+   */
+  turnstile_action?: 'log' | 'infinite_queue';
+
+  /**
+   * Body param: Which Turnstile widget type to use for detecting bot traffic. See
+   * [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+   * for the definitions of these widget types. Set to `off` to disable the Turnstile
+   * integration entirely. Setting this to anything other than `off` or `invisible`
+   * requires Advanced Waiting Room.
+   */
+  turnstile_mode?: 'off' | 'invisible' | 'visible_non_interactive' | 'visible_managed';
 }
 
 export interface WaitingRoomUpdateParams {
@@ -1310,7 +1480,28 @@ export interface WaitingRoomUpdateParams {
     | 'tr-TR'
     | 'ar-EG'
     | 'ru-RU'
-    | 'fa-IR';
+    | 'fa-IR'
+    | 'bg-BG'
+    | 'hr-HR'
+    | 'cs-CZ'
+    | 'da-DK'
+    | 'fi-FI'
+    | 'lt-LT'
+    | 'ms-MY'
+    | 'nb-NO'
+    | 'ro-RO'
+    | 'el-GR'
+    | 'he-IL'
+    | 'hi-IN'
+    | 'hu-HU'
+    | 'sr-BA'
+    | 'sk-SK'
+    | 'sl-SI'
+    | 'sv-SE'
+    | 'tl-PH'
+    | 'th-TH'
+    | 'uk-UA'
+    | 'vi-VN';
 
   /**
    * Body param: A note that you can use to add more details about the waiting room.
@@ -1326,6 +1517,11 @@ export interface WaitingRoomUpdateParams {
    */
   disable_session_renewal?: boolean;
 
+  /**
+   * Body param: A list of enabled origin commands.
+   */
+  enabled_origin_commands?: Array<'revoke'>;
+
   /**
    * Body param: Only available for the Waiting Room Advanced subscription. If
    * `true`, requests to the waiting room with the header `Accept: application/json`
@@ -1539,23 +1735,31 @@ export interface WaitingRoomUpdateParams {
    * `true`, the traffic will not go to the waiting room.
    */
   suspended?: boolean;
-}
 
-export interface WaitingRoomListParams {
   /**
-   * Path param: Identifier
+   * Body param: Which action to take when a bot is detected using Turnstile. `log`
+   * will have no impact on queueing behavior, simply keeping track of how many bots
+   * are detected in Waiting Room Analytics. `infinite_queue` will send bots to a
+   * false queueing state, where they will never reach your origin. `infinite_queue`
+   * requires Advanced Waiting Room.
    */
-  zone_id: string;
+  turnstile_action?: 'log' | 'infinite_queue';
 
   /**
-   * Query param: Page number of paginated results.
+   * Body param: Which Turnstile widget type to use for detecting bot traffic. See
+   * [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+   * for the definitions of these widget types. Set to `off` to disable the Turnstile
+   * integration entirely. Setting this to anything other than `off` or `invisible`
+   * requires Advanced Waiting Room.
    */
-  page?: unknown;
+  turnstile_mode?: 'off' | 'invisible' | 'visible_non_interactive' | 'visible_managed';
+}
 
+export interface WaitingRoomListParams extends V4PagePaginationArrayParams {
   /**
-   * Query param: Maximum number of results per page. Must be a multiple of 5.
+   * Path param: Identifier
    */
-  per_page?: unknown;
+  zone_id: string;
 }
 
 export interface WaitingRoomDeleteParams {
@@ -1671,7 +1875,28 @@ export interface WaitingRoomEditParams {
     | 'tr-TR'
     | 'ar-EG'
     | 'ru-RU'
-    | 'fa-IR';
+    | 'fa-IR'
+    | 'bg-BG'
+    | 'hr-HR'
+    | 'cs-CZ'
+    | 'da-DK'
+    | 'fi-FI'
+    | 'lt-LT'
+    | 'ms-MY'
+    | 'nb-NO'
+    | 'ro-RO'
+    | 'el-GR'
+    | 'he-IL'
+    | 'hi-IN'
+    | 'hu-HU'
+    | 'sr-BA'
+    | 'sk-SK'
+    | 'sl-SI'
+    | 'sv-SE'
+    | 'tl-PH'
+    | 'th-TH'
+    | 'uk-UA'
+    | 'vi-VN';
 
   /**
    * Body param: A note that you can use to add more details about the waiting room.
@@ -1687,6 +1912,11 @@ export interface WaitingRoomEditParams {
    */
   disable_session_renewal?: boolean;
 
+  /**
+   * Body param: A list of enabled origin commands.
+   */
+  enabled_origin_commands?: Array<'revoke'>;
+
   /**
    * Body param: Only available for the Waiting Room Advanced subscription. If
    * `true`, requests to the waiting room with the header `Accept: application/json`
@@ -1900,6 +2130,24 @@ export interface WaitingRoomEditParams {
    * `true`, the traffic will not go to the waiting room.
    */
   suspended?: boolean;
+
+  /**
+   * Body param: Which action to take when a bot is detected using Turnstile. `log`
+   * will have no impact on queueing behavior, simply keeping track of how many bots
+   * are detected in Waiting Room Analytics. `infinite_queue` will send bots to a
+   * false queueing state, where they will never reach your origin. `infinite_queue`
+   * requires Advanced Waiting Room.
+   */
+  turnstile_action?: 'log' | 'infinite_queue';
+
+  /**
+   * Body param: Which Turnstile widget type to use for detecting bot traffic. See
+   * [the Turnstile documentation](https://developers.cloudflare.com/turnstile/concepts/widget/#widget-types)
+   * for the definitions of these widget types. Set to `off` to disable the Turnstile
+   * integration entirely. Setting this to anything other than `off` or `invisible`
+   * requires Advanced Waiting Room.
+   */
+  turnstile_mode?: 'off' | 'invisible' | 'visible_non_interactive' | 'visible_managed';
 }
 
 export interface WaitingRoomGetParams {
@@ -1909,41 +2157,62 @@ export interface WaitingRoomGetParams {
   zone_id: string;
 }
 
-export namespace WaitingRooms {
-  export import Page = PageAPI.Page;
-  export import PagePreviewResponse = PageAPI.PagePreviewResponse;
-  export import PagePreviewParams = PageAPI.PagePreviewParams;
-  export import Events = EventsAPI.Events;
-  export import Event = EventsAPI.Event;
-  export import EventDeleteResponse = EventsAPI.EventDeleteResponse;
-  export import EventsSinglePage = EventsAPI.EventsSinglePage;
-  export import EventCreateParams = EventsAPI.EventCreateParams;
-  export import EventUpdateParams = EventsAPI.EventUpdateParams;
-  export import EventListParams = EventsAPI.EventListParams;
-  export import EventDeleteParams = EventsAPI.EventDeleteParams;
-  export import EventEditParams = EventsAPI.EventEditParams;
-  export import EventGetParams = EventsAPI.EventGetParams;
-  export import Rules = RulesAPI.Rules;
-  export import WaitingRoomRule = RulesAPI.WaitingRoomRule;
-  export import RuleCreateResponse = RulesAPI.RuleCreateResponse;
-  export import RuleUpdateResponse = RulesAPI.RuleUpdateResponse;
-  export import RuleDeleteResponse = RulesAPI.RuleDeleteResponse;
-  export import RuleEditResponse = RulesAPI.RuleEditResponse;
-  export import WaitingRoomRulesSinglePage = RulesAPI.WaitingRoomRulesSinglePage;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleDeleteParams = RulesAPI.RuleDeleteParams;
-  export import RuleEditParams = RulesAPI.RuleEditParams;
-  export import Statuses = StatusesAPI.Statuses;
-  export import StatusGetResponse = StatusesAPI.StatusGetResponse;
-  export import StatusGetParams = StatusesAPI.StatusGetParams;
-  export import Settings = SettingsAPI.Settings;
-  export import Setting = SettingsAPI.Setting;
-  export import SettingUpdateResponse = SettingsAPI.SettingUpdateResponse;
-  export import SettingEditResponse = SettingsAPI.SettingEditResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingUpdateParams = SettingsAPI.SettingUpdateParams;
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
+WaitingRooms.Page = Page;
+WaitingRooms.Events = Events;
+WaitingRooms.EventsV4PagePaginationArray = EventsV4PagePaginationArray;
+WaitingRooms.Rules = Rules;
+WaitingRooms.Statuses = Statuses;
+WaitingRooms.Settings = Settings;
+
+export declare namespace WaitingRooms {
+  export {
+    Page as Page,
+    type PagePreviewResponse as PagePreviewResponse,
+    type PagePreviewParams as PagePreviewParams,
+  };
+
+  export {
+    Events as Events,
+    type Event as Event,
+    type EventDeleteResponse as EventDeleteResponse,
+    EventsV4PagePaginationArray as EventsV4PagePaginationArray,
+    type EventCreateParams as EventCreateParams,
+    type EventUpdateParams as EventUpdateParams,
+    type EventListParams as EventListParams,
+    type EventDeleteParams as EventDeleteParams,
+    type EventEditParams as EventEditParams,
+    type EventGetParams as EventGetParams,
+  };
+
+  export {
+    Rules as Rules,
+    type WaitingRoomRule as WaitingRoomRule,
+    type RuleCreateResponse as RuleCreateResponse,
+    type RuleUpdateResponse as RuleUpdateResponse,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    type RuleEditResponse as RuleEditResponse,
+    type RuleGetResponse as RuleGetResponse,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleEditParams as RuleEditParams,
+    type RuleGetParams as RuleGetParams,
+  };
+
+  export {
+    Statuses as Statuses,
+    type StatusGetResponse as StatusGetResponse,
+    type StatusGetParams as StatusGetParams,
+  };
+
+  export {
+    Settings as Settings,
+    type Setting as Setting,
+    type SettingUpdateResponse as SettingUpdateResponse,
+    type SettingEditResponse as SettingEditResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingUpdateParams as SettingUpdateParams,
+    type SettingEditParams as SettingEditParams,
+    type SettingGetParams as SettingGetParams,
+  };
 }
diff --git a/src/resources/web3/hostnames/hostnames.ts b/src/resources/web3/hostnames/hostnames.ts
index b1fe3d20e8..2058ee9894 100644
--- a/src/resources/web3/hostnames/hostnames.ts
+++ b/src/resources/web3/hostnames/hostnames.ts
@@ -2,8 +2,8 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as HostnamesAPI from './hostnames';
 import * as IPFSUniversalPathsAPI from './ipfs-universal-paths/ipfs-universal-paths';
+import { IPFSUniversalPaths } from './ipfs-universal-paths/ipfs-universal-paths';
 import { SinglePage } from '../../../pagination';
 
 export class Hostnames extends APIResource {
@@ -14,13 +14,10 @@ export class Hostnames extends APIResource {
   /**
    * Create Web3 Hostname
    */
-  create(
-    zoneIdentifier: string,
-    body: HostnameCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<Hostname> {
+  create(params: HostnameCreateParams, options?: Core.RequestOptions): Core.APIPromise<Hostname> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.post(`/zones/${zoneIdentifier}/web3/hostnames`, { body, ...options }) as Core.APIPromise<{
+      this._client.post(`/zones/${zone_id}/web3/hostnames`, { body, ...options }) as Core.APIPromise<{
         result: Hostname;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -30,25 +27,26 @@ export class Hostnames extends APIResource {
    * List Web3 Hostnames
    */
   list(
-    zoneIdentifier: string,
+    params: HostnameListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<HostnamesSinglePage, Hostname> {
-    return this._client.getAPIList(`/zones/${zoneIdentifier}/web3/hostnames`, HostnamesSinglePage, options);
+    const { zone_id } = params;
+    return this._client.getAPIList(`/zones/${zone_id}/web3/hostnames`, HostnamesSinglePage, options);
   }
 
   /**
    * Delete Web3 Hostname
    */
   delete(
-    zoneIdentifier: string,
     identifier: string,
+    params: HostnameDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<HostnameDeleteResponse | null> {
+    const { zone_id } = params;
     return (
-      this._client.delete(
-        `/zones/${zoneIdentifier}/web3/hostnames/${identifier}`,
-        options,
-      ) as Core.APIPromise<{ result: HostnameDeleteResponse | null }>
+      this._client.delete(`/zones/${zone_id}/web3/hostnames/${identifier}`, options) as Core.APIPromise<{
+        result: HostnameDeleteResponse | null;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -56,13 +54,13 @@ export class Hostnames extends APIResource {
    * Edit Web3 Hostname
    */
   edit(
-    zoneIdentifier: string,
     identifier: string,
-    body: HostnameEditParams,
+    params: HostnameEditParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<Hostname> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.patch(`/zones/${zoneIdentifier}/web3/hostnames/${identifier}`, {
+      this._client.patch(`/zones/${zone_id}/web3/hostnames/${identifier}`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: Hostname }>
@@ -72,9 +70,14 @@ export class Hostnames extends APIResource {
   /**
    * Web3 Hostname Details
    */
-  get(zoneIdentifier: string, identifier: string, options?: Core.RequestOptions): Core.APIPromise<Hostname> {
+  get(
+    identifier: string,
+    params: HostnameGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<Hostname> {
+    const { zone_id } = params;
     return (
-      this._client.get(`/zones/${zoneIdentifier}/web3/hostnames/${identifier}`, options) as Core.APIPromise<{
+      this._client.get(`/zones/${zone_id}/web3/hostnames/${identifier}`, options) as Core.APIPromise<{
         result: Hostname;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -128,38 +131,83 @@ export interface HostnameDeleteResponse {
 
 export interface HostnameCreateParams {
   /**
-   * Target gateway of the hostname.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The hostname that will point to the target gateway via CNAME.
+   */
+  name: string;
+
+  /**
+   * Body param: Target gateway of the hostname.
    */
   target: 'ethereum' | 'ipfs' | 'ipfs_universal_path';
 
   /**
-   * An optional description of the hostname.
+   * Body param: An optional description of the hostname.
    */
   description?: string;
 
   /**
-   * DNSLink value used if the target is ipfs.
+   * Body param: DNSLink value used if the target is ipfs.
    */
   dnslink?: string;
 }
 
+export interface HostnameListParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface HostnameDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
 export interface HostnameEditParams {
   /**
-   * An optional description of the hostname.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: An optional description of the hostname.
    */
   description?: string;
 
   /**
-   * DNSLink value used if the target is ipfs.
+   * Body param: DNSLink value used if the target is ipfs.
    */
   dnslink?: string;
 }
 
-export namespace Hostnames {
-  export import Hostname = HostnamesAPI.Hostname;
-  export import HostnameDeleteResponse = HostnamesAPI.HostnameDeleteResponse;
-  export import HostnamesSinglePage = HostnamesAPI.HostnamesSinglePage;
-  export import HostnameCreateParams = HostnamesAPI.HostnameCreateParams;
-  export import HostnameEditParams = HostnamesAPI.HostnameEditParams;
-  export import IPFSUniversalPaths = IPFSUniversalPathsAPI.IPFSUniversalPaths;
+export interface HostnameGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+Hostnames.HostnamesSinglePage = HostnamesSinglePage;
+Hostnames.IPFSUniversalPaths = IPFSUniversalPaths;
+
+export declare namespace Hostnames {
+  export {
+    type Hostname as Hostname,
+    type HostnameDeleteResponse as HostnameDeleteResponse,
+    HostnamesSinglePage as HostnamesSinglePage,
+    type HostnameCreateParams as HostnameCreateParams,
+    type HostnameListParams as HostnameListParams,
+    type HostnameDeleteParams as HostnameDeleteParams,
+    type HostnameEditParams as HostnameEditParams,
+    type HostnameGetParams as HostnameGetParams,
+  };
+
+  export { IPFSUniversalPaths as IPFSUniversalPaths };
 }
diff --git a/src/resources/web3/hostnames/index.ts b/src/resources/web3/hostnames/index.ts
index 1394908df7..5536e64203 100644
--- a/src/resources/web3/hostnames/index.ts
+++ b/src/resources/web3/hostnames/index.ts
@@ -1,11 +1,14 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Hostname,
-  HostnameDeleteResponse,
-  HostnameCreateParams,
-  HostnameEditParams,
   HostnamesSinglePage,
   Hostnames,
+  type Hostname,
+  type HostnameDeleteResponse,
+  type HostnameCreateParams,
+  type HostnameListParams,
+  type HostnameDeleteParams,
+  type HostnameEditParams,
+  type HostnameGetParams,
 } from './hostnames';
 export { IPFSUniversalPaths } from './ipfs-universal-paths/index';
diff --git a/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.ts b/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.ts
index d2c436ed31..20bcbbe148 100644
--- a/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.ts
+++ b/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.ts
@@ -2,8 +2,20 @@
 
 import { APIResource } from '../../../../../resource';
 import * as Core from '../../../../../core';
-import * as ContentListsAPI from './content-lists';
 import * as EntriesAPI from './entries';
+import {
+  Entries,
+  EntryCreateParams,
+  EntryCreateResponse,
+  EntryDeleteParams,
+  EntryDeleteResponse,
+  EntryGetParams,
+  EntryGetResponse,
+  EntryListParams,
+  EntryListResponse,
+  EntryUpdateParams,
+  EntryUpdateResponse,
+} from './entries';
 
 export class ContentLists extends APIResource {
   entries: EntriesAPI.Entries = new EntriesAPI.Entries(this._client);
@@ -12,16 +24,16 @@ export class ContentLists extends APIResource {
    * Update IPFS Universal Path Gateway Content List
    */
   update(
-    zoneIdentifier: string,
     identifier: string,
-    body: ContentListUpdateParams,
+    params: ContentListUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<ContentList> {
+    const { zone_id, ...body } = params;
     return (
-      this._client.put(
-        `/zones/${zoneIdentifier}/web3/hostnames/${identifier}/ipfs_universal_path/content_list`,
-        { body, ...options },
-      ) as Core.APIPromise<{ result: ContentList }>
+      this._client.put(`/zones/${zone_id}/web3/hostnames/${identifier}/ipfs_universal_path/content_list`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: ContentList }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -29,13 +41,14 @@ export class ContentLists extends APIResource {
    * IPFS Universal Path Gateway Content List Details
    */
   get(
-    zoneIdentifier: string,
     identifier: string,
+    params: ContentListGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<ContentList> {
+    const { zone_id } = params;
     return (
       this._client.get(
-        `/zones/${zoneIdentifier}/web3/hostnames/${identifier}/ipfs_universal_path/content_list`,
+        `/zones/${zone_id}/web3/hostnames/${identifier}/ipfs_universal_path/content_list`,
         options,
       ) as Core.APIPromise<{ result: ContentList }>
     )._thenUnwrap((obj) => obj.result);
@@ -51,12 +64,17 @@ export interface ContentList {
 
 export interface ContentListUpdateParams {
   /**
-   * Behavior of the content list.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: Behavior of the content list.
    */
   action: 'block';
 
   /**
-   * Content list entries.
+   * Body param: Content list entries.
    */
   entries: Array<ContentListUpdateParams.Entry>;
 }
@@ -83,15 +101,33 @@ export namespace ContentListUpdateParams {
   }
 }
 
-export namespace ContentLists {
-  export import ContentList = ContentListsAPI.ContentList;
-  export import ContentListUpdateParams = ContentListsAPI.ContentListUpdateParams;
-  export import Entries = EntriesAPI.Entries;
-  export import EntryCreateResponse = EntriesAPI.EntryCreateResponse;
-  export import EntryUpdateResponse = EntriesAPI.EntryUpdateResponse;
-  export import EntryListResponse = EntriesAPI.EntryListResponse;
-  export import EntryDeleteResponse = EntriesAPI.EntryDeleteResponse;
-  export import EntryGetResponse = EntriesAPI.EntryGetResponse;
-  export import EntryCreateParams = EntriesAPI.EntryCreateParams;
-  export import EntryUpdateParams = EntriesAPI.EntryUpdateParams;
+export interface ContentListGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+ContentLists.Entries = Entries;
+
+export declare namespace ContentLists {
+  export {
+    type ContentList as ContentList,
+    type ContentListUpdateParams as ContentListUpdateParams,
+    type ContentListGetParams as ContentListGetParams,
+  };
+
+  export {
+    Entries as Entries,
+    type EntryCreateResponse as EntryCreateResponse,
+    type EntryUpdateResponse as EntryUpdateResponse,
+    type EntryListResponse as EntryListResponse,
+    type EntryDeleteResponse as EntryDeleteResponse,
+    type EntryGetResponse as EntryGetResponse,
+    type EntryCreateParams as EntryCreateParams,
+    type EntryUpdateParams as EntryUpdateParams,
+    type EntryListParams as EntryListParams,
+    type EntryDeleteParams as EntryDeleteParams,
+    type EntryGetParams as EntryGetParams,
+  };
 }
diff --git a/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts b/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts
index 4ebee3352c..aa370ccc51 100644
--- a/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts
+++ b/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.ts
@@ -2,21 +2,20 @@
 
 import { APIResource } from '../../../../../resource';
 import * as Core from '../../../../../core';
-import * as EntriesAPI from './entries';
 
 export class Entries extends APIResource {
   /**
    * Create IPFS Universal Path Gateway Content List Entry
    */
   create(
-    zoneIdentifier: string,
     identifier: string,
-    body: EntryCreateParams,
+    params: EntryCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<EntryCreateResponse> {
+    const { zone_id, ...body } = params;
     return (
       this._client.post(
-        `/zones/${zoneIdentifier}/web3/hostnames/${identifier}/ipfs_universal_path/content_list/entries`,
+        `/zones/${zone_id}/web3/hostnames/${identifier}/ipfs_universal_path/content_list/entries`,
         { body, ...options },
       ) as Core.APIPromise<{ result: EntryCreateResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -26,15 +25,15 @@ export class Entries extends APIResource {
    * Edit IPFS Universal Path Gateway Content List Entry
    */
   update(
-    zoneIdentifier: string,
     identifier: string,
     contentListEntryIdentifier: string,
-    body: EntryUpdateParams,
+    params: EntryUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<EntryUpdateResponse> {
+    const { zone_id, ...body } = params;
     return (
       this._client.put(
-        `/zones/${zoneIdentifier}/web3/hostnames/${identifier}/ipfs_universal_path/content_list/entries/${contentListEntryIdentifier}`,
+        `/zones/${zone_id}/web3/hostnames/${identifier}/ipfs_universal_path/content_list/entries/${contentListEntryIdentifier}`,
         { body, ...options },
       ) as Core.APIPromise<{ result: EntryUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -44,13 +43,14 @@ export class Entries extends APIResource {
    * List IPFS Universal Path Gateway Content List Entries
    */
   list(
-    zoneIdentifier: string,
     identifier: string,
+    params: EntryListParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<EntryListResponse | null> {
+    const { zone_id } = params;
     return (
       this._client.get(
-        `/zones/${zoneIdentifier}/web3/hostnames/${identifier}/ipfs_universal_path/content_list/entries`,
+        `/zones/${zone_id}/web3/hostnames/${identifier}/ipfs_universal_path/content_list/entries`,
         options,
       ) as Core.APIPromise<{ result: EntryListResponse | null }>
     )._thenUnwrap((obj) => obj.result);
@@ -60,14 +60,15 @@ export class Entries extends APIResource {
    * Delete IPFS Universal Path Gateway Content List Entry
    */
   delete(
-    zoneIdentifier: string,
     identifier: string,
     contentListEntryIdentifier: string,
+    params: EntryDeleteParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<EntryDeleteResponse | null> {
+    const { zone_id } = params;
     return (
       this._client.delete(
-        `/zones/${zoneIdentifier}/web3/hostnames/${identifier}/ipfs_universal_path/content_list/entries/${contentListEntryIdentifier}`,
+        `/zones/${zone_id}/web3/hostnames/${identifier}/ipfs_universal_path/content_list/entries/${contentListEntryIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: EntryDeleteResponse | null }>
     )._thenUnwrap((obj) => obj.result);
@@ -77,14 +78,15 @@ export class Entries extends APIResource {
    * IPFS Universal Path Gateway Content List Entry Details
    */
   get(
-    zoneIdentifier: string,
     identifier: string,
     contentListEntryIdentifier: string,
+    params: EntryGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<EntryGetResponse> {
+    const { zone_id } = params;
     return (
       this._client.get(
-        `/zones/${zoneIdentifier}/web3/hostnames/${identifier}/ipfs_universal_path/content_list/entries/${contentListEntryIdentifier}`,
+        `/zones/${zone_id}/web3/hostnames/${identifier}/ipfs_universal_path/content_list/entries/${contentListEntryIdentifier}`,
         options,
       ) as Core.APIPromise<{ result: EntryGetResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -225,44 +227,80 @@ export interface EntryGetResponse {
 
 export interface EntryCreateParams {
   /**
-   * CID or content path of content to block.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: CID or content path of content to block.
    */
   content: string;
 
   /**
-   * Type of content list entry to block.
+   * Body param: Type of content list entry to block.
    */
   type: 'cid' | 'content_path';
 
   /**
-   * An optional description of the content list entry.
+   * Body param: An optional description of the content list entry.
    */
   description?: string;
 }
 
 export interface EntryUpdateParams {
   /**
-   * CID or content path of content to block.
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: CID or content path of content to block.
    */
   content: string;
 
   /**
-   * Type of content list entry to block.
+   * Body param: Type of content list entry to block.
    */
   type: 'cid' | 'content_path';
 
   /**
-   * An optional description of the content list entry.
+   * Body param: An optional description of the content list entry.
    */
   description?: string;
 }
 
-export namespace Entries {
-  export import EntryCreateResponse = EntriesAPI.EntryCreateResponse;
-  export import EntryUpdateResponse = EntriesAPI.EntryUpdateResponse;
-  export import EntryListResponse = EntriesAPI.EntryListResponse;
-  export import EntryDeleteResponse = EntriesAPI.EntryDeleteResponse;
-  export import EntryGetResponse = EntriesAPI.EntryGetResponse;
-  export import EntryCreateParams = EntriesAPI.EntryCreateParams;
-  export import EntryUpdateParams = EntriesAPI.EntryUpdateParams;
+export interface EntryListParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface EntryDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface EntryGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export declare namespace Entries {
+  export {
+    type EntryCreateResponse as EntryCreateResponse,
+    type EntryUpdateResponse as EntryUpdateResponse,
+    type EntryListResponse as EntryListResponse,
+    type EntryDeleteResponse as EntryDeleteResponse,
+    type EntryGetResponse as EntryGetResponse,
+    type EntryCreateParams as EntryCreateParams,
+    type EntryUpdateParams as EntryUpdateParams,
+    type EntryListParams as EntryListParams,
+    type EntryDeleteParams as EntryDeleteParams,
+    type EntryGetParams as EntryGetParams,
+  };
 }
diff --git a/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/index.ts b/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/index.ts
index 7c2d516718..53d6fef184 100644
--- a/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/index.ts
+++ b/src/resources/web3/hostnames/ipfs-universal-paths/content-lists/index.ts
@@ -1,13 +1,21 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { ContentList, ContentListUpdateParams, ContentLists } from './content-lists';
 export {
-  EntryCreateResponse,
-  EntryUpdateResponse,
-  EntryListResponse,
-  EntryDeleteResponse,
-  EntryGetResponse,
-  EntryCreateParams,
-  EntryUpdateParams,
+  ContentLists,
+  type ContentList,
+  type ContentListUpdateParams,
+  type ContentListGetParams,
+} from './content-lists';
+export {
   Entries,
+  type EntryCreateResponse,
+  type EntryUpdateResponse,
+  type EntryListResponse,
+  type EntryDeleteResponse,
+  type EntryGetResponse,
+  type EntryCreateParams,
+  type EntryUpdateParams,
+  type EntryListParams,
+  type EntryDeleteParams,
+  type EntryGetParams,
 } from './entries';
diff --git a/src/resources/web3/hostnames/ipfs-universal-paths/index.ts b/src/resources/web3/hostnames/ipfs-universal-paths/index.ts
index 5362990ee9..528af13594 100644
--- a/src/resources/web3/hostnames/ipfs-universal-paths/index.ts
+++ b/src/resources/web3/hostnames/ipfs-universal-paths/index.ts
@@ -1,4 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { ContentList, ContentListUpdateParams, ContentLists } from './content-lists/index';
+export {
+  ContentLists,
+  type ContentList,
+  type ContentListUpdateParams,
+  type ContentListGetParams,
+} from './content-lists/index';
 export { IPFSUniversalPaths } from './ipfs-universal-paths';
diff --git a/src/resources/web3/hostnames/ipfs-universal-paths/ipfs-universal-paths.ts b/src/resources/web3/hostnames/ipfs-universal-paths/ipfs-universal-paths.ts
index 152de4e7d2..104bf02252 100644
--- a/src/resources/web3/hostnames/ipfs-universal-paths/ipfs-universal-paths.ts
+++ b/src/resources/web3/hostnames/ipfs-universal-paths/ipfs-universal-paths.ts
@@ -2,13 +2,24 @@
 
 import { APIResource } from '../../../../resource';
 import * as ContentListsAPI from './content-lists/content-lists';
+import {
+  ContentList,
+  ContentListGetParams,
+  ContentListUpdateParams,
+  ContentLists,
+} from './content-lists/content-lists';
 
 export class IPFSUniversalPaths extends APIResource {
   contentLists: ContentListsAPI.ContentLists = new ContentListsAPI.ContentLists(this._client);
 }
 
-export namespace IPFSUniversalPaths {
-  export import ContentLists = ContentListsAPI.ContentLists;
-  export import ContentList = ContentListsAPI.ContentList;
-  export import ContentListUpdateParams = ContentListsAPI.ContentListUpdateParams;
+IPFSUniversalPaths.ContentLists = ContentLists;
+
+export declare namespace IPFSUniversalPaths {
+  export {
+    ContentLists as ContentLists,
+    type ContentList as ContentList,
+    type ContentListUpdateParams as ContentListUpdateParams,
+    type ContentListGetParams as ContentListGetParams,
+  };
 }
diff --git a/src/resources/web3/index.ts b/src/resources/web3/index.ts
index 5e6ed00f30..28b0c7bf6c 100644
--- a/src/resources/web3/index.ts
+++ b/src/resources/web3/index.ts
@@ -1,11 +1,14 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Hostname,
-  HostnameDeleteResponse,
-  HostnameCreateParams,
-  HostnameEditParams,
   HostnamesSinglePage,
   Hostnames,
+  type Hostname,
+  type HostnameDeleteResponse,
+  type HostnameCreateParams,
+  type HostnameListParams,
+  type HostnameDeleteParams,
+  type HostnameEditParams,
+  type HostnameGetParams,
 } from './hostnames/index';
 export { Web3 } from './web3';
diff --git a/src/resources/web3/web3.ts b/src/resources/web3/web3.ts
index 01b5766d42..9ac8497072 100644
--- a/src/resources/web3/web3.ts
+++ b/src/resources/web3/web3.ts
@@ -2,16 +2,35 @@
 
 import { APIResource } from '../../resource';
 import * as HostnamesAPI from './hostnames/hostnames';
+import {
+  Hostname,
+  HostnameCreateParams,
+  HostnameDeleteParams,
+  HostnameDeleteResponse,
+  HostnameEditParams,
+  HostnameGetParams,
+  HostnameListParams,
+  Hostnames,
+  HostnamesSinglePage,
+} from './hostnames/hostnames';
 
 export class Web3 extends APIResource {
   hostnames: HostnamesAPI.Hostnames = new HostnamesAPI.Hostnames(this._client);
 }
 
-export namespace Web3 {
-  export import Hostnames = HostnamesAPI.Hostnames;
-  export import Hostname = HostnamesAPI.Hostname;
-  export import HostnameDeleteResponse = HostnamesAPI.HostnameDeleteResponse;
-  export import HostnamesSinglePage = HostnamesAPI.HostnamesSinglePage;
-  export import HostnameCreateParams = HostnamesAPI.HostnameCreateParams;
-  export import HostnameEditParams = HostnamesAPI.HostnameEditParams;
+Web3.Hostnames = Hostnames;
+Web3.HostnamesSinglePage = HostnamesSinglePage;
+
+export declare namespace Web3 {
+  export {
+    Hostnames as Hostnames,
+    type Hostname as Hostname,
+    type HostnameDeleteResponse as HostnameDeleteResponse,
+    HostnamesSinglePage as HostnamesSinglePage,
+    type HostnameCreateParams as HostnameCreateParams,
+    type HostnameListParams as HostnameListParams,
+    type HostnameDeleteParams as HostnameDeleteParams,
+    type HostnameEditParams as HostnameEditParams,
+    type HostnameGetParams as HostnameGetParams,
+  };
 }
diff --git a/src/resources/workers-for-platforms/dispatch/dispatch.ts b/src/resources/workers-for-platforms/dispatch/dispatch.ts
index 019a8b6412..df434e9107 100644
--- a/src/resources/workers-for-platforms/dispatch/dispatch.ts
+++ b/src/resources/workers-for-platforms/dispatch/dispatch.ts
@@ -2,20 +2,37 @@
 
 import { APIResource } from '../../../resource';
 import * as NamespacesAPI from './namespaces/namespaces';
+import {
+  NamespaceCreateParams,
+  NamespaceCreateResponse,
+  NamespaceDeleteParams,
+  NamespaceDeleteResponse,
+  NamespaceGetParams,
+  NamespaceGetResponse,
+  NamespaceListParams,
+  NamespaceListResponse,
+  NamespaceListResponsesSinglePage,
+  Namespaces,
+} from './namespaces/namespaces';
 
 export class Dispatch extends APIResource {
   namespaces: NamespacesAPI.Namespaces = new NamespacesAPI.Namespaces(this._client);
 }
 
-export namespace Dispatch {
-  export import Namespaces = NamespacesAPI.Namespaces;
-  export import NamespaceCreateResponse = NamespacesAPI.NamespaceCreateResponse;
-  export import NamespaceListResponse = NamespacesAPI.NamespaceListResponse;
-  export import NamespaceDeleteResponse = NamespacesAPI.NamespaceDeleteResponse;
-  export import NamespaceGetResponse = NamespacesAPI.NamespaceGetResponse;
-  export import NamespaceListResponsesSinglePage = NamespacesAPI.NamespaceListResponsesSinglePage;
-  export import NamespaceCreateParams = NamespacesAPI.NamespaceCreateParams;
-  export import NamespaceListParams = NamespacesAPI.NamespaceListParams;
-  export import NamespaceDeleteParams = NamespacesAPI.NamespaceDeleteParams;
-  export import NamespaceGetParams = NamespacesAPI.NamespaceGetParams;
+Dispatch.Namespaces = Namespaces;
+Dispatch.NamespaceListResponsesSinglePage = NamespaceListResponsesSinglePage;
+
+export declare namespace Dispatch {
+  export {
+    Namespaces as Namespaces,
+    type NamespaceCreateResponse as NamespaceCreateResponse,
+    type NamespaceListResponse as NamespaceListResponse,
+    type NamespaceDeleteResponse as NamespaceDeleteResponse,
+    type NamespaceGetResponse as NamespaceGetResponse,
+    NamespaceListResponsesSinglePage as NamespaceListResponsesSinglePage,
+    type NamespaceCreateParams as NamespaceCreateParams,
+    type NamespaceListParams as NamespaceListParams,
+    type NamespaceDeleteParams as NamespaceDeleteParams,
+    type NamespaceGetParams as NamespaceGetParams,
+  };
 }
diff --git a/src/resources/workers-for-platforms/dispatch/index.ts b/src/resources/workers-for-platforms/dispatch/index.ts
index 9317a05a72..96d4417596 100644
--- a/src/resources/workers-for-platforms/dispatch/index.ts
+++ b/src/resources/workers-for-platforms/dispatch/index.ts
@@ -2,14 +2,14 @@
 
 export { Dispatch } from './dispatch';
 export {
-  NamespaceCreateResponse,
-  NamespaceListResponse,
-  NamespaceDeleteResponse,
-  NamespaceGetResponse,
-  NamespaceCreateParams,
-  NamespaceListParams,
-  NamespaceDeleteParams,
-  NamespaceGetParams,
   NamespaceListResponsesSinglePage,
   Namespaces,
+  type NamespaceCreateResponse,
+  type NamespaceListResponse,
+  type NamespaceDeleteResponse,
+  type NamespaceGetResponse,
+  type NamespaceCreateParams,
+  type NamespaceListParams,
+  type NamespaceDeleteParams,
+  type NamespaceGetParams,
 } from './namespaces/index';
diff --git a/src/resources/workers-for-platforms/dispatch/namespaces/index.ts b/src/resources/workers-for-platforms/dispatch/namespaces/index.ts
index 4a65dca60f..f0c5b8da07 100644
--- a/src/resources/workers-for-platforms/dispatch/namespaces/index.ts
+++ b/src/resources/workers-for-platforms/dispatch/namespaces/index.ts
@@ -1,15 +1,22 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  NamespaceCreateResponse,
-  NamespaceListResponse,
-  NamespaceDeleteResponse,
-  NamespaceGetResponse,
-  NamespaceCreateParams,
-  NamespaceListParams,
-  NamespaceDeleteParams,
-  NamespaceGetParams,
   NamespaceListResponsesSinglePage,
   Namespaces,
+  type NamespaceCreateResponse,
+  type NamespaceListResponse,
+  type NamespaceDeleteResponse,
+  type NamespaceGetResponse,
+  type NamespaceCreateParams,
+  type NamespaceListParams,
+  type NamespaceDeleteParams,
+  type NamespaceGetParams,
 } from './namespaces';
-export { Script, ScriptUpdateParams, ScriptDeleteParams, ScriptGetParams, Scripts } from './scripts/index';
+export {
+  Scripts,
+  type Script,
+  type ScriptUpdateResponse,
+  type ScriptUpdateParams,
+  type ScriptDeleteParams,
+  type ScriptGetParams,
+} from './scripts/index';
diff --git a/src/resources/workers-for-platforms/dispatch/namespaces/namespaces.ts b/src/resources/workers-for-platforms/dispatch/namespaces/namespaces.ts
index 4e2fec41c7..3ca965ffec 100644
--- a/src/resources/workers-for-platforms/dispatch/namespaces/namespaces.ts
+++ b/src/resources/workers-for-platforms/dispatch/namespaces/namespaces.ts
@@ -2,8 +2,15 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as NamespacesAPI from './namespaces';
 import * as ScriptsAPI from './scripts/scripts';
+import {
+  Script,
+  ScriptDeleteParams,
+  ScriptGetParams,
+  ScriptUpdateParams,
+  ScriptUpdateResponse,
+  Scripts,
+} from './scripts/scripts';
 import { SinglePage } from '../../../../pagination';
 
 export class Namespaces extends APIResource {
@@ -223,19 +230,28 @@ export interface NamespaceGetParams {
   account_id: string;
 }
 
-export namespace Namespaces {
-  export import NamespaceCreateResponse = NamespacesAPI.NamespaceCreateResponse;
-  export import NamespaceListResponse = NamespacesAPI.NamespaceListResponse;
-  export import NamespaceDeleteResponse = NamespacesAPI.NamespaceDeleteResponse;
-  export import NamespaceGetResponse = NamespacesAPI.NamespaceGetResponse;
-  export import NamespaceListResponsesSinglePage = NamespacesAPI.NamespaceListResponsesSinglePage;
-  export import NamespaceCreateParams = NamespacesAPI.NamespaceCreateParams;
-  export import NamespaceListParams = NamespacesAPI.NamespaceListParams;
-  export import NamespaceDeleteParams = NamespacesAPI.NamespaceDeleteParams;
-  export import NamespaceGetParams = NamespacesAPI.NamespaceGetParams;
-  export import Scripts = ScriptsAPI.Scripts;
-  export import Script = ScriptsAPI.Script;
-  export import ScriptUpdateParams = ScriptsAPI.ScriptUpdateParams;
-  export import ScriptDeleteParams = ScriptsAPI.ScriptDeleteParams;
-  export import ScriptGetParams = ScriptsAPI.ScriptGetParams;
+Namespaces.NamespaceListResponsesSinglePage = NamespaceListResponsesSinglePage;
+Namespaces.Scripts = Scripts;
+
+export declare namespace Namespaces {
+  export {
+    type NamespaceCreateResponse as NamespaceCreateResponse,
+    type NamespaceListResponse as NamespaceListResponse,
+    type NamespaceDeleteResponse as NamespaceDeleteResponse,
+    type NamespaceGetResponse as NamespaceGetResponse,
+    NamespaceListResponsesSinglePage as NamespaceListResponsesSinglePage,
+    type NamespaceCreateParams as NamespaceCreateParams,
+    type NamespaceListParams as NamespaceListParams,
+    type NamespaceDeleteParams as NamespaceDeleteParams,
+    type NamespaceGetParams as NamespaceGetParams,
+  };
+
+  export {
+    Scripts as Scripts,
+    type Script as Script,
+    type ScriptUpdateResponse as ScriptUpdateResponse,
+    type ScriptUpdateParams as ScriptUpdateParams,
+    type ScriptDeleteParams as ScriptDeleteParams,
+    type ScriptGetParams as ScriptGetParams,
+  };
 }
diff --git a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/asset-upload.ts b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/asset-upload.ts
new file mode 100644
index 0000000000..acb1c5dff5
--- /dev/null
+++ b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/asset-upload.ts
@@ -0,0 +1,72 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+
+export class AssetUpload extends APIResource {
+  /**
+   * Start uploading a collection of assets for use in a Worker version. To learn
+   * more about the direct uploads of assets, see
+   * https://developers.cloudflare.com/workers/static-assets/direct-upload/
+   */
+  create(
+    dispatchNamespace: string,
+    scriptName: string,
+    params: AssetUploadCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AssetUploadCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(
+        `/accounts/${account_id}/workers/dispatch/namespaces/${dispatchNamespace}/scripts/${scriptName}/assets-upload-session`,
+        { body, ...options },
+      ) as Core.APIPromise<{ result: AssetUploadCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface AssetUploadCreateResponse {
+  /**
+   * The requests to make to upload assets.
+   */
+  buckets?: Array<Array<string>>;
+
+  /**
+   * A JWT to use as authentication for uploading assets.
+   */
+  jwt?: string;
+}
+
+export interface AssetUploadCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: A manifest ([path]: {hash, size}) map of files to upload. As an
+   * example, `/blog/hello-world.html` would be a valid path key.
+   */
+  manifest?: Record<string, AssetUploadCreateParams.Manifest>;
+}
+
+export namespace AssetUploadCreateParams {
+  export interface Manifest {
+    /**
+     * The hash of the file.
+     */
+    hash?: string;
+
+    /**
+     * The size of the file in bytes.
+     */
+    size?: number;
+  }
+}
+
+export declare namespace AssetUpload {
+  export {
+    type AssetUploadCreateResponse as AssetUploadCreateResponse,
+    type AssetUploadCreateParams as AssetUploadCreateParams,
+  };
+}
diff --git a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/bindings.ts b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/bindings.ts
index 98659b211e..1c79b0fa37 100644
--- a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/bindings.ts
+++ b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/bindings.ts
@@ -2,8 +2,6 @@
 
 import { APIResource } from '../../../../../resource';
 import * as Core from '../../../../../core';
-import * as BindingsAPI from './bindings';
-import * as WorkersAPI from '../../../../workers/workers';
 
 export class Bindings extends APIResource {
   /**
@@ -27,9 +25,411 @@ export class Bindings extends APIResource {
 }
 
 /**
- * List of bindings attached to this Worker
+ * List of bindings attached to a Worker. You can find more about bindings on our
+ * docs:
+ * https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
  */
-export type BindingGetResponse = Array<WorkersAPI.Binding>;
+export type BindingGetResponse = Array<
+  | BindingGetResponse.WorkersBindingKindAny
+  | BindingGetResponse.WorkersBindingKindAI
+  | BindingGetResponse.WorkersBindingKindAnalyticsEngine
+  | BindingGetResponse.WorkersBindingKindAssets
+  | BindingGetResponse.WorkersBindingKindBrowserRendering
+  | BindingGetResponse.WorkersBindingKindD1
+  | BindingGetResponse.WorkersBindingKindDispatchNamespace
+  | BindingGetResponse.WorkersBindingKindDo
+  | BindingGetResponse.WorkersBindingKindHyperdrive
+  | BindingGetResponse.WorkersBindingKindJson
+  | BindingGetResponse.WorkersBindingKindKVNamespace
+  | BindingGetResponse.WorkersBindingKindMTLSCERT
+  | BindingGetResponse.WorkersBindingKindPlainText
+  | BindingGetResponse.WorkersBindingKindQueue
+  | BindingGetResponse.WorkersBindingKindR2
+  | BindingGetResponse.WorkersBindingKindSecret
+  | BindingGetResponse.WorkersBindingKindService
+  | BindingGetResponse.WorkersBindingKindTailConsumer
+  | BindingGetResponse.WorkersBindingKindVectorize
+  | BindingGetResponse.WorkersBindingKindVersionMetadata
+>;
+
+export namespace BindingGetResponse {
+  export interface WorkersBindingKindAny {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: string;
+    [k: string]: unknown;
+  }
+
+  export interface WorkersBindingKindAI {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'ai';
+  }
+
+  export interface WorkersBindingKindAnalyticsEngine {
+    /**
+     * The dataset name to bind to.
+     */
+    dataset: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'analytics_engine';
+  }
+
+  export interface WorkersBindingKindAssets {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'assets';
+  }
+
+  export interface WorkersBindingKindBrowserRendering {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'browser_rendering';
+  }
+
+  export interface WorkersBindingKindD1 {
+    /**
+     * Identifier of the D1 database to bind to.
+     */
+    id: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'd1';
+  }
+
+  export interface WorkersBindingKindDispatchNamespace {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Namespace to bind to.
+     */
+    namespace: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'dispatch_namespace';
+
+    /**
+     * Outbound worker.
+     */
+    outbound?: WorkersBindingKindDispatchNamespace.Outbound;
+  }
+
+  export namespace WorkersBindingKindDispatchNamespace {
+    /**
+     * Outbound worker.
+     */
+    export interface Outbound {
+      /**
+       * Pass information from the Dispatch Worker to the Outbound Worker through the
+       * parameters.
+       */
+      params?: Array<string>;
+
+      /**
+       * Outbound worker.
+       */
+      worker?: Outbound.Worker;
+    }
+
+    export namespace Outbound {
+      /**
+       * Outbound worker.
+       */
+      export interface Worker {
+        /**
+         * Environment of the outbound worker.
+         */
+        environment?: string;
+
+        /**
+         * Name of the outbound worker.
+         */
+        service?: string;
+      }
+    }
+  }
+
+  export interface WorkersBindingKindDo {
+    /**
+     * The exported class name of the Durable Object.
+     */
+    class_name: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'durable_object_namespace';
+
+    /**
+     * The environment of the script_name to bind to.
+     */
+    environment?: string;
+
+    /**
+     * Namespace identifier tag.
+     */
+    namespace_id?: string;
+
+    /**
+     * The script where the Durable Object is defined, if it is external to this
+     * Worker.
+     */
+    script_name?: string;
+  }
+
+  export interface WorkersBindingKindHyperdrive {
+    /**
+     * Identifier of the Hyperdrive connection to bind to.
+     */
+    id: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'hyperdrive';
+  }
+
+  export interface WorkersBindingKindJson {
+    /**
+     * JSON data to use.
+     */
+    json: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'json';
+  }
+
+  export interface WorkersBindingKindKVNamespace {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Namespace identifier tag.
+     */
+    namespace_id: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'kv_namespace';
+  }
+
+  export interface WorkersBindingKindMTLSCERT {
+    /**
+     * Identifier of the certificate to bind to.
+     */
+    certificate_id: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'mtls_certificate';
+  }
+
+  export interface WorkersBindingKindPlainText {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The text value to use.
+     */
+    text: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'plain_text';
+  }
+
+  export interface WorkersBindingKindQueue {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Name of the Queue to bind to.
+     */
+    queue_name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'queue';
+  }
+
+  export interface WorkersBindingKindR2 {
+    /**
+     * R2 bucket to bind to.
+     */
+    bucket_name: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'r2_bucket';
+  }
+
+  export interface WorkersBindingKindSecret {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The secret value to use.
+     */
+    text: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'secret_text';
+  }
+
+  export interface WorkersBindingKindService {
+    /**
+     * Optional environment if the Worker utilizes one.
+     */
+    environment: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Name of Worker to bind to.
+     */
+    service: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'service';
+  }
+
+  export interface WorkersBindingKindTailConsumer {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Name of Tail Worker to bind to.
+     */
+    service: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'tail_consumer';
+  }
+
+  export interface WorkersBindingKindVectorize {
+    /**
+     * Name of the Vectorize index to bind to.
+     */
+    index_name: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'vectorize';
+  }
+
+  export interface WorkersBindingKindVersionMetadata {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'version_metadata';
+  }
+}
 
 export interface BindingGetParams {
   /**
@@ -38,7 +438,6 @@ export interface BindingGetParams {
   account_id: string;
 }
 
-export namespace Bindings {
-  export import BindingGetResponse = BindingsAPI.BindingGetResponse;
-  export import BindingGetParams = BindingsAPI.BindingGetParams;
+export declare namespace Bindings {
+  export { type BindingGetResponse as BindingGetResponse, type BindingGetParams as BindingGetParams };
 }
diff --git a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/content.ts b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/content.ts
index 574f4b0f89..401f5abc8d 100644
--- a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/content.ts
+++ b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/content.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../../resource';
 import * as Core from '../../../../../core';
-import * as ContentAPI from './content';
 import * as WorkersAPI from '../../../../workers/workers';
 import * as ScriptsAPI from '../../../../workers/scripts/scripts';
 import { type Response } from '../../../../../_shims/index';
@@ -54,7 +53,7 @@ export class Content extends APIResource {
     const { account_id } = params;
     return this._client.get(
       `/accounts/${account_id}/workers/dispatch/namespaces/${dispatchNamespace}/scripts/${scriptName}/content`,
-      { ...options, __binaryResponse: true },
+      { ...options, headers: { Accept: 'string', ...options?.headers }, __binaryResponse: true },
     );
   }
 }
@@ -65,22 +64,11 @@ export interface ContentUpdateParams {
    */
   account_id: string;
 
-  /**
-   * Body param: A module comprising a Worker script, often a javascript file.
-   * Multiple modules may be provided as separate named parts, but at least one
-   * module must be present. This should be referenced either in the metadata as
-   * `main_module` (esm)/`body_part` (service worker) or as a header
-   * `CF-WORKER-MAIN-MODULE-PART` (esm) /`CF-WORKER-BODY-PART` (service worker) by
-   * part name. Source maps may also be included using the `application/source-map`
-   * content type.
-   */
-  '<any part name>'?: Array<Core.Uploadable>;
-
   /**
    * Body param: JSON encoded metadata about the uploaded parts and Worker
    * configuration.
    */
-  metadata?: WorkersAPI.WorkerMetadataParam;
+  metadata: WorkersAPI.WorkerMetadataParam;
 
   /**
    * Header param: The multipart name of a script upload part containing script
@@ -102,7 +90,6 @@ export interface ContentGetParams {
   account_id: string;
 }
 
-export namespace Content {
-  export import ContentUpdateParams = ContentAPI.ContentUpdateParams;
-  export import ContentGetParams = ContentAPI.ContentGetParams;
+export declare namespace Content {
+  export { type ContentUpdateParams as ContentUpdateParams, type ContentGetParams as ContentGetParams };
 }
diff --git a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/index.ts b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/index.ts
index 0ac53688ed..f2e3258013 100644
--- a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/index.ts
+++ b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/index.ts
@@ -1,30 +1,41 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { BindingGetResponse, BindingGetParams, Bindings } from './bindings';
-export { ContentUpdateParams, ContentGetParams, Content } from './content';
-export { Script, ScriptUpdateParams, ScriptDeleteParams, ScriptGetParams, Scripts } from './scripts';
+export { AssetUpload, type AssetUploadCreateResponse, type AssetUploadCreateParams } from './asset-upload';
+export { Bindings, type BindingGetResponse, type BindingGetParams } from './bindings';
+export { Content, type ContentUpdateParams, type ContentGetParams } from './content';
+export {
+  Scripts,
+  type Script,
+  type ScriptUpdateResponse,
+  type ScriptUpdateParams,
+  type ScriptDeleteParams,
+  type ScriptGetParams,
+} from './scripts';
 export {
-  SecretUpdateResponse,
-  SecretListResponse,
-  SecretUpdateParams,
-  SecretListParams,
   SecretListResponsesSinglePage,
   Secrets,
+  type WorkersSecretModel,
+  type SecretUpdateResponse,
+  type SecretListResponse,
+  type SecretGetResponse,
+  type SecretUpdateParams,
+  type SecretListParams,
+  type SecretGetParams,
 } from './secrets';
 export {
-  SettingEditResponse,
-  SettingGetResponse,
-  SettingEditParams,
-  SettingGetParams,
   Settings,
+  type SettingEditResponse,
+  type SettingGetResponse,
+  type SettingEditParams,
+  type SettingGetParams,
 } from './settings';
 export {
-  TagUpdateResponse,
-  TagListResponse,
-  TagDeleteResponse,
-  TagUpdateParams,
-  TagListParams,
-  TagDeleteParams,
   TagListResponsesSinglePage,
   Tags,
+  type TagUpdateResponse,
+  type TagListResponse,
+  type TagDeleteResponse,
+  type TagUpdateParams,
+  type TagListParams,
+  type TagDeleteParams,
 } from './tags';
diff --git a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.ts b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.ts
index c6e5ef7e01..27a69db639 100644
--- a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.ts
+++ b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.ts
@@ -2,17 +2,49 @@
 
 import { APIResource } from '../../../../../resource';
 import * as Core from '../../../../../core';
-import * as ScriptsScriptsAPI from './scripts';
 import * as WorkersAPI from '../../../../workers/workers';
 import * as ScriptsAPI from '../../../../workers/scripts/scripts';
 import * as TailAPI from '../../../../workers/scripts/tail';
+import * as AssetUploadAPI from './asset-upload';
+import { AssetUpload, AssetUploadCreateParams, AssetUploadCreateResponse } from './asset-upload';
 import * as BindingsAPI from './bindings';
+import { BindingGetParams, BindingGetResponse, Bindings } from './bindings';
 import * as ContentAPI from './content';
+import { Content, ContentGetParams, ContentUpdateParams } from './content';
 import * as SecretsAPI from './secrets';
+import {
+  SecretGetParams,
+  SecretGetResponse,
+  SecretListParams,
+  SecretListResponse,
+  SecretListResponsesSinglePage,
+  SecretUpdateParams,
+  SecretUpdateResponse,
+  Secrets,
+  WorkersSecretModel,
+} from './secrets';
 import * as SettingsAPI from './settings';
+import {
+  SettingEditParams,
+  SettingEditResponse,
+  SettingGetParams,
+  SettingGetResponse,
+  Settings,
+} from './settings';
 import * as TagsAPI from './tags';
+import {
+  TagDeleteParams,
+  TagDeleteResponse,
+  TagListParams,
+  TagListResponse,
+  TagListResponsesSinglePage,
+  TagUpdateParams,
+  TagUpdateResponse,
+  Tags,
+} from './tags';
 
 export class Scripts extends APIResource {
+  assetUpload: AssetUploadAPI.AssetUpload = new AssetUploadAPI.AssetUpload(this._client);
   content: ContentAPI.Content = new ContentAPI.Content(this._client);
   settings: SettingsAPI.Settings = new SettingsAPI.Settings(this._client);
   bindings: BindingsAPI.Bindings = new BindingsAPI.Bindings(this._client);
@@ -20,16 +52,16 @@ export class Scripts extends APIResource {
   tags: TagsAPI.Tags = new TagsAPI.Tags(this._client);
 
   /**
-   * Upload a worker module to a Workers for Platforms namespace. You can find an
-   * example of the metadata on our docs:
-   * https://developers.cloudflare.com/cloudflare-for-platforms/workers-for-platforms/reference/metadata/
+   * Upload a worker module to a Workers for Platforms namespace. You can find more
+   * about the multipart metadata on our docs:
+   * https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/.
    */
   update(
     dispatchNamespace: string,
     scriptName: string,
     params: ScriptUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ScriptsAPI.Script> {
+  ): Core.APIPromise<ScriptUpdateResponse> {
     const { account_id, ...body } = params;
     return (
       this._client.put(
@@ -39,7 +71,7 @@ export class Scripts extends APIResource {
           ...options,
           headers: { 'Content-Type': 'application/javascript', ...options?.headers },
         }),
-      ) as Core.APIPromise<{ result: ScriptsAPI.Script }>
+      ) as Core.APIPromise<{ result: ScriptUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -101,117 +133,681 @@ export interface Script {
   script?: ScriptsAPI.Script;
 }
 
-export type ScriptUpdateParams = ScriptUpdateParams.Variant0 | ScriptUpdateParams.Variant1;
+export interface ScriptUpdateResponse {
+  /**
+   * The id of the script in the Workers system. Usually the script name.
+   */
+  id?: string;
+
+  /**
+   * When the script was created.
+   */
+  created_on?: string;
+
+  /**
+   * Hashed script content, can be used in a If-None-Match header when updating.
+   */
+  etag?: string;
+
+  /**
+   * Whether a Worker contains assets.
+   */
+  has_assets?: boolean;
+
+  /**
+   * Whether a Worker contains modules.
+   */
+  has_modules?: boolean;
+
+  /**
+   * Whether Logpush is turned on for the Worker.
+   */
+  logpush?: boolean;
+
+  /**
+   * When the script was last modified.
+   */
+  modified_on?: string;
+
+  /**
+   * Configuration for
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  placement?: ScriptUpdateResponse.Placement;
+
+  /**
+   * @deprecated: Enables
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  placement_mode?: 'smart';
+
+  /**
+   * @deprecated: Status of
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  placement_status?: 'SUCCESS' | 'UNSUPPORTED_APPLICATION' | 'INSUFFICIENT_INVOCATIONS';
+
+  startup_time_ms?: number;
+
+  /**
+   * List of Workers that will consume logs from the attached Worker.
+   */
+  tail_consumers?: Array<TailAPI.ConsumerScript>;
+
+  /**
+   * Usage model for the Worker invocations.
+   */
+  usage_model?: 'standard';
+}
+
+export namespace ScriptUpdateResponse {
+  /**
+   * Configuration for
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  export interface Placement {
+    /**
+     * Enables
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+     */
+    mode?: 'smart';
+
+    /**
+     * Status of
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+     */
+    status?: 'SUCCESS' | 'UNSUPPORTED_APPLICATION' | 'INSUFFICIENT_INVOCATIONS';
+  }
+}
+
+export interface ScriptUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: JSON encoded metadata about the uploaded parts and Worker
+   * configuration.
+   */
+  metadata: ScriptUpdateParams.Metadata;
+}
 
 export namespace ScriptUpdateParams {
-  export interface Variant0 {
+  /**
+   * JSON encoded metadata about the uploaded parts and Worker configuration.
+   */
+  export interface Metadata {
+    /**
+     * Configuration for assets within a Worker
+     */
+    assets?: Metadata.Assets;
+
+    /**
+     * List of bindings attached to a Worker. You can find more about bindings on our
+     * docs:
+     * https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+     */
+    bindings?: Array<
+      | Metadata.WorkersBindingKindAny
+      | Metadata.WorkersBindingKindAI
+      | Metadata.WorkersBindingKindAnalyticsEngine
+      | Metadata.WorkersBindingKindAssets
+      | Metadata.WorkersBindingKindBrowserRendering
+      | Metadata.WorkersBindingKindD1
+      | Metadata.WorkersBindingKindDispatchNamespace
+      | Metadata.WorkersBindingKindDo
+      | Metadata.WorkersBindingKindHyperdrive
+      | Metadata.WorkersBindingKindJson
+      | Metadata.WorkersBindingKindKVNamespace
+      | Metadata.WorkersBindingKindMTLSCERT
+      | Metadata.WorkersBindingKindPlainText
+      | Metadata.WorkersBindingKindQueue
+      | Metadata.WorkersBindingKindR2
+      | Metadata.WorkersBindingKindSecret
+      | Metadata.WorkersBindingKindService
+      | Metadata.WorkersBindingKindTailConsumer
+      | Metadata.WorkersBindingKindVectorize
+      | Metadata.WorkersBindingKindVersionMetadata
+    >;
+
+    /**
+     * Name of the part in the multipart request that contains the script (e.g. the
+     * file adding a listener to the `fetch` event). Indicates a
+     * `service worker syntax` Worker.
+     */
+    body_part?: string;
+
+    /**
+     * Date indicating targeted support in the Workers runtime. Backwards incompatible
+     * fixes to the runtime following this date will not affect this Worker.
+     */
+    compatibility_date?: string;
+
     /**
-     * Path param: Identifier
+     * Flags that enable or disable certain features in the Workers runtime. Used to
+     * enable upcoming features or opt in or out of specific changes not included in a
+     * `compatibility_date`.
      */
-    account_id: string;
+    compatibility_flags?: Array<string>;
 
     /**
-     * Body param: A module comprising a Worker script, often a javascript file.
-     * Multiple modules may be provided as separate named parts, but at least one
-     * module must be present and referenced in the metadata as `main_module` or
-     * `body_part` by part name. Source maps may also be included using the
-     * `application/source-map` content type.
+     * Retain assets which exist for a previously uploaded Worker version; used in lieu
+     * of providing a completion token.
      */
-    '<any part name>'?: Array<Core.Uploadable>;
+    keep_assets?: boolean;
 
     /**
-     * Body param: JSON encoded metadata about the uploaded parts and Worker
-     * configuration.
+     * List of binding types to keep from previous_upload.
      */
-    metadata?: ScriptUpdateParams.Variant0.Metadata;
+    keep_bindings?: Array<string>;
+
+    /**
+     * Whether Logpush is turned on for the Worker.
+     */
+    logpush?: boolean;
+
+    /**
+     * Name of the part in the multipart request that contains the main module (e.g.
+     * the file exporting a `fetch` handler). Indicates a `module syntax` Worker.
+     */
+    main_module?: string;
+
+    /**
+     * Migrations to apply for Durable Objects associated with this Worker.
+     */
+    migrations?: WorkersAPI.SingleStepMigrationParam | Metadata.WorkersMultipleStepMigrations;
+
+    /**
+     * Observability settings for the Worker.
+     */
+    observability?: Metadata.Observability;
+
+    /**
+     * Configuration for
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+     */
+    placement?: Metadata.Placement;
+
+    /**
+     * List of strings to use as tags for this Worker.
+     */
+    tags?: Array<string>;
+
+    /**
+     * List of Workers that will consume logs from the attached Worker.
+     */
+    tail_consumers?: Array<TailAPI.ConsumerScriptParam>;
+
+    /**
+     * Usage model for the Worker invocations.
+     */
+    usage_model?: 'standard';
   }
 
-  export namespace Variant0 {
+  export namespace Metadata {
     /**
-     * JSON encoded metadata about the uploaded parts and Worker configuration.
+     * Configuration for assets within a Worker
      */
-    export interface Metadata {
+    export interface Assets {
       /**
-       * List of bindings available to the worker.
+       * Configuration for assets within a Worker.
        */
-      bindings?: Array<unknown>;
+      config?: Assets.Config;
+
+      /**
+       * Token provided upon successful upload of all files from a registered manifest.
+       */
+      jwt?: string;
+    }
 
+    export namespace Assets {
       /**
-       * Name of the part in the multipart request that contains the script (e.g. the
-       * file adding a listener to the `fetch` event). Indicates a
-       * `service worker syntax` Worker.
+       * Configuration for assets within a Worker.
        */
-      body_part?: string;
+      export interface Config {
+        /**
+         * Determines the redirects and rewrites of requests for HTML content.
+         */
+        html_handling?: 'auto-trailing-slash' | 'force-trailing-slash' | 'drop-trailing-slash' | 'none';
+
+        /**
+         * Determines the response when a request does not match a static asset, and there
+         * is no Worker script.
+         */
+        not_found_handling?: 'none' | '404-page' | 'single-page-application';
+
+        /**
+         * When true and the incoming request matches an asset, that will be served instead
+         * of invoking the Worker script. When false, requests will always invoke the
+         * Worker script.
+         */
+        serve_directly?: boolean;
+      }
+    }
 
+    export interface WorkersBindingKindAny {
       /**
-       * Date indicating targeted support in the Workers runtime. Backwards incompatible
-       * fixes to the runtime following this date will not affect this Worker.
+       * A JavaScript variable name for the binding.
        */
-      compatibility_date?: string;
+      name: string;
 
       /**
-       * Flags that enable or disable certain features in the Workers runtime. Used to
-       * enable upcoming features or opt in or out of specific changes not included in a
-       * `compatibility_date`.
+       * The kind of resource that the binding provides.
        */
-      compatibility_flags?: Array<string>;
+      type: string;
+      [k: string]: unknown;
+    }
 
+    export interface WorkersBindingKindAI {
       /**
-       * List of binding types to keep from previous_upload.
+       * A JavaScript variable name for the binding.
        */
-      keep_bindings?: Array<string>;
+      name: string;
 
       /**
-       * Whether Logpush is turned on for the Worker.
+       * The kind of resource that the binding provides.
        */
-      logpush?: boolean;
+      type: 'ai';
+    }
 
+    export interface WorkersBindingKindAnalyticsEngine {
       /**
-       * Name of the part in the multipart request that contains the main module (e.g.
-       * the file exporting a `fetch` handler). Indicates a `module syntax` Worker.
+       * The dataset name to bind to.
        */
-      main_module?: string;
+      dataset: string;
 
       /**
-       * Migrations to apply for Durable Objects associated with this Worker.
+       * A JavaScript variable name for the binding.
        */
-      migrations?: WorkersAPI.SingleStepMigrationParam | WorkersAPI.SteppedMigrationParam;
+      name: string;
 
-      placement?: WorkersAPI.PlacementConfigurationParam;
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'analytics_engine';
+    }
 
+    export interface WorkersBindingKindAssets {
       /**
-       * List of strings to use as tags for this Worker
+       * A JavaScript variable name for the binding.
        */
-      tags?: Array<string>;
+      name: string;
 
       /**
-       * List of Workers that will consume logs from the attached Worker.
+       * The kind of resource that the binding provides.
        */
-      tail_consumers?: Array<TailAPI.ConsumerScriptParam>;
+      type: 'assets';
+    }
 
+    export interface WorkersBindingKindBrowserRendering {
       /**
-       * Usage model to apply to invocations.
+       * A JavaScript variable name for the binding.
        */
-      usage_model?: 'bundled' | 'unbound';
+      name: string;
 
       /**
-       * Key-value pairs to use as tags for this version of this Worker
+       * The kind of resource that the binding provides.
        */
-      version_tags?: unknown;
+      type: 'browser_rendering';
+    }
+
+    export interface WorkersBindingKindD1 {
+      /**
+       * Identifier of the D1 database to bind to.
+       */
+      id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'd1';
+    }
+
+    export interface WorkersBindingKindDispatchNamespace {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Namespace to bind to.
+       */
+      namespace: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'dispatch_namespace';
+
+      /**
+       * Outbound worker.
+       */
+      outbound?: WorkersBindingKindDispatchNamespace.Outbound;
+    }
+
+    export namespace WorkersBindingKindDispatchNamespace {
+      /**
+       * Outbound worker.
+       */
+      export interface Outbound {
+        /**
+         * Pass information from the Dispatch Worker to the Outbound Worker through the
+         * parameters.
+         */
+        params?: Array<string>;
+
+        /**
+         * Outbound worker.
+         */
+        worker?: Outbound.Worker;
+      }
+
+      export namespace Outbound {
+        /**
+         * Outbound worker.
+         */
+        export interface Worker {
+          /**
+           * Environment of the outbound worker.
+           */
+          environment?: string;
+
+          /**
+           * Name of the outbound worker.
+           */
+          service?: string;
+        }
+      }
+    }
+
+    export interface WorkersBindingKindDo {
+      /**
+       * The exported class name of the Durable Object.
+       */
+      class_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'durable_object_namespace';
+
+      /**
+       * The environment of the script_name to bind to.
+       */
+      environment?: string;
+
+      /**
+       * Namespace identifier tag.
+       */
+      namespace_id?: string;
+
+      /**
+       * The script where the Durable Object is defined, if it is external to this
+       * Worker.
+       */
+      script_name?: string;
+    }
+
+    export interface WorkersBindingKindHyperdrive {
+      /**
+       * Identifier of the Hyperdrive connection to bind to.
+       */
+      id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'hyperdrive';
+    }
+
+    export interface WorkersBindingKindJson {
+      /**
+       * JSON data to use.
+       */
+      json: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'json';
+    }
+
+    export interface WorkersBindingKindKVNamespace {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Namespace identifier tag.
+       */
+      namespace_id: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'kv_namespace';
+    }
+
+    export interface WorkersBindingKindMTLSCERT {
+      /**
+       * Identifier of the certificate to bind to.
+       */
+      certificate_id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'mtls_certificate';
+    }
+
+    export interface WorkersBindingKindPlainText {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The text value to use.
+       */
+      text: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'plain_text';
+    }
+
+    export interface WorkersBindingKindQueue {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of the Queue to bind to.
+       */
+      queue_name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'queue';
+    }
+
+    export interface WorkersBindingKindR2 {
+      /**
+       * R2 bucket to bind to.
+       */
+      bucket_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'r2_bucket';
+    }
+
+    export interface WorkersBindingKindSecret {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The secret value to use.
+       */
+      text: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'secret_text';
+    }
+
+    export interface WorkersBindingKindService {
+      /**
+       * Optional environment if the Worker utilizes one.
+       */
+      environment: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of Worker to bind to.
+       */
+      service: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'service';
+    }
+
+    export interface WorkersBindingKindTailConsumer {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of Tail Worker to bind to.
+       */
+      service: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'tail_consumer';
+    }
+
+    export interface WorkersBindingKindVectorize {
+      /**
+       * Name of the Vectorize index to bind to.
+       */
+      index_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'vectorize';
+    }
+
+    export interface WorkersBindingKindVersionMetadata {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'version_metadata';
+    }
+
+    export interface WorkersMultipleStepMigrations {
+      /**
+       * Tag to set as the latest migration tag.
+       */
+      new_tag?: string;
+
+      /**
+       * Tag used to verify against the latest migration tag for this Worker. If they
+       * don't match, the upload is rejected.
+       */
+      old_tag?: string;
+
+      /**
+       * Migrations to apply in order.
+       */
+      steps?: Array<WorkersAPI.MigrationStepParam>;
     }
-  }
 
-  export interface Variant1 {
     /**
-     * Path param: Identifier
+     * Observability settings for the Worker.
      */
-    account_id: string;
+    export interface Observability {
+      /**
+       * Whether observability is enabled for the Worker.
+       */
+      enabled: boolean;
+
+      /**
+       * The sampling rate for incoming requests. From 0 to 1 (1 = 100%, 0.1 = 10%).
+       * Default is 1.
+       */
+      head_sampling_rate?: number | null;
+    }
 
     /**
-     * Body param: Rollback message to be associated with this deployment. Only parsed
-     * when query param `"rollback_to"` is present.
+     * Configuration for
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
      */
-    message?: string;
+    export interface Placement {
+      /**
+       * Enables
+       * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+       */
+      mode?: 'smart';
+    }
   }
 }
 
@@ -236,34 +832,70 @@ export interface ScriptGetParams {
   account_id: string;
 }
 
-export namespace Scripts {
-  export import Script = ScriptsScriptsAPI.Script;
-  export import ScriptUpdateParams = ScriptsScriptsAPI.ScriptUpdateParams;
-  export import ScriptDeleteParams = ScriptsScriptsAPI.ScriptDeleteParams;
-  export import ScriptGetParams = ScriptsScriptsAPI.ScriptGetParams;
-  export import Content = ContentAPI.Content;
-  export import ContentUpdateParams = ContentAPI.ContentUpdateParams;
-  export import ContentGetParams = ContentAPI.ContentGetParams;
-  export import Settings = SettingsAPI.Settings;
-  export import SettingEditResponse = SettingsAPI.SettingEditResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
-  export import Bindings = BindingsAPI.Bindings;
-  export import BindingGetResponse = BindingsAPI.BindingGetResponse;
-  export import BindingGetParams = BindingsAPI.BindingGetParams;
-  export import Secrets = SecretsAPI.Secrets;
-  export import SecretUpdateResponse = SecretsAPI.SecretUpdateResponse;
-  export import SecretListResponse = SecretsAPI.SecretListResponse;
-  export import SecretListResponsesSinglePage = SecretsAPI.SecretListResponsesSinglePage;
-  export import SecretUpdateParams = SecretsAPI.SecretUpdateParams;
-  export import SecretListParams = SecretsAPI.SecretListParams;
-  export import Tags = TagsAPI.Tags;
-  export import TagUpdateResponse = TagsAPI.TagUpdateResponse;
-  export import TagListResponse = TagsAPI.TagListResponse;
-  export import TagDeleteResponse = TagsAPI.TagDeleteResponse;
-  export import TagListResponsesSinglePage = TagsAPI.TagListResponsesSinglePage;
-  export import TagUpdateParams = TagsAPI.TagUpdateParams;
-  export import TagListParams = TagsAPI.TagListParams;
-  export import TagDeleteParams = TagsAPI.TagDeleteParams;
+Scripts.AssetUpload = AssetUpload;
+Scripts.Content = Content;
+Scripts.Settings = Settings;
+Scripts.Bindings = Bindings;
+Scripts.Secrets = Secrets;
+Scripts.SecretListResponsesSinglePage = SecretListResponsesSinglePage;
+Scripts.Tags = Tags;
+Scripts.TagListResponsesSinglePage = TagListResponsesSinglePage;
+
+export declare namespace Scripts {
+  export {
+    type Script as Script,
+    type ScriptUpdateResponse as ScriptUpdateResponse,
+    type ScriptUpdateParams as ScriptUpdateParams,
+    type ScriptDeleteParams as ScriptDeleteParams,
+    type ScriptGetParams as ScriptGetParams,
+  };
+
+  export {
+    AssetUpload as AssetUpload,
+    type AssetUploadCreateResponse as AssetUploadCreateResponse,
+    type AssetUploadCreateParams as AssetUploadCreateParams,
+  };
+
+  export {
+    Content as Content,
+    type ContentUpdateParams as ContentUpdateParams,
+    type ContentGetParams as ContentGetParams,
+  };
+
+  export {
+    Settings as Settings,
+    type SettingEditResponse as SettingEditResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingEditParams as SettingEditParams,
+    type SettingGetParams as SettingGetParams,
+  };
+
+  export {
+    Bindings as Bindings,
+    type BindingGetResponse as BindingGetResponse,
+    type BindingGetParams as BindingGetParams,
+  };
+
+  export {
+    Secrets as Secrets,
+    type WorkersSecretModel as WorkersSecretModel,
+    type SecretUpdateResponse as SecretUpdateResponse,
+    type SecretListResponse as SecretListResponse,
+    type SecretGetResponse as SecretGetResponse,
+    SecretListResponsesSinglePage as SecretListResponsesSinglePage,
+    type SecretUpdateParams as SecretUpdateParams,
+    type SecretListParams as SecretListParams,
+    type SecretGetParams as SecretGetParams,
+  };
+
+  export {
+    Tags as Tags,
+    type TagUpdateResponse as TagUpdateResponse,
+    type TagListResponse as TagListResponse,
+    type TagDeleteResponse as TagDeleteResponse,
+    TagListResponsesSinglePage as TagListResponsesSinglePage,
+    type TagUpdateParams as TagUpdateParams,
+    type TagListParams as TagListParams,
+    type TagDeleteParams as TagDeleteParams,
+  };
 }
diff --git a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.ts b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.ts
index 341d1b71ce..e57757aaaf 100644
--- a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.ts
+++ b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../../resource';
 import * as Core from '../../../../../core';
-import * as SecretsAPI from './secrets';
 import { SinglePage } from '../../../../../pagination';
 
 export class Secrets extends APIResource {
@@ -25,7 +24,7 @@ export class Secrets extends APIResource {
   }
 
   /**
-   * Fetch secrets from a script uploaded to a Workers for Platforms namespace.
+   * List secrets from a script uploaded to a Workers for Platforms namespace.
    */
   list(
     dispatchNamespace: string,
@@ -40,30 +39,82 @@ export class Secrets extends APIResource {
       options,
     );
   }
+
+  /**
+   * Get secret from a script uploaded to a Workers for Platforms namespace.
+   */
+  get(
+    dispatchNamespace: string,
+    scriptName: string,
+    secretName: string,
+    params: SecretGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SecretGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/workers/dispatch/namespaces/${dispatchNamespace}/scripts/${scriptName}/secrets/${secretName}`,
+        options,
+      ) as Core.APIPromise<{ result: SecretGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
 }
 
 export class SecretListResponsesSinglePage extends SinglePage<SecretListResponse> {}
 
-export interface SecretUpdateResponse {
+export interface WorkersSecretModel {
   /**
-   * The name of this secret, this is what will be to access it inside the Worker.
+   * The name of this secret, this is what will be used to access it inside the
+   * Worker.
    */
   name?: string;
 
+  /**
+   * The value of the secret.
+   */
+  text?: string;
+
   /**
    * The type of secret to put.
    */
   type?: 'secret_text';
 }
 
+export interface SecretUpdateResponse {
+  /**
+   * The name of this secret, this is what will be used to access it inside the
+   * Worker.
+   */
+  name?: string;
+
+  /**
+   * The type of secret.
+   */
+  type?: 'secret_text';
+}
+
 export interface SecretListResponse {
   /**
-   * The name of this secret, this is what will be to access it inside the Worker.
+   * The name of this secret, this is what will be used to access it inside the
+   * Worker.
    */
   name?: string;
 
   /**
-   * The type of secret to put.
+   * The type of secret.
+   */
+  type?: 'secret_text';
+}
+
+export interface SecretGetResponse {
+  /**
+   * The name of this secret, this is what will be used to access it inside the
+   * Worker.
+   */
+  name?: string;
+
+  /**
+   * The type of secret.
    */
   type?: 'secret_text';
 }
@@ -75,8 +126,8 @@ export interface SecretUpdateParams {
   account_id: string;
 
   /**
-   * Body param: The name of this secret, this is what will be to access it inside
-   * the Worker.
+   * Body param: The name of this secret, this is what will be used to access it
+   * inside the Worker.
    */
   name?: string;
 
@@ -98,10 +149,24 @@ export interface SecretListParams {
   account_id: string;
 }
 
-export namespace Secrets {
-  export import SecretUpdateResponse = SecretsAPI.SecretUpdateResponse;
-  export import SecretListResponse = SecretsAPI.SecretListResponse;
-  export import SecretListResponsesSinglePage = SecretsAPI.SecretListResponsesSinglePage;
-  export import SecretUpdateParams = SecretsAPI.SecretUpdateParams;
-  export import SecretListParams = SecretsAPI.SecretListParams;
+export interface SecretGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+Secrets.SecretListResponsesSinglePage = SecretListResponsesSinglePage;
+
+export declare namespace Secrets {
+  export {
+    type WorkersSecretModel as WorkersSecretModel,
+    type SecretUpdateResponse as SecretUpdateResponse,
+    type SecretListResponse as SecretListResponse,
+    type SecretGetResponse as SecretGetResponse,
+    SecretListResponsesSinglePage as SecretListResponsesSinglePage,
+    type SecretUpdateParams as SecretUpdateParams,
+    type SecretListParams as SecretListParams,
+    type SecretGetParams as SecretGetParams,
+  };
 }
diff --git a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/settings.ts b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/settings.ts
index 53a3a52149..3422ca6643 100644
--- a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/settings.ts
+++ b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/settings.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../../resource';
 import * as Core from '../../../../../core';
-import * as SettingsAPI from './settings';
 import * as WorkersAPI from '../../../../workers/workers';
 import * as TailAPI from '../../../../workers/scripts/tail';
 
@@ -46,17 +45,43 @@ export class Settings extends APIResource {
 
 export interface SettingEditResponse {
   /**
-   * List of bindings attached to this Worker
+   * List of bindings attached to a Worker. You can find more about bindings on our
+   * docs:
+   * https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
    */
-  bindings?: Array<WorkersAPI.Binding>;
+  bindings?: Array<
+    | SettingEditResponse.WorkersBindingKindAny
+    | SettingEditResponse.WorkersBindingKindAI
+    | SettingEditResponse.WorkersBindingKindAnalyticsEngine
+    | SettingEditResponse.WorkersBindingKindAssets
+    | SettingEditResponse.WorkersBindingKindBrowserRendering
+    | SettingEditResponse.WorkersBindingKindD1
+    | SettingEditResponse.WorkersBindingKindDispatchNamespace
+    | SettingEditResponse.WorkersBindingKindDo
+    | SettingEditResponse.WorkersBindingKindHyperdrive
+    | SettingEditResponse.WorkersBindingKindJson
+    | SettingEditResponse.WorkersBindingKindKVNamespace
+    | SettingEditResponse.WorkersBindingKindMTLSCERT
+    | SettingEditResponse.WorkersBindingKindPlainText
+    | SettingEditResponse.WorkersBindingKindQueue
+    | SettingEditResponse.WorkersBindingKindR2
+    | SettingEditResponse.WorkersBindingKindSecret
+    | SettingEditResponse.WorkersBindingKindService
+    | SettingEditResponse.WorkersBindingKindTailConsumer
+    | SettingEditResponse.WorkersBindingKindVectorize
+    | SettingEditResponse.WorkersBindingKindVersionMetadata
+  >;
 
   /**
-   * Opt your Worker into changes after this date
+   * Date indicating targeted support in the Workers runtime. Backwards incompatible
+   * fixes to the runtime following this date will not affect this Worker.
    */
   compatibility_date?: string;
 
   /**
-   * Opt your Worker into specific changes
+   * Flags that enable or disable certain features in the Workers runtime. Used to
+   * enable upcoming features or opt in or out of specific changes not included in a
+   * `compatibility_date`.
    */
   compatibility_flags?: Array<string>;
 
@@ -73,9 +98,18 @@ export interface SettingEditResponse {
   /**
    * Migrations to apply for Durable Objects associated with this Worker.
    */
-  migrations?: WorkersAPI.SingleStepMigration | WorkersAPI.SteppedMigration;
+  migrations?: WorkersAPI.SingleStepMigration | SettingEditResponse.WorkersMultipleStepMigrations;
 
-  placement?: WorkersAPI.PlacementConfiguration;
+  /**
+   * Observability settings for the Worker.
+   */
+  observability?: SettingEditResponse.Observability;
+
+  /**
+   * Configuration for
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  placement?: SettingEditResponse.Placement;
 
   /**
    * Tags to help you manage your Workers
@@ -88,12 +122,389 @@ export interface SettingEditResponse {
   tail_consumers?: Array<TailAPI.ConsumerScript>;
 
   /**
-   * Specifies the usage model for the Worker (e.g. 'bundled' or 'unbound').
+   * Usage model for the Worker invocations.
    */
-  usage_model?: string;
+  usage_model?: 'standard';
 }
 
 export namespace SettingEditResponse {
+  export interface WorkersBindingKindAny {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: string;
+    [k: string]: unknown;
+  }
+
+  export interface WorkersBindingKindAI {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'ai';
+  }
+
+  export interface WorkersBindingKindAnalyticsEngine {
+    /**
+     * The dataset name to bind to.
+     */
+    dataset: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'analytics_engine';
+  }
+
+  export interface WorkersBindingKindAssets {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'assets';
+  }
+
+  export interface WorkersBindingKindBrowserRendering {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'browser_rendering';
+  }
+
+  export interface WorkersBindingKindD1 {
+    /**
+     * Identifier of the D1 database to bind to.
+     */
+    id: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'd1';
+  }
+
+  export interface WorkersBindingKindDispatchNamespace {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Namespace to bind to.
+     */
+    namespace: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'dispatch_namespace';
+
+    /**
+     * Outbound worker.
+     */
+    outbound?: WorkersBindingKindDispatchNamespace.Outbound;
+  }
+
+  export namespace WorkersBindingKindDispatchNamespace {
+    /**
+     * Outbound worker.
+     */
+    export interface Outbound {
+      /**
+       * Pass information from the Dispatch Worker to the Outbound Worker through the
+       * parameters.
+       */
+      params?: Array<string>;
+
+      /**
+       * Outbound worker.
+       */
+      worker?: Outbound.Worker;
+    }
+
+    export namespace Outbound {
+      /**
+       * Outbound worker.
+       */
+      export interface Worker {
+        /**
+         * Environment of the outbound worker.
+         */
+        environment?: string;
+
+        /**
+         * Name of the outbound worker.
+         */
+        service?: string;
+      }
+    }
+  }
+
+  export interface WorkersBindingKindDo {
+    /**
+     * The exported class name of the Durable Object.
+     */
+    class_name: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'durable_object_namespace';
+
+    /**
+     * The environment of the script_name to bind to.
+     */
+    environment?: string;
+
+    /**
+     * Namespace identifier tag.
+     */
+    namespace_id?: string;
+
+    /**
+     * The script where the Durable Object is defined, if it is external to this
+     * Worker.
+     */
+    script_name?: string;
+  }
+
+  export interface WorkersBindingKindHyperdrive {
+    /**
+     * Identifier of the Hyperdrive connection to bind to.
+     */
+    id: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'hyperdrive';
+  }
+
+  export interface WorkersBindingKindJson {
+    /**
+     * JSON data to use.
+     */
+    json: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'json';
+  }
+
+  export interface WorkersBindingKindKVNamespace {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Namespace identifier tag.
+     */
+    namespace_id: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'kv_namespace';
+  }
+
+  export interface WorkersBindingKindMTLSCERT {
+    /**
+     * Identifier of the certificate to bind to.
+     */
+    certificate_id: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'mtls_certificate';
+  }
+
+  export interface WorkersBindingKindPlainText {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The text value to use.
+     */
+    text: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'plain_text';
+  }
+
+  export interface WorkersBindingKindQueue {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Name of the Queue to bind to.
+     */
+    queue_name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'queue';
+  }
+
+  export interface WorkersBindingKindR2 {
+    /**
+     * R2 bucket to bind to.
+     */
+    bucket_name: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'r2_bucket';
+  }
+
+  export interface WorkersBindingKindSecret {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The secret value to use.
+     */
+    text: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'secret_text';
+  }
+
+  export interface WorkersBindingKindService {
+    /**
+     * Optional environment if the Worker utilizes one.
+     */
+    environment: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Name of Worker to bind to.
+     */
+    service: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'service';
+  }
+
+  export interface WorkersBindingKindTailConsumer {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Name of Tail Worker to bind to.
+     */
+    service: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'tail_consumer';
+  }
+
+  export interface WorkersBindingKindVectorize {
+    /**
+     * Name of the Vectorize index to bind to.
+     */
+    index_name: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'vectorize';
+  }
+
+  export interface WorkersBindingKindVersionMetadata {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'version_metadata';
+  }
+
   /**
    * Limits to apply for this Worker.
    */
@@ -103,21 +514,93 @@ export namespace SettingEditResponse {
      */
     cpu_ms?: number;
   }
+
+  export interface WorkersMultipleStepMigrations {
+    /**
+     * Tag to set as the latest migration tag.
+     */
+    new_tag?: string;
+
+    /**
+     * Tag used to verify against the latest migration tag for this Worker. If they
+     * don't match, the upload is rejected.
+     */
+    old_tag?: string;
+
+    /**
+     * Migrations to apply in order.
+     */
+    steps?: Array<WorkersAPI.MigrationStep>;
+  }
+
+  /**
+   * Observability settings for the Worker.
+   */
+  export interface Observability {
+    /**
+     * Whether observability is enabled for the Worker.
+     */
+    enabled: boolean;
+
+    /**
+     * The sampling rate for incoming requests. From 0 to 1 (1 = 100%, 0.1 = 10%).
+     * Default is 1.
+     */
+    head_sampling_rate?: number | null;
+  }
+
+  /**
+   * Configuration for
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  export interface Placement {
+    /**
+     * Enables
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+     */
+    mode?: 'smart';
+  }
 }
 
 export interface SettingGetResponse {
   /**
-   * List of bindings attached to this Worker
+   * List of bindings attached to a Worker. You can find more about bindings on our
+   * docs:
+   * https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
    */
-  bindings?: Array<WorkersAPI.Binding>;
+  bindings?: Array<
+    | SettingGetResponse.WorkersBindingKindAny
+    | SettingGetResponse.WorkersBindingKindAI
+    | SettingGetResponse.WorkersBindingKindAnalyticsEngine
+    | SettingGetResponse.WorkersBindingKindAssets
+    | SettingGetResponse.WorkersBindingKindBrowserRendering
+    | SettingGetResponse.WorkersBindingKindD1
+    | SettingGetResponse.WorkersBindingKindDispatchNamespace
+    | SettingGetResponse.WorkersBindingKindDo
+    | SettingGetResponse.WorkersBindingKindHyperdrive
+    | SettingGetResponse.WorkersBindingKindJson
+    | SettingGetResponse.WorkersBindingKindKVNamespace
+    | SettingGetResponse.WorkersBindingKindMTLSCERT
+    | SettingGetResponse.WorkersBindingKindPlainText
+    | SettingGetResponse.WorkersBindingKindQueue
+    | SettingGetResponse.WorkersBindingKindR2
+    | SettingGetResponse.WorkersBindingKindSecret
+    | SettingGetResponse.WorkersBindingKindService
+    | SettingGetResponse.WorkersBindingKindTailConsumer
+    | SettingGetResponse.WorkersBindingKindVectorize
+    | SettingGetResponse.WorkersBindingKindVersionMetadata
+  >;
 
   /**
-   * Opt your Worker into changes after this date
+   * Date indicating targeted support in the Workers runtime. Backwards incompatible
+   * fixes to the runtime following this date will not affect this Worker.
    */
   compatibility_date?: string;
 
   /**
-   * Opt your Worker into specific changes
+   * Flags that enable or disable certain features in the Workers runtime. Used to
+   * enable upcoming features or opt in or out of specific changes not included in a
+   * `compatibility_date`.
    */
   compatibility_flags?: Array<string>;
 
@@ -134,35 +617,467 @@ export interface SettingGetResponse {
   /**
    * Migrations to apply for Durable Objects associated with this Worker.
    */
-  migrations?: WorkersAPI.SingleStepMigration | WorkersAPI.SteppedMigration;
+  migrations?: WorkersAPI.SingleStepMigration | SettingGetResponse.WorkersMultipleStepMigrations;
 
-  placement?: WorkersAPI.PlacementConfiguration;
+  /**
+   * Observability settings for the Worker.
+   */
+  observability?: SettingGetResponse.Observability;
+
+  /**
+   * Configuration for
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  placement?: SettingGetResponse.Placement;
 
   /**
    * Tags to help you manage your Workers
    */
   tags?: Array<string>;
 
-  /**
-   * List of Workers that will consume logs from the attached Worker.
-   */
-  tail_consumers?: Array<TailAPI.ConsumerScript>;
+  /**
+   * List of Workers that will consume logs from the attached Worker.
+   */
+  tail_consumers?: Array<TailAPI.ConsumerScript>;
+
+  /**
+   * Usage model for the Worker invocations.
+   */
+  usage_model?: 'standard';
+}
+
+export namespace SettingGetResponse {
+  export interface WorkersBindingKindAny {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: string;
+    [k: string]: unknown;
+  }
+
+  export interface WorkersBindingKindAI {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'ai';
+  }
+
+  export interface WorkersBindingKindAnalyticsEngine {
+    /**
+     * The dataset name to bind to.
+     */
+    dataset: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'analytics_engine';
+  }
+
+  export interface WorkersBindingKindAssets {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'assets';
+  }
+
+  export interface WorkersBindingKindBrowserRendering {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'browser_rendering';
+  }
+
+  export interface WorkersBindingKindD1 {
+    /**
+     * Identifier of the D1 database to bind to.
+     */
+    id: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'd1';
+  }
+
+  export interface WorkersBindingKindDispatchNamespace {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Namespace to bind to.
+     */
+    namespace: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'dispatch_namespace';
+
+    /**
+     * Outbound worker.
+     */
+    outbound?: WorkersBindingKindDispatchNamespace.Outbound;
+  }
+
+  export namespace WorkersBindingKindDispatchNamespace {
+    /**
+     * Outbound worker.
+     */
+    export interface Outbound {
+      /**
+       * Pass information from the Dispatch Worker to the Outbound Worker through the
+       * parameters.
+       */
+      params?: Array<string>;
+
+      /**
+       * Outbound worker.
+       */
+      worker?: Outbound.Worker;
+    }
+
+    export namespace Outbound {
+      /**
+       * Outbound worker.
+       */
+      export interface Worker {
+        /**
+         * Environment of the outbound worker.
+         */
+        environment?: string;
+
+        /**
+         * Name of the outbound worker.
+         */
+        service?: string;
+      }
+    }
+  }
+
+  export interface WorkersBindingKindDo {
+    /**
+     * The exported class name of the Durable Object.
+     */
+    class_name: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'durable_object_namespace';
+
+    /**
+     * The environment of the script_name to bind to.
+     */
+    environment?: string;
+
+    /**
+     * Namespace identifier tag.
+     */
+    namespace_id?: string;
+
+    /**
+     * The script where the Durable Object is defined, if it is external to this
+     * Worker.
+     */
+    script_name?: string;
+  }
+
+  export interface WorkersBindingKindHyperdrive {
+    /**
+     * Identifier of the Hyperdrive connection to bind to.
+     */
+    id: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'hyperdrive';
+  }
+
+  export interface WorkersBindingKindJson {
+    /**
+     * JSON data to use.
+     */
+    json: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'json';
+  }
+
+  export interface WorkersBindingKindKVNamespace {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Namespace identifier tag.
+     */
+    namespace_id: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'kv_namespace';
+  }
+
+  export interface WorkersBindingKindMTLSCERT {
+    /**
+     * Identifier of the certificate to bind to.
+     */
+    certificate_id: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'mtls_certificate';
+  }
+
+  export interface WorkersBindingKindPlainText {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The text value to use.
+     */
+    text: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'plain_text';
+  }
+
+  export interface WorkersBindingKindQueue {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Name of the Queue to bind to.
+     */
+    queue_name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'queue';
+  }
+
+  export interface WorkersBindingKindR2 {
+    /**
+     * R2 bucket to bind to.
+     */
+    bucket_name: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'r2_bucket';
+  }
+
+  export interface WorkersBindingKindSecret {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The secret value to use.
+     */
+    text: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'secret_text';
+  }
+
+  export interface WorkersBindingKindService {
+    /**
+     * Optional environment if the Worker utilizes one.
+     */
+    environment: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Name of Worker to bind to.
+     */
+    service: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'service';
+  }
+
+  export interface WorkersBindingKindTailConsumer {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * Name of Tail Worker to bind to.
+     */
+    service: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'tail_consumer';
+  }
+
+  export interface WorkersBindingKindVectorize {
+    /**
+     * Name of the Vectorize index to bind to.
+     */
+    index_name: string;
+
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'vectorize';
+  }
+
+  export interface WorkersBindingKindVersionMetadata {
+    /**
+     * A JavaScript variable name for the binding.
+     */
+    name: string;
+
+    /**
+     * The kind of resource that the binding provides.
+     */
+    type: 'version_metadata';
+  }
+
+  /**
+   * Limits to apply for this Worker.
+   */
+  export interface Limits {
+    /**
+     * The amount of CPU time this Worker can use in milliseconds.
+     */
+    cpu_ms?: number;
+  }
+
+  export interface WorkersMultipleStepMigrations {
+    /**
+     * Tag to set as the latest migration tag.
+     */
+    new_tag?: string;
+
+    /**
+     * Tag used to verify against the latest migration tag for this Worker. If they
+     * don't match, the upload is rejected.
+     */
+    old_tag?: string;
+
+    /**
+     * Migrations to apply in order.
+     */
+    steps?: Array<WorkersAPI.MigrationStep>;
+  }
 
   /**
-   * Specifies the usage model for the Worker (e.g. 'bundled' or 'unbound').
+   * Observability settings for the Worker.
    */
-  usage_model?: string;
-}
+  export interface Observability {
+    /**
+     * Whether observability is enabled for the Worker.
+     */
+    enabled: boolean;
+
+    /**
+     * The sampling rate for incoming requests. From 0 to 1 (1 = 100%, 0.1 = 10%).
+     * Default is 1.
+     */
+    head_sampling_rate?: number | null;
+  }
 
-export namespace SettingGetResponse {
   /**
-   * Limits to apply for this Worker.
+   * Configuration for
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
    */
-  export interface Limits {
+  export interface Placement {
     /**
-     * The amount of CPU time this Worker can use in milliseconds.
+     * Enables
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
      */
-    cpu_ms?: number;
+    mode?: 'smart';
   }
 }
 
@@ -181,17 +1096,43 @@ export interface SettingEditParams {
 export namespace SettingEditParams {
   export interface Settings {
     /**
-     * List of bindings attached to this Worker
+     * List of bindings attached to a Worker. You can find more about bindings on our
+     * docs:
+     * https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
      */
-    bindings?: Array<WorkersAPI.BindingParam>;
+    bindings?: Array<
+      | Settings.WorkersBindingKindAny
+      | Settings.WorkersBindingKindAI
+      | Settings.WorkersBindingKindAnalyticsEngine
+      | Settings.WorkersBindingKindAssets
+      | Settings.WorkersBindingKindBrowserRendering
+      | Settings.WorkersBindingKindD1
+      | Settings.WorkersBindingKindDispatchNamespace
+      | Settings.WorkersBindingKindDo
+      | Settings.WorkersBindingKindHyperdrive
+      | Settings.WorkersBindingKindJson
+      | Settings.WorkersBindingKindKVNamespace
+      | Settings.WorkersBindingKindMTLSCERT
+      | Settings.WorkersBindingKindPlainText
+      | Settings.WorkersBindingKindQueue
+      | Settings.WorkersBindingKindR2
+      | Settings.WorkersBindingKindSecret
+      | Settings.WorkersBindingKindService
+      | Settings.WorkersBindingKindTailConsumer
+      | Settings.WorkersBindingKindVectorize
+      | Settings.WorkersBindingKindVersionMetadata
+    >;
 
     /**
-     * Opt your Worker into changes after this date
+     * Date indicating targeted support in the Workers runtime. Backwards incompatible
+     * fixes to the runtime following this date will not affect this Worker.
      */
     compatibility_date?: string;
 
     /**
-     * Opt your Worker into specific changes
+     * Flags that enable or disable certain features in the Workers runtime. Used to
+     * enable upcoming features or opt in or out of specific changes not included in a
+     * `compatibility_date`.
      */
     compatibility_flags?: Array<string>;
 
@@ -208,9 +1149,18 @@ export namespace SettingEditParams {
     /**
      * Migrations to apply for Durable Objects associated with this Worker.
      */
-    migrations?: WorkersAPI.SingleStepMigrationParam | WorkersAPI.SteppedMigrationParam;
+    migrations?: WorkersAPI.SingleStepMigrationParam | Settings.WorkersMultipleStepMigrations;
+
+    /**
+     * Observability settings for the Worker.
+     */
+    observability?: Settings.Observability;
 
-    placement?: WorkersAPI.PlacementConfigurationParam;
+    /**
+     * Configuration for
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+     */
+    placement?: Settings.Placement;
 
     /**
      * Tags to help you manage your Workers
@@ -223,12 +1173,389 @@ export namespace SettingEditParams {
     tail_consumers?: Array<TailAPI.ConsumerScriptParam>;
 
     /**
-     * Specifies the usage model for the Worker (e.g. 'bundled' or 'unbound').
+     * Usage model for the Worker invocations.
      */
-    usage_model?: string;
+    usage_model?: 'standard';
   }
 
   export namespace Settings {
+    export interface WorkersBindingKindAny {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: string;
+      [k: string]: unknown;
+    }
+
+    export interface WorkersBindingKindAI {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'ai';
+    }
+
+    export interface WorkersBindingKindAnalyticsEngine {
+      /**
+       * The dataset name to bind to.
+       */
+      dataset: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'analytics_engine';
+    }
+
+    export interface WorkersBindingKindAssets {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'assets';
+    }
+
+    export interface WorkersBindingKindBrowserRendering {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'browser_rendering';
+    }
+
+    export interface WorkersBindingKindD1 {
+      /**
+       * Identifier of the D1 database to bind to.
+       */
+      id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'd1';
+    }
+
+    export interface WorkersBindingKindDispatchNamespace {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Namespace to bind to.
+       */
+      namespace: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'dispatch_namespace';
+
+      /**
+       * Outbound worker.
+       */
+      outbound?: WorkersBindingKindDispatchNamespace.Outbound;
+    }
+
+    export namespace WorkersBindingKindDispatchNamespace {
+      /**
+       * Outbound worker.
+       */
+      export interface Outbound {
+        /**
+         * Pass information from the Dispatch Worker to the Outbound Worker through the
+         * parameters.
+         */
+        params?: Array<string>;
+
+        /**
+         * Outbound worker.
+         */
+        worker?: Outbound.Worker;
+      }
+
+      export namespace Outbound {
+        /**
+         * Outbound worker.
+         */
+        export interface Worker {
+          /**
+           * Environment of the outbound worker.
+           */
+          environment?: string;
+
+          /**
+           * Name of the outbound worker.
+           */
+          service?: string;
+        }
+      }
+    }
+
+    export interface WorkersBindingKindDo {
+      /**
+       * The exported class name of the Durable Object.
+       */
+      class_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'durable_object_namespace';
+
+      /**
+       * The environment of the script_name to bind to.
+       */
+      environment?: string;
+
+      /**
+       * Namespace identifier tag.
+       */
+      namespace_id?: string;
+
+      /**
+       * The script where the Durable Object is defined, if it is external to this
+       * Worker.
+       */
+      script_name?: string;
+    }
+
+    export interface WorkersBindingKindHyperdrive {
+      /**
+       * Identifier of the Hyperdrive connection to bind to.
+       */
+      id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'hyperdrive';
+    }
+
+    export interface WorkersBindingKindJson {
+      /**
+       * JSON data to use.
+       */
+      json: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'json';
+    }
+
+    export interface WorkersBindingKindKVNamespace {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Namespace identifier tag.
+       */
+      namespace_id: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'kv_namespace';
+    }
+
+    export interface WorkersBindingKindMTLSCERT {
+      /**
+       * Identifier of the certificate to bind to.
+       */
+      certificate_id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'mtls_certificate';
+    }
+
+    export interface WorkersBindingKindPlainText {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The text value to use.
+       */
+      text: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'plain_text';
+    }
+
+    export interface WorkersBindingKindQueue {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of the Queue to bind to.
+       */
+      queue_name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'queue';
+    }
+
+    export interface WorkersBindingKindR2 {
+      /**
+       * R2 bucket to bind to.
+       */
+      bucket_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'r2_bucket';
+    }
+
+    export interface WorkersBindingKindSecret {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The secret value to use.
+       */
+      text: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'secret_text';
+    }
+
+    export interface WorkersBindingKindService {
+      /**
+       * Optional environment if the Worker utilizes one.
+       */
+      environment: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of Worker to bind to.
+       */
+      service: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'service';
+    }
+
+    export interface WorkersBindingKindTailConsumer {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of Tail Worker to bind to.
+       */
+      service: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'tail_consumer';
+    }
+
+    export interface WorkersBindingKindVectorize {
+      /**
+       * Name of the Vectorize index to bind to.
+       */
+      index_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'vectorize';
+    }
+
+    export interface WorkersBindingKindVersionMetadata {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'version_metadata';
+    }
+
     /**
      * Limits to apply for this Worker.
      */
@@ -238,6 +1565,52 @@ export namespace SettingEditParams {
        */
       cpu_ms?: number;
     }
+
+    export interface WorkersMultipleStepMigrations {
+      /**
+       * Tag to set as the latest migration tag.
+       */
+      new_tag?: string;
+
+      /**
+       * Tag used to verify against the latest migration tag for this Worker. If they
+       * don't match, the upload is rejected.
+       */
+      old_tag?: string;
+
+      /**
+       * Migrations to apply in order.
+       */
+      steps?: Array<WorkersAPI.MigrationStepParam>;
+    }
+
+    /**
+     * Observability settings for the Worker.
+     */
+    export interface Observability {
+      /**
+       * Whether observability is enabled for the Worker.
+       */
+      enabled: boolean;
+
+      /**
+       * The sampling rate for incoming requests. From 0 to 1 (1 = 100%, 0.1 = 10%).
+       * Default is 1.
+       */
+      head_sampling_rate?: number | null;
+    }
+
+    /**
+     * Configuration for
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+     */
+    export interface Placement {
+      /**
+       * Enables
+       * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+       */
+      mode?: 'smart';
+    }
   }
 }
 
@@ -248,9 +1621,11 @@ export interface SettingGetParams {
   account_id: string;
 }
 
-export namespace Settings {
-  export import SettingEditResponse = SettingsAPI.SettingEditResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
+export declare namespace Settings {
+  export {
+    type SettingEditResponse as SettingEditResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingEditParams as SettingEditParams,
+    type SettingGetParams as SettingGetParams,
+  };
 }
diff --git a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/tags.ts b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/tags.ts
index a5198f45c3..9e0a6270c7 100644
--- a/src/resources/workers-for-platforms/dispatch/namespaces/scripts/tags.ts
+++ b/src/resources/workers-for-platforms/dispatch/namespaces/scripts/tags.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../../resource';
 import * as Core from '../../../../../core';
-import * as TagsAPI from './tags';
 import { SinglePage } from '../../../../../pagination';
 
 export class Tags extends APIResource {
@@ -98,12 +97,16 @@ export interface TagDeleteParams {
   account_id: string;
 }
 
-export namespace Tags {
-  export import TagUpdateResponse = TagsAPI.TagUpdateResponse;
-  export import TagListResponse = TagsAPI.TagListResponse;
-  export import TagDeleteResponse = TagsAPI.TagDeleteResponse;
-  export import TagListResponsesSinglePage = TagsAPI.TagListResponsesSinglePage;
-  export import TagUpdateParams = TagsAPI.TagUpdateParams;
-  export import TagListParams = TagsAPI.TagListParams;
-  export import TagDeleteParams = TagsAPI.TagDeleteParams;
+Tags.TagListResponsesSinglePage = TagListResponsesSinglePage;
+
+export declare namespace Tags {
+  export {
+    type TagUpdateResponse as TagUpdateResponse,
+    type TagListResponse as TagListResponse,
+    type TagDeleteResponse as TagDeleteResponse,
+    TagListResponsesSinglePage as TagListResponsesSinglePage,
+    type TagUpdateParams as TagUpdateParams,
+    type TagListParams as TagListParams,
+    type TagDeleteParams as TagDeleteParams,
+  };
 }
diff --git a/src/resources/workers-for-platforms/workers-for-platforms.ts b/src/resources/workers-for-platforms/workers-for-platforms.ts
index 3fa3f301b7..7fc001cf3f 100644
--- a/src/resources/workers-for-platforms/workers-for-platforms.ts
+++ b/src/resources/workers-for-platforms/workers-for-platforms.ts
@@ -2,11 +2,14 @@
 
 import { APIResource } from '../../resource';
 import * as DispatchAPI from './dispatch/dispatch';
+import { Dispatch } from './dispatch/dispatch';
 
 export class WorkersForPlatforms extends APIResource {
   dispatch: DispatchAPI.Dispatch = new DispatchAPI.Dispatch(this._client);
 }
 
-export namespace WorkersForPlatforms {
-  export import Dispatch = DispatchAPI.Dispatch;
+WorkersForPlatforms.Dispatch = Dispatch;
+
+export declare namespace WorkersForPlatforms {
+  export { Dispatch as Dispatch };
 }
diff --git a/src/resources/workers/account-settings.ts b/src/resources/workers/account-settings.ts
index ea1a25c951..7f06933e63 100644
--- a/src/resources/workers/account-settings.ts
+++ b/src/resources/workers/account-settings.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as AccountSettingsAPI from './account-settings';
 
 export class AccountSettings extends APIResource {
   /**
@@ -12,10 +11,10 @@ export class AccountSettings extends APIResource {
     params: AccountSettingUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<AccountSettingUpdateResponse> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
       this._client.put(`/accounts/${account_id}/workers/account-settings`, {
-        body: body,
+        body,
         ...options,
       }) as Core.APIPromise<{ result: AccountSettingUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -38,15 +37,15 @@ export class AccountSettings extends APIResource {
 }
 
 export interface AccountSettingUpdateResponse {
-  default_usage_model?: unknown;
+  default_usage_model?: string;
 
-  green_compute?: unknown;
+  green_compute?: boolean;
 }
 
 export interface AccountSettingGetResponse {
-  default_usage_model?: unknown;
+  default_usage_model?: string;
 
-  green_compute?: unknown;
+  green_compute?: boolean;
 }
 
 export interface AccountSettingUpdateParams {
@@ -58,7 +57,12 @@ export interface AccountSettingUpdateParams {
   /**
    * Body param:
    */
-  body: string;
+  default_usage_model?: string;
+
+  /**
+   * Body param:
+   */
+  green_compute?: boolean;
 }
 
 export interface AccountSettingGetParams {
@@ -68,9 +72,11 @@ export interface AccountSettingGetParams {
   account_id: string;
 }
 
-export namespace AccountSettings {
-  export import AccountSettingUpdateResponse = AccountSettingsAPI.AccountSettingUpdateResponse;
-  export import AccountSettingGetResponse = AccountSettingsAPI.AccountSettingGetResponse;
-  export import AccountSettingUpdateParams = AccountSettingsAPI.AccountSettingUpdateParams;
-  export import AccountSettingGetParams = AccountSettingsAPI.AccountSettingGetParams;
+export declare namespace AccountSettings {
+  export {
+    type AccountSettingUpdateResponse as AccountSettingUpdateResponse,
+    type AccountSettingGetResponse as AccountSettingGetResponse,
+    type AccountSettingUpdateParams as AccountSettingUpdateParams,
+    type AccountSettingGetParams as AccountSettingGetParams,
+  };
 }
diff --git a/src/resources/workers/ai/ai.ts b/src/resources/workers/ai/ai.ts
deleted file mode 100644
index de846a74a0..0000000000
--- a/src/resources/workers/ai/ai.ts
+++ /dev/null
@@ -1,538 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../resource';
-import * as Core from '../../../core';
-import * as AIAPI from './ai';
-import * as ModelsAPI from './models/models';
-
-export class AI extends APIResource {
-  models: ModelsAPI.Models = new ModelsAPI.Models(this._client);
-
-  /**
-   * This endpoint provides users with the capability to run specific AI models
-   * on-demand.
-   *
-   * By submitting the required input data, users can receive real-time predictions
-   * or results generated by the chosen AI model. The endpoint supports various AI
-   * model types, ensuring flexibility and adaptability for diverse use cases.
-   *
-   * Model specific inputs available in
-   * [Cloudflare Docs](https://developers.cloudflare.com/workers-ai/models/).
-   */
-  run(modelName: string, params: AIRunParams, options?: Core.RequestOptions): Core.APIPromise<AIRunResponse> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.post(`/accounts/${account_id}/ai/run/${modelName}`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: AIRunResponse }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export type AIRunResponse =
-  | Array<AIRunResponse.TextClassification>
-  | Core.Uploadable
-  | AIRunResponse.TextEmbeddings
-  | AIRunResponse.AutomaticSpeechRecognition
-  | Array<AIRunResponse.ImageClassification>
-  | Array<AIRunResponse.ObjectDetection>
-  | AIRunResponse.UnionMember6
-  | Core.Uploadable
-  | AIRunResponse.Translation
-  | AIRunResponse.Summarization
-  | AIRunResponse.ImageToText;
-
-export namespace AIRunResponse {
-  export interface TextClassification {
-    label?: string;
-
-    score?: number;
-  }
-
-  export interface TextEmbeddings {
-    data?: Array<Array<number>>;
-
-    shape?: Array<number>;
-  }
-
-  export interface AutomaticSpeechRecognition {
-    text: string;
-
-    vtt?: string;
-
-    word_count?: number;
-
-    words?: Array<AutomaticSpeechRecognition.Word>;
-  }
-
-  export namespace AutomaticSpeechRecognition {
-    export interface Word {
-      end?: number;
-
-      start?: number;
-
-      word?: string;
-    }
-  }
-
-  export interface ImageClassification {
-    label?: string;
-
-    score?: number;
-  }
-
-  export interface ObjectDetection {
-    box?: ObjectDetection.Box;
-
-    label?: string;
-
-    score?: number;
-  }
-
-  export namespace ObjectDetection {
-    export interface Box {
-      xmax?: number;
-
-      xmin?: number;
-
-      ymax?: number;
-
-      ymin?: number;
-    }
-  }
-
-  export interface UnionMember6 {
-    response?: string;
-
-    tool_calls?: Array<UnionMember6.ToolCall>;
-  }
-
-  export namespace UnionMember6 {
-    export interface ToolCall {
-      arguments?: unknown;
-
-      name?: string;
-    }
-  }
-
-  export interface Translation {
-    translated_text?: string;
-  }
-
-  export interface Summarization {
-    summary?: string;
-  }
-
-  export interface ImageToText {
-    description?: string;
-  }
-}
-
-export type AIRunParams =
-  | AIRunParams.TextClassification
-  | AIRunParams.TextToImage
-  | AIRunParams.TextEmbeddings
-  | AIRunParams.AutomaticSpeechRecognition
-  | AIRunParams.ImageClassification
-  | AIRunParams.ObjectDetection
-  | AIRunParams.Variant6
-  | AIRunParams.Variant7
-  | AIRunParams.Translation
-  | AIRunParams.Summarization
-  | AIRunParams.ImageToText;
-
-export namespace AIRunParams {
-  export interface TextClassification {
-    /**
-     * Path param:
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    text: string;
-  }
-
-  export interface TextToImage {
-    /**
-     * Path param:
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    prompt: string;
-
-    /**
-     * Body param:
-     */
-    guidance?: number;
-
-    /**
-     * Body param:
-     */
-    height?: number;
-
-    /**
-     * Body param:
-     */
-    image?: Array<number>;
-
-    /**
-     * Body param:
-     */
-    image_b64?: string;
-
-    /**
-     * Body param:
-     */
-    lora_weights?: Array<number>;
-
-    /**
-     * Body param:
-     */
-    loras?: Array<string>;
-
-    /**
-     * Body param:
-     */
-    mask?: Array<number>;
-
-    /**
-     * Body param:
-     */
-    negative_prompt?: string;
-
-    /**
-     * Body param:
-     */
-    num_steps?: number;
-
-    /**
-     * Body param:
-     */
-    seed?: number;
-
-    /**
-     * Body param:
-     */
-    strength?: number;
-
-    /**
-     * Body param:
-     */
-    width?: number;
-  }
-
-  export interface TextEmbeddings {
-    /**
-     * Path param:
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    text: string | Array<string>;
-  }
-
-  export interface AutomaticSpeechRecognition {
-    /**
-     * Path param:
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    audio: Array<number>;
-  }
-
-  export interface ImageClassification {
-    /**
-     * Path param:
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    image: Array<number>;
-  }
-
-  export interface ObjectDetection {
-    /**
-     * Path param:
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    image?: Array<number>;
-  }
-
-  export interface Variant6 {
-    /**
-     * Path param:
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    prompt: string;
-
-    /**
-     * Body param:
-     */
-    frequency_penalty?: number;
-
-    /**
-     * Body param:
-     */
-    lora?: string;
-
-    /**
-     * Body param:
-     */
-    max_tokens?: number;
-
-    /**
-     * Body param:
-     */
-    presence_penalty?: number;
-
-    /**
-     * Body param:
-     */
-    raw?: boolean;
-
-    /**
-     * Body param:
-     */
-    repetition_penalty?: number;
-
-    /**
-     * Body param:
-     */
-    seed?: number;
-
-    /**
-     * Body param:
-     */
-    stream?: boolean;
-
-    /**
-     * Body param:
-     */
-    temperature?: number;
-
-    /**
-     * Body param:
-     */
-    top_k?: number;
-
-    /**
-     * Body param:
-     */
-    top_p?: number;
-  }
-
-  export interface Variant7 {
-    /**
-     * Path param:
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    messages: Array<AIRunParams.Variant7.Message>;
-
-    /**
-     * Body param:
-     */
-    frequency_penalty?: number;
-
-    /**
-     * Body param:
-     */
-    max_tokens?: number;
-
-    /**
-     * Body param:
-     */
-    presence_penalty?: number;
-
-    /**
-     * Body param:
-     */
-    repetition_penalty?: number;
-
-    /**
-     * Body param:
-     */
-    seed?: number;
-
-    /**
-     * Body param:
-     */
-    stream?: boolean;
-
-    /**
-     * Body param:
-     */
-    temperature?: number;
-
-    /**
-     * Body param:
-     */
-    tools?: Array<AIRunParams.Variant7.Tool>;
-
-    /**
-     * Body param:
-     */
-    top_k?: number;
-
-    /**
-     * Body param:
-     */
-    top_p?: number;
-  }
-
-  export namespace Variant7 {
-    export interface Message {
-      content: string;
-
-      role: string;
-    }
-
-    export interface Tool {
-      function?: Tool.Function;
-
-      type?: string;
-    }
-
-    export namespace Tool {
-      export interface Function {
-        description?: string;
-
-        name?: string;
-
-        parameters?: Function.Parameters;
-      }
-
-      export namespace Function {
-        export interface Parameters {
-          properties?: Record<string, Parameters.Properties>;
-
-          required?: Array<string>;
-
-          type?: string;
-        }
-
-        export namespace Parameters {
-          export interface Properties {
-            description?: string;
-
-            type?: string;
-          }
-        }
-      }
-    }
-  }
-
-  export interface Translation {
-    /**
-     * Path param:
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    target_lang: string;
-
-    /**
-     * Body param:
-     */
-    text: string;
-
-    /**
-     * Body param:
-     */
-    source_lang?: string;
-  }
-
-  export interface Summarization {
-    /**
-     * Path param:
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    input_text: string;
-
-    /**
-     * Body param:
-     */
-    max_length?: number;
-  }
-
-  export interface ImageToText {
-    /**
-     * Path param:
-     */
-    account_id: string;
-
-    /**
-     * Body param:
-     */
-    image: Array<number>;
-
-    /**
-     * Body param:
-     */
-    max_tokens?: number;
-
-    /**
-     * Body param:
-     */
-    messages?: Array<AIRunParams.ImageToText.Message>;
-
-    /**
-     * Body param:
-     */
-    prompt?: string;
-
-    /**
-     * Body param:
-     */
-    raw?: boolean;
-
-    /**
-     * Body param:
-     */
-    temperature?: number;
-  }
-
-  export namespace ImageToText {
-    export interface Message {
-      content: string;
-
-      role: string;
-    }
-  }
-}
-
-export namespace AI {
-  export import AIRunResponse = AIAPI.AIRunResponse;
-  export import AIRunParams = AIAPI.AIRunParams;
-  export import Models = ModelsAPI.Models;
-}
diff --git a/src/resources/workers/ai/index.ts b/src/resources/workers/ai/index.ts
deleted file mode 100644
index 1ce37976f9..0000000000
--- a/src/resources/workers/ai/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { AIRunResponse, AIRunParams, AI } from './ai';
-export { Models } from './models/index';
diff --git a/src/resources/workers/ai/models/index.ts b/src/resources/workers/ai/models/index.ts
deleted file mode 100644
index e19233e767..0000000000
--- a/src/resources/workers/ai/models/index.ts
+++ /dev/null
@@ -1,4 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-export { Models } from './models';
-export { SchemaGetResponse, SchemaGetParams, Schema } from './schema';
diff --git a/src/resources/workers/ai/models/models.ts b/src/resources/workers/ai/models/models.ts
deleted file mode 100644
index fc61d9483f..0000000000
--- a/src/resources/workers/ai/models/models.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../../resource';
-import * as SchemaAPI from './schema';
-
-export class Models extends APIResource {
-  schema: SchemaAPI.Schema = new SchemaAPI.Schema(this._client);
-}
-
-export namespace Models {
-  export import Schema = SchemaAPI.Schema;
-  export import SchemaGetResponse = SchemaAPI.SchemaGetResponse;
-  export import SchemaGetParams = SchemaAPI.SchemaGetParams;
-}
diff --git a/src/resources/workers/assets/assets.ts b/src/resources/workers/assets/assets.ts
new file mode 100644
index 0000000000..709de95a23
--- /dev/null
+++ b/src/resources/workers/assets/assets.ts
@@ -0,0 +1,19 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as UploadAPI from './upload';
+import { Upload, UploadCreateParams, UploadCreateResponse } from './upload';
+
+export class Assets extends APIResource {
+  upload: UploadAPI.Upload = new UploadAPI.Upload(this._client);
+}
+
+Assets.Upload = Upload;
+
+export declare namespace Assets {
+  export {
+    Upload as Upload,
+    type UploadCreateResponse as UploadCreateResponse,
+    type UploadCreateParams as UploadCreateParams,
+  };
+}
diff --git a/src/resources/workers/assets/index.ts b/src/resources/workers/assets/index.ts
new file mode 100644
index 0000000000..775d4518a7
--- /dev/null
+++ b/src/resources/workers/assets/index.ts
@@ -0,0 +1,4 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Assets } from './assets';
+export { Upload, type UploadCreateResponse, type UploadCreateParams } from './upload';
diff --git a/src/resources/workers/assets/upload.ts b/src/resources/workers/assets/upload.ts
new file mode 100644
index 0000000000..883d5fd5ae
--- /dev/null
+++ b/src/resources/workers/assets/upload.ts
@@ -0,0 +1,51 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Upload extends APIResource {
+  /**
+   * Upload assets ahead of creating a Worker version. To learn more about the direct
+   * uploads of assets, see
+   * https://developers.cloudflare.com/workers/static-assets/direct-upload/
+   */
+  create(params: UploadCreateParams, options?: Core.RequestOptions): Core.APIPromise<UploadCreateResponse> {
+    const { account_id, base64, ...body } = params;
+    return (
+      this._client.post(
+        `/accounts/${account_id}/workers/assets/upload`,
+        Core.multipartFormRequestOptions({ query: { base64 }, body, ...options }),
+      ) as Core.APIPromise<{ result: UploadCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface UploadCreateResponse {
+  /**
+   * A "completion" JWT which can be redeemed when creating a Worker version.
+   */
+  jwt?: string;
+}
+
+export interface UploadCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param: Whether the file contents are base64-encoded. Must be `true`.
+   */
+  base64: true;
+
+  /**
+   * Body param: Base-64 encoded contents of the file. The content type of the file
+   * should be included to ensure a valid "Content-Type" header is included in asset
+   * responses.
+   */
+  '<any file hash>'?: Array<string>;
+}
+
+export declare namespace Upload {
+  export { type UploadCreateResponse as UploadCreateResponse, type UploadCreateParams as UploadCreateParams };
+}
diff --git a/src/resources/workers/domains.ts b/src/resources/workers/domains.ts
index e27055ee82..4dbe79ac8c 100644
--- a/src/resources/workers/domains.ts
+++ b/src/resources/workers/domains.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as DomainsAPI from './domains';
 import { SinglePage } from '../../pagination';
 
 export class Domains extends APIResource {
@@ -89,7 +88,7 @@ export interface Domain {
 
 export interface DomainUpdateParams {
   /**
-   * Path param:
+   * Path param: Identifer of the account.
    */
   account_id: string;
 
@@ -116,7 +115,7 @@ export interface DomainUpdateParams {
 
 export interface DomainListParams {
   /**
-   * Path param:
+   * Path param: Identifer of the account.
    */
   account_id: string;
 
@@ -147,18 +146,28 @@ export interface DomainListParams {
 }
 
 export interface DomainDeleteParams {
+  /**
+   * Identifer of the account.
+   */
   account_id: string;
 }
 
 export interface DomainGetParams {
+  /**
+   * Identifer of the account.
+   */
   account_id: string;
 }
 
-export namespace Domains {
-  export import Domain = DomainsAPI.Domain;
-  export import DomainsSinglePage = DomainsAPI.DomainsSinglePage;
-  export import DomainUpdateParams = DomainsAPI.DomainUpdateParams;
-  export import DomainListParams = DomainsAPI.DomainListParams;
-  export import DomainDeleteParams = DomainsAPI.DomainDeleteParams;
-  export import DomainGetParams = DomainsAPI.DomainGetParams;
+Domains.DomainsSinglePage = DomainsSinglePage;
+
+export declare namespace Domains {
+  export {
+    type Domain as Domain,
+    DomainsSinglePage as DomainsSinglePage,
+    type DomainUpdateParams as DomainUpdateParams,
+    type DomainListParams as DomainListParams,
+    type DomainDeleteParams as DomainDeleteParams,
+    type DomainGetParams as DomainGetParams,
+  };
 }
diff --git a/src/resources/workers/index.ts b/src/resources/workers/index.ts
index 830d2e1fd4..5d409f5db8 100644
--- a/src/resources/workers/index.ts
+++ b/src/resources/workers/index.ts
@@ -1,37 +1,53 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { AIRunResponse, AIRunParams, AI } from './ai/index';
 export {
-  AccountSettingUpdateResponse,
-  AccountSettingGetResponse,
-  AccountSettingUpdateParams,
-  AccountSettingGetParams,
   AccountSettings,
+  type AccountSettingUpdateResponse,
+  type AccountSettingGetResponse,
+  type AccountSettingUpdateParams,
+  type AccountSettingGetParams,
 } from './account-settings';
+export { Assets } from './assets/index';
 export {
-  Domain,
-  DomainUpdateParams,
-  DomainListParams,
-  DomainDeleteParams,
-  DomainGetParams,
   DomainsSinglePage,
   Domains,
+  type Domain,
+  type DomainUpdateParams,
+  type DomainListParams,
+  type DomainDeleteParams,
+  type DomainGetParams,
 } from './domains';
 export {
-  Script,
-  ScriptSetting,
-  ScriptUpdateParams,
-  ScriptListParams,
-  ScriptDeleteParams,
-  ScriptGetParams,
+  RouteListResponsesSinglePage,
+  Routes,
+  type RouteCreateResponse,
+  type RouteUpdateResponse,
+  type RouteListResponse,
+  type RouteDeleteResponse,
+  type RouteGetResponse,
+  type RouteCreateParams,
+  type RouteUpdateParams,
+  type RouteListParams,
+  type RouteDeleteParams,
+  type RouteGetParams,
+} from './routes';
+export {
   ScriptsSinglePage,
   Scripts,
+  type Script,
+  type ScriptSetting,
+  type ScriptUpdateResponse,
+  type ScriptGetResponse,
+  type ScriptUpdateParams,
+  type ScriptListParams,
+  type ScriptDeleteParams,
+  type ScriptGetParams,
 } from './scripts/index';
 export {
-  SubdomainUpdateResponse,
-  SubdomainGetResponse,
-  SubdomainUpdateParams,
-  SubdomainGetParams,
   Subdomains,
+  type SubdomainUpdateResponse,
+  type SubdomainGetResponse,
+  type SubdomainUpdateParams,
+  type SubdomainGetParams,
 } from './subdomains';
 export { Workers } from './workers';
diff --git a/src/resources/workers/routes.ts b/src/resources/workers/routes.ts
new file mode 100644
index 0000000000..a4c38199a7
--- /dev/null
+++ b/src/resources/workers/routes.ts
@@ -0,0 +1,211 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import * as Shared from '../shared';
+import { SinglePage } from '../../pagination';
+
+export class Routes extends APIResource {
+  /**
+   * Creates a route that maps a URL pattern to a Worker.
+   */
+  create(params: RouteCreateParams, options?: Core.RequestOptions): Core.APIPromise<RouteCreateResponse> {
+    const { zone_id, ...body } = params;
+    return this._client.post(`/zones/${zone_id}/workers/routes`, { body, ...options });
+  }
+
+  /**
+   * Updates the URL pattern or Worker associated with a route.
+   */
+  update(
+    routeId: string,
+    params: RouteUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RouteUpdateResponse> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.put(`/zones/${zone_id}/workers/routes/${routeId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: RouteUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Returns routes for a zone.
+   */
+  list(
+    params: RouteListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<RouteListResponsesSinglePage, RouteListResponse> {
+    const { zone_id } = params;
+    return this._client.getAPIList(`/zones/${zone_id}/workers/routes`, RouteListResponsesSinglePage, options);
+  }
+
+  /**
+   * Deletes a route.
+   */
+  delete(
+    routeId: string,
+    params: RouteDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RouteDeleteResponse> {
+    const { zone_id } = params;
+    return this._client.delete(`/zones/${zone_id}/workers/routes/${routeId}`, options);
+  }
+
+  /**
+   * Returns information about a route, including URL pattern and Worker.
+   */
+  get(
+    routeId: string,
+    params: RouteGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RouteGetResponse> {
+    const { zone_id } = params;
+    return (
+      this._client.get(`/zones/${zone_id}/workers/routes/${routeId}`, options) as Core.APIPromise<{
+        result: RouteGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class RouteListResponsesSinglePage extends SinglePage<RouteListResponse> {}
+
+export interface RouteCreateResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+}
+
+export interface RouteUpdateResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  pattern: string;
+
+  /**
+   * Name of the script, used in URLs and route configuration.
+   */
+  script: string;
+}
+
+export interface RouteListResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  pattern: string;
+
+  /**
+   * Name of the script, used in URLs and route configuration.
+   */
+  script: string;
+}
+
+export interface RouteDeleteResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
+
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+}
+
+export interface RouteGetResponse {
+  /**
+   * Identifier
+   */
+  id: string;
+
+  pattern: string;
+
+  /**
+   * Name of the script, used in URLs and route configuration.
+   */
+  script: string;
+}
+
+export interface RouteCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  pattern: string;
+
+  /**
+   * Body param: Name of the script, used in URLs and route configuration.
+   */
+  script?: string;
+}
+
+export interface RouteUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param:
+   */
+  pattern: string;
+
+  /**
+   * Body param: Name of the script, used in URLs and route configuration.
+   */
+  script?: string;
+}
+
+export interface RouteListParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface RouteDeleteParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface RouteGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+Routes.RouteListResponsesSinglePage = RouteListResponsesSinglePage;
+
+export declare namespace Routes {
+  export {
+    type RouteCreateResponse as RouteCreateResponse,
+    type RouteUpdateResponse as RouteUpdateResponse,
+    type RouteListResponse as RouteListResponse,
+    type RouteDeleteResponse as RouteDeleteResponse,
+    type RouteGetResponse as RouteGetResponse,
+    RouteListResponsesSinglePage as RouteListResponsesSinglePage,
+    type RouteCreateParams as RouteCreateParams,
+    type RouteUpdateParams as RouteUpdateParams,
+    type RouteListParams as RouteListParams,
+    type RouteDeleteParams as RouteDeleteParams,
+    type RouteGetParams as RouteGetParams,
+  };
+}
diff --git a/src/resources/workers/scripts/assets/assets.ts b/src/resources/workers/scripts/assets/assets.ts
new file mode 100644
index 0000000000..80e6c64e1d
--- /dev/null
+++ b/src/resources/workers/scripts/assets/assets.ts
@@ -0,0 +1,19 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as UploadAPI from './upload';
+import { Upload, UploadCreateParams, UploadCreateResponse } from './upload';
+
+export class Assets extends APIResource {
+  upload: UploadAPI.Upload = new UploadAPI.Upload(this._client);
+}
+
+Assets.Upload = Upload;
+
+export declare namespace Assets {
+  export {
+    Upload as Upload,
+    type UploadCreateResponse as UploadCreateResponse,
+    type UploadCreateParams as UploadCreateParams,
+  };
+}
diff --git a/src/resources/workers/scripts/assets/index.ts b/src/resources/workers/scripts/assets/index.ts
new file mode 100644
index 0000000000..775d4518a7
--- /dev/null
+++ b/src/resources/workers/scripts/assets/index.ts
@@ -0,0 +1,4 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Assets } from './assets';
+export { Upload, type UploadCreateResponse, type UploadCreateParams } from './upload';
diff --git a/src/resources/workers/scripts/assets/upload.ts b/src/resources/workers/scripts/assets/upload.ts
new file mode 100644
index 0000000000..451af71c28
--- /dev/null
+++ b/src/resources/workers/scripts/assets/upload.ts
@@ -0,0 +1,68 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+
+export class Upload extends APIResource {
+  /**
+   * Start uploading a collection of assets for use in a Worker version. To learn
+   * more about the direct uploads of assets, see
+   * https://developers.cloudflare.com/workers/static-assets/direct-upload/
+   */
+  create(
+    scriptName: string,
+    params: UploadCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<UploadCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/workers/scripts/${scriptName}/assets-upload-session`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: UploadCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface UploadCreateResponse {
+  /**
+   * The requests to make to upload assets.
+   */
+  buckets?: Array<Array<string>>;
+
+  /**
+   * A JWT to use as authentication for uploading assets.
+   */
+  jwt?: string;
+}
+
+export interface UploadCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: A manifest ([path]: {hash, size}) map of files to upload. As an
+   * example, `/blog/hello-world.html` would be a valid path key.
+   */
+  manifest?: Record<string, UploadCreateParams.Manifest>;
+}
+
+export namespace UploadCreateParams {
+  export interface Manifest {
+    /**
+     * The hash of the file.
+     */
+    hash?: string;
+
+    /**
+     * The size of the file in bytes.
+     */
+    size?: number;
+  }
+}
+
+export declare namespace Upload {
+  export { type UploadCreateResponse as UploadCreateResponse, type UploadCreateParams as UploadCreateParams };
+}
diff --git a/src/resources/workers/scripts/content.ts b/src/resources/workers/scripts/content.ts
index 0c5c4322f7..7830d9b8ed 100644
--- a/src/resources/workers/scripts/content.ts
+++ b/src/resources/workers/scripts/content.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ContentAPI from './content';
 import * as WorkersAPI from '../workers';
 import * as ScriptsAPI from './scripts';
 import { type Response } from '../../../_shims/index';
@@ -51,6 +50,7 @@ export class Content extends APIResource {
     const { account_id } = params;
     return this._client.get(`/accounts/${account_id}/workers/scripts/${scriptName}/content/v2`, {
       ...options,
+      headers: { Accept: 'string', ...options?.headers },
       __binaryResponse: true,
     });
   }
@@ -62,22 +62,11 @@ export interface ContentUpdateParams {
    */
   account_id: string;
 
-  /**
-   * Body param: A module comprising a Worker script, often a javascript file.
-   * Multiple modules may be provided as separate named parts, but at least one
-   * module must be present. This should be referenced either in the metadata as
-   * `main_module` (esm)/`body_part` (service worker) or as a header
-   * `CF-WORKER-MAIN-MODULE-PART` (esm) /`CF-WORKER-BODY-PART` (service worker) by
-   * part name. Source maps may also be included using the `application/source-map`
-   * content type.
-   */
-  '<any part name>'?: Array<Core.Uploadable>;
-
   /**
    * Body param: JSON encoded metadata about the uploaded parts and Worker
    * configuration.
    */
-  metadata?: WorkersAPI.WorkerMetadataParam;
+  metadata: WorkersAPI.WorkerMetadataParam;
 
   /**
    * Header param: The multipart name of a script upload part containing script
@@ -99,7 +88,6 @@ export interface ContentGetParams {
   account_id: string;
 }
 
-export namespace Content {
-  export import ContentUpdateParams = ContentAPI.ContentUpdateParams;
-  export import ContentGetParams = ContentAPI.ContentGetParams;
+export declare namespace Content {
+  export { type ContentUpdateParams as ContentUpdateParams, type ContentGetParams as ContentGetParams };
 }
diff --git a/src/resources/workers/scripts/deployments.ts b/src/resources/workers/scripts/deployments.ts
index 9ab2cdb48d..e37e32f3bb 100644
--- a/src/resources/workers/scripts/deployments.ts
+++ b/src/resources/workers/scripts/deployments.ts
@@ -16,9 +16,10 @@ export class Deployments extends APIResource {
     params: DeploymentCreateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<DeploymentCreateResponse> {
-    const { account_id, ...body } = params;
+    const { account_id, force, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/workers/scripts/${scriptName}/deployments`, {
+        query: { force },
         body,
         ...options,
       }) as Core.APIPromise<{ result: DeploymentCreateResponse }>
@@ -46,19 +47,23 @@ export class Deployments extends APIResource {
 
 export interface Deployment {
   /**
-   * Human-readable message about the deployment.
+   * Human-readable message about the deployment. Truncated to 100 bytes.
    */
   'workers/message'?: string;
 }
 
 export interface DeploymentParam {
   /**
-   * Human-readable message about the deployment.
+   * Human-readable message about the deployment. Truncated to 100 bytes.
    */
   'workers/message'?: string;
 }
 
 export interface DeploymentCreateResponse {
+  strategy: 'percentage';
+
+  versions: Array<DeploymentCreateResponse.Version>;
+
   id?: string;
 
   annotations?: Deployment;
@@ -68,8 +73,14 @@ export interface DeploymentCreateResponse {
   created_on?: string;
 
   source?: string;
+}
 
-  strategy?: string;
+export namespace DeploymentCreateResponse {
+  export interface Version {
+    percentage: number;
+
+    version_id: string;
+  }
 }
 
 export interface DeploymentGetResponse {
@@ -78,6 +89,10 @@ export interface DeploymentGetResponse {
 
 export namespace DeploymentGetResponse {
   export interface Deployment {
+    strategy: 'percentage';
+
+    versions: Array<Deployment.Version>;
+
     id?: string;
 
     annotations?: DeploymentsAPI.Deployment;
@@ -87,8 +102,14 @@ export namespace DeploymentGetResponse {
     created_on?: string;
 
     source?: string;
+  }
+
+  export namespace Deployment {
+    export interface Version {
+      percentage: number;
 
-    strategy?: string;
+      version_id: string;
+    }
   }
 }
 
@@ -101,12 +122,32 @@ export interface DeploymentCreateParams {
   /**
    * Body param:
    */
-  annotations?: DeploymentParam;
+  strategy: 'percentage';
+
+  /**
+   * Body param:
+   */
+  versions: Array<DeploymentCreateParams.Version>;
+
+  /**
+   * Query param: If set to true, the deployment will be created even if normally
+   * blocked by something such rolling back to an older version when a secret has
+   * changed.
+   */
+  force?: boolean;
 
   /**
    * Body param:
    */
-  strategy?: string;
+  annotations?: DeploymentParam;
+}
+
+export namespace DeploymentCreateParams {
+  export interface Version {
+    percentage: number;
+
+    version_id: string;
+  }
 }
 
 export interface DeploymentGetParams {
@@ -116,10 +157,12 @@ export interface DeploymentGetParams {
   account_id: string;
 }
 
-export namespace Deployments {
-  export import Deployment = DeploymentsAPI.Deployment;
-  export import DeploymentCreateResponse = DeploymentsAPI.DeploymentCreateResponse;
-  export import DeploymentGetResponse = DeploymentsAPI.DeploymentGetResponse;
-  export import DeploymentCreateParams = DeploymentsAPI.DeploymentCreateParams;
-  export import DeploymentGetParams = DeploymentsAPI.DeploymentGetParams;
+export declare namespace Deployments {
+  export {
+    type Deployment as Deployment,
+    type DeploymentCreateResponse as DeploymentCreateResponse,
+    type DeploymentGetResponse as DeploymentGetResponse,
+    type DeploymentCreateParams as DeploymentCreateParams,
+    type DeploymentGetParams as DeploymentGetParams,
+  };
 }
diff --git a/src/resources/workers/scripts/index.ts b/src/resources/workers/scripts/index.ts
index 6e2054fdd0..f49940c0da 100644
--- a/src/resources/workers/scripts/index.ts
+++ b/src/resources/workers/scripts/index.ts
@@ -1,50 +1,60 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export { Assets } from './assets/index';
+export { Content, type ContentUpdateParams, type ContentGetParams } from './content';
 export {
-  ConsumerScript,
-  TailCreateResponse,
-  TailDeleteResponse,
-  TailGetResponse,
-  TailCreateParams,
-  TailDeleteParams,
-  TailGetParams,
-  Tail,
-} from './tail';
-export { ContentUpdateParams, ContentGetParams, Content } from './content';
-export {
-  Deployment,
-  DeploymentCreateResponse,
-  DeploymentGetResponse,
-  DeploymentCreateParams,
-  DeploymentGetParams,
   Deployments,
+  type Deployment,
+  type DeploymentCreateResponse,
+  type DeploymentGetResponse,
+  type DeploymentCreateParams,
+  type DeploymentGetParams,
 } from './deployments';
 export {
-  Schedule,
-  ScheduleUpdateResponse,
-  ScheduleGetResponse,
-  ScheduleUpdateParams,
-  ScheduleGetParams,
   Schedules,
+  type Schedule,
+  type ScheduleUpdateResponse,
+  type ScheduleGetResponse,
+  type ScheduleUpdateParams,
+  type ScheduleGetParams,
 } from './schedules';
 export {
-  Script,
-  ScriptSetting,
-  ScriptUpdateParams,
-  ScriptListParams,
-  ScriptDeleteParams,
-  ScriptGetParams,
   ScriptsSinglePage,
   Scripts,
+  type Script,
+  type ScriptSetting,
+  type ScriptUpdateResponse,
+  type ScriptGetResponse,
+  type ScriptUpdateParams,
+  type ScriptListParams,
+  type ScriptDeleteParams,
+  type ScriptGetParams,
 } from './scripts';
-export { SettingEditParams, SettingGetParams, Settings } from './settings';
+export { Settings, type SettingEditParams, type SettingGetParams } from './settings';
+export {
+  Subdomain,
+  type SubdomainCreateResponse,
+  type SubdomainGetResponse,
+  type SubdomainCreateParams,
+  type SubdomainGetParams,
+} from './subdomain';
+export {
+  Tail,
+  type ConsumerScript,
+  type TailCreateResponse,
+  type TailDeleteResponse,
+  type TailGetResponse,
+  type TailCreateParams,
+  type TailDeleteParams,
+  type TailGetParams,
+} from './tail';
 export {
-  VersionCreateResponse,
-  VersionListResponse,
-  VersionGetResponse,
-  VersionCreateParams,
-  VersionListParams,
-  VersionGetParams,
   VersionListResponsesV4PagePagination,
   Versions,
+  type VersionCreateResponse,
+  type VersionListResponse,
+  type VersionGetResponse,
+  type VersionCreateParams,
+  type VersionListParams,
+  type VersionGetParams,
 } from './versions';
diff --git a/src/resources/workers/scripts/schedules.ts b/src/resources/workers/scripts/schedules.ts
index 994ed7ad80..35c22d76ae 100644
--- a/src/resources/workers/scripts/schedules.ts
+++ b/src/resources/workers/scripts/schedules.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as SchedulesAPI from './schedules';
 
 export class Schedules extends APIResource {
   /**
@@ -41,11 +40,15 @@ export class Schedules extends APIResource {
 }
 
 export interface Schedule {
-  created_on?: unknown;
+  created_on?: string;
 
-  cron?: unknown;
+  cron?: string;
 
-  modified_on?: unknown;
+  modified_on?: string;
+}
+
+export interface ScheduleParam {
+  cron?: string;
 }
 
 export interface ScheduleUpdateResponse {
@@ -65,7 +68,7 @@ export interface ScheduleUpdateParams {
   /**
    * Body param:
    */
-  body: string;
+  body: Array<ScheduleParam>;
 }
 
 export interface ScheduleGetParams {
@@ -75,10 +78,12 @@ export interface ScheduleGetParams {
   account_id: string;
 }
 
-export namespace Schedules {
-  export import Schedule = SchedulesAPI.Schedule;
-  export import ScheduleUpdateResponse = SchedulesAPI.ScheduleUpdateResponse;
-  export import ScheduleGetResponse = SchedulesAPI.ScheduleGetResponse;
-  export import ScheduleUpdateParams = SchedulesAPI.ScheduleUpdateParams;
-  export import ScheduleGetParams = SchedulesAPI.ScheduleGetParams;
+export declare namespace Schedules {
+  export {
+    type Schedule as Schedule,
+    type ScheduleUpdateResponse as ScheduleUpdateResponse,
+    type ScheduleGetResponse as ScheduleGetResponse,
+    type ScheduleUpdateParams as ScheduleUpdateParams,
+    type ScheduleGetParams as ScheduleGetParams,
+  };
 }
diff --git a/src/resources/workers/scripts/scripts.ts b/src/resources/workers/scripts/scripts.ts
index 2042774fcc..1cde061b07 100644
--- a/src/resources/workers/scripts/scripts.ts
+++ b/src/resources/workers/scripts/scripts.ts
@@ -2,18 +2,66 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ScriptsAPI from './scripts';
 import * as WorkersAPI from '../workers';
 import * as ContentAPI from './content';
+import { Content, ContentGetParams, ContentUpdateParams } from './content';
 import * as DeploymentsAPI from './deployments';
+import {
+  Deployment,
+  DeploymentCreateParams,
+  DeploymentCreateResponse,
+  DeploymentGetParams,
+  DeploymentGetResponse,
+  Deployments,
+} from './deployments';
 import * as SchedulesAPI from './schedules';
+import {
+  Schedule,
+  ScheduleGetParams,
+  ScheduleGetResponse,
+  ScheduleUpdateParams,
+  ScheduleUpdateResponse,
+  Schedules,
+} from './schedules';
 import * as SettingsAPI from './settings';
+import { SettingEditParams, SettingGetParams, Settings } from './settings';
+import * as SubdomainAPI from './subdomain';
+import {
+  Subdomain,
+  SubdomainCreateParams,
+  SubdomainCreateResponse,
+  SubdomainGetParams,
+  SubdomainGetResponse,
+} from './subdomain';
 import * as TailAPI from './tail';
+import {
+  ConsumerScript,
+  Tail,
+  TailCreateParams,
+  TailCreateResponse,
+  TailDeleteParams,
+  TailDeleteResponse,
+  TailGetParams,
+  TailGetResponse,
+} from './tail';
 import * as VersionsAPI from './versions';
+import {
+  VersionCreateParams,
+  VersionCreateResponse,
+  VersionGetParams,
+  VersionGetResponse,
+  VersionListParams,
+  VersionListResponse,
+  VersionListResponsesV4PagePagination,
+  Versions,
+} from './versions';
+import * as AssetsAPI from './assets/assets';
+import { Assets as AssetsAPIAssets } from './assets/assets';
 import { SinglePage } from '../../../pagination';
-import { type Response } from '../../../_shims/index';
 
 export class Scripts extends APIResource {
+  assets: AssetsAPI.Assets = new AssetsAPI.Assets(this._client);
+  subdomain: SubdomainAPI.Subdomain = new SubdomainAPI.Subdomain(this._client);
   schedules: SchedulesAPI.Schedules = new SchedulesAPI.Schedules(this._client);
   tail: TailAPI.Tail = new TailAPI.Tail(this._client);
   content: ContentAPI.Content = new ContentAPI.Content(this._client);
@@ -22,24 +70,25 @@ export class Scripts extends APIResource {
   versions: VersionsAPI.Versions = new VersionsAPI.Versions(this._client);
 
   /**
-   * Upload a worker module.
+   * Upload a worker module. You can find more about the multipart metadata on our
+   * docs:
+   * https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/.
    */
   update(
     scriptName: string,
     params: ScriptUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<Script> {
-    const { account_id, rollback_to, ...body } = params;
+  ): Core.APIPromise<ScriptUpdateResponse> {
+    const { account_id, ...body } = params;
     return (
       this._client.put(
         `/accounts/${account_id}/workers/scripts/${scriptName}`,
         Core.maybeMultipartFormRequestOptions({
-          query: { rollback_to },
           body,
           ...options,
           headers: { 'Content-Type': 'application/javascript', ...options?.headers },
         }),
-      ) as Core.APIPromise<{ result: Script }>
+      ) as Core.APIPromise<{ result: ScriptUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -71,11 +120,11 @@ export class Scripts extends APIResource {
    * Fetch raw script content for your worker. Note this is the original script
    * content, not JSON encoded.
    */
-  get(scriptName: string, params: ScriptGetParams, options?: Core.RequestOptions): Core.APIPromise<Response> {
+  get(scriptName: string, params: ScriptGetParams, options?: Core.RequestOptions): Core.APIPromise<string> {
     const { account_id } = params;
     return this._client.get(`/accounts/${account_id}/workers/scripts/${scriptName}`, {
       ...options,
-      __binaryResponse: true,
+      headers: { Accept: 'application/javascript', ...options?.headers },
     });
   }
 }
@@ -98,6 +147,16 @@ export interface Script {
    */
   etag?: string;
 
+  /**
+   * Whether a Worker contains assets.
+   */
+  has_assets?: boolean;
+
+  /**
+   * Whether a Worker contains modules.
+   */
+  has_modules?: boolean;
+
   /**
    * Whether Logpush is turned on for the Worker.
    */
@@ -109,9 +168,22 @@ export interface Script {
   modified_on?: string;
 
   /**
-   * Specifies the placement mode for the Worker (e.g. 'smart').
+   * Configuration for
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  placement?: Script.Placement;
+
+  /**
+   * @deprecated: Enables
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  placement_mode?: 'smart';
+
+  /**
+   * @deprecated: Status of
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
    */
-  placement_mode?: string;
+  placement_status?: 'SUCCESS' | 'UNSUPPORTED_APPLICATION' | 'INSUFFICIENT_INVOCATIONS';
 
   /**
    * List of Workers that will consume logs from the attached Worker.
@@ -119,9 +191,29 @@ export interface Script {
   tail_consumers?: Array<TailAPI.ConsumerScript>;
 
   /**
-   * Specifies the usage model for the Worker (e.g. 'bundled' or 'unbound').
+   * Usage model for the Worker invocations.
+   */
+  usage_model?: 'standard';
+}
+
+export namespace Script {
+  /**
+   * Configuration for
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
    */
-  usage_model?: string;
+  export interface Placement {
+    /**
+     * Enables
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+     */
+    mode?: 'smart';
+
+    /**
+     * Status of
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+     */
+    status?: 'SUCCESS' | 'UNSUPPORTED_APPLICATION' | 'INSUFFICIENT_INVOCATIONS';
+  }
 }
 
 export interface ScriptSetting {
@@ -130,137 +222,712 @@ export interface ScriptSetting {
    */
   logpush?: boolean;
 
+  /**
+   * Observability settings for the Worker.
+   */
+  observability?: ScriptSetting.Observability;
+
+  /**
+   * List of Workers that will consume logs from the attached Worker.
+   */
+  tail_consumers?: Array<TailAPI.ConsumerScript>;
+}
+
+export namespace ScriptSetting {
+  /**
+   * Observability settings for the Worker.
+   */
+  export interface Observability {
+    /**
+     * Whether observability is enabled for the Worker.
+     */
+    enabled: boolean;
+
+    /**
+     * The sampling rate for incoming requests. From 0 to 1 (1 = 100%, 0.1 = 10%).
+     * Default is 1.
+     */
+    head_sampling_rate?: number | null;
+  }
+}
+
+export interface ScriptUpdateResponse {
+  /**
+   * The id of the script in the Workers system. Usually the script name.
+   */
+  id?: string;
+
+  /**
+   * When the script was created.
+   */
+  created_on?: string;
+
+  /**
+   * Hashed script content, can be used in a If-None-Match header when updating.
+   */
+  etag?: string;
+
+  /**
+   * Whether a Worker contains assets.
+   */
+  has_assets?: boolean;
+
+  /**
+   * Whether a Worker contains modules.
+   */
+  has_modules?: boolean;
+
+  /**
+   * Whether Logpush is turned on for the Worker.
+   */
+  logpush?: boolean;
+
+  /**
+   * When the script was last modified.
+   */
+  modified_on?: string;
+
+  /**
+   * Configuration for
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  placement?: ScriptUpdateResponse.Placement;
+
+  /**
+   * @deprecated: Enables
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  placement_mode?: 'smart';
+
+  /**
+   * @deprecated: Status of
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  placement_status?: 'SUCCESS' | 'UNSUPPORTED_APPLICATION' | 'INSUFFICIENT_INVOCATIONS';
+
+  startup_time_ms?: number;
+
   /**
    * List of Workers that will consume logs from the attached Worker.
    */
   tail_consumers?: Array<TailAPI.ConsumerScript>;
+
+  /**
+   * Usage model for the Worker invocations.
+   */
+  usage_model?: 'standard';
+}
+
+export namespace ScriptUpdateResponse {
+  /**
+   * Configuration for
+   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+   */
+  export interface Placement {
+    /**
+     * Enables
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+     */
+    mode?: 'smart';
+
+    /**
+     * Status of
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+     */
+    status?: 'SUCCESS' | 'UNSUPPORTED_APPLICATION' | 'INSUFFICIENT_INVOCATIONS';
+  }
 }
 
-export type ScriptUpdateParams = ScriptUpdateParams.Variant0 | ScriptUpdateParams.Variant1;
+export type ScriptGetResponse = string;
+
+export interface ScriptUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: JSON encoded metadata about the uploaded parts and Worker
+   * configuration.
+   */
+  metadata: ScriptUpdateParams.Metadata;
+}
 
 export namespace ScriptUpdateParams {
-  export interface Variant0 {
+  /**
+   * JSON encoded metadata about the uploaded parts and Worker configuration.
+   */
+  export interface Metadata {
+    /**
+     * Configuration for assets within a Worker
+     */
+    assets?: Metadata.Assets;
+
+    /**
+     * List of bindings attached to a Worker. You can find more about bindings on our
+     * docs:
+     * https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
+     */
+    bindings?: Array<
+      | Metadata.WorkersBindingKindAny
+      | Metadata.WorkersBindingKindAI
+      | Metadata.WorkersBindingKindAnalyticsEngine
+      | Metadata.WorkersBindingKindAssets
+      | Metadata.WorkersBindingKindBrowserRendering
+      | Metadata.WorkersBindingKindD1
+      | Metadata.WorkersBindingKindDispatchNamespace
+      | Metadata.WorkersBindingKindDo
+      | Metadata.WorkersBindingKindHyperdrive
+      | Metadata.WorkersBindingKindJson
+      | Metadata.WorkersBindingKindKVNamespace
+      | Metadata.WorkersBindingKindMTLSCERT
+      | Metadata.WorkersBindingKindPlainText
+      | Metadata.WorkersBindingKindQueue
+      | Metadata.WorkersBindingKindR2
+      | Metadata.WorkersBindingKindSecret
+      | Metadata.WorkersBindingKindService
+      | Metadata.WorkersBindingKindTailConsumer
+      | Metadata.WorkersBindingKindVectorize
+      | Metadata.WorkersBindingKindVersionMetadata
+    >;
+
+    /**
+     * Name of the part in the multipart request that contains the script (e.g. the
+     * file adding a listener to the `fetch` event). Indicates a
+     * `service worker syntax` Worker.
+     */
+    body_part?: string;
+
+    /**
+     * Date indicating targeted support in the Workers runtime. Backwards incompatible
+     * fixes to the runtime following this date will not affect this Worker.
+     */
+    compatibility_date?: string;
+
+    /**
+     * Flags that enable or disable certain features in the Workers runtime. Used to
+     * enable upcoming features or opt in or out of specific changes not included in a
+     * `compatibility_date`.
+     */
+    compatibility_flags?: Array<string>;
+
+    /**
+     * Retain assets which exist for a previously uploaded Worker version; used in lieu
+     * of providing a completion token.
+     */
+    keep_assets?: boolean;
+
+    /**
+     * List of binding types to keep from previous_upload.
+     */
+    keep_bindings?: Array<string>;
+
+    /**
+     * Whether Logpush is turned on for the Worker.
+     */
+    logpush?: boolean;
+
+    /**
+     * Name of the part in the multipart request that contains the main module (e.g.
+     * the file exporting a `fetch` handler). Indicates a `module syntax` Worker.
+     */
+    main_module?: string;
+
+    /**
+     * Migrations to apply for Durable Objects associated with this Worker.
+     */
+    migrations?: WorkersAPI.SingleStepMigrationParam | Metadata.WorkersMultipleStepMigrations;
+
     /**
-     * Path param: Identifier
+     * Observability settings for the Worker.
      */
-    account_id: string;
+    observability?: Metadata.Observability;
 
     /**
-     * Query param: Rollback to provided deployment based on deployment ID. Request
-     * body will only parse a "message" part. You can learn more about deployments
-     * [here](https://developers.cloudflare.com/workers/platform/deployments/).
+     * Configuration for
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
      */
-    rollback_to?: string;
+    placement?: Metadata.Placement;
 
     /**
-     * Body param: A module comprising a Worker script, often a javascript file.
-     * Multiple modules may be provided as separate named parts, but at least one
-     * module must be present and referenced in the metadata as `main_module` or
-     * `body_part` by part name. Source maps may also be included using the
-     * `application/source-map` content type.
+     * List of strings to use as tags for this Worker.
      */
-    '<any part name>'?: Array<Core.Uploadable>;
+    tags?: Array<string>;
 
     /**
-     * Body param: JSON encoded metadata about the uploaded parts and Worker
-     * configuration.
+     * List of Workers that will consume logs from the attached Worker.
      */
-    metadata?: ScriptUpdateParams.Variant0.Metadata;
+    tail_consumers?: Array<TailAPI.ConsumerScriptParam>;
+
+    /**
+     * Usage model for the Worker invocations.
+     */
+    usage_model?: 'standard';
   }
 
-  export namespace Variant0 {
+  export namespace Metadata {
     /**
-     * JSON encoded metadata about the uploaded parts and Worker configuration.
+     * Configuration for assets within a Worker
      */
-    export interface Metadata {
+    export interface Assets {
       /**
-       * List of bindings available to the worker.
+       * Configuration for assets within a Worker.
        */
-      bindings?: Array<unknown>;
+      config?: Assets.Config;
+
+      /**
+       * Token provided upon successful upload of all files from a registered manifest.
+       */
+      jwt?: string;
+    }
 
+    export namespace Assets {
       /**
-       * Name of the part in the multipart request that contains the script (e.g. the
-       * file adding a listener to the `fetch` event). Indicates a
-       * `service worker syntax` Worker.
+       * Configuration for assets within a Worker.
        */
-      body_part?: string;
+      export interface Config {
+        /**
+         * Determines the redirects and rewrites of requests for HTML content.
+         */
+        html_handling?: 'auto-trailing-slash' | 'force-trailing-slash' | 'drop-trailing-slash' | 'none';
 
+        /**
+         * Determines the response when a request does not match a static asset, and there
+         * is no Worker script.
+         */
+        not_found_handling?: 'none' | '404-page' | 'single-page-application';
+
+        /**
+         * When true and the incoming request matches an asset, that will be served instead
+         * of invoking the Worker script. When false, requests will always invoke the
+         * Worker script.
+         */
+        serve_directly?: boolean;
+      }
+    }
+
+    export interface WorkersBindingKindAny {
       /**
-       * Date indicating targeted support in the Workers runtime. Backwards incompatible
-       * fixes to the runtime following this date will not affect this Worker.
+       * A JavaScript variable name for the binding.
        */
-      compatibility_date?: string;
+      name: string;
 
       /**
-       * Flags that enable or disable certain features in the Workers runtime. Used to
-       * enable upcoming features or opt in or out of specific changes not included in a
-       * `compatibility_date`.
+       * The kind of resource that the binding provides.
        */
-      compatibility_flags?: Array<string>;
+      type: string;
+      [k: string]: unknown;
+    }
 
+    export interface WorkersBindingKindAI {
       /**
-       * List of binding types to keep from previous_upload.
+       * A JavaScript variable name for the binding.
        */
-      keep_bindings?: Array<string>;
+      name: string;
 
       /**
-       * Whether Logpush is turned on for the Worker.
+       * The kind of resource that the binding provides.
        */
-      logpush?: boolean;
+      type: 'ai';
+    }
 
+    export interface WorkersBindingKindAnalyticsEngine {
       /**
-       * Name of the part in the multipart request that contains the main module (e.g.
-       * the file exporting a `fetch` handler). Indicates a `module syntax` Worker.
+       * The dataset name to bind to.
        */
-      main_module?: string;
+      dataset: string;
 
       /**
-       * Migrations to apply for Durable Objects associated with this Worker.
+       * A JavaScript variable name for the binding.
        */
-      migrations?: WorkersAPI.SingleStepMigrationParam | WorkersAPI.SteppedMigrationParam;
+      name: string;
 
-      placement?: WorkersAPI.PlacementConfigurationParam;
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'analytics_engine';
+    }
 
+    export interface WorkersBindingKindAssets {
       /**
-       * List of strings to use as tags for this Worker
+       * A JavaScript variable name for the binding.
        */
-      tags?: Array<string>;
+      name: string;
 
       /**
-       * List of Workers that will consume logs from the attached Worker.
+       * The kind of resource that the binding provides.
        */
-      tail_consumers?: Array<TailAPI.ConsumerScriptParam>;
+      type: 'assets';
+    }
 
+    export interface WorkersBindingKindBrowserRendering {
       /**
-       * Usage model to apply to invocations.
+       * A JavaScript variable name for the binding.
        */
-      usage_model?: 'bundled' | 'unbound';
+      name: string;
 
       /**
-       * Key-value pairs to use as tags for this version of this Worker
+       * The kind of resource that the binding provides.
        */
-      version_tags?: unknown;
+      type: 'browser_rendering';
     }
-  }
 
-  export interface Variant1 {
-    /**
-     * Path param: Identifier
-     */
-    account_id: string;
+    export interface WorkersBindingKindD1 {
+      /**
+       * Identifier of the D1 database to bind to.
+       */
+      id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'd1';
+    }
+
+    export interface WorkersBindingKindDispatchNamespace {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Namespace to bind to.
+       */
+      namespace: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'dispatch_namespace';
+
+      /**
+       * Outbound worker.
+       */
+      outbound?: WorkersBindingKindDispatchNamespace.Outbound;
+    }
+
+    export namespace WorkersBindingKindDispatchNamespace {
+      /**
+       * Outbound worker.
+       */
+      export interface Outbound {
+        /**
+         * Pass information from the Dispatch Worker to the Outbound Worker through the
+         * parameters.
+         */
+        params?: Array<string>;
+
+        /**
+         * Outbound worker.
+         */
+        worker?: Outbound.Worker;
+      }
+
+      export namespace Outbound {
+        /**
+         * Outbound worker.
+         */
+        export interface Worker {
+          /**
+           * Environment of the outbound worker.
+           */
+          environment?: string;
+
+          /**
+           * Name of the outbound worker.
+           */
+          service?: string;
+        }
+      }
+    }
+
+    export interface WorkersBindingKindDo {
+      /**
+       * The exported class name of the Durable Object.
+       */
+      class_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'durable_object_namespace';
+
+      /**
+       * The environment of the script_name to bind to.
+       */
+      environment?: string;
+
+      /**
+       * Namespace identifier tag.
+       */
+      namespace_id?: string;
+
+      /**
+       * The script where the Durable Object is defined, if it is external to this
+       * Worker.
+       */
+      script_name?: string;
+    }
+
+    export interface WorkersBindingKindHyperdrive {
+      /**
+       * Identifier of the Hyperdrive connection to bind to.
+       */
+      id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'hyperdrive';
+    }
+
+    export interface WorkersBindingKindJson {
+      /**
+       * JSON data to use.
+       */
+      json: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'json';
+    }
+
+    export interface WorkersBindingKindKVNamespace {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Namespace identifier tag.
+       */
+      namespace_id: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'kv_namespace';
+    }
+
+    export interface WorkersBindingKindMTLSCERT {
+      /**
+       * Identifier of the certificate to bind to.
+       */
+      certificate_id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'mtls_certificate';
+    }
+
+    export interface WorkersBindingKindPlainText {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The text value to use.
+       */
+      text: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'plain_text';
+    }
+
+    export interface WorkersBindingKindQueue {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of the Queue to bind to.
+       */
+      queue_name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'queue';
+    }
+
+    export interface WorkersBindingKindR2 {
+      /**
+       * R2 bucket to bind to.
+       */
+      bucket_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'r2_bucket';
+    }
+
+    export interface WorkersBindingKindSecret {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The secret value to use.
+       */
+      text: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'secret_text';
+    }
+
+    export interface WorkersBindingKindService {
+      /**
+       * Optional environment if the Worker utilizes one.
+       */
+      environment: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of Worker to bind to.
+       */
+      service: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'service';
+    }
+
+    export interface WorkersBindingKindTailConsumer {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of Tail Worker to bind to.
+       */
+      service: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'tail_consumer';
+    }
+
+    export interface WorkersBindingKindVectorize {
+      /**
+       * Name of the Vectorize index to bind to.
+       */
+      index_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'vectorize';
+    }
+
+    export interface WorkersBindingKindVersionMetadata {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'version_metadata';
+    }
+
+    export interface WorkersMultipleStepMigrations {
+      /**
+       * Tag to set as the latest migration tag.
+       */
+      new_tag?: string;
+
+      /**
+       * Tag used to verify against the latest migration tag for this Worker. If they
+       * don't match, the upload is rejected.
+       */
+      old_tag?: string;
+
+      /**
+       * Migrations to apply in order.
+       */
+      steps?: Array<WorkersAPI.MigrationStepParam>;
+    }
 
     /**
-     * Query param: Rollback to provided deployment based on deployment ID. Request
-     * body will only parse a "message" part. You can learn more about deployments
-     * [here](https://developers.cloudflare.com/workers/platform/deployments/).
+     * Observability settings for the Worker.
      */
-    rollback_to?: string;
+    export interface Observability {
+      /**
+       * Whether observability is enabled for the Worker.
+       */
+      enabled: boolean;
+
+      /**
+       * The sampling rate for incoming requests. From 0 to 1 (1 = 100%, 0.1 = 10%).
+       * Default is 1.
+       */
+      head_sampling_rate?: number | null;
+    }
 
     /**
-     * Body param: Rollback message to be associated with this deployment. Only parsed
-     * when query param `"rollback_to"` is present.
+     * Configuration for
+     * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
      */
-    message?: string;
+    export interface Placement {
+      /**
+       * Enables
+       * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
+       */
+      mode?: 'smart';
+    }
   }
 }
 
@@ -292,46 +959,89 @@ export interface ScriptGetParams {
   account_id: string;
 }
 
-export namespace Scripts {
-  export import Script = ScriptsAPI.Script;
-  export import ScriptSetting = ScriptsAPI.ScriptSetting;
-  export import ScriptsSinglePage = ScriptsAPI.ScriptsSinglePage;
-  export import ScriptUpdateParams = ScriptsAPI.ScriptUpdateParams;
-  export import ScriptListParams = ScriptsAPI.ScriptListParams;
-  export import ScriptDeleteParams = ScriptsAPI.ScriptDeleteParams;
-  export import ScriptGetParams = ScriptsAPI.ScriptGetParams;
-  export import Schedules = SchedulesAPI.Schedules;
-  export import Schedule = SchedulesAPI.Schedule;
-  export import ScheduleUpdateResponse = SchedulesAPI.ScheduleUpdateResponse;
-  export import ScheduleGetResponse = SchedulesAPI.ScheduleGetResponse;
-  export import ScheduleUpdateParams = SchedulesAPI.ScheduleUpdateParams;
-  export import ScheduleGetParams = SchedulesAPI.ScheduleGetParams;
-  export import Tail = TailAPI.Tail;
-  export import ConsumerScript = TailAPI.ConsumerScript;
-  export import TailCreateResponse = TailAPI.TailCreateResponse;
-  export import TailDeleteResponse = TailAPI.TailDeleteResponse;
-  export import TailGetResponse = TailAPI.TailGetResponse;
-  export import TailCreateParams = TailAPI.TailCreateParams;
-  export import TailDeleteParams = TailAPI.TailDeleteParams;
-  export import TailGetParams = TailAPI.TailGetParams;
-  export import Content = ContentAPI.Content;
-  export import ContentUpdateParams = ContentAPI.ContentUpdateParams;
-  export import ContentGetParams = ContentAPI.ContentGetParams;
-  export import Settings = SettingsAPI.Settings;
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
-  export import Deployments = DeploymentsAPI.Deployments;
-  export import Deployment = DeploymentsAPI.Deployment;
-  export import DeploymentCreateResponse = DeploymentsAPI.DeploymentCreateResponse;
-  export import DeploymentGetResponse = DeploymentsAPI.DeploymentGetResponse;
-  export import DeploymentCreateParams = DeploymentsAPI.DeploymentCreateParams;
-  export import DeploymentGetParams = DeploymentsAPI.DeploymentGetParams;
-  export import Versions = VersionsAPI.Versions;
-  export import VersionCreateResponse = VersionsAPI.VersionCreateResponse;
-  export import VersionListResponse = VersionsAPI.VersionListResponse;
-  export import VersionGetResponse = VersionsAPI.VersionGetResponse;
-  export import VersionListResponsesV4PagePagination = VersionsAPI.VersionListResponsesV4PagePagination;
-  export import VersionCreateParams = VersionsAPI.VersionCreateParams;
-  export import VersionListParams = VersionsAPI.VersionListParams;
-  export import VersionGetParams = VersionsAPI.VersionGetParams;
+Scripts.ScriptsSinglePage = ScriptsSinglePage;
+Scripts.Assets = AssetsAPIAssets;
+Scripts.Subdomain = Subdomain;
+Scripts.Schedules = Schedules;
+Scripts.Tail = Tail;
+Scripts.Content = Content;
+Scripts.Settings = Settings;
+Scripts.Deployments = Deployments;
+Scripts.Versions = Versions;
+Scripts.VersionListResponsesV4PagePagination = VersionListResponsesV4PagePagination;
+
+export declare namespace Scripts {
+  export {
+    type Script as Script,
+    type ScriptSetting as ScriptSetting,
+    type ScriptUpdateResponse as ScriptUpdateResponse,
+    type ScriptGetResponse as ScriptGetResponse,
+    ScriptsSinglePage as ScriptsSinglePage,
+    type ScriptUpdateParams as ScriptUpdateParams,
+    type ScriptListParams as ScriptListParams,
+    type ScriptDeleteParams as ScriptDeleteParams,
+    type ScriptGetParams as ScriptGetParams,
+  };
+
+  export { AssetsAPIAssets as Assets };
+
+  export {
+    Subdomain as Subdomain,
+    type SubdomainCreateResponse as SubdomainCreateResponse,
+    type SubdomainGetResponse as SubdomainGetResponse,
+    type SubdomainCreateParams as SubdomainCreateParams,
+    type SubdomainGetParams as SubdomainGetParams,
+  };
+
+  export {
+    Schedules as Schedules,
+    type Schedule as Schedule,
+    type ScheduleUpdateResponse as ScheduleUpdateResponse,
+    type ScheduleGetResponse as ScheduleGetResponse,
+    type ScheduleUpdateParams as ScheduleUpdateParams,
+    type ScheduleGetParams as ScheduleGetParams,
+  };
+
+  export {
+    Tail as Tail,
+    type ConsumerScript as ConsumerScript,
+    type TailCreateResponse as TailCreateResponse,
+    type TailDeleteResponse as TailDeleteResponse,
+    type TailGetResponse as TailGetResponse,
+    type TailCreateParams as TailCreateParams,
+    type TailDeleteParams as TailDeleteParams,
+    type TailGetParams as TailGetParams,
+  };
+
+  export {
+    Content as Content,
+    type ContentUpdateParams as ContentUpdateParams,
+    type ContentGetParams as ContentGetParams,
+  };
+
+  export {
+    Settings as Settings,
+    type SettingEditParams as SettingEditParams,
+    type SettingGetParams as SettingGetParams,
+  };
+
+  export {
+    Deployments as Deployments,
+    type Deployment as Deployment,
+    type DeploymentCreateResponse as DeploymentCreateResponse,
+    type DeploymentGetResponse as DeploymentGetResponse,
+    type DeploymentCreateParams as DeploymentCreateParams,
+    type DeploymentGetParams as DeploymentGetParams,
+  };
+
+  export {
+    Versions as Versions,
+    type VersionCreateResponse as VersionCreateResponse,
+    type VersionListResponse as VersionListResponse,
+    type VersionGetResponse as VersionGetResponse,
+    VersionListResponsesV4PagePagination as VersionListResponsesV4PagePagination,
+    type VersionCreateParams as VersionCreateParams,
+    type VersionListParams as VersionListParams,
+    type VersionGetParams as VersionGetParams,
+  };
 }
diff --git a/src/resources/workers/scripts/settings.ts b/src/resources/workers/scripts/settings.ts
index 9d7f6ae749..d209bd7730 100644
--- a/src/resources/workers/scripts/settings.ts
+++ b/src/resources/workers/scripts/settings.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as SettingsAPI from './settings';
 import * as ScriptsAPI from './scripts';
 import * as TailAPI from './tail';
 
@@ -10,7 +9,7 @@ export class Settings extends APIResource {
   /**
    * Patch script-level settings when using
    * [Worker Versions](https://developers.cloudflare.com/api/operations/worker-versions-list-versions).
-   * Includes Logpush and Tail Consumers.
+   * Including but not limited to Logpush and Tail Consumers.
    */
   edit(
     scriptName: string,
@@ -57,12 +56,35 @@ export interface SettingEditParams {
    */
   logpush?: boolean;
 
+  /**
+   * Body param: Observability settings for the Worker.
+   */
+  observability?: SettingEditParams.Observability;
+
   /**
    * Body param: List of Workers that will consume logs from the attached Worker.
    */
   tail_consumers?: Array<TailAPI.ConsumerScriptParam>;
 }
 
+export namespace SettingEditParams {
+  /**
+   * Observability settings for the Worker.
+   */
+  export interface Observability {
+    /**
+     * Whether observability is enabled for the Worker.
+     */
+    enabled: boolean;
+
+    /**
+     * The sampling rate for incoming requests. From 0 to 1 (1 = 100%, 0.1 = 10%).
+     * Default is 1.
+     */
+    head_sampling_rate?: number | null;
+  }
+}
+
 export interface SettingGetParams {
   /**
    * Identifier
@@ -70,7 +92,6 @@ export interface SettingGetParams {
   account_id: string;
 }
 
-export namespace Settings {
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
+export declare namespace Settings {
+  export { type SettingEditParams as SettingEditParams, type SettingGetParams as SettingGetParams };
 }
diff --git a/src/resources/workers/scripts/subdomain.ts b/src/resources/workers/scripts/subdomain.ts
new file mode 100644
index 0000000000..9cd1876072
--- /dev/null
+++ b/src/resources/workers/scripts/subdomain.ts
@@ -0,0 +1,93 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Subdomain extends APIResource {
+  /**
+   * Enable or disable the Worker on the workers.dev subdomain.
+   */
+  create(
+    scriptName: string,
+    params: SubdomainCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SubdomainCreateResponse> {
+    const { account_id, ...body } = params;
+    return this._client.post(`/accounts/${account_id}/workers/scripts/${scriptName}/subdomain`, {
+      body,
+      ...options,
+    });
+  }
+
+  /**
+   * Get if the Worker is available on the workers.dev subdomain.
+   */
+  get(
+    scriptName: string,
+    params: SubdomainGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<SubdomainGetResponse> {
+    const { account_id } = params;
+    return this._client.get(`/accounts/${account_id}/workers/scripts/${scriptName}/subdomain`, options);
+  }
+}
+
+export interface SubdomainCreateResponse {
+  /**
+   * Whether the Worker is available on the workers.dev subdomain.
+   */
+  enabled?: boolean;
+
+  /**
+   * Whether the Worker's Preview URLs should be available on the workers.dev
+   * subdomain.
+   */
+  previews_enabled?: boolean;
+}
+
+export interface SubdomainGetResponse {
+  /**
+   * Whether the Worker is available on the workers.dev subdomain.
+   */
+  enabled?: boolean;
+
+  /**
+   * Whether the Worker's Preview URLs should be available on the workers.dev
+   * subdomain.
+   */
+  previews_enabled?: boolean;
+}
+
+export interface SubdomainCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: Whether the Worker should be available on the workers.dev subdomain.
+   */
+  enabled: boolean;
+
+  /**
+   * Body param: Whether the Worker's Preview URLs should be available on the
+   * workers.dev subdomain.
+   */
+  previews_enabled?: boolean;
+}
+
+export interface SubdomainGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace Subdomain {
+  export {
+    type SubdomainCreateResponse as SubdomainCreateResponse,
+    type SubdomainGetResponse as SubdomainGetResponse,
+    type SubdomainCreateParams as SubdomainCreateParams,
+    type SubdomainGetParams as SubdomainGetParams,
+  };
+}
diff --git a/src/resources/workers/scripts/tail.ts b/src/resources/workers/scripts/tail.ts
index cfe443a6ca..c6e2dc41f2 100644
--- a/src/resources/workers/scripts/tail.ts
+++ b/src/resources/workers/scripts/tail.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as TailAPI from './tail';
 import * as Shared from '../../shared';
 
 export class Tail extends APIResource {
@@ -95,11 +94,11 @@ export interface ConsumerScriptParam {
 }
 
 export interface TailCreateResponse {
-  id?: unknown;
+  id?: string;
 
-  expires_at?: unknown;
+  expires_at?: string;
 
-  url?: unknown;
+  url?: string;
 }
 
 export interface TailDeleteResponse {
@@ -114,11 +113,11 @@ export interface TailDeleteResponse {
 }
 
 export interface TailGetResponse {
-  id?: unknown;
+  id?: string;
 
-  expires_at?: unknown;
+  expires_at?: string;
 
-  url?: unknown;
+  url?: string;
 }
 
 export interface TailCreateParams {
@@ -147,12 +146,14 @@ export interface TailGetParams {
   account_id: string;
 }
 
-export namespace Tail {
-  export import ConsumerScript = TailAPI.ConsumerScript;
-  export import TailCreateResponse = TailAPI.TailCreateResponse;
-  export import TailDeleteResponse = TailAPI.TailDeleteResponse;
-  export import TailGetResponse = TailAPI.TailGetResponse;
-  export import TailCreateParams = TailAPI.TailCreateParams;
-  export import TailDeleteParams = TailAPI.TailDeleteParams;
-  export import TailGetParams = TailAPI.TailGetParams;
+export declare namespace Tail {
+  export {
+    type ConsumerScript as ConsumerScript,
+    type TailCreateResponse as TailCreateResponse,
+    type TailDeleteResponse as TailDeleteResponse,
+    type TailGetResponse as TailGetResponse,
+    type TailCreateParams as TailCreateParams,
+    type TailDeleteParams as TailDeleteParams,
+    type TailGetParams as TailGetParams,
+  };
 }
diff --git a/src/resources/workers/scripts/versions.ts b/src/resources/workers/scripts/versions.ts
index 0d4c26e5a7..fdfa41606a 100644
--- a/src/resources/workers/scripts/versions.ts
+++ b/src/resources/workers/scripts/versions.ts
@@ -2,12 +2,13 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as VersionsAPI from './versions';
 import { V4PagePagination, type V4PagePaginationParams } from '../../../pagination';
 
 export class Versions extends APIResource {
   /**
-   * Upload a Worker Version without deploying to Cloudflare's network.
+   * Upload a Worker Version without deploying to Cloudflare's network. You can find
+   * more about the multipart metadata on our docs:
+   * https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/.
    */
   create(
     scriptName: string,
@@ -68,6 +69,8 @@ export interface VersionCreateResponse {
   metadata?: unknown;
 
   number?: number;
+
+  startup_time_ms?: number;
 }
 
 export interface VersionListResponse {
@@ -94,18 +97,11 @@ export interface VersionCreateParams {
    */
   account_id: string;
 
-  /**
-   * Body param: A module comprising a Worker script, often a javascript file.
-   * Multiple modules may be provided as separate named parts, but at least one
-   * module must be present and referenced in the metadata as `main_module`.
-   */
-  '<any part name>'?: Array<Core.Uploadable>;
-
   /**
    * Body param: JSON encoded metadata about the uploaded parts and Worker
    * configuration.
    */
-  metadata?: VersionCreateParams.Metadata;
+  metadata: VersionCreateParams.Metadata;
 }
 
 export namespace VersionCreateParams {
@@ -113,12 +109,42 @@ export namespace VersionCreateParams {
    * JSON encoded metadata about the uploaded parts and Worker configuration.
    */
   export interface Metadata {
+    /**
+     * Name of the part in the multipart request that contains the main module (e.g.
+     * the file exporting a `fetch` handler). Indicates a `module syntax` Worker, which
+     * is required for Version Upload.
+     */
+    main_module: string;
+
     annotations?: Metadata.Annotations;
 
     /**
-     * List of bindings available to the worker.
+     * List of bindings attached to a Worker. You can find more about bindings on our
+     * docs:
+     * https://developers.cloudflare.com/workers/configuration/multipart-upload-metadata/#bindings.
      */
-    bindings?: Array<unknown>;
+    bindings?: Array<
+      | Metadata.WorkersBindingKindAny
+      | Metadata.WorkersBindingKindAI
+      | Metadata.WorkersBindingKindAnalyticsEngine
+      | Metadata.WorkersBindingKindAssets
+      | Metadata.WorkersBindingKindBrowserRendering
+      | Metadata.WorkersBindingKindD1
+      | Metadata.WorkersBindingKindDispatchNamespace
+      | Metadata.WorkersBindingKindDo
+      | Metadata.WorkersBindingKindHyperdrive
+      | Metadata.WorkersBindingKindJson
+      | Metadata.WorkersBindingKindKVNamespace
+      | Metadata.WorkersBindingKindMTLSCERT
+      | Metadata.WorkersBindingKindPlainText
+      | Metadata.WorkersBindingKindQueue
+      | Metadata.WorkersBindingKindR2
+      | Metadata.WorkersBindingKindSecret
+      | Metadata.WorkersBindingKindService
+      | Metadata.WorkersBindingKindTailConsumer
+      | Metadata.WorkersBindingKindVectorize
+      | Metadata.WorkersBindingKindVersionMetadata
+    >;
 
     /**
      * Date indicating targeted support in the Workers runtime. Backwards incompatible
@@ -139,13 +165,7 @@ export namespace VersionCreateParams {
     keep_bindings?: Array<string>;
 
     /**
-     * Name of the part in the multipart request that contains the main module (e.g.
-     * the file exporting a `fetch` handler). Indicates a `module syntax` Worker.
-     */
-    main_module?: string;
-
-    /**
-     * Usage model to apply to invocations.
+     * Usage model for the Worker invocations.
      */
     usage_model?: 'standard';
   }
@@ -153,7 +173,7 @@ export namespace VersionCreateParams {
   export namespace Metadata {
     export interface Annotations {
       /**
-       * Human-readable message about the version.
+       * Human-readable message about the version. Truncated to 100 bytes.
        */
       'workers/message'?: string;
 
@@ -162,6 +182,383 @@ export namespace VersionCreateParams {
        */
       'workers/tag'?: string;
     }
+
+    export interface WorkersBindingKindAny {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: string;
+      [k: string]: unknown;
+    }
+
+    export interface WorkersBindingKindAI {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'ai';
+    }
+
+    export interface WorkersBindingKindAnalyticsEngine {
+      /**
+       * The dataset name to bind to.
+       */
+      dataset: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'analytics_engine';
+    }
+
+    export interface WorkersBindingKindAssets {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'assets';
+    }
+
+    export interface WorkersBindingKindBrowserRendering {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'browser_rendering';
+    }
+
+    export interface WorkersBindingKindD1 {
+      /**
+       * Identifier of the D1 database to bind to.
+       */
+      id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'd1';
+    }
+
+    export interface WorkersBindingKindDispatchNamespace {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Namespace to bind to.
+       */
+      namespace: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'dispatch_namespace';
+
+      /**
+       * Outbound worker.
+       */
+      outbound?: WorkersBindingKindDispatchNamespace.Outbound;
+    }
+
+    export namespace WorkersBindingKindDispatchNamespace {
+      /**
+       * Outbound worker.
+       */
+      export interface Outbound {
+        /**
+         * Pass information from the Dispatch Worker to the Outbound Worker through the
+         * parameters.
+         */
+        params?: Array<string>;
+
+        /**
+         * Outbound worker.
+         */
+        worker?: Outbound.Worker;
+      }
+
+      export namespace Outbound {
+        /**
+         * Outbound worker.
+         */
+        export interface Worker {
+          /**
+           * Environment of the outbound worker.
+           */
+          environment?: string;
+
+          /**
+           * Name of the outbound worker.
+           */
+          service?: string;
+        }
+      }
+    }
+
+    export interface WorkersBindingKindDo {
+      /**
+       * The exported class name of the Durable Object.
+       */
+      class_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'durable_object_namespace';
+
+      /**
+       * The environment of the script_name to bind to.
+       */
+      environment?: string;
+
+      /**
+       * Namespace identifier tag.
+       */
+      namespace_id?: string;
+
+      /**
+       * The script where the Durable Object is defined, if it is external to this
+       * Worker.
+       */
+      script_name?: string;
+    }
+
+    export interface WorkersBindingKindHyperdrive {
+      /**
+       * Identifier of the Hyperdrive connection to bind to.
+       */
+      id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'hyperdrive';
+    }
+
+    export interface WorkersBindingKindJson {
+      /**
+       * JSON data to use.
+       */
+      json: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'json';
+    }
+
+    export interface WorkersBindingKindKVNamespace {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Namespace identifier tag.
+       */
+      namespace_id: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'kv_namespace';
+    }
+
+    export interface WorkersBindingKindMTLSCERT {
+      /**
+       * Identifier of the certificate to bind to.
+       */
+      certificate_id: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'mtls_certificate';
+    }
+
+    export interface WorkersBindingKindPlainText {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The text value to use.
+       */
+      text: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'plain_text';
+    }
+
+    export interface WorkersBindingKindQueue {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of the Queue to bind to.
+       */
+      queue_name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'queue';
+    }
+
+    export interface WorkersBindingKindR2 {
+      /**
+       * R2 bucket to bind to.
+       */
+      bucket_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'r2_bucket';
+    }
+
+    export interface WorkersBindingKindSecret {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The secret value to use.
+       */
+      text: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'secret_text';
+    }
+
+    export interface WorkersBindingKindService {
+      /**
+       * Optional environment if the Worker utilizes one.
+       */
+      environment: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of Worker to bind to.
+       */
+      service: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'service';
+    }
+
+    export interface WorkersBindingKindTailConsumer {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * Name of Tail Worker to bind to.
+       */
+      service: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'tail_consumer';
+    }
+
+    export interface WorkersBindingKindVectorize {
+      /**
+       * Name of the Vectorize index to bind to.
+       */
+      index_name: string;
+
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'vectorize';
+    }
+
+    export interface WorkersBindingKindVersionMetadata {
+      /**
+       * A JavaScript variable name for the binding.
+       */
+      name: string;
+
+      /**
+       * The kind of resource that the binding provides.
+       */
+      type: 'version_metadata';
+    }
   }
 }
 
@@ -185,12 +582,16 @@ export interface VersionGetParams {
   account_id: string;
 }
 
-export namespace Versions {
-  export import VersionCreateResponse = VersionsAPI.VersionCreateResponse;
-  export import VersionListResponse = VersionsAPI.VersionListResponse;
-  export import VersionGetResponse = VersionsAPI.VersionGetResponse;
-  export import VersionListResponsesV4PagePagination = VersionsAPI.VersionListResponsesV4PagePagination;
-  export import VersionCreateParams = VersionsAPI.VersionCreateParams;
-  export import VersionListParams = VersionsAPI.VersionListParams;
-  export import VersionGetParams = VersionsAPI.VersionGetParams;
+Versions.VersionListResponsesV4PagePagination = VersionListResponsesV4PagePagination;
+
+export declare namespace Versions {
+  export {
+    type VersionCreateResponse as VersionCreateResponse,
+    type VersionListResponse as VersionListResponse,
+    type VersionGetResponse as VersionGetResponse,
+    VersionListResponsesV4PagePagination as VersionListResponsesV4PagePagination,
+    type VersionCreateParams as VersionCreateParams,
+    type VersionListParams as VersionListParams,
+    type VersionGetParams as VersionGetParams,
+  };
 }
diff --git a/src/resources/workers/subdomains.ts b/src/resources/workers/subdomains.ts
index fbb8be1b5b..573d33f113 100644
--- a/src/resources/workers/subdomains.ts
+++ b/src/resources/workers/subdomains.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SubdomainsAPI from './subdomains';
 
 export class Subdomains extends APIResource {
   /**
@@ -12,12 +11,11 @@ export class Subdomains extends APIResource {
     params: SubdomainUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<SubdomainUpdateResponse> {
-    const { account_id, body } = params;
+    const { account_id, ...body } = params;
     return (
-      this._client.put(`/accounts/${account_id}/workers/subdomain`, {
-        body: body,
-        ...options,
-      }) as Core.APIPromise<{ result: SubdomainUpdateResponse }>
+      this._client.put(`/accounts/${account_id}/workers/subdomain`, { body, ...options }) as Core.APIPromise<{
+        result: SubdomainUpdateResponse;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -35,11 +33,11 @@ export class Subdomains extends APIResource {
 }
 
 export interface SubdomainUpdateResponse {
-  name?: unknown;
+  subdomain?: string;
 }
 
 export interface SubdomainGetResponse {
-  name?: unknown;
+  subdomain?: string;
 }
 
 export interface SubdomainUpdateParams {
@@ -51,7 +49,7 @@ export interface SubdomainUpdateParams {
   /**
    * Body param:
    */
-  body: string;
+  subdomain?: string;
 }
 
 export interface SubdomainGetParams {
@@ -61,9 +59,11 @@ export interface SubdomainGetParams {
   account_id: string;
 }
 
-export namespace Subdomains {
-  export import SubdomainUpdateResponse = SubdomainsAPI.SubdomainUpdateResponse;
-  export import SubdomainGetResponse = SubdomainsAPI.SubdomainGetResponse;
-  export import SubdomainUpdateParams = SubdomainsAPI.SubdomainUpdateParams;
-  export import SubdomainGetParams = SubdomainsAPI.SubdomainGetParams;
+export declare namespace Subdomains {
+  export {
+    type SubdomainUpdateResponse as SubdomainUpdateResponse,
+    type SubdomainGetResponse as SubdomainGetResponse,
+    type SubdomainUpdateParams as SubdomainUpdateParams,
+    type SubdomainGetParams as SubdomainGetParams,
+  };
 }
diff --git a/src/resources/workers/workers.ts b/src/resources/workers/workers.ts
index 22608378b8..ac2af4ff5c 100644
--- a/src/resources/workers/workers.ts
+++ b/src/resources/workers/workers.ts
@@ -2,304 +2,71 @@
 
 import { APIResource } from '../../resource';
 import * as AccountSettingsAPI from './account-settings';
+import {
+  AccountSettingGetParams,
+  AccountSettingGetResponse,
+  AccountSettingUpdateParams,
+  AccountSettingUpdateResponse,
+  AccountSettings,
+} from './account-settings';
 import * as DomainsAPI from './domains';
+import {
+  Domain,
+  DomainDeleteParams,
+  DomainGetParams,
+  DomainListParams,
+  DomainUpdateParams,
+  Domains,
+  DomainsSinglePage,
+} from './domains';
+import * as RoutesAPI from './routes';
+import {
+  RouteCreateParams,
+  RouteCreateResponse,
+  RouteDeleteParams,
+  RouteDeleteResponse,
+  RouteGetParams,
+  RouteGetResponse,
+  RouteListParams,
+  RouteListResponse,
+  RouteListResponsesSinglePage,
+  RouteUpdateParams,
+  RouteUpdateResponse,
+  Routes,
+} from './routes';
 import * as SubdomainsAPI from './subdomains';
-import * as AIAPI from './ai/ai';
+import {
+  SubdomainGetParams,
+  SubdomainGetResponse,
+  SubdomainUpdateParams,
+  SubdomainUpdateResponse,
+  Subdomains,
+} from './subdomains';
+import * as AssetsAPI from './assets/assets';
+import { Assets } from './assets/assets';
 import * as ScriptsAPI from './scripts/scripts';
+import {
+  Script,
+  ScriptDeleteParams,
+  ScriptGetParams,
+  ScriptGetResponse,
+  ScriptListParams,
+  ScriptSetting,
+  ScriptUpdateParams,
+  ScriptUpdateResponse,
+  Scripts,
+  ScriptsSinglePage,
+} from './scripts/scripts';
 
 export class Workers extends APIResource {
-  ai: AIAPI.AI = new AIAPI.AI(this._client);
+  routes: RoutesAPI.Routes = new RoutesAPI.Routes(this._client);
+  assets: AssetsAPI.Assets = new AssetsAPI.Assets(this._client);
   scripts: ScriptsAPI.Scripts = new ScriptsAPI.Scripts(this._client);
   accountSettings: AccountSettingsAPI.AccountSettings = new AccountSettingsAPI.AccountSettings(this._client);
   domains: DomainsAPI.Domains = new DomainsAPI.Domains(this._client);
   subdomains: SubdomainsAPI.Subdomains = new SubdomainsAPI.Subdomains(this._client);
 }
 
-/**
- * A binding to allow the Worker to communicate with resources
- */
-export type Binding =
-  | KVNamespaceBinding
-  | ServiceBinding
-  | DurableObjectBinding
-  | R2Binding
-  | Binding.WorkersQueueBinding
-  | D1Binding
-  | DispatchNamespaceBinding
-  | MTLSCERTBinding;
-
-export namespace Binding {
-  export interface WorkersQueueBinding {
-    /**
-     * A JavaScript variable name for the binding.
-     */
-    name: string;
-
-    /**
-     * Name of the Queue to bind to
-     */
-    queue_name: string;
-
-    /**
-     * The class of resource that the binding provides.
-     */
-    type: 'queue';
-  }
-}
-
-/**
- * A binding to allow the Worker to communicate with resources
- */
-export type BindingParam =
-  | KVNamespaceBindingParam
-  | ServiceBindingParam
-  | DurableObjectBindingParam
-  | R2BindingParam
-  | BindingParam.WorkersQueueBinding
-  | D1BindingParam
-  | DispatchNamespaceBindingParam
-  | MTLSCERTBindingParam;
-
-export namespace BindingParam {
-  export interface WorkersQueueBinding {
-    /**
-     * Name of the Queue to bind to
-     */
-    queue_name: string;
-
-    /**
-     * The class of resource that the binding provides.
-     */
-    type: 'queue';
-  }
-}
-
-export interface D1Binding {
-  /**
-   * ID of the D1 database to bind to
-   */
-  id: string;
-
-  /**
-   * A JavaScript variable name for the binding.
-   */
-  binding: string;
-
-  /**
-   * The name of the D1 database associated with the 'id' provided.
-   */
-  name: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'd1';
-}
-
-export interface D1BindingParam {
-  /**
-   * ID of the D1 database to bind to
-   */
-  id: string;
-
-  /**
-   * The name of the D1 database associated with the 'id' provided.
-   */
-  name: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'd1';
-}
-
-export interface DispatchNamespaceBinding {
-  /**
-   * A JavaScript variable name for the binding.
-   */
-  name: string;
-
-  /**
-   * Namespace to bind to
-   */
-  namespace: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'dispatch_namespace';
-
-  /**
-   * Outbound worker
-   */
-  outbound?: DispatchNamespaceBinding.Outbound;
-}
-
-export namespace DispatchNamespaceBinding {
-  /**
-   * Outbound worker
-   */
-  export interface Outbound {
-    /**
-     * Pass information from the Dispatch Worker to the Outbound Worker through the
-     * parameters
-     */
-    params?: Array<string>;
-
-    /**
-     * Outbound worker
-     */
-    worker?: Outbound.Worker;
-  }
-
-  export namespace Outbound {
-    /**
-     * Outbound worker
-     */
-    export interface Worker {
-      /**
-       * Environment of the outbound worker
-       */
-      environment?: string;
-
-      /**
-       * Name of the outbound worker
-       */
-      service?: string;
-    }
-  }
-}
-
-export interface DispatchNamespaceBindingParam {
-  /**
-   * Namespace to bind to
-   */
-  namespace: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'dispatch_namespace';
-
-  /**
-   * Outbound worker
-   */
-  outbound?: DispatchNamespaceBindingParam.Outbound;
-}
-
-export namespace DispatchNamespaceBindingParam {
-  /**
-   * Outbound worker
-   */
-  export interface Outbound {
-    /**
-     * Pass information from the Dispatch Worker to the Outbound Worker through the
-     * parameters
-     */
-    params?: Array<string>;
-
-    /**
-     * Outbound worker
-     */
-    worker?: Outbound.Worker;
-  }
-
-  export namespace Outbound {
-    /**
-     * Outbound worker
-     */
-    export interface Worker {
-      /**
-       * Environment of the outbound worker
-       */
-      environment?: string;
-
-      /**
-       * Name of the outbound worker
-       */
-      service?: string;
-    }
-  }
-}
-
-export interface DurableObjectBinding {
-  /**
-   * The exported class name of the Durable Object
-   */
-  class_name: string;
-
-  /**
-   * A JavaScript variable name for the binding.
-   */
-  name: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'durable_object_namespace';
-
-  /**
-   * The environment of the script_name to bind to
-   */
-  environment?: string;
-
-  /**
-   * Namespace identifier tag.
-   */
-  namespace_id?: string;
-
-  /**
-   * The script where the Durable Object is defined, if it is external to this Worker
-   */
-  script_name?: string;
-}
-
-export interface DurableObjectBindingParam {
-  /**
-   * The exported class name of the Durable Object
-   */
-  class_name: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'durable_object_namespace';
-
-  /**
-   * The environment of the script_name to bind to
-   */
-  environment?: string;
-
-  /**
-   * The script where the Durable Object is defined, if it is external to this Worker
-   */
-  script_name?: string;
-}
-
-export interface KVNamespaceBinding {
-  /**
-   * A JavaScript variable name for the binding.
-   */
-  name: string;
-
-  /**
-   * Namespace identifier tag.
-   */
-  namespace_id: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'kv_namespace';
-}
-
-export interface KVNamespaceBindingParam {
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'kv_namespace';
-}
-
 export interface MigrationStep {
   /**
    * A list of classes to delete Durable Object namespaces from.
@@ -311,6 +78,11 @@ export interface MigrationStep {
    */
   new_classes?: Array<string>;
 
+  /**
+   * A list of classes to create Durable Object namespaces with SQLite from.
+   */
+  new_sqlite_classes?: Array<string>;
+
   /**
    * A list of classes with Durable Object namespaces that were renamed.
    */
@@ -350,6 +122,11 @@ export interface MigrationStepParam {
    */
   new_classes?: Array<string>;
 
+  /**
+   * A list of classes to create Durable Object namespaces with SQLite from.
+   */
+  new_sqlite_classes?: Array<string>;
+
   /**
    * A list of classes with Durable Object namespaces that were renamed.
    */
@@ -378,121 +155,6 @@ export namespace MigrationStepParam {
   }
 }
 
-export interface MTLSCERTBinding {
-  /**
-   * A JavaScript variable name for the binding.
-   */
-  name: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'mtls_certificate';
-
-  /**
-   * ID of the certificate to bind to
-   */
-  certificate_id?: string;
-}
-
-export interface MTLSCERTBindingParam {
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'mtls_certificate';
-
-  /**
-   * ID of the certificate to bind to
-   */
-  certificate_id?: string;
-}
-
-export interface PlacementConfiguration {
-  /**
-   * Enables
-   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
-   * Only `"smart"` is currently supported
-   */
-  mode?: 'smart';
-}
-
-export interface PlacementConfigurationParam {
-  /**
-   * Enables
-   * [Smart Placement](https://developers.cloudflare.com/workers/configuration/smart-placement).
-   * Only `"smart"` is currently supported
-   */
-  mode?: 'smart';
-}
-
-export interface R2Binding {
-  /**
-   * R2 bucket to bind to
-   */
-  bucket_name: string;
-
-  /**
-   * A JavaScript variable name for the binding.
-   */
-  name: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'r2_bucket';
-}
-
-export interface R2BindingParam {
-  /**
-   * R2 bucket to bind to
-   */
-  bucket_name: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'r2_bucket';
-}
-
-export interface ServiceBinding {
-  /**
-   * Optional environment if the Worker utilizes one.
-   */
-  environment: string;
-
-  /**
-   * A JavaScript variable name for the binding.
-   */
-  name: string;
-
-  /**
-   * Name of Worker to bind to
-   */
-  service: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'service';
-}
-
-export interface ServiceBindingParam {
-  /**
-   * Optional environment if the Worker utilizes one.
-   */
-  environment: string;
-
-  /**
-   * Name of Worker to bind to
-   */
-  service: string;
-
-  /**
-   * The class of resource that the binding provides.
-   */
-  type: 'service';
-}
-
 /**
  * A single set of migrations to apply.
  */
@@ -507,6 +169,11 @@ export interface SingleStepMigration {
    */
   new_classes?: Array<string>;
 
+  /**
+   * A list of classes to create Durable Object namespaces with SQLite from.
+   */
+  new_sqlite_classes?: Array<string>;
+
   /**
    * Tag to set as the latest migration tag.
    */
@@ -560,6 +227,11 @@ export interface SingleStepMigrationParam {
    */
   new_classes?: Array<string>;
 
+  /**
+   * A list of classes to create Durable Object namespaces with SQLite from.
+   */
+  new_sqlite_classes?: Array<string>;
+
   /**
    * Tag to set as the latest migration tag.
    */
@@ -599,42 +271,6 @@ export namespace SingleStepMigrationParam {
   }
 }
 
-export interface SteppedMigration {
-  /**
-   * Tag to set as the latest migration tag.
-   */
-  new_tag?: string;
-
-  /**
-   * Tag used to verify against the latest migration tag for this Worker. If they
-   * don't match, the upload is rejected.
-   */
-  old_tag?: string;
-
-  /**
-   * Migrations to apply in order.
-   */
-  steps?: Array<MigrationStep>;
-}
-
-export interface SteppedMigrationParam {
-  /**
-   * Tag to set as the latest migration tag.
-   */
-  new_tag?: string;
-
-  /**
-   * Tag used to verify against the latest migration tag for this Worker. If they
-   * don't match, the upload is rejected.
-   */
-  old_tag?: string;
-
-  /**
-   * Migrations to apply in order.
-   */
-  steps?: Array<MigrationStepParam>;
-}
-
 /**
  * JSON encoded metadata about the uploaded parts and Worker configuration.
  */
@@ -671,33 +307,70 @@ export interface WorkerMetadataParam {
   main_module?: string;
 }
 
-export namespace Workers {
-  export import AI = AIAPI.AI;
-  export import AIRunResponse = AIAPI.AIRunResponse;
-  export import AIRunParams = AIAPI.AIRunParams;
-  export import Scripts = ScriptsAPI.Scripts;
-  export import Script = ScriptsAPI.Script;
-  export import ScriptSetting = ScriptsAPI.ScriptSetting;
-  export import ScriptsSinglePage = ScriptsAPI.ScriptsSinglePage;
-  export import ScriptUpdateParams = ScriptsAPI.ScriptUpdateParams;
-  export import ScriptListParams = ScriptsAPI.ScriptListParams;
-  export import ScriptDeleteParams = ScriptsAPI.ScriptDeleteParams;
-  export import ScriptGetParams = ScriptsAPI.ScriptGetParams;
-  export import AccountSettings = AccountSettingsAPI.AccountSettings;
-  export import AccountSettingUpdateResponse = AccountSettingsAPI.AccountSettingUpdateResponse;
-  export import AccountSettingGetResponse = AccountSettingsAPI.AccountSettingGetResponse;
-  export import AccountSettingUpdateParams = AccountSettingsAPI.AccountSettingUpdateParams;
-  export import AccountSettingGetParams = AccountSettingsAPI.AccountSettingGetParams;
-  export import Domains = DomainsAPI.Domains;
-  export import Domain = DomainsAPI.Domain;
-  export import DomainsSinglePage = DomainsAPI.DomainsSinglePage;
-  export import DomainUpdateParams = DomainsAPI.DomainUpdateParams;
-  export import DomainListParams = DomainsAPI.DomainListParams;
-  export import DomainDeleteParams = DomainsAPI.DomainDeleteParams;
-  export import DomainGetParams = DomainsAPI.DomainGetParams;
-  export import Subdomains = SubdomainsAPI.Subdomains;
-  export import SubdomainUpdateResponse = SubdomainsAPI.SubdomainUpdateResponse;
-  export import SubdomainGetResponse = SubdomainsAPI.SubdomainGetResponse;
-  export import SubdomainUpdateParams = SubdomainsAPI.SubdomainUpdateParams;
-  export import SubdomainGetParams = SubdomainsAPI.SubdomainGetParams;
+Workers.Routes = Routes;
+Workers.RouteListResponsesSinglePage = RouteListResponsesSinglePage;
+Workers.Assets = Assets;
+Workers.Scripts = Scripts;
+Workers.ScriptsSinglePage = ScriptsSinglePage;
+Workers.AccountSettings = AccountSettings;
+Workers.Domains = Domains;
+Workers.DomainsSinglePage = DomainsSinglePage;
+Workers.Subdomains = Subdomains;
+
+export declare namespace Workers {
+  export {
+    Routes as Routes,
+    type RouteCreateResponse as RouteCreateResponse,
+    type RouteUpdateResponse as RouteUpdateResponse,
+    type RouteListResponse as RouteListResponse,
+    type RouteDeleteResponse as RouteDeleteResponse,
+    type RouteGetResponse as RouteGetResponse,
+    RouteListResponsesSinglePage as RouteListResponsesSinglePage,
+    type RouteCreateParams as RouteCreateParams,
+    type RouteUpdateParams as RouteUpdateParams,
+    type RouteListParams as RouteListParams,
+    type RouteDeleteParams as RouteDeleteParams,
+    type RouteGetParams as RouteGetParams,
+  };
+
+  export { Assets as Assets };
+
+  export {
+    Scripts as Scripts,
+    type Script as Script,
+    type ScriptSetting as ScriptSetting,
+    type ScriptUpdateResponse as ScriptUpdateResponse,
+    type ScriptGetResponse as ScriptGetResponse,
+    ScriptsSinglePage as ScriptsSinglePage,
+    type ScriptUpdateParams as ScriptUpdateParams,
+    type ScriptListParams as ScriptListParams,
+    type ScriptDeleteParams as ScriptDeleteParams,
+    type ScriptGetParams as ScriptGetParams,
+  };
+
+  export {
+    AccountSettings as AccountSettings,
+    type AccountSettingUpdateResponse as AccountSettingUpdateResponse,
+    type AccountSettingGetResponse as AccountSettingGetResponse,
+    type AccountSettingUpdateParams as AccountSettingUpdateParams,
+    type AccountSettingGetParams as AccountSettingGetParams,
+  };
+
+  export {
+    Domains as Domains,
+    type Domain as Domain,
+    DomainsSinglePage as DomainsSinglePage,
+    type DomainUpdateParams as DomainUpdateParams,
+    type DomainListParams as DomainListParams,
+    type DomainDeleteParams as DomainDeleteParams,
+    type DomainGetParams as DomainGetParams,
+  };
+
+  export {
+    Subdomains as Subdomains,
+    type SubdomainUpdateResponse as SubdomainUpdateResponse,
+    type SubdomainGetResponse as SubdomainGetResponse,
+    type SubdomainUpdateParams as SubdomainUpdateParams,
+    type SubdomainGetParams as SubdomainGetParams,
+  };
 }
diff --git a/src/resources/workflows/index.ts b/src/resources/workflows/index.ts
new file mode 100644
index 0000000000..6eb83ae07b
--- /dev/null
+++ b/src/resources/workflows/index.ts
@@ -0,0 +1,21 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  InstanceListResponsesV4PagePaginationArray,
+  Instances,
+  type InstanceCreateResponse,
+  type InstanceListResponse,
+  type InstanceGetResponse,
+  type InstanceCreateParams,
+  type InstanceListParams,
+  type InstanceGetParams,
+} from './instances/index';
+export {
+  VersionListResponsesV4PagePaginationArray,
+  Versions,
+  type VersionListResponse,
+  type VersionGetResponse,
+  type VersionListParams,
+  type VersionGetParams,
+} from './versions';
+export { Workflows } from './workflows';
diff --git a/src/resources/workflows/instances/index.ts b/src/resources/workflows/instances/index.ts
new file mode 100644
index 0000000000..5d6aaac375
--- /dev/null
+++ b/src/resources/workflows/instances/index.ts
@@ -0,0 +1,13 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  InstanceListResponsesV4PagePaginationArray,
+  Instances,
+  type InstanceCreateResponse,
+  type InstanceListResponse,
+  type InstanceGetResponse,
+  type InstanceCreateParams,
+  type InstanceListParams,
+  type InstanceGetParams,
+} from './instances';
+export { Status, type StatusEditResponse, type StatusEditParams } from './status';
diff --git a/src/resources/workflows/instances/instances.ts b/src/resources/workflows/instances/instances.ts
new file mode 100644
index 0000000000..9b61ae4631
--- /dev/null
+++ b/src/resources/workflows/instances/instances.ts
@@ -0,0 +1,318 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as StatusAPI from './status';
+import { Status, StatusEditParams, StatusEditResponse } from './status';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
+
+export class Instances extends APIResource {
+  status: StatusAPI.Status = new StatusAPI.Status(this._client);
+
+  /**
+   * Create a new workflow instance
+   */
+  create(
+    workflowName: string,
+    params: InstanceCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<InstanceCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/workflows/${workflowName}/instances`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: InstanceCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List of workflow instances
+   */
+  list(
+    workflowName: string,
+    params: InstanceListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<InstanceListResponsesV4PagePaginationArray, InstanceListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/workflows/${workflowName}/instances`,
+      InstanceListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Get logs and status from instance
+   */
+  get(
+    workflowName: string,
+    instanceId: string,
+    params: InstanceGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<InstanceGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/workflows/${workflowName}/instances/${instanceId}`,
+        options,
+      ) as Core.APIPromise<{ result: InstanceGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class InstanceListResponsesV4PagePaginationArray extends V4PagePaginationArray<InstanceListResponse> {}
+
+export interface InstanceCreateResponse {
+  id: string;
+
+  status:
+    | 'queued'
+    | 'running'
+    | 'paused'
+    | 'errored'
+    | 'terminated'
+    | 'complete'
+    | 'waitingForPause'
+    | 'waiting'
+    | 'unknown';
+
+  version_id: string;
+
+  workflow_id: string;
+}
+
+export interface InstanceListResponse {
+  id: string;
+
+  created_on: string;
+
+  ended_on: string | null;
+
+  modified_on: string;
+
+  started_on: string | null;
+
+  status:
+    | 'queued'
+    | 'running'
+    | 'paused'
+    | 'errored'
+    | 'terminated'
+    | 'complete'
+    | 'waitingForPause'
+    | 'waiting'
+    | 'unknown';
+
+  version_id: string;
+
+  workflow_id: string;
+}
+
+export interface InstanceGetResponse {
+  end: string | null;
+
+  error: InstanceGetResponse.Error | null;
+
+  output: string | number;
+
+  params: unknown;
+
+  queued: string;
+
+  start: string | null;
+
+  status:
+    | 'queued'
+    | 'running'
+    | 'paused'
+    | 'errored'
+    | 'terminated'
+    | 'complete'
+    | 'waitingForPause'
+    | 'waiting'
+    | 'unknown';
+
+  steps: Array<
+    InstanceGetResponse.UnionMember0 | InstanceGetResponse.UnionMember1 | InstanceGetResponse.UnionMember2
+  >;
+
+  success: boolean | null;
+
+  trigger: InstanceGetResponse.Trigger;
+
+  versionId: string;
+}
+
+export namespace InstanceGetResponse {
+  export interface Error {
+    message: string;
+
+    name: string;
+  }
+
+  export interface UnionMember0 {
+    attempts: Array<UnionMember0.Attempt>;
+
+    config: UnionMember0.Config;
+
+    end: string | null;
+
+    name: string;
+
+    output: unknown;
+
+    start: string;
+
+    success: boolean | null;
+
+    type: 'step';
+  }
+
+  export namespace UnionMember0 {
+    export interface Attempt {
+      end: string | null;
+
+      error: Attempt.Error | null;
+
+      start: string;
+
+      success: boolean | null;
+    }
+
+    export namespace Attempt {
+      export interface Error {
+        message: string;
+
+        name: string;
+      }
+    }
+
+    export interface Config {
+      retries: Config.Retries;
+
+      timeout: string | number;
+    }
+
+    export namespace Config {
+      export interface Retries {
+        delay: string | number;
+
+        limit: number;
+
+        backoff?: 'constant' | 'linear' | 'exponential';
+      }
+    }
+  }
+
+  export interface UnionMember1 {
+    end: string;
+
+    error: UnionMember1.Error | null;
+
+    finished: boolean;
+
+    name: string;
+
+    start: string;
+
+    type: 'sleep';
+  }
+
+  export namespace UnionMember1 {
+    export interface Error {
+      message: string;
+
+      name: string;
+    }
+  }
+
+  export interface UnionMember2 {
+    trigger: UnionMember2.Trigger;
+
+    type: 'termination';
+  }
+
+  export namespace UnionMember2 {
+    export interface Trigger {
+      source: string;
+    }
+  }
+
+  export interface Trigger {
+    source: 'unknown' | 'api' | 'binding' | 'event' | 'cron';
+  }
+}
+
+export interface InstanceCreateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  instance_id?: string;
+
+  /**
+   * Body param:
+   */
+  params?: unknown;
+}
+
+export interface InstanceListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Query param: In ISO 8601 with no timezone offsets and in UTC.
+   */
+  date_end?: string;
+
+  /**
+   * Query param: In ISO 8601 with no timezone offsets and in UTC.
+   */
+  date_start?: string;
+
+  /**
+   * Query param:
+   */
+  status?:
+    | 'queued'
+    | 'running'
+    | 'paused'
+    | 'errored'
+    | 'terminated'
+    | 'complete'
+    | 'waitingForPause'
+    | 'waiting'
+    | 'unknown';
+}
+
+export interface InstanceGetParams {
+  account_id: string;
+}
+
+Instances.InstanceListResponsesV4PagePaginationArray = InstanceListResponsesV4PagePaginationArray;
+Instances.Status = Status;
+
+export declare namespace Instances {
+  export {
+    type InstanceCreateResponse as InstanceCreateResponse,
+    type InstanceListResponse as InstanceListResponse,
+    type InstanceGetResponse as InstanceGetResponse,
+    InstanceListResponsesV4PagePaginationArray as InstanceListResponsesV4PagePaginationArray,
+    type InstanceCreateParams as InstanceCreateParams,
+    type InstanceListParams as InstanceListParams,
+    type InstanceGetParams as InstanceGetParams,
+  };
+
+  export {
+    Status as Status,
+    type StatusEditResponse as StatusEditResponse,
+    type StatusEditParams as StatusEditParams,
+  };
+}
diff --git a/src/resources/workflows/instances/status.ts b/src/resources/workflows/instances/status.ts
new file mode 100644
index 0000000000..e309bbc1af
--- /dev/null
+++ b/src/resources/workflows/instances/status.ts
@@ -0,0 +1,58 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Status extends APIResource {
+  /**
+   * Change status of instance
+   */
+  edit(
+    workflowName: string,
+    instanceId: string,
+    params: StatusEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<StatusEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/workflows/${workflowName}/instances/${instanceId}/status`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: StatusEditResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface StatusEditResponse {
+  status:
+    | 'queued'
+    | 'running'
+    | 'paused'
+    | 'errored'
+    | 'terminated'
+    | 'complete'
+    | 'waitingForPause'
+    | 'waiting'
+    | 'unknown';
+
+  /**
+   * In ISO 8601 with no timezone offsets and in UTC.
+   */
+  timestamp: string;
+}
+
+export interface StatusEditParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param: Possible actions to apply to instance
+   */
+  status: 'resume' | 'pause' | 'terminate';
+}
+
+export declare namespace Status {
+  export { type StatusEditResponse as StatusEditResponse, type StatusEditParams as StatusEditParams };
+}
diff --git a/src/resources/workflows/versions.ts b/src/resources/workflows/versions.ts
new file mode 100644
index 0000000000..dab04a8662
--- /dev/null
+++ b/src/resources/workflows/versions.ts
@@ -0,0 +1,90 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
+
+export class Versions extends APIResource {
+  /**
+   * List deployed Workflow versions
+   */
+  list(
+    workflowName: string,
+    params: VersionListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<VersionListResponsesV4PagePaginationArray, VersionListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/workflows/${workflowName}/versions`,
+      VersionListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Get Workflow version details
+   */
+  get(
+    workflowName: string,
+    versionId: string,
+    params: VersionGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<VersionGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/workflows/${workflowName}/versions/${versionId}`,
+        options,
+      ) as Core.APIPromise<{ result: VersionGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class VersionListResponsesV4PagePaginationArray extends V4PagePaginationArray<VersionListResponse> {}
+
+export interface VersionListResponse {
+  id: string;
+
+  class_name: string;
+
+  created_on: string;
+
+  modified_on: string;
+
+  workflow_id: string;
+}
+
+export interface VersionGetResponse {
+  id: string;
+
+  class_name: string;
+
+  created_on: string;
+
+  modified_on: string;
+
+  workflow_id: string;
+}
+
+export interface VersionListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+}
+
+export interface VersionGetParams {
+  account_id: string;
+}
+
+Versions.VersionListResponsesV4PagePaginationArray = VersionListResponsesV4PagePaginationArray;
+
+export declare namespace Versions {
+  export {
+    type VersionListResponse as VersionListResponse,
+    type VersionGetResponse as VersionGetResponse,
+    VersionListResponsesV4PagePaginationArray as VersionListResponsesV4PagePaginationArray,
+    type VersionListParams as VersionListParams,
+    type VersionGetParams as VersionGetParams,
+  };
+}
diff --git a/src/resources/workflows/workflows.ts b/src/resources/workflows/workflows.ts
new file mode 100644
index 0000000000..7070e52c3a
--- /dev/null
+++ b/src/resources/workflows/workflows.ts
@@ -0,0 +1,233 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import * as VersionsAPI from './versions';
+import {
+  VersionGetParams,
+  VersionGetResponse,
+  VersionListParams,
+  VersionListResponse,
+  VersionListResponsesV4PagePaginationArray,
+  Versions,
+} from './versions';
+import * as InstancesAPI from './instances/instances';
+import {
+  InstanceCreateParams,
+  InstanceCreateResponse,
+  InstanceGetParams,
+  InstanceGetResponse,
+  InstanceListParams,
+  InstanceListResponse,
+  InstanceListResponsesV4PagePaginationArray,
+  Instances as InstancesAPIInstances,
+} from './instances/instances';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
+
+export class Workflows extends APIResource {
+  instances: InstancesAPI.Instances = new InstancesAPI.Instances(this._client);
+  versions: VersionsAPI.Versions = new VersionsAPI.Versions(this._client);
+
+  /**
+   * Create/modify Workflow
+   */
+  update(
+    workflowName: string,
+    params: WorkflowUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<WorkflowUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/workflows/${workflowName}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: WorkflowUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * List all Workflows
+   */
+  list(
+    params: WorkflowListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<WorkflowListResponsesV4PagePaginationArray, WorkflowListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/workflows`,
+      WorkflowListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Get Workflow details
+   */
+  get(
+    workflowName: string,
+    params: WorkflowGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<WorkflowGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/workflows/${workflowName}`, options) as Core.APIPromise<{
+        result: WorkflowGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class WorkflowListResponsesV4PagePaginationArray extends V4PagePaginationArray<WorkflowListResponse> {}
+
+export interface WorkflowUpdateResponse {
+  id: string;
+
+  class_name: string;
+
+  created_on: string;
+
+  modified_on: string;
+
+  name: string;
+
+  script_name: string;
+
+  triggered_on: string | null;
+
+  version_id: string;
+}
+
+export interface WorkflowListResponse {
+  id: string;
+
+  class_name: string;
+
+  created_on: string;
+
+  instances: WorkflowListResponse.Instances;
+
+  modified_on: string;
+
+  name: string;
+
+  script_name: string;
+
+  triggered_on: string | null;
+}
+
+export namespace WorkflowListResponse {
+  export interface Instances {
+    complete?: number;
+
+    errored?: number;
+
+    paused?: number;
+
+    queued?: number;
+
+    running?: number;
+
+    terminated?: number;
+
+    unknown?: number;
+
+    waiting?: number;
+
+    waitingForPause?: number;
+  }
+}
+
+export interface WorkflowGetResponse {
+  id: string;
+
+  class_name: string;
+
+  created_on: string;
+
+  instances: WorkflowGetResponse.Instances;
+
+  modified_on: string;
+
+  name: string;
+
+  script_name: string;
+
+  triggered_on: string | null;
+}
+
+export namespace WorkflowGetResponse {
+  export interface Instances {
+    complete?: number;
+
+    errored?: number;
+
+    paused?: number;
+
+    queued?: number;
+
+    running?: number;
+
+    terminated?: number;
+
+    unknown?: number;
+
+    waiting?: number;
+
+    waitingForPause?: number;
+  }
+}
+
+export interface WorkflowUpdateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  class_name: string;
+
+  /**
+   * Body param:
+   */
+  script_name: string;
+}
+
+export interface WorkflowListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+}
+
+export interface WorkflowGetParams {
+  account_id: string;
+}
+
+Workflows.Instances = InstancesAPIInstances;
+Workflows.InstanceListResponsesV4PagePaginationArray = InstanceListResponsesV4PagePaginationArray;
+Workflows.Versions = Versions;
+Workflows.VersionListResponsesV4PagePaginationArray = VersionListResponsesV4PagePaginationArray;
+
+export declare namespace Workflows {
+  export {
+    InstancesAPIInstances as Instances,
+    type InstanceCreateResponse as InstanceCreateResponse,
+    type InstanceListResponse as InstanceListResponse,
+    type InstanceGetResponse as InstanceGetResponse,
+    InstanceListResponsesV4PagePaginationArray as InstanceListResponsesV4PagePaginationArray,
+    type InstanceCreateParams as InstanceCreateParams,
+    type InstanceListParams as InstanceListParams,
+    type InstanceGetParams as InstanceGetParams,
+  };
+
+  export {
+    Versions as Versions,
+    type VersionListResponse as VersionListResponse,
+    type VersionGetResponse as VersionGetResponse,
+    VersionListResponsesV4PagePaginationArray as VersionListResponsesV4PagePaginationArray,
+    type VersionListParams as VersionListParams,
+    type VersionGetParams as VersionGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/access/access.ts b/src/resources/zero-trust/access/access.ts
index 8b4f72c7ef..3b93d70b45 100644
--- a/src/resources/zero-trust/access/access.ts
+++ b/src/resources/zero-trust/access/access.ts
@@ -1,20 +1,167 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../resource';
-import * as AccessAPI from './access';
 import * as BookmarksAPI from './bookmarks';
+import {
+  Bookmark,
+  BookmarkCreateParams,
+  BookmarkDeleteParams,
+  BookmarkDeleteResponse,
+  BookmarkGetParams,
+  BookmarkListParams,
+  BookmarkUpdateParams,
+  Bookmarks,
+  BookmarksSinglePage,
+} from './bookmarks';
 import * as CustomPagesAPI from './custom-pages';
+import {
+  CustomPage,
+  CustomPageCreateParams,
+  CustomPageDeleteParams,
+  CustomPageDeleteResponse,
+  CustomPageGetParams,
+  CustomPageListParams,
+  CustomPageUpdateParams,
+  CustomPageWithoutHTML,
+  CustomPageWithoutHTMLsSinglePage,
+  CustomPages,
+} from './custom-pages';
+import * as GatewayCAAPI from './gateway-ca';
+import {
+  GatewayCA,
+  GatewayCACreateParams,
+  GatewayCACreateResponse,
+  GatewayCADeleteParams,
+  GatewayCADeleteResponse,
+  GatewayCAListParams,
+  GatewayCAListResponse,
+  GatewayCAListResponsesSinglePage,
+} from './gateway-ca';
 import * as GroupsAPI from './groups';
+import {
+  GroupCreateParams,
+  GroupDeleteParams,
+  GroupDeleteResponse,
+  GroupGetParams,
+  GroupListParams,
+  GroupUpdateParams,
+  Groups,
+  ZeroTrustGroup,
+  ZeroTrustGroupsSinglePage,
+} from './groups';
 import * as KeysAPI from './keys';
+import {
+  KeyGetParams,
+  KeyGetResponse,
+  KeyRotateParams,
+  KeyRotateResponse,
+  KeyUpdateParams,
+  KeyUpdateResponse,
+  Keys,
+} from './keys';
 import * as PoliciesAPI from './policies';
+import {
+  ApprovalGroup,
+  Policies,
+  Policy,
+  PolicyCreateParams,
+  PolicyCreateResponse,
+  PolicyDeleteParams,
+  PolicyDeleteResponse,
+  PolicyGetParams,
+  PolicyGetResponse,
+  PolicyListParams,
+  PolicyListResponse,
+  PolicyListResponsesSinglePage,
+  PolicyUpdateParams,
+  PolicyUpdateResponse,
+} from './policies';
 import * as ServiceTokensAPI from './service-tokens';
+import {
+  ServiceToken as ServiceTokensAPIServiceToken,
+  ServiceTokenCreateParams,
+  ServiceTokenCreateResponse,
+  ServiceTokenDeleteParams,
+  ServiceTokenGetParams,
+  ServiceTokenListParams,
+  ServiceTokenRefreshParams,
+  ServiceTokenRotateParams,
+  ServiceTokenRotateResponse,
+  ServiceTokenUpdateParams,
+  ServiceTokens,
+  ServiceTokensSinglePage,
+} from './service-tokens';
 import * as TagsAPI from './tags';
+import {
+  Tag,
+  TagCreateParams,
+  TagDeleteParams,
+  TagDeleteResponse,
+  TagGetParams,
+  TagListParams,
+  TagUpdateParams,
+  Tags,
+  TagsSinglePage,
+} from './tags';
 import * as ApplicationsAPI from './applications/applications';
+import {
+  AllowedHeaders,
+  AllowedIdPs,
+  AllowedMethods,
+  AllowedOrigins,
+  AppID,
+  Application,
+  ApplicationCreateParams,
+  ApplicationCreateResponse,
+  ApplicationDeleteParams,
+  ApplicationDeleteResponse,
+  ApplicationGetParams,
+  ApplicationGetResponse,
+  ApplicationListParams,
+  ApplicationListResponse,
+  ApplicationListResponsesSinglePage,
+  ApplicationPolicy,
+  ApplicationRevokeTokensParams,
+  ApplicationRevokeTokensResponse,
+  ApplicationSCIMConfig,
+  ApplicationType,
+  ApplicationUpdateParams,
+  ApplicationUpdateResponse,
+  Applications,
+  CORSHeaders,
+  Decision,
+  OIDCSaaSApp,
+  SAMLSaaSApp,
+  SCIMConfigAuthenticationHTTPBasic,
+  SCIMConfigAuthenticationOAuthBearerToken,
+  SCIMConfigAuthenticationOauth2,
+  SCIMConfigMapping,
+  SaaSAppNameIDFormat,
+  SelfHostedDomains,
+} from './applications/applications';
 import * as CertificatesAPI from './certificates/certificates';
+import {
+  AssociatedHostnames,
+  Certificate as CertificatesAPICertificate,
+  CertificateCreateParams,
+  CertificateDeleteParams,
+  CertificateDeleteResponse,
+  CertificateGetParams,
+  CertificateListParams,
+  CertificateUpdateParams,
+  Certificates,
+  CertificatesSinglePage,
+} from './certificates/certificates';
+import * as InfrastructureAPI from './infrastructure/infrastructure';
+import { Infrastructure } from './infrastructure/infrastructure';
 import * as LogsAPI from './logs/logs';
+import { Logs } from './logs/logs';
 import * as UsersAPI from './users/users';
+import { AccessUser, AccessUsersSinglePage, UserListParams, Users } from './users/users';
 
 export class Access extends APIResource {
+  gatewayCA: GatewayCAAPI.GatewayCA = new GatewayCAAPI.GatewayCA(this._client);
+  infrastructure: InfrastructureAPI.Infrastructure = new InfrastructureAPI.Infrastructure(this._client);
   applications: ApplicationsAPI.Applications = new ApplicationsAPI.Applications(this._client);
   certificates: CertificatesAPI.Certificates = new CertificatesAPI.Certificates(this._client);
   groups: GroupsAPI.Groups = new GroupsAPI.Groups(this._client);
@@ -61,52 +208,144 @@ export namespace AccessDevicePostureRuleParam {
 }
 
 /**
- * Matches a specific email.
+ * Matches an Access group.
  */
 export type AccessRule =
-  | EmailRule
-  | EmailListRule
-  | DomainRule
-  | EveryoneRule
-  | IPRule
-  | IPListRule
-  | CertificateRule
   | GroupRule
+  | AnyValidServiceTokenRule
+  | AccessRule.AccessAuthContextRule
+  | AuthenticationMethodRule
   | AzureGroupRule
+  | CertificateRule
+  | AccessRule.AccessCommonNameRule
+  | CountryRule
+  | AccessDevicePostureRule
+  | DomainRule
+  | EmailListRule
+  | EmailRule
+  | EveryoneRule
+  | ExternalEvaluationRule
   | GitHubOrganizationRule
   | GSuiteGroupRule
+  | IPListRule
+  | IPRule
   | OktaGroupRule
   | SAMLGroupRule
-  | ServiceTokenRule
-  | AnyValidServiceTokenRule
-  | ExternalEvaluationRule
-  | CountryRule
-  | AuthenticationMethodRule
-  | AccessDevicePostureRule;
+  | ServiceTokenRule;
+
+export namespace AccessRule {
+  /**
+   * Matches an Azure Authentication Context. Requires an Azure identity provider.
+   */
+  export interface AccessAuthContextRule {
+    auth_context: AccessAuthContextRule.AuthContext;
+  }
+
+  export namespace AccessAuthContextRule {
+    export interface AuthContext {
+      /**
+       * The ID of an Authentication context.
+       */
+      id: string;
+
+      /**
+       * The ACID of an Authentication context.
+       */
+      ac_id: string;
+
+      /**
+       * The ID of your Azure identity provider.
+       */
+      identity_provider_id: string;
+    }
+  }
+
+  /**
+   * Matches a specific common name.
+   */
+  export interface AccessCommonNameRule {
+    common_name: AccessCommonNameRule.CommonName;
+  }
+
+  export namespace AccessCommonNameRule {
+    export interface CommonName {
+      /**
+       * The common name to match.
+       */
+      common_name: string;
+    }
+  }
+}
 
 /**
- * Matches a specific email.
+ * Matches an Access group.
  */
 export type AccessRuleParam =
-  | EmailRuleParam
-  | EmailListRuleParam
-  | DomainRuleParam
-  | EveryoneRuleParam
-  | IPRuleParam
-  | IPListRuleParam
-  | CertificateRuleParam
   | GroupRuleParam
+  | AnyValidServiceTokenRuleParam
+  | AccessRuleParam.AccessAuthContextRule
+  | AuthenticationMethodRuleParam
   | AzureGroupRuleParam
+  | CertificateRuleParam
+  | AccessRuleParam.AccessCommonNameRule
+  | CountryRuleParam
+  | AccessDevicePostureRuleParam
+  | DomainRuleParam
+  | EmailListRuleParam
+  | EmailRuleParam
+  | EveryoneRuleParam
+  | ExternalEvaluationRuleParam
   | GitHubOrganizationRuleParam
   | GSuiteGroupRuleParam
+  | IPListRuleParam
+  | IPRuleParam
   | OktaGroupRuleParam
   | SAMLGroupRuleParam
-  | ServiceTokenRuleParam
-  | AnyValidServiceTokenRuleParam
-  | ExternalEvaluationRuleParam
-  | CountryRuleParam
-  | AuthenticationMethodRuleParam
-  | AccessDevicePostureRuleParam;
+  | ServiceTokenRuleParam;
+
+export namespace AccessRuleParam {
+  /**
+   * Matches an Azure Authentication Context. Requires an Azure identity provider.
+   */
+  export interface AccessAuthContextRule {
+    auth_context: AccessAuthContextRule.AuthContext;
+  }
+
+  export namespace AccessAuthContextRule {
+    export interface AuthContext {
+      /**
+       * The ID of an Authentication context.
+       */
+      id: string;
+
+      /**
+       * The ACID of an Authentication context.
+       */
+      ac_id: string;
+
+      /**
+       * The ID of your Azure identity provider.
+       */
+      identity_provider_id: string;
+    }
+  }
+
+  /**
+   * Matches a specific common name.
+   */
+  export interface AccessCommonNameRule {
+    common_name: AccessCommonNameRule.CommonName;
+  }
+
+  export namespace AccessCommonNameRule {
+    export interface CommonName {
+      /**
+       * The common name to match.
+       */
+      common_name: string;
+    }
+  }
+}
 
 /**
  * Matches any valid Access Service Token
@@ -115,7 +354,14 @@ export interface AnyValidServiceTokenRule {
   /**
    * An empty object which matches on all service tokens.
    */
-  any_valid_service_token: unknown;
+  any_valid_service_token: AnyValidServiceTokenRule.AnyValidServiceToken;
+}
+
+export namespace AnyValidServiceTokenRule {
+  /**
+   * An empty object which matches on all service tokens.
+   */
+  export interface AnyValidServiceToken {}
 }
 
 /**
@@ -125,7 +371,14 @@ export interface AnyValidServiceTokenRuleParam {
   /**
    * An empty object which matches on all service tokens.
    */
-  any_valid_service_token: unknown;
+  any_valid_service_token: AnyValidServiceTokenRuleParam.AnyValidServiceToken;
+}
+
+export namespace AnyValidServiceTokenRuleParam {
+  /**
+   * An empty object which matches on all service tokens.
+   */
+  export interface AnyValidServiceToken {}
 }
 
 /**
@@ -138,7 +391,8 @@ export interface AuthenticationMethodRule {
 export namespace AuthenticationMethodRule {
   export interface AuthMethod {
     /**
-     * The type of authentication method https://datatracker.ietf.org/doc/html/rfc8176.
+     * The type of authentication method
+     * https://datatracker.ietf.org/doc/html/rfc8176#section-2.
      */
     auth_method: string;
   }
@@ -154,7 +408,8 @@ export interface AuthenticationMethodRuleParam {
 export namespace AuthenticationMethodRuleParam {
   export interface AuthMethod {
     /**
-     * The type of authentication method https://datatracker.ietf.org/doc/html/rfc8176.
+     * The type of authentication method
+     * https://datatracker.ietf.org/doc/html/rfc8176#section-2.
      */
     auth_method: string;
   }
@@ -177,7 +432,7 @@ export namespace AzureGroupRule {
     /**
      * The ID of your Azure identity provider.
      */
-    connection_id: string;
+    identity_provider_id: string;
   }
 }
 
@@ -198,7 +453,7 @@ export namespace AzureGroupRuleParam {
     /**
      * The ID of your Azure identity provider.
      */
-    connection_id: string;
+    identity_provider_id: string;
   }
 }
 
@@ -206,14 +461,22 @@ export namespace AzureGroupRuleParam {
  * Matches any valid client certificate.
  */
 export interface CertificateRule {
-  certificate: unknown;
+  certificate: CertificateRule.Certificate;
+}
+
+export namespace CertificateRule {
+  export interface Certificate {}
 }
 
 /**
  * Matches any valid client certificate.
  */
 export interface CertificateRuleParam {
-  certificate: unknown;
+  certificate: CertificateRuleParam.Certificate;
+}
+
+export namespace CertificateRuleParam {
+  export interface Certificate {}
 }
 
 /**
@@ -351,7 +614,14 @@ export interface EveryoneRule {
   /**
    * An empty object which matches on all users.
    */
-  everyone: unknown;
+  everyone: EveryoneRule.Everyone;
+}
+
+export namespace EveryoneRule {
+  /**
+   * An empty object which matches on all users.
+   */
+  export interface Everyone {}
 }
 
 /**
@@ -361,7 +631,14 @@ export interface EveryoneRuleParam {
   /**
    * An empty object which matches on all users.
    */
-  everyone: unknown;
+  everyone: EveryoneRuleParam.Everyone;
+}
+
+export namespace EveryoneRuleParam {
+  /**
+   * An empty object which matches on all users.
+   */
+  export interface Everyone {}
 }
 
 /**
@@ -420,12 +697,17 @@ export namespace GitHubOrganizationRule {
     /**
      * The ID of your Github identity provider.
      */
-    connection_id: string;
+    identity_provider_id: string;
 
     /**
      * The name of the organization.
      */
     name: string;
+
+    /**
+     * The name of the team
+     */
+    team?: string;
   }
 }
 
@@ -441,12 +723,17 @@ export namespace GitHubOrganizationRuleParam {
     /**
      * The ID of your Github identity provider.
      */
-    connection_id: string;
+    identity_provider_id: string;
 
     /**
      * The name of the organization.
      */
     name: string;
+
+    /**
+     * The name of the team
+     */
+    team?: string;
   }
 }
 
@@ -493,14 +780,14 @@ export interface GSuiteGroupRule {
 export namespace GSuiteGroupRule {
   export interface GSuite {
     /**
-     * The ID of your Google Workspace identity provider.
+     * The email of the Google Workspace group.
      */
-    connection_id: string;
+    email: string;
 
     /**
-     * The email of the Google Workspace group.
+     * The ID of your Google Workspace identity provider.
      */
-    email: string;
+    identity_provider_id: string;
   }
 }
 
@@ -515,14 +802,14 @@ export interface GSuiteGroupRuleParam {
 export namespace GSuiteGroupRuleParam {
   export interface GSuite {
     /**
-     * The ID of your Google Workspace identity provider.
+     * The email of the Google Workspace group.
      */
-    connection_id: string;
+    email: string;
 
     /**
-     * The email of the Google Workspace group.
+     * The ID of your Google Workspace identity provider.
      */
-    email: string;
+    identity_provider_id: string;
   }
 }
 
@@ -602,12 +889,12 @@ export namespace OktaGroupRule {
     /**
      * The ID of your Okta identity provider.
      */
-    connection_id: string;
+    identity_provider_id: string;
 
     /**
-     * The email of the Okta group.
+     * The name of the Okta group.
      */
-    email: string;
+    name: string;
   }
 }
 
@@ -623,12 +910,12 @@ export namespace OktaGroupRuleParam {
     /**
      * The ID of your Okta identity provider.
      */
-    connection_id: string;
+    identity_provider_id: string;
 
     /**
-     * The email of the Okta group.
+     * The name of the Okta group.
      */
-    email: string;
+    name: string;
   }
 }
 
@@ -650,6 +937,11 @@ export namespace SAMLGroupRule {
      * The SAML attribute value to look for.
      */
     attribute_value: string;
+
+    /**
+     * The ID of your SAML identity provider.
+     */
+    identity_provider_id: string;
   }
 }
 
@@ -671,6 +963,11 @@ export namespace SAMLGroupRuleParam {
      * The SAML attribute value to look for.
      */
     attribute_value: string;
+
+    /**
+     * The ID of your SAML identity provider.
+     */
+    identity_provider_id: string;
   }
 }
 
@@ -706,136 +1003,213 @@ export namespace ServiceTokenRuleParam {
   }
 }
 
-export namespace Access {
-  export import AccessDevicePostureRule = AccessAPI.AccessDevicePostureRule;
-  export import AccessRule = AccessAPI.AccessRule;
-  export import AnyValidServiceTokenRule = AccessAPI.AnyValidServiceTokenRule;
-  export import AuthenticationMethodRule = AccessAPI.AuthenticationMethodRule;
-  export import AzureGroupRule = AccessAPI.AzureGroupRule;
-  export import CertificateRule = AccessAPI.CertificateRule;
-  export import CountryRule = AccessAPI.CountryRule;
-  export import DomainRule = AccessAPI.DomainRule;
-  export import EmailListRule = AccessAPI.EmailListRule;
-  export import EmailRule = AccessAPI.EmailRule;
-  export import EveryoneRule = AccessAPI.EveryoneRule;
-  export import ExternalEvaluationRule = AccessAPI.ExternalEvaluationRule;
-  export import GitHubOrganizationRule = AccessAPI.GitHubOrganizationRule;
-  export import GroupRule = AccessAPI.GroupRule;
-  export import GSuiteGroupRule = AccessAPI.GSuiteGroupRule;
-  export import IPListRule = AccessAPI.IPListRule;
-  export import IPRule = AccessAPI.IPRule;
-  export import OktaGroupRule = AccessAPI.OktaGroupRule;
-  export import SAMLGroupRule = AccessAPI.SAMLGroupRule;
-  export import ServiceTokenRule = AccessAPI.ServiceTokenRule;
-  export import Applications = ApplicationsAPI.Applications;
-  export import AllowedHeaders = ApplicationsAPI.AllowedHeaders;
-  export import AllowedIdPs = ApplicationsAPI.AllowedIdPs;
-  export import AllowedMethods = ApplicationsAPI.AllowedMethods;
-  export import AllowedOrigins = ApplicationsAPI.AllowedOrigins;
-  export import AppID = ApplicationsAPI.AppID;
-  export import Application = ApplicationsAPI.Application;
-  export import ApplicationType = ApplicationsAPI.ApplicationType;
-  export import CORSHeaders = ApplicationsAPI.CORSHeaders;
-  export import Decision = ApplicationsAPI.Decision;
-  export import SaaSAppNameFormat = ApplicationsAPI.SaaSAppNameFormat;
-  export import SaaSAppNameIDFormat = ApplicationsAPI.SaaSAppNameIDFormat;
-  export import SaaSAppSource = ApplicationsAPI.SaaSAppSource;
-  export import SAMLSaaSApp = ApplicationsAPI.SAMLSaaSApp;
-  export import SelfHostedDomains = ApplicationsAPI.SelfHostedDomains;
-  export import ApplicationCreateResponse = ApplicationsAPI.ApplicationCreateResponse;
-  export import ApplicationUpdateResponse = ApplicationsAPI.ApplicationUpdateResponse;
-  export import ApplicationListResponse = ApplicationsAPI.ApplicationListResponse;
-  export import ApplicationDeleteResponse = ApplicationsAPI.ApplicationDeleteResponse;
-  export import ApplicationGetResponse = ApplicationsAPI.ApplicationGetResponse;
-  export import ApplicationRevokeTokensResponse = ApplicationsAPI.ApplicationRevokeTokensResponse;
-  export import ApplicationListResponsesSinglePage = ApplicationsAPI.ApplicationListResponsesSinglePage;
-  export import ApplicationCreateParams = ApplicationsAPI.ApplicationCreateParams;
-  export import ApplicationUpdateParams = ApplicationsAPI.ApplicationUpdateParams;
-  export import ApplicationListParams = ApplicationsAPI.ApplicationListParams;
-  export import ApplicationDeleteParams = ApplicationsAPI.ApplicationDeleteParams;
-  export import ApplicationGetParams = ApplicationsAPI.ApplicationGetParams;
-  export import ApplicationRevokeTokensParams = ApplicationsAPI.ApplicationRevokeTokensParams;
-  export import Certificates = CertificatesAPI.Certificates;
-  export import AssociatedHostnames = CertificatesAPI.AssociatedHostnames;
-  export import Certificate = CertificatesAPI.Certificate;
-  export import CertificateDeleteResponse = CertificatesAPI.CertificateDeleteResponse;
-  export import CertificatesSinglePage = CertificatesAPI.CertificatesSinglePage;
-  export import CertificateCreateParams = CertificatesAPI.CertificateCreateParams;
-  export import CertificateUpdateParams = CertificatesAPI.CertificateUpdateParams;
-  export import CertificateListParams = CertificatesAPI.CertificateListParams;
-  export import CertificateDeleteParams = CertificatesAPI.CertificateDeleteParams;
-  export import CertificateGetParams = CertificatesAPI.CertificateGetParams;
-  export import Groups = GroupsAPI.Groups;
-  export import ZeroTrustGroup = GroupsAPI.ZeroTrustGroup;
-  export import GroupDeleteResponse = GroupsAPI.GroupDeleteResponse;
-  export import ZeroTrustGroupsSinglePage = GroupsAPI.ZeroTrustGroupsSinglePage;
-  export import GroupCreateParams = GroupsAPI.GroupCreateParams;
-  export import GroupUpdateParams = GroupsAPI.GroupUpdateParams;
-  export import GroupListParams = GroupsAPI.GroupListParams;
-  export import GroupDeleteParams = GroupsAPI.GroupDeleteParams;
-  export import GroupGetParams = GroupsAPI.GroupGetParams;
-  export import ServiceTokens = ServiceTokensAPI.ServiceTokens;
-  export import ServiceToken = ServiceTokensAPI.ServiceToken;
-  export import ServiceTokenCreateResponse = ServiceTokensAPI.ServiceTokenCreateResponse;
-  export import ServiceTokenRotateResponse = ServiceTokensAPI.ServiceTokenRotateResponse;
-  export import ServiceTokensSinglePage = ServiceTokensAPI.ServiceTokensSinglePage;
-  export import ServiceTokenCreateParams = ServiceTokensAPI.ServiceTokenCreateParams;
-  export import ServiceTokenUpdateParams = ServiceTokensAPI.ServiceTokenUpdateParams;
-  export import ServiceTokenListParams = ServiceTokensAPI.ServiceTokenListParams;
-  export import ServiceTokenDeleteParams = ServiceTokensAPI.ServiceTokenDeleteParams;
-  export import ServiceTokenGetParams = ServiceTokensAPI.ServiceTokenGetParams;
-  export import ServiceTokenRefreshParams = ServiceTokensAPI.ServiceTokenRefreshParams;
-  export import ServiceTokenRotateParams = ServiceTokensAPI.ServiceTokenRotateParams;
-  export import Bookmarks = BookmarksAPI.Bookmarks;
-  export import Bookmark = BookmarksAPI.Bookmark;
-  export import BookmarkDeleteResponse = BookmarksAPI.BookmarkDeleteResponse;
-  export import BookmarksSinglePage = BookmarksAPI.BookmarksSinglePage;
-  export import BookmarkCreateParams = BookmarksAPI.BookmarkCreateParams;
-  export import BookmarkUpdateParams = BookmarksAPI.BookmarkUpdateParams;
-  export import BookmarkListParams = BookmarksAPI.BookmarkListParams;
-  export import BookmarkDeleteParams = BookmarksAPI.BookmarkDeleteParams;
-  export import BookmarkGetParams = BookmarksAPI.BookmarkGetParams;
-  export import Keys = KeysAPI.Keys;
-  export import KeyUpdateResponse = KeysAPI.KeyUpdateResponse;
-  export import KeyGetResponse = KeysAPI.KeyGetResponse;
-  export import KeyRotateResponse = KeysAPI.KeyRotateResponse;
-  export import KeyUpdateParams = KeysAPI.KeyUpdateParams;
-  export import KeyGetParams = KeysAPI.KeyGetParams;
-  export import KeyRotateParams = KeysAPI.KeyRotateParams;
-  export import Logs = LogsAPI.Logs;
-  export import Users = UsersAPI.Users;
-  export import AccessUser = UsersAPI.AccessUser;
-  export import AccessUsersSinglePage = UsersAPI.AccessUsersSinglePage;
-  export import UserListParams = UsersAPI.UserListParams;
-  export import CustomPages = CustomPagesAPI.CustomPages;
-  export import CustomPage = CustomPagesAPI.CustomPage;
-  export import CustomPageWithoutHTML = CustomPagesAPI.CustomPageWithoutHTML;
-  export import CustomPageDeleteResponse = CustomPagesAPI.CustomPageDeleteResponse;
-  export import CustomPageWithoutHTMLsSinglePage = CustomPagesAPI.CustomPageWithoutHTMLsSinglePage;
-  export import CustomPageCreateParams = CustomPagesAPI.CustomPageCreateParams;
-  export import CustomPageUpdateParams = CustomPagesAPI.CustomPageUpdateParams;
-  export import CustomPageListParams = CustomPagesAPI.CustomPageListParams;
-  export import CustomPageDeleteParams = CustomPagesAPI.CustomPageDeleteParams;
-  export import CustomPageGetParams = CustomPagesAPI.CustomPageGetParams;
-  export import Tags = TagsAPI.Tags;
-  export import Tag = TagsAPI.Tag;
-  export import TagDeleteResponse = TagsAPI.TagDeleteResponse;
-  export import TagsSinglePage = TagsAPI.TagsSinglePage;
-  export import TagCreateParams = TagsAPI.TagCreateParams;
-  export import TagUpdateParams = TagsAPI.TagUpdateParams;
-  export import TagListParams = TagsAPI.TagListParams;
-  export import TagDeleteParams = TagsAPI.TagDeleteParams;
-  export import TagGetParams = TagsAPI.TagGetParams;
-  export import Policies = PoliciesAPI.Policies;
-  export import PolicyCreateResponse = PoliciesAPI.PolicyCreateResponse;
-  export import PolicyUpdateResponse = PoliciesAPI.PolicyUpdateResponse;
-  export import PolicyListResponse = PoliciesAPI.PolicyListResponse;
-  export import PolicyDeleteResponse = PoliciesAPI.PolicyDeleteResponse;
-  export import PolicyGetResponse = PoliciesAPI.PolicyGetResponse;
-  export import PolicyListResponsesSinglePage = PoliciesAPI.PolicyListResponsesSinglePage;
-  export import PolicyCreateParams = PoliciesAPI.PolicyCreateParams;
-  export import PolicyUpdateParams = PoliciesAPI.PolicyUpdateParams;
-  export import PolicyListParams = PoliciesAPI.PolicyListParams;
-  export import PolicyDeleteParams = PoliciesAPI.PolicyDeleteParams;
-  export import PolicyGetParams = PoliciesAPI.PolicyGetParams;
+Access.GatewayCA = GatewayCA;
+Access.GatewayCAListResponsesSinglePage = GatewayCAListResponsesSinglePage;
+Access.Infrastructure = Infrastructure;
+Access.Applications = Applications;
+Access.ApplicationListResponsesSinglePage = ApplicationListResponsesSinglePage;
+Access.Certificates = Certificates;
+Access.CertificatesSinglePage = CertificatesSinglePage;
+Access.Groups = Groups;
+Access.ZeroTrustGroupsSinglePage = ZeroTrustGroupsSinglePage;
+Access.ServiceTokens = ServiceTokens;
+Access.ServiceTokensSinglePage = ServiceTokensSinglePage;
+Access.Bookmarks = Bookmarks;
+Access.BookmarksSinglePage = BookmarksSinglePage;
+Access.Keys = Keys;
+Access.Logs = Logs;
+Access.Users = Users;
+Access.AccessUsersSinglePage = AccessUsersSinglePage;
+Access.CustomPages = CustomPages;
+Access.CustomPageWithoutHTMLsSinglePage = CustomPageWithoutHTMLsSinglePage;
+Access.Tags = Tags;
+Access.TagsSinglePage = TagsSinglePage;
+Access.Policies = Policies;
+Access.PolicyListResponsesSinglePage = PolicyListResponsesSinglePage;
+
+export declare namespace Access {
+  export {
+    type AccessDevicePostureRule as AccessDevicePostureRule,
+    type AccessRule as AccessRule,
+    type AnyValidServiceTokenRule as AnyValidServiceTokenRule,
+    type AuthenticationMethodRule as AuthenticationMethodRule,
+    type AzureGroupRule as AzureGroupRule,
+    type CertificateRule as CertificateRule,
+    type CountryRule as CountryRule,
+    type DomainRule as DomainRule,
+    type EmailListRule as EmailListRule,
+    type EmailRule as EmailRule,
+    type EveryoneRule as EveryoneRule,
+    type ExternalEvaluationRule as ExternalEvaluationRule,
+    type GitHubOrganizationRule as GitHubOrganizationRule,
+    type GroupRule as GroupRule,
+    type GSuiteGroupRule as GSuiteGroupRule,
+    type IPListRule as IPListRule,
+    type IPRule as IPRule,
+    type OktaGroupRule as OktaGroupRule,
+    type SAMLGroupRule as SAMLGroupRule,
+    type ServiceTokenRule as ServiceTokenRule,
+  };
+
+  export {
+    GatewayCA as GatewayCA,
+    type GatewayCACreateResponse as GatewayCACreateResponse,
+    type GatewayCAListResponse as GatewayCAListResponse,
+    type GatewayCADeleteResponse as GatewayCADeleteResponse,
+    GatewayCAListResponsesSinglePage as GatewayCAListResponsesSinglePage,
+    type GatewayCACreateParams as GatewayCACreateParams,
+    type GatewayCAListParams as GatewayCAListParams,
+    type GatewayCADeleteParams as GatewayCADeleteParams,
+  };
+
+  export { Infrastructure as Infrastructure };
+
+  export {
+    Applications as Applications,
+    type AllowedHeaders as AllowedHeaders,
+    type AllowedIdPs as AllowedIdPs,
+    type AllowedMethods as AllowedMethods,
+    type AllowedOrigins as AllowedOrigins,
+    type AppID as AppID,
+    type Application as Application,
+    type ApplicationPolicy as ApplicationPolicy,
+    type ApplicationSCIMConfig as ApplicationSCIMConfig,
+    type ApplicationType as ApplicationType,
+    type CORSHeaders as CORSHeaders,
+    type Decision as Decision,
+    type OIDCSaaSApp as OIDCSaaSApp,
+    type SaaSAppNameIDFormat as SaaSAppNameIDFormat,
+    type SAMLSaaSApp as SAMLSaaSApp,
+    type SCIMConfigAuthenticationHTTPBasic as SCIMConfigAuthenticationHTTPBasic,
+    type SCIMConfigAuthenticationOAuthBearerToken as SCIMConfigAuthenticationOAuthBearerToken,
+    type SCIMConfigAuthenticationOauth2 as SCIMConfigAuthenticationOauth2,
+    type SCIMConfigMapping as SCIMConfigMapping,
+    type SelfHostedDomains as SelfHostedDomains,
+    type ApplicationCreateResponse as ApplicationCreateResponse,
+    type ApplicationUpdateResponse as ApplicationUpdateResponse,
+    type ApplicationListResponse as ApplicationListResponse,
+    type ApplicationDeleteResponse as ApplicationDeleteResponse,
+    type ApplicationGetResponse as ApplicationGetResponse,
+    type ApplicationRevokeTokensResponse as ApplicationRevokeTokensResponse,
+    ApplicationListResponsesSinglePage as ApplicationListResponsesSinglePage,
+    type ApplicationCreateParams as ApplicationCreateParams,
+    type ApplicationUpdateParams as ApplicationUpdateParams,
+    type ApplicationListParams as ApplicationListParams,
+    type ApplicationDeleteParams as ApplicationDeleteParams,
+    type ApplicationGetParams as ApplicationGetParams,
+    type ApplicationRevokeTokensParams as ApplicationRevokeTokensParams,
+  };
+
+  export {
+    Certificates as Certificates,
+    type AssociatedHostnames as AssociatedHostnames,
+    type CertificatesAPICertificate as Certificate,
+    type CertificateDeleteResponse as CertificateDeleteResponse,
+    CertificatesSinglePage as CertificatesSinglePage,
+    type CertificateCreateParams as CertificateCreateParams,
+    type CertificateUpdateParams as CertificateUpdateParams,
+    type CertificateListParams as CertificateListParams,
+    type CertificateDeleteParams as CertificateDeleteParams,
+    type CertificateGetParams as CertificateGetParams,
+  };
+
+  export {
+    Groups as Groups,
+    type ZeroTrustGroup as ZeroTrustGroup,
+    type GroupDeleteResponse as GroupDeleteResponse,
+    ZeroTrustGroupsSinglePage as ZeroTrustGroupsSinglePage,
+    type GroupCreateParams as GroupCreateParams,
+    type GroupUpdateParams as GroupUpdateParams,
+    type GroupListParams as GroupListParams,
+    type GroupDeleteParams as GroupDeleteParams,
+    type GroupGetParams as GroupGetParams,
+  };
+
+  export {
+    ServiceTokens as ServiceTokens,
+    type ServiceTokensAPIServiceToken as ServiceToken,
+    type ServiceTokenCreateResponse as ServiceTokenCreateResponse,
+    type ServiceTokenRotateResponse as ServiceTokenRotateResponse,
+    ServiceTokensSinglePage as ServiceTokensSinglePage,
+    type ServiceTokenCreateParams as ServiceTokenCreateParams,
+    type ServiceTokenUpdateParams as ServiceTokenUpdateParams,
+    type ServiceTokenListParams as ServiceTokenListParams,
+    type ServiceTokenDeleteParams as ServiceTokenDeleteParams,
+    type ServiceTokenGetParams as ServiceTokenGetParams,
+    type ServiceTokenRefreshParams as ServiceTokenRefreshParams,
+    type ServiceTokenRotateParams as ServiceTokenRotateParams,
+  };
+
+  export {
+    Bookmarks as Bookmarks,
+    type Bookmark as Bookmark,
+    type BookmarkDeleteResponse as BookmarkDeleteResponse,
+    BookmarksSinglePage as BookmarksSinglePage,
+    type BookmarkCreateParams as BookmarkCreateParams,
+    type BookmarkUpdateParams as BookmarkUpdateParams,
+    type BookmarkListParams as BookmarkListParams,
+    type BookmarkDeleteParams as BookmarkDeleteParams,
+    type BookmarkGetParams as BookmarkGetParams,
+  };
+
+  export {
+    Keys as Keys,
+    type KeyUpdateResponse as KeyUpdateResponse,
+    type KeyGetResponse as KeyGetResponse,
+    type KeyRotateResponse as KeyRotateResponse,
+    type KeyUpdateParams as KeyUpdateParams,
+    type KeyGetParams as KeyGetParams,
+    type KeyRotateParams as KeyRotateParams,
+  };
+
+  export { Logs as Logs };
+
+  export {
+    Users as Users,
+    type AccessUser as AccessUser,
+    AccessUsersSinglePage as AccessUsersSinglePage,
+    type UserListParams as UserListParams,
+  };
+
+  export {
+    CustomPages as CustomPages,
+    type CustomPage as CustomPage,
+    type CustomPageWithoutHTML as CustomPageWithoutHTML,
+    type CustomPageDeleteResponse as CustomPageDeleteResponse,
+    CustomPageWithoutHTMLsSinglePage as CustomPageWithoutHTMLsSinglePage,
+    type CustomPageCreateParams as CustomPageCreateParams,
+    type CustomPageUpdateParams as CustomPageUpdateParams,
+    type CustomPageListParams as CustomPageListParams,
+    type CustomPageDeleteParams as CustomPageDeleteParams,
+    type CustomPageGetParams as CustomPageGetParams,
+  };
+
+  export {
+    Tags as Tags,
+    type Tag as Tag,
+    type TagDeleteResponse as TagDeleteResponse,
+    TagsSinglePage as TagsSinglePage,
+    type TagCreateParams as TagCreateParams,
+    type TagUpdateParams as TagUpdateParams,
+    type TagListParams as TagListParams,
+    type TagDeleteParams as TagDeleteParams,
+    type TagGetParams as TagGetParams,
+  };
+
+  export {
+    Policies as Policies,
+    type ApprovalGroup as ApprovalGroup,
+    type Policy as Policy,
+    type PolicyCreateResponse as PolicyCreateResponse,
+    type PolicyUpdateResponse as PolicyUpdateResponse,
+    type PolicyListResponse as PolicyListResponse,
+    type PolicyDeleteResponse as PolicyDeleteResponse,
+    type PolicyGetResponse as PolicyGetResponse,
+    PolicyListResponsesSinglePage as PolicyListResponsesSinglePage,
+    type PolicyCreateParams as PolicyCreateParams,
+    type PolicyUpdateParams as PolicyUpdateParams,
+    type PolicyListParams as PolicyListParams,
+    type PolicyDeleteParams as PolicyDeleteParams,
+    type PolicyGetParams as PolicyGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/applications/applications.ts b/src/resources/zero-trust/access/applications/applications.ts
index fea7e648b9..b862845a75 100644
--- a/src/resources/zero-trust/access/applications/applications.ts
+++ b/src/resources/zero-trust/access/applications/applications.ts
@@ -3,12 +3,51 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import { CloudflareError } from '../../../../error';
+import { CloudflareError } from 'cloudflare/error';
 import * as ApplicationsAPI from './applications';
 import * as AccessAPI from '../access';
+import * as PoliciesAPI from '../policies';
 import * as CAsAPI from './cas';
-import * as PoliciesAPI from './policies';
+import {
+  CA,
+  CACreateParams,
+  CADeleteParams,
+  CADeleteResponse,
+  CAGetParams,
+  CAListParams,
+  CAs,
+  CAsSinglePage,
+} from './cas';
+import * as ApplicationsPoliciesAPI from './policies';
+import {
+  Policies,
+  PolicyCreateParams,
+  PolicyCreateResponse,
+  PolicyDeleteParams,
+  PolicyDeleteResponse,
+  PolicyGetParams,
+  PolicyGetResponse,
+  PolicyListParams,
+  PolicyListResponse,
+  PolicyListResponsesSinglePage,
+  PolicyUpdateParams,
+  PolicyUpdateResponse,
+} from './policies';
 import * as UserPolicyChecksAPI from './user-policy-checks';
+import {
+  UserPolicyCheckGeo,
+  UserPolicyCheckListParams,
+  UserPolicyCheckListResponse,
+  UserPolicyChecks,
+} from './user-policy-checks';
+import * as PolicyTestsAPI from './policy-tests/policy-tests';
+import {
+  PolicyTestCreateParams,
+  PolicyTestCreateResponse,
+  PolicyTestGetParams,
+  PolicyTestGetResponse,
+  PolicyTests,
+} from './policy-tests/policy-tests';
 import { SinglePage } from '../../../../pagination';
 
 export class Applications extends APIResource {
@@ -16,7 +55,8 @@ export class Applications extends APIResource {
   userPolicyChecks: UserPolicyChecksAPI.UserPolicyChecks = new UserPolicyChecksAPI.UserPolicyChecks(
     this._client,
   );
-  policies: PoliciesAPI.Policies = new PoliciesAPI.Policies(this._client);
+  policies: ApplicationsPoliciesAPI.Policies = new ApplicationsPoliciesAPI.Policies(this._client);
+  policyTests: PolicyTestsAPI.PolicyTests = new PolicyTestsAPI.PolicyTests(this._client);
 
   /**
    * Adds a new application to Access.
@@ -100,7 +140,7 @@ export class Applications extends APIResource {
     if (isRequestOptions(params)) {
       return this.list({}, params);
     }
-    const { account_id, zone_id } = params;
+    const { account_id, zone_id, ...query } = params;
     if (!account_id && !zone_id) {
       throw new CloudflareError('You must provide either account_id or zone_id.');
     }
@@ -120,7 +160,7 @@ export class Applications extends APIResource {
     return this._client.getAPIList(
       `/${accountOrZone}/${accountOrZoneId}/access/apps`,
       ApplicationListResponsesSinglePage,
-      options,
+      { query, ...options },
     );
   }
 
@@ -299,18 +339,18 @@ export type AllowedOriginsParam = string;
 /**
  * Identifier
  */
-export type AppID = string | string;
+export type AppID = string;
 
 /**
  * Identifier
  */
-export type AppIDParam = string | string;
+export type AppIDParam = string;
 
 export type Application =
   | Application.SelfHostedApplication
   | Application.SaaSApplication
   | Application.BrowserSSHApplication
-  | Application.BrowserVncApplication
+  | Application.BrowserVNCApplication
   | Application.AppLauncherApplication
   | Application.DeviceEnrollmentPermissionsApplication
   | Application.BrowserIsolationPermissionsApplication
@@ -409,7 +449,7 @@ export namespace Application {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: SelfHostedApplication.SCIMConfig;
+    scim_config?: ApplicationsAPI.ApplicationSCIMConfig;
 
     /**
      * Returns a 401 status code when the request is blocked by a Service Auth policy.
@@ -474,185 +514,6 @@ export namespace Application {
        */
       max_age?: number;
     }
-
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    export interface SCIMConfig {
-      /**
-       * The UID of the IdP to use as the source for SCIM resources to provision to this
-       * application.
-       */
-      idp_uid: string;
-
-      /**
-       * The base URI for the application's SCIM-compatible API.
-       */
-      remote_uri: string;
-
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
-
-      /**
-       * If false, we propagate DELETE requests to the target application for SCIM
-       * resources. If true, we only set `active` to false on the SCIM resource. This is
-       * useful because some targets do not support DELETE operations.
-       */
-      deactivate_on_delete?: boolean;
-
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
-
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
   }
 
   export interface SaaSApplication {
@@ -701,7 +562,7 @@ export namespace Application {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: SaaSApplication.SCIMConfig;
+    scim_config?: ApplicationsAPI.ApplicationSCIMConfig;
 
     /**
      * The application type.
@@ -727,7 +588,7 @@ export namespace Application {
 
       created_at?: string;
 
-      custom_attributes?: AccessSchemasSAMLSaaSApp.CustomAttributes;
+      custom_attributes?: Array<AccessSchemasSAMLSaaSApp.CustomAttribute>;
 
       /**
        * The unique identifier for your SaaS application.
@@ -766,7 +627,7 @@ export namespace Application {
     }
 
     export namespace AccessSchemasSAMLSaaSApp {
-      export interface CustomAttributes {
+      export interface CustomAttribute {
         /**
          * The SAML FriendlyName of the attribute.
          */
@@ -780,14 +641,31 @@ export namespace Application {
         /**
          * A globally unique name for an identity or service provider.
          */
-        name_format?: ApplicationsAPI.SaaSAppNameFormat;
+        name_format?:
+          | 'urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified'
+          | 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic'
+          | 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri';
 
         /**
          * If the attribute is required when building a SAML assertion.
          */
         required?: boolean;
 
-        source?: ApplicationsAPI.SaaSAppSource;
+        source?: CustomAttribute.Source;
+      }
+
+      export namespace CustomAttribute {
+        export interface Source {
+          /**
+           * The name of the IdP attribute.
+           */
+          name?: string;
+
+          /**
+           * A mapping from IdP ID to attribute name.
+           */
+          name_by_idp?: Record<string, string>;
+        }
       }
     }
 
@@ -827,7 +705,7 @@ export namespace Application {
 
       created_at?: string;
 
-      custom_claims?: AccessSchemasOIDCSaaSApp.CustomClaims;
+      custom_claims?: Array<AccessSchemasOIDCSaaSApp.CustomClaim>;
 
       /**
        * The OIDC flows supported by this application
@@ -866,7 +744,7 @@ export namespace Application {
     }
 
     export namespace AccessSchemasOIDCSaaSApp {
-      export interface CustomClaims {
+      export interface CustomClaim {
         /**
          * The name of the claim.
          */
@@ -882,10 +760,10 @@ export namespace Application {
          */
         scope?: 'groups' | 'profile' | 'email' | 'openid';
 
-        source?: CustomClaims.Source;
+        source?: CustomClaim.Source;
       }
 
-      export namespace CustomClaims {
+      export namespace CustomClaim {
         export interface Source {
           /**
            * The name of the IdP claim.
@@ -919,185 +797,6 @@ export namespace Application {
         lifetime?: string;
       }
     }
-
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    export interface SCIMConfig {
-      /**
-       * The UID of the IdP to use as the source for SCIM resources to provision to this
-       * application.
-       */
-      idp_uid: string;
-
-      /**
-       * The base URI for the application's SCIM-compatible API.
-       */
-      remote_uri: string;
-
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
-
-      /**
-       * If false, we propagate DELETE requests to the target application for SCIM
-       * resources. If true, we only set `active` to false on the SCIM resource. This is
-       * useful because some targets do not support DELETE operations.
-       */
-      deactivate_on_delete?: boolean;
-
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
-
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
   }
 
   export interface BrowserSSHApplication {
@@ -1192,7 +891,7 @@ export namespace Application {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserSSHApplication.SCIMConfig;
+    scim_config?: ApplicationsAPI.ApplicationSCIMConfig;
 
     /**
      * Returns a 401 status code when the request is blocked by a Service Auth policy.
@@ -1257,188 +956,9 @@ export namespace Application {
        */
       max_age?: number;
     }
-
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    export interface SCIMConfig {
-      /**
-       * The UID of the IdP to use as the source for SCIM resources to provision to this
-       * application.
-       */
-      idp_uid: string;
-
-      /**
-       * The base URI for the application's SCIM-compatible API.
-       */
-      remote_uri: string;
-
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
-
-      /**
-       * If false, we propagate DELETE requests to the target application for SCIM
-       * resources. If true, we only set `active` to false on the SCIM resource. This is
-       * useful because some targets do not support DELETE operations.
-       */
-      deactivate_on_delete?: boolean;
-
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
-
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
   }
 
-  export interface BrowserVncApplication {
+  export interface BrowserVNCApplication {
     /**
      * The domain and path that Access will secure.
      */
@@ -1476,7 +996,7 @@ export namespace Application {
      */
     auto_redirect_to_identity?: boolean;
 
-    cors_headers?: BrowserVncApplication.CORSHeaders;
+    cors_headers?: BrowserVNCApplication.CORSHeaders;
 
     created_at?: string;
 
@@ -1530,7 +1050,7 @@ export namespace Application {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserVncApplication.SCIMConfig;
+    scim_config?: ApplicationsAPI.ApplicationSCIMConfig;
 
     /**
      * Returns a 401 status code when the request is blocked by a Service Auth policy.
@@ -1552,7 +1072,7 @@ export namespace Application {
     updated_at?: string;
   }
 
-  export namespace BrowserVncApplication {
+  export namespace BrowserVNCApplication {
     export interface CORSHeaders {
       /**
        * Allows all HTTP request headers.
@@ -1595,192 +1115,13 @@ export namespace Application {
        */
       max_age?: number;
     }
-
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    export interface SCIMConfig {
-      /**
-       * The UID of the IdP to use as the source for SCIM resources to provision to this
-       * application.
-       */
-      idp_uid: string;
-
-      /**
-       * The base URI for the application's SCIM-compatible API.
-       */
-      remote_uri: string;
-
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
-
-      /**
-       * If false, we propagate DELETE requests to the target application for SCIM
-       * resources. If true, we only set `active` to false on the SCIM resource. This is
-       * useful because some targets do not support DELETE operations.
-       */
-      deactivate_on_delete?: boolean;
-
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
-
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
   }
 
   export interface AppLauncherApplication {
     /**
      * The application type.
      */
-    type: ApplicationsAPI.ApplicationType;
+    type: 'self_hosted' | 'saas' | 'ssh' | 'vnc' | 'app_launcher' | 'warp' | 'biso' | 'bookmark' | 'dash_sso';
 
     /**
      * UUID
@@ -1820,7 +1161,7 @@ export namespace Application {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: AppLauncherApplication.SCIMConfig;
+    scim_config?: ApplicationsAPI.ApplicationSCIMConfig;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -1832,192 +1173,11 @@ export namespace Application {
     updated_at?: string;
   }
 
-  export namespace AppLauncherApplication {
+  export interface DeviceEnrollmentPermissionsApplication {
     /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
+     * The application type.
      */
-    export interface SCIMConfig {
-      /**
-       * The UID of the IdP to use as the source for SCIM resources to provision to this
-       * application.
-       */
-      idp_uid: string;
-
-      /**
-       * The base URI for the application's SCIM-compatible API.
-       */
-      remote_uri: string;
-
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
-
-      /**
-       * If false, we propagate DELETE requests to the target application for SCIM
-       * resources. If true, we only set `active` to false on the SCIM resource. This is
-       * useful because some targets do not support DELETE operations.
-       */
-      deactivate_on_delete?: boolean;
-
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
-
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
-  }
-
-  export interface DeviceEnrollmentPermissionsApplication {
-    /**
-     * The application type.
-     */
-    type: ApplicationsAPI.ApplicationType;
+    type: 'self_hosted' | 'saas' | 'ssh' | 'vnc' | 'app_launcher' | 'warp' | 'biso' | 'bookmark' | 'dash_sso';
 
     /**
      * UUID
@@ -2057,7 +1217,7 @@ export namespace Application {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: DeviceEnrollmentPermissionsApplication.SCIMConfig;
+    scim_config?: ApplicationsAPI.ApplicationSCIMConfig;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -2069,192 +1229,11 @@ export namespace Application {
     updated_at?: string;
   }
 
-  export namespace DeviceEnrollmentPermissionsApplication {
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    export interface SCIMConfig {
-      /**
-       * The UID of the IdP to use as the source for SCIM resources to provision to this
-       * application.
-       */
-      idp_uid: string;
-
-      /**
-       * The base URI for the application's SCIM-compatible API.
-       */
-      remote_uri: string;
-
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
-
-      /**
-       * If false, we propagate DELETE requests to the target application for SCIM
-       * resources. If true, we only set `active` to false on the SCIM resource. This is
-       * useful because some targets do not support DELETE operations.
-       */
-      deactivate_on_delete?: boolean;
-
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
-
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
-  }
-
   export interface BrowserIsolationPermissionsApplication {
     /**
      * The application type.
      */
-    type: ApplicationsAPI.ApplicationType;
+    type: 'self_hosted' | 'saas' | 'ssh' | 'vnc' | 'app_launcher' | 'warp' | 'biso' | 'bookmark' | 'dash_sso';
 
     /**
      * UUID
@@ -2294,7 +1273,7 @@ export namespace Application {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserIsolationPermissionsApplication.SCIMConfig;
+    scim_config?: ApplicationsAPI.ApplicationSCIMConfig;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -2306,192 +1285,11 @@ export namespace Application {
     updated_at?: string;
   }
 
-  export namespace BrowserIsolationPermissionsApplication {
+  export interface BookmarkApplication {
     /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
+     * The URL or domain of the bookmark.
      */
-    export interface SCIMConfig {
-      /**
-       * The UID of the IdP to use as the source for SCIM resources to provision to this
-       * application.
-       */
-      idp_uid: string;
-
-      /**
-       * The base URI for the application's SCIM-compatible API.
-       */
-      remote_uri: string;
-
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
-
-      /**
-       * If false, we propagate DELETE requests to the target application for SCIM
-       * resources. If true, we only set `active` to false on the SCIM resource. This is
-       * useful because some targets do not support DELETE operations.
-       */
-      deactivate_on_delete?: boolean;
-
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
-
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
-  }
-
-  export interface BookmarkApplication {
-    /**
-     * The URL or domain of the bookmark.
-     */
-    domain: string;
+    domain: string;
 
     /**
      * The application type.
@@ -2526,190 +1324,183 @@ export namespace Application {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BookmarkApplication.SCIMConfig;
+    scim_config?: ApplicationsAPI.ApplicationSCIMConfig;
 
     updated_at?: string;
   }
+}
 
-  export namespace BookmarkApplication {
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    export interface SCIMConfig {
-      /**
-       * The UID of the IdP to use as the source for SCIM resources to provision to this
-       * application.
-       */
-      idp_uid: string;
+export interface ApplicationPolicy {
+  /**
+   * The UUID of the policy
+   */
+  id?: string;
 
-      /**
-       * The base URI for the application's SCIM-compatible API.
-       */
-      remote_uri: string;
+  /**
+   * Administrators who can approve a temporary authentication request.
+   */
+  approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
 
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+  /**
+   * Requires the user to request access from an administrator at the start of each
+   * session.
+   */
+  approval_required?: boolean;
 
-      /**
-       * If false, we propagate DELETE requests to the target application for SCIM
-       * resources. If true, we only set `active` to false on the SCIM resource. This is
-       * useful because some targets do not support DELETE operations.
-       */
-      deactivate_on_delete?: boolean;
+  created_at?: string;
 
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
+  /**
+   * The action Access will take if a user matches this policy. Infrastructure
+   * application policies can only use the Allow action.
+   */
+  decision?: Decision;
 
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
+  /**
+   * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
+   * meet any of the Exclude rules.
+   */
+  exclude?: Array<AccessAPI.AccessRule>;
 
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
+  /**
+   * Rules evaluated with an OR logical operator. A user needs to meet only one of
+   * the Include rules.
+   */
+  include?: Array<AccessAPI.AccessRule>;
 
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
+  /**
+   * Require this application to be served in an isolated browser for users matching
+   * this policy. 'Client Web Isolation' must be on for the account in order to use
+   * this feature.
+   */
+  isolation_required?: boolean;
 
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
+  /**
+   * The name of the Access policy.
+   */
+  name?: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
+  /**
+   * A custom message that will appear on the purpose justification screen.
+   */
+  purpose_justification_prompt?: string;
 
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
+  /**
+   * Require users to enter a justification when they log in to the application.
+   */
+  purpose_justification_required?: boolean;
 
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
+  /**
+   * Rules evaluated with an AND logical operator. To match the policy, a user must
+   * meet all of the Require rules.
+   */
+  require?: Array<AccessAPI.AccessRule>;
 
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
+  /**
+   * The amount of time that tokens issued for the application will be valid. Must be
+   * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
+   * m, h.
+   */
+  session_duration?: string;
 
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
+  updated_at?: string;
+}
 
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
+/**
+ * Configuration for provisioning to this application via SCIM. This is currently
+ * in closed beta.
+ */
+export interface ApplicationSCIMConfig {
+  /**
+   * The UID of the IdP to use as the source for SCIM resources to provision to this
+   * application.
+   */
+  idp_uid: string;
 
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
+  /**
+   * The base URI for the application's SCIM-compatible API.
+   */
+  remote_uri: string;
 
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
+  /**
+   * Attributes for configuring HTTP Basic authentication scheme for SCIM
+   * provisioning to an application.
+   */
+  authentication?:
+    | SCIMConfigAuthenticationHTTPBasic
+    | SCIMConfigAuthenticationOAuthBearerToken
+    | SCIMConfigAuthenticationOauth2
+    | ApplicationSCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+    | Array<
+        | SCIMConfigAuthenticationHTTPBasic
+        | SCIMConfigAuthenticationOAuthBearerToken
+        | SCIMConfigAuthenticationOauth2
+        | ApplicationSCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+      >;
 
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
+  /**
+   * If false, we propagate DELETE requests to the target application for SCIM
+   * resources. If true, we only set `active` to false on the SCIM resource. This is
+   * useful because some targets do not support DELETE operations.
+   */
+  deactivate_on_delete?: boolean;
 
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
+  /**
+   * Whether SCIM provisioning is turned on for this application.
+   */
+  enabled?: boolean;
 
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
+  /**
+   * A list of mappings to apply to SCIM resources before provisioning them in this
+   * application. These can transform or filter the resources to be provisioned.
+   */
+  mappings?: Array<SCIMConfigMapping>;
+}
 
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
+export namespace ApplicationSCIMConfig {
+  /**
+   * Attributes for configuring Access Service Token authentication scheme for SCIM
+   * provisioning to an application.
+   */
+  export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+    /**
+     * Client ID of the Access service token used to authenticate with the remote
+     * service.
+     */
+    client_id: string;
 
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
+    /**
+     * Client secret of the Access service token used to authenticate with the remote
+     * service.
+     */
+    client_secret: string;
 
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
+    /**
+     * The authentication scheme to use when making SCIM requests to this application.
+     */
+    scheme: 'access_service_token';
+  }
 
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
+  /**
+   * Attributes for configuring Access Service Token authentication scheme for SCIM
+   * provisioning to an application.
+   */
+  export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+    /**
+     * Client ID of the Access service token used to authenticate with the remote
+     * service.
+     */
+    client_id: string;
 
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
+    /**
+     * Client secret of the Access service token used to authenticate with the remote
+     * service.
+     */
+    client_secret: string;
+
+    /**
+     * The authentication scheme to use when making SCIM requests to this application.
+     */
+    scheme: 'access_service_token';
   }
 }
 
@@ -2725,7 +1516,8 @@ export type ApplicationType =
   | 'warp'
   | 'biso'
   | 'bookmark'
-  | 'dash_sso';
+  | 'dash_sso'
+  | 'infrastructure';
 
 /**
  * The application type.
@@ -2739,7 +1531,8 @@ export type ApplicationTypeParam =
   | 'warp'
   | 'biso'
   | 'bookmark'
-  | 'dash_sso';
+  | 'dash_sso'
+  | 'infrastructure';
 
 export interface CORSHeaders {
   /**
@@ -2828,65 +1621,281 @@ export interface CORSHeadersParam {
 }
 
 /**
- * The action Access will take if a user matches this policy.
+ * The action Access will take if a user matches this policy. Infrastructure
+ * application policies can only use the Allow action.
  */
 export type Decision = 'allow' | 'deny' | 'non_identity' | 'bypass';
 
 /**
- * The action Access will take if a user matches this policy.
+ * The action Access will take if a user matches this policy. Infrastructure
+ * application policies can only use the Allow action.
  */
 export type DecisionParam = 'allow' | 'deny' | 'non_identity' | 'bypass';
 
-/**
- * A globally unique name for an identity or service provider.
- */
-export type SaaSAppNameFormat =
-  | 'urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified'
-  | 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic'
-  | 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri';
+export interface OIDCSaaSApp {
+  /**
+   * The lifetime of the OIDC Access Token after creation. Valid units are m,h. Must
+   * be greater than or equal to 1m and less than or equal to 24h.
+   */
+  access_token_lifetime?: string;
 
-/**
- * A globally unique name for an identity or service provider.
- */
-export type SaaSAppNameFormatParam =
-  | 'urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified'
-  | 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic'
-  | 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri';
+  /**
+   * If client secret should be required on the token endpoint when
+   * authorization_code_with_pkce grant is used.
+   */
+  allow_pkce_without_client_secret?: boolean;
 
-/**
- * The format of the name identifier sent to the SaaS application.
- */
-export type SaaSAppNameIDFormat = 'id' | 'email';
+  /**
+   * The URL where this applications tile redirects users
+   */
+  app_launcher_url?: string;
 
-/**
- * The format of the name identifier sent to the SaaS application.
- */
-export type SaaSAppNameIDFormatParam = 'id' | 'email';
+  /**
+   * Identifier of the authentication protocol used for the saas app. Required for
+   * OIDC.
+   */
+  auth_type?: 'saml' | 'oidc';
 
-export interface SaaSAppSource {
   /**
-   * The name of the IdP attribute.
+   * The application client id
    */
-  name?: string;
+  client_id?: string;
+
+  /**
+   * The application client secret, only returned on POST request.
+   */
+  client_secret?: string;
+
+  created_at?: string;
+
+  custom_claims?: Array<OIDCSaaSApp.CustomClaim>;
+
+  /**
+   * The OIDC flows supported by this application
+   */
+  grant_types?: Array<
+    'authorization_code' | 'authorization_code_with_pkce' | 'refresh_tokens' | 'hybrid' | 'implicit'
+  >;
+
+  /**
+   * A regex to filter Cloudflare groups returned in ID token and userinfo endpoint
+   */
+  group_filter_regex?: string;
+
+  hybrid_and_implicit_options?: OIDCSaaSApp.HybridAndImplicitOptions;
+
+  /**
+   * The Access public certificate that will be used to verify your identity.
+   */
+  public_key?: string;
+
+  /**
+   * The permitted URL's for Cloudflare to return Authorization codes and Access/ID
+   * tokens
+   */
+  redirect_uris?: Array<string>;
+
+  refresh_token_options?: OIDCSaaSApp.RefreshTokenOptions;
 
   /**
-   * A mapping from IdP ID to attribute name.
+   * Define the user information shared with access, "offline_access" scope will be
+   * automatically enabled if refresh tokens are enabled
    */
-  name_by_idp?: Record<string, string>;
+  scopes?: Array<'openid' | 'groups' | 'email' | 'profile'>;
+
+  updated_at?: string;
+}
+
+export namespace OIDCSaaSApp {
+  export interface CustomClaim {
+    /**
+     * The name of the claim.
+     */
+    name?: string;
+
+    /**
+     * If the claim is required when building an OIDC token.
+     */
+    required?: boolean;
+
+    /**
+     * The scope of the claim.
+     */
+    scope?: 'groups' | 'profile' | 'email' | 'openid';
+
+    source?: CustomClaim.Source;
+  }
+
+  export namespace CustomClaim {
+    export interface Source {
+      /**
+       * The name of the IdP claim.
+       */
+      name?: string;
+
+      /**
+       * A mapping from IdP ID to claim name.
+       */
+      name_by_idp?: Record<string, string>;
+    }
+  }
+
+  export interface HybridAndImplicitOptions {
+    /**
+     * If an Access Token should be returned from the OIDC Authorization endpoint
+     */
+    return_access_token_from_authorization_endpoint?: boolean;
+
+    /**
+     * If an ID Token should be returned from the OIDC Authorization endpoint
+     */
+    return_id_token_from_authorization_endpoint?: boolean;
+  }
+
+  export interface RefreshTokenOptions {
+    /**
+     * How long a refresh token will be valid for after creation. Valid units are
+     * m,h,d. Must be longer than 1m.
+     */
+    lifetime?: string;
+  }
 }
 
-export interface SaaSAppSourceParam {
+export interface OIDCSaaSAppParam {
   /**
-   * The name of the IdP attribute.
+   * The lifetime of the OIDC Access Token after creation. Valid units are m,h. Must
+   * be greater than or equal to 1m and less than or equal to 24h.
    */
-  name?: string;
+  access_token_lifetime?: string;
+
+  /**
+   * If client secret should be required on the token endpoint when
+   * authorization_code_with_pkce grant is used.
+   */
+  allow_pkce_without_client_secret?: boolean;
+
+  /**
+   * The URL where this applications tile redirects users
+   */
+  app_launcher_url?: string;
+
+  /**
+   * Identifier of the authentication protocol used for the saas app. Required for
+   * OIDC.
+   */
+  auth_type?: 'saml' | 'oidc';
+
+  /**
+   * The application client id
+   */
+  client_id?: string;
+
+  /**
+   * The application client secret, only returned on POST request.
+   */
+  client_secret?: string;
+
+  custom_claims?: Array<OIDCSaaSAppParam.CustomClaim>;
+
+  /**
+   * The OIDC flows supported by this application
+   */
+  grant_types?: Array<
+    'authorization_code' | 'authorization_code_with_pkce' | 'refresh_tokens' | 'hybrid' | 'implicit'
+  >;
+
+  /**
+   * A regex to filter Cloudflare groups returned in ID token and userinfo endpoint
+   */
+  group_filter_regex?: string;
+
+  hybrid_and_implicit_options?: OIDCSaaSAppParam.HybridAndImplicitOptions;
+
+  /**
+   * The Access public certificate that will be used to verify your identity.
+   */
+  public_key?: string;
+
+  /**
+   * The permitted URL's for Cloudflare to return Authorization codes and Access/ID
+   * tokens
+   */
+  redirect_uris?: Array<string>;
+
+  refresh_token_options?: OIDCSaaSAppParam.RefreshTokenOptions;
 
   /**
-   * A mapping from IdP ID to attribute name.
+   * Define the user information shared with access, "offline_access" scope will be
+   * automatically enabled if refresh tokens are enabled
    */
-  name_by_idp?: Record<string, string>;
+  scopes?: Array<'openid' | 'groups' | 'email' | 'profile'>;
+}
+
+export namespace OIDCSaaSAppParam {
+  export interface CustomClaim {
+    /**
+     * The name of the claim.
+     */
+    name?: string;
+
+    /**
+     * If the claim is required when building an OIDC token.
+     */
+    required?: boolean;
+
+    /**
+     * The scope of the claim.
+     */
+    scope?: 'groups' | 'profile' | 'email' | 'openid';
+
+    source?: CustomClaim.Source;
+  }
+
+  export namespace CustomClaim {
+    export interface Source {
+      /**
+       * The name of the IdP claim.
+       */
+      name?: string;
+
+      /**
+       * A mapping from IdP ID to claim name.
+       */
+      name_by_idp?: Record<string, string>;
+    }
+  }
+
+  export interface HybridAndImplicitOptions {
+    /**
+     * If an Access Token should be returned from the OIDC Authorization endpoint
+     */
+    return_access_token_from_authorization_endpoint?: boolean;
+
+    /**
+     * If an ID Token should be returned from the OIDC Authorization endpoint
+     */
+    return_id_token_from_authorization_endpoint?: boolean;
+  }
+
+  export interface RefreshTokenOptions {
+    /**
+     * How long a refresh token will be valid for after creation. Valid units are
+     * m,h,d. Must be longer than 1m.
+     */
+    lifetime?: string;
+  }
 }
 
+/**
+ * The format of the name identifier sent to the SaaS application.
+ */
+export type SaaSAppNameIDFormat = 'id' | 'email';
+
+/**
+ * The format of the name identifier sent to the SaaS application.
+ */
+export type SaaSAppNameIDFormatParam = 'id' | 'email';
+
 export interface SAMLSaaSApp {
   /**
    * Optional identifier indicating the authentication protocol used for the saas
@@ -2902,7 +1911,7 @@ export interface SAMLSaaSApp {
 
   created_at?: string;
 
-  custom_attributes?: SAMLSaaSApp.CustomAttributes;
+  custom_attributes?: Array<SAMLSaaSApp.CustomAttribute>;
 
   /**
    * The URL that the user will be redirected to after a successful login for IDP
@@ -2956,7 +1965,7 @@ export interface SAMLSaaSApp {
 }
 
 export namespace SAMLSaaSApp {
-  export interface CustomAttributes {
+  export interface CustomAttribute {
     /**
      * The SAML FriendlyName of the attribute.
      */
@@ -2970,14 +1979,31 @@ export namespace SAMLSaaSApp {
     /**
      * A globally unique name for an identity or service provider.
      */
-    name_format?: ApplicationsAPI.SaaSAppNameFormat;
+    name_format?:
+      | 'urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified'
+      | 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic'
+      | 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri';
 
     /**
      * If the attribute is required when building a SAML assertion.
      */
     required?: boolean;
 
-    source?: ApplicationsAPI.SaaSAppSource;
+    source?: CustomAttribute.Source;
+  }
+
+  export namespace CustomAttribute {
+    export interface Source {
+      /**
+       * The name of the IdP attribute.
+       */
+      name?: string;
+
+      /**
+       * A mapping from IdP ID to attribute name.
+       */
+      name_by_idp?: Record<string, string>;
+    }
   }
 }
 
@@ -2994,9 +2020,7 @@ export interface SAMLSaaSAppParam {
    */
   consumer_service_url?: string;
 
-  created_at?: string;
-
-  custom_attributes?: SAMLSaaSAppParam.CustomAttributes;
+  custom_attributes?: Array<SAMLSaaSAppParam.CustomAttribute>;
 
   /**
    * The URL that the user will be redirected to after a successful login for IDP
@@ -3045,12 +2069,10 @@ export interface SAMLSaaSAppParam {
    * The endpoint where your SaaS application will send login requests.
    */
   sso_endpoint?: string;
-
-  updated_at?: string;
 }
 
 export namespace SAMLSaaSAppParam {
-  export interface CustomAttributes {
+  export interface CustomAttribute {
     /**
      * The SAML FriendlyName of the attribute.
      */
@@ -3064,1311 +2086,340 @@ export namespace SAMLSaaSAppParam {
     /**
      * A globally unique name for an identity or service provider.
      */
-    name_format?: ApplicationsAPI.SaaSAppNameFormatParam;
+    name_format?:
+      | 'urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified'
+      | 'urn:oasis:names:tc:SAML:2.0:attrname-format:basic'
+      | 'urn:oasis:names:tc:SAML:2.0:attrname-format:uri';
 
     /**
      * If the attribute is required when building a SAML assertion.
      */
     required?: boolean;
 
-    source?: ApplicationsAPI.SaaSAppSourceParam;
+    source?: CustomAttribute.Source;
+  }
+
+  export namespace CustomAttribute {
+    export interface Source {
+      /**
+       * The name of the IdP attribute.
+       */
+      name?: string;
+
+      /**
+       * A mapping from IdP ID to attribute name.
+       */
+      name_by_idp?: Record<string, string>;
+    }
   }
 }
 
 /**
- * A domain that Access will secure.
+ * Attributes for configuring HTTP Basic authentication scheme for SCIM
+ * provisioning to an application.
  */
-export type SelfHostedDomains = string;
+export interface SCIMConfigAuthenticationHTTPBasic {
+  /**
+   * Password used to authenticate with the remote SCIM service.
+   */
+  password: string;
+
+  /**
+   * The authentication scheme to use when making SCIM requests to this application.
+   */
+  scheme: 'httpbasic';
+
+  /**
+   * User name used to authenticate with the remote SCIM service.
+   */
+  user: string;
+}
 
 /**
- * A domain that Access will secure.
+ * Attributes for configuring HTTP Basic authentication scheme for SCIM
+ * provisioning to an application.
  */
-export type SelfHostedDomainsParam = string;
+export interface SCIMConfigAuthenticationHTTPBasicParam {
+  /**
+   * Password used to authenticate with the remote SCIM service.
+   */
+  password: string;
 
-export type ApplicationCreateResponse =
-  | ApplicationCreateResponse.SelfHostedApplication
-  | ApplicationCreateResponse.SaaSApplication
-  | ApplicationCreateResponse.BrowserSSHApplication
-  | ApplicationCreateResponse.BrowserVncApplication
-  | ApplicationCreateResponse.AppLauncherApplication
-  | ApplicationCreateResponse.DeviceEnrollmentPermissionsApplication
-  | ApplicationCreateResponse.BrowserIsolationPermissionsApplication
-  | ApplicationCreateResponse.BookmarkApplication;
+  /**
+   * The authentication scheme to use when making SCIM requests to this application.
+   */
+  scheme: 'httpbasic';
 
-export namespace ApplicationCreateResponse {
-  export interface SelfHostedApplication {
-    /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
-     */
-    domain: string;
+  /**
+   * User name used to authenticate with the remote SCIM service.
+   */
+  user: string;
+}
 
-    /**
-     * The application type.
-     */
-    type: string;
+/**
+ * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+ * provisioning to an application.
+ */
+export interface SCIMConfigAuthenticationOAuthBearerToken {
+  /**
+   * Token used to authenticate with the remote SCIM service.
+   */
+  token: string;
 
-    /**
-     * UUID
-     */
-    id?: string;
+  /**
+   * The authentication scheme to use when making SCIM requests to this application.
+   */
+  scheme: 'oauthbearertoken';
+}
 
-    /**
-     * When set to true, users can authenticate to this application using their WARP
-     * session. When set to false this application will always require direct IdP
-     * authentication. This setting always overrides the organization setting for WARP
-     * authentication.
-     */
-    allow_authenticate_via_warp?: boolean;
-
-    /**
-     * The identity providers your users can select when connecting to this
-     * application. Defaults to all IdPs configured in your account.
-     */
-    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
-
-    /**
-     * Displays the application in the App Launcher.
-     */
-    app_launcher_visible?: boolean;
-
-    /**
-     * Audience tag.
-     */
-    aud?: string;
-
-    /**
-     * When set to `true`, users skip the identity provider selection step during
-     * login. You must specify only one identity provider in allowed_idps.
-     */
-    auto_redirect_to_identity?: boolean;
-
-    cors_headers?: ApplicationsAPI.CORSHeaders;
-
-    created_at?: string;
-
-    /**
-     * The custom error message shown to a user when they are denied access to the
-     * application.
-     */
-    custom_deny_message?: string;
-
-    /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing identity-based rules.
-     */
-    custom_deny_url?: string;
-
-    /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing non-identity rules.
-     */
-    custom_non_identity_deny_url?: string;
-
-    /**
-     * The custom pages that will be displayed when applicable for this application
-     */
-    custom_pages?: Array<string>;
-
-    /**
-     * Enables the binding cookie, which increases security against compromised
-     * authorization tokens and CSRF attacks.
-     */
-    enable_binding_cookie?: boolean;
-
-    /**
-     * Enables the HttpOnly cookie attribute, which increases security against XSS
-     * attacks.
-     */
-    http_only_cookie_attribute?: boolean;
-
-    /**
-     * The image URL for the logo shown in the App Launcher dashboard.
-     */
-    logo_url?: string;
-
-    /**
-     * The name of the application.
-     */
-    name?: string;
-
-    /**
-     * Allows options preflight requests to bypass Access authentication and go
-     * directly to the origin. Cannot turn on if cors_headers is set.
-     */
-    options_preflight_bypass?: boolean;
-
-    /**
-     * Enables cookie paths to scope an application's JWT to the application path. If
-     * disabled, the JWT will scope to the hostname by default
-     */
-    path_cookie_attribute?: boolean;
-
-    policies?: Array<SelfHostedApplication.Policy>;
-
-    /**
-     * Sets the SameSite cookie setting, which provides increased security against CSRF
-     * attacks.
-     */
-    same_site_cookie_attribute?: string;
-
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    scim_config?: SelfHostedApplication.SCIMConfig;
-
-    /**
-     * List of domains that Access will secure.
-     */
-    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
-
-    /**
-     * Returns a 401 status code when the request is blocked by a Service Auth policy.
-     */
-    service_auth_401_redirect?: boolean;
-
-    /**
-     * The amount of time that tokens issued for this application will be valid. Must
-     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-     * s, m, h.
-     */
-    session_duration?: string;
-
-    /**
-     * Enables automatic authentication through cloudflared.
-     */
-    skip_interstitial?: boolean;
-
-    /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
-     */
-    tags?: Array<string>;
-
-    updated_at?: string;
-  }
-
-  export namespace SelfHostedApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
-
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
-       */
-      include?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
-       */
-      isolation_required?: boolean;
-
-      /**
-       * The name of the Access policy.
-       */
-      name?: string;
-
-      /**
-       * A custom message that will appear on the purpose justification screen.
-       */
-      purpose_justification_prompt?: string;
-
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
-
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
-       */
-      session_duration?: string;
-
-      updated_at?: string;
-    }
-
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    export interface SCIMConfig {
-      /**
-       * The UID of the IdP to use as the source for SCIM resources to provision to this
-       * application.
-       */
-      idp_uid: string;
-
-      /**
-       * The base URI for the application's SCIM-compatible API.
-       */
-      remote_uri: string;
-
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
-
-      /**
-       * If false, propagates DELETE requests to the target application for SCIM
-       * resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-       * targets do not support DELETE operations.
-       */
-      deactivate_on_delete?: boolean;
-
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
-
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
-  }
-
-  export interface SaaSApplication {
-    /**
-     * UUID
-     */
-    id?: string;
-
-    /**
-     * The identity providers your users can select when connecting to this
-     * application. Defaults to all IdPs configured in your account.
-     */
-    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
-
-    /**
-     * Displays the application in the App Launcher.
-     */
-    app_launcher_visible?: boolean;
-
-    /**
-     * Audience tag.
-     */
-    aud?: string;
-
-    /**
-     * When set to `true`, users skip the identity provider selection step during
-     * login. You must specify only one identity provider in allowed_idps.
-     */
-    auto_redirect_to_identity?: boolean;
-
-    created_at?: string;
-
-    /**
-     * The custom pages that will be displayed when applicable for this application
-     */
-    custom_pages?: Array<string>;
-
-    /**
-     * The image URL for the logo shown in the App Launcher dashboard.
-     */
-    logo_url?: string;
-
-    /**
-     * The name of the application.
-     */
-    name?: string;
-
-    policies?: Array<SaaSApplication.Policy>;
-
-    saas_app?: ApplicationsAPI.SAMLSaaSApp | SaaSApplication.AccessOIDCSaaSApp;
-
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    scim_config?: SaaSApplication.SCIMConfig;
-
-    /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
-     */
-    tags?: Array<string>;
-
-    /**
-     * The application type.
-     */
-    type?: string;
-
-    updated_at?: string;
-  }
-
-  export namespace SaaSApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
-
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
-       */
-      include?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
-       */
-      isolation_required?: boolean;
-
-      /**
-       * The name of the Access policy.
-       */
-      name?: string;
-
-      /**
-       * A custom message that will appear on the purpose justification screen.
-       */
-      purpose_justification_prompt?: string;
-
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
-
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
-       */
-      session_duration?: string;
-
-      updated_at?: string;
-    }
-
-    export interface AccessOIDCSaaSApp {
-      /**
-       * The lifetime of the OIDC Access Token after creation. Valid units are m,h. Must
-       * be greater than or equal to 1m and less than or equal to 24h.
-       */
-      access_token_lifetime?: string;
-
-      /**
-       * If client secret should be required on the token endpoint when
-       * authorization_code_with_pkce grant is used.
-       */
-      allow_pkce_without_client_secret?: boolean;
-
-      /**
-       * The URL where this applications tile redirects users
-       */
-      app_launcher_url?: string;
-
-      /**
-       * Identifier of the authentication protocol used for the saas app. Required for
-       * OIDC.
-       */
-      auth_type?: 'saml' | 'oidc';
-
-      /**
-       * The application client id
-       */
-      client_id?: string;
-
-      /**
-       * The application client secret, only returned on POST request.
-       */
-      client_secret?: string;
-
-      created_at?: string;
-
-      custom_claims?: AccessOIDCSaaSApp.CustomClaims;
-
-      /**
-       * The OIDC flows supported by this application
-       */
-      grant_types?: Array<
-        'authorization_code' | 'authorization_code_with_pkce' | 'refresh_tokens' | 'hybrid' | 'implicit'
-      >;
-
-      /**
-       * A regex to filter Cloudflare groups returned in ID token and userinfo endpoint
-       */
-      group_filter_regex?: string;
-
-      hybrid_and_implicit_options?: AccessOIDCSaaSApp.HybridAndImplicitOptions;
-
-      /**
-       * The Access public certificate that will be used to verify your identity.
-       */
-      public_key?: string;
-
-      /**
-       * The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-       * tokens
-       */
-      redirect_uris?: Array<string>;
-
-      refresh_token_options?: AccessOIDCSaaSApp.RefreshTokenOptions;
-
-      /**
-       * Define the user information shared with access, "offline_access" scope will be
-       * automatically enabled if refresh tokens are enabled
-       */
-      scopes?: Array<'openid' | 'groups' | 'email' | 'profile'>;
-
-      updated_at?: string;
-    }
-
-    export namespace AccessOIDCSaaSApp {
-      export interface CustomClaims {
-        /**
-         * The name of the claim.
-         */
-        name?: string;
-
-        /**
-         * If the claim is required when building an OIDC token.
-         */
-        required?: boolean;
-
-        /**
-         * The scope of the claim.
-         */
-        scope?: 'groups' | 'profile' | 'email' | 'openid';
-
-        source?: CustomClaims.Source;
-      }
-
-      export namespace CustomClaims {
-        export interface Source {
-          /**
-           * The name of the IdP claim.
-           */
-          name?: string;
-
-          /**
-           * A mapping from IdP ID to claim name.
-           */
-          name_by_idp?: Record<string, string>;
-        }
-      }
-
-      export interface HybridAndImplicitOptions {
-        /**
-         * If an Access Token should be returned from the OIDC Authorization endpoint
-         */
-        return_access_token_from_authorization_endpoint?: boolean;
-
-        /**
-         * If an ID Token should be returned from the OIDC Authorization endpoint
-         */
-        return_id_token_from_authorization_endpoint?: boolean;
-      }
-
-      export interface RefreshTokenOptions {
-        /**
-         * How long a refresh token will be valid for after creation. Valid units are
-         * m,h,d. Must be longer than 1m.
-         */
-        lifetime?: string;
-      }
-    }
-
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    export interface SCIMConfig {
-      /**
-       * The UID of the IdP to use as the source for SCIM resources to provision to this
-       * application.
-       */
-      idp_uid: string;
-
-      /**
-       * The base URI for the application's SCIM-compatible API.
-       */
-      remote_uri: string;
-
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
-
-      /**
-       * If false, propagates DELETE requests to the target application for SCIM
-       * resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-       * targets do not support DELETE operations.
-       */
-      deactivate_on_delete?: boolean;
-
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
-
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
-  }
-
-  export interface BrowserSSHApplication {
-    /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
-     */
-    domain: string;
-
-    /**
-     * The application type.
-     */
-    type: string;
-
-    /**
-     * UUID
-     */
-    id?: string;
-
-    /**
-     * When set to true, users can authenticate to this application using their WARP
-     * session. When set to false this application will always require direct IdP
-     * authentication. This setting always overrides the organization setting for WARP
-     * authentication.
-     */
-    allow_authenticate_via_warp?: boolean;
-
-    /**
-     * The identity providers your users can select when connecting to this
-     * application. Defaults to all IdPs configured in your account.
-     */
-    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
-
-    /**
-     * Displays the application in the App Launcher.
-     */
-    app_launcher_visible?: boolean;
-
-    /**
-     * Audience tag.
-     */
-    aud?: string;
-
-    /**
-     * When set to `true`, users skip the identity provider selection step during
-     * login. You must specify only one identity provider in allowed_idps.
-     */
-    auto_redirect_to_identity?: boolean;
-
-    cors_headers?: ApplicationsAPI.CORSHeaders;
-
-    created_at?: string;
-
-    /**
-     * The custom error message shown to a user when they are denied access to the
-     * application.
-     */
-    custom_deny_message?: string;
-
-    /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing identity-based rules.
-     */
-    custom_deny_url?: string;
-
-    /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing non-identity rules.
-     */
-    custom_non_identity_deny_url?: string;
-
-    /**
-     * The custom pages that will be displayed when applicable for this application
-     */
-    custom_pages?: Array<string>;
-
-    /**
-     * Enables the binding cookie, which increases security against compromised
-     * authorization tokens and CSRF attacks.
-     */
-    enable_binding_cookie?: boolean;
-
-    /**
-     * Enables the HttpOnly cookie attribute, which increases security against XSS
-     * attacks.
-     */
-    http_only_cookie_attribute?: boolean;
-
-    /**
-     * The image URL for the logo shown in the App Launcher dashboard.
-     */
-    logo_url?: string;
-
-    /**
-     * The name of the application.
-     */
-    name?: string;
-
-    /**
-     * Allows options preflight requests to bypass Access authentication and go
-     * directly to the origin. Cannot turn on if cors_headers is set.
-     */
-    options_preflight_bypass?: boolean;
-
-    /**
-     * Enables cookie paths to scope an application's JWT to the application path. If
-     * disabled, the JWT will scope to the hostname by default
-     */
-    path_cookie_attribute?: boolean;
-
-    policies?: Array<BrowserSSHApplication.Policy>;
-
-    /**
-     * Sets the SameSite cookie setting, which provides increased security against CSRF
-     * attacks.
-     */
-    same_site_cookie_attribute?: string;
-
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    scim_config?: BrowserSSHApplication.SCIMConfig;
-
-    /**
-     * List of domains that Access will secure.
-     */
-    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
-
-    /**
-     * Returns a 401 status code when the request is blocked by a Service Auth policy.
-     */
-    service_auth_401_redirect?: boolean;
-
-    /**
-     * The amount of time that tokens issued for this application will be valid. Must
-     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-     * s, m, h.
-     */
-    session_duration?: string;
-
-    /**
-     * Enables automatic authentication through cloudflared.
-     */
-    skip_interstitial?: boolean;
-
-    /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
-     */
-    tags?: Array<string>;
-
-    updated_at?: string;
-  }
-
-  export namespace BrowserSSHApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
-
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
-       */
-      include?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
-       */
-      isolation_required?: boolean;
+/**
+ * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+ * provisioning to an application.
+ */
+export interface SCIMConfigAuthenticationOAuthBearerTokenParam {
+  /**
+   * Token used to authenticate with the remote SCIM service.
+   */
+  token: string;
 
-      /**
-       * The name of the Access policy.
-       */
-      name?: string;
+  /**
+   * The authentication scheme to use when making SCIM requests to this application.
+   */
+  scheme: 'oauthbearertoken';
+}
 
-      /**
-       * A custom message that will appear on the purpose justification screen.
-       */
-      purpose_justification_prompt?: string;
+/**
+ * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
+ * to an application.
+ */
+export interface SCIMConfigAuthenticationOauth2 {
+  /**
+   * URL used to generate the auth code used during token generation.
+   */
+  authorization_url: string;
 
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
+  /**
+   * Client ID used to authenticate when generating a token for authenticating with
+   * the remote SCIM service.
+   */
+  client_id: string;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRule>;
+  /**
+   * Secret used to authenticate when generating a token for authenticating with the
+   * remove SCIM service.
+   */
+  client_secret: string;
 
-      /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
-       */
-      session_duration?: string;
+  /**
+   * The authentication scheme to use when making SCIM requests to this application.
+   */
+  scheme: 'oauth2';
 
-      updated_at?: string;
-    }
+  /**
+   * URL used to generate the token used to authenticate with the remote SCIM
+   * service.
+   */
+  token_url: string;
 
-    /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
-     */
-    export interface SCIMConfig {
-      /**
-       * The UID of the IdP to use as the source for SCIM resources to provision to this
-       * application.
-       */
-      idp_uid: string;
+  /**
+   * The authorization scopes to request when generating the token used to
+   * authenticate with the remove SCIM service.
+   */
+  scopes?: Array<string>;
+}
 
-      /**
-       * The base URI for the application's SCIM-compatible API.
-       */
-      remote_uri: string;
+/**
+ * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
+ * to an application.
+ */
+export interface SCIMConfigAuthenticationOauth2Param {
+  /**
+   * URL used to generate the auth code used during token generation.
+   */
+  authorization_url: string;
 
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+  /**
+   * Client ID used to authenticate when generating a token for authenticating with
+   * the remote SCIM service.
+   */
+  client_id: string;
 
-      /**
-       * If false, propagates DELETE requests to the target application for SCIM
-       * resources. If true, sets 'active' to false on the SCIM resource. Note: Some
-       * targets do not support DELETE operations.
-       */
-      deactivate_on_delete?: boolean;
+  /**
+   * Secret used to authenticate when generating a token for authenticating with the
+   * remove SCIM service.
+   */
+  client_secret: string;
 
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
+  /**
+   * The authentication scheme to use when making SCIM requests to this application.
+   */
+  scheme: 'oauth2';
 
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
+  /**
+   * URL used to generate the token used to authenticate with the remote SCIM
+   * service.
+   */
+  token_url: string;
 
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
+  /**
+   * The authorization scopes to request when generating the token used to
+   * authenticate with the remove SCIM service.
+   */
+  scopes?: Array<string>;
+}
 
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
+/**
+ * Transformations and filters applied to resources before they are provisioned in
+ * the remote SCIM service.
+ */
+export interface SCIMConfigMapping {
+  /**
+   * Which SCIM resource type this mapping applies to.
+   */
+  schema: string;
 
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
+  /**
+   * Whether or not this mapping is enabled.
+   */
+  enabled?: boolean;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
+  /**
+   * A
+   * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
+   * that matches resources that should be provisioned to this application.
+   */
+  filter?: string;
 
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
+  /**
+   * Whether or not this mapping applies to creates, updates, or deletes.
+   */
+  operations?: SCIMConfigMapping.Operations;
 
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
+  /**
+   * The level of adherence to outbound resource schemas when provisioning to this
+   * mapping. ‘Strict’ removes unknown values, while ‘passthrough’ passes unknown
+   * values to the target.
+   */
+  strictness?: 'strict' | 'passthrough';
 
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
+  /**
+   * A [JSONata](https://jsonata.org/) expression that transforms the resource before
+   * provisioning it in the application.
+   */
+  transform_jsonata?: string;
+}
 
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
+export namespace SCIMConfigMapping {
+  /**
+   * Whether or not this mapping applies to creates, updates, or deletes.
+   */
+  export interface Operations {
+    /**
+     * Whether or not this mapping applies to create (POST) operations.
+     */
+    create?: boolean;
 
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
+    /**
+     * Whether or not this mapping applies to DELETE operations.
+     */
+    delete?: boolean;
 
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
+    /**
+     * Whether or not this mapping applies to update (PATCH/PUT) operations.
+     */
+    update?: boolean;
+  }
+}
 
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
+/**
+ * Transformations and filters applied to resources before they are provisioned in
+ * the remote SCIM service.
+ */
+export interface SCIMConfigMappingParam {
+  /**
+   * Which SCIM resource type this mapping applies to.
+   */
+  schema: string;
 
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
+  /**
+   * Whether or not this mapping is enabled.
+   */
+  enabled?: boolean;
 
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
+  /**
+   * A
+   * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
+   * that matches resources that should be provisioned to this application.
+   */
+  filter?: string;
 
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
+  /**
+   * Whether or not this mapping applies to creates, updates, or deletes.
+   */
+  operations?: SCIMConfigMappingParam.Operations;
 
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
+  /**
+   * The level of adherence to outbound resource schemas when provisioning to this
+   * mapping. ‘Strict’ removes unknown values, while ‘passthrough’ passes unknown
+   * values to the target.
+   */
+  strictness?: 'strict' | 'passthrough';
 
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
+  /**
+   * A [JSONata](https://jsonata.org/) expression that transforms the resource before
+   * provisioning it in the application.
+   */
+  transform_jsonata?: string;
+}
 
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
+export namespace SCIMConfigMappingParam {
+  /**
+   * Whether or not this mapping applies to creates, updates, or deletes.
+   */
+  export interface Operations {
+    /**
+     * Whether or not this mapping applies to create (POST) operations.
+     */
+    create?: boolean;
 
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
+    /**
+     * Whether or not this mapping applies to DELETE operations.
+     */
+    delete?: boolean;
 
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
+    /**
+     * Whether or not this mapping applies to update (PATCH/PUT) operations.
+     */
+    update?: boolean;
   }
+}
+
+/**
+ * A domain that Access will secure.
+ */
+export type SelfHostedDomains = string;
+
+/**
+ * A domain that Access will secure.
+ */
+export type SelfHostedDomainsParam = string;
 
-  export interface BrowserVncApplication {
+export type ApplicationCreateResponse =
+  | ApplicationCreateResponse.SelfHostedApplication
+  | ApplicationCreateResponse.SaaSApplication
+  | ApplicationCreateResponse.BrowserSSHApplication
+  | ApplicationCreateResponse.BrowserVNCApplication
+  | ApplicationCreateResponse.AppLauncherApplication
+  | ApplicationCreateResponse.DeviceEnrollmentPermissionsApplication
+  | ApplicationCreateResponse.BrowserIsolationPermissionsApplication
+  | ApplicationCreateResponse.BookmarkApplication
+  | ApplicationCreateResponse.InfrastructureApplication;
+
+export namespace ApplicationCreateResponse {
+  export interface SelfHostedApplication {
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -4439,6 +2490,13 @@ export namespace ApplicationCreateResponse {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<SelfHostedApplication.PublicDestination | SelfHostedApplication.PrivateDestination>;
+
     /**
      * Enables the binding cookie, which increases security against compromised
      * authorization tokens and CSRF attacks.
@@ -4473,7 +2531,7 @@ export namespace ApplicationCreateResponse {
      */
     path_cookie_attribute?: boolean;
 
-    policies?: Array<BrowserVncApplication.Policy>;
+    policies?: Array<SelfHostedApplication.Policy>;
 
     /**
      * Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -4485,10 +2543,13 @@ export namespace ApplicationCreateResponse {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserVncApplication.SCIMConfig;
+    scim_config?: SelfHostedApplication.SCIMConfig;
 
     /**
-     * List of domains that Access will secure.
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
     self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
 
@@ -4518,79 +2579,63 @@ export namespace ApplicationCreateResponse {
     updated_at?: string;
   }
 
-  export namespace BrowserVncApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+  export namespace SelfHostedApplication {
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
 
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      cidr?: string;
 
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      isolation_required?: boolean;
+      hostname?: string;
 
       /**
-       * The name of the Access policy.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      name?: string;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      purpose_justification_prompt?: string;
+      port_range?: string;
 
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
+      type?: 'private';
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      vnet_id?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -4614,9 +2659,16 @@ export namespace ApplicationCreateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -4634,151 +2686,59 @@ export namespace ApplicationCreateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface AppLauncherApplication {
-    /**
-     * The application type.
-     */
-    type: ApplicationsAPI.ApplicationType;
-
+  export interface SaaSApplication {
     /**
      * UUID
      */
@@ -4788,7 +2748,12 @@ export namespace ApplicationCreateResponse {
      * The identity providers your users can select when connecting to this
      * application. Defaults to all IdPs configured in your account.
      */
-    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
+    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
+
+    /**
+     * Displays the application in the App Launcher.
+     */
+    app_launcher_visible?: boolean;
 
     /**
      * Audience tag.
@@ -4804,107 +2769,51 @@ export namespace ApplicationCreateResponse {
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The custom pages that will be displayed when applicable for this application
      */
-    domain?: string;
+    custom_pages?: Array<string>;
+
+    /**
+     * The image URL for the logo shown in the App Launcher dashboard.
+     */
+    logo_url?: string;
 
     /**
      * The name of the application.
      */
     name?: string;
 
-    policies?: Array<AppLauncherApplication.Policy>;
+    policies?: Array<SaaSApplication.Policy>;
+
+    saas_app?: ApplicationsAPI.SAMLSaaSApp | ApplicationsAPI.OIDCSaaSApp;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: AppLauncherApplication.SCIMConfig;
+    scim_config?: SaaSApplication.SCIMConfig;
 
     /**
-     * The amount of time that tokens issued for this application will be valid. Must
-     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-     * s, m, h.
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
      */
-    session_duration?: string;
+    tags?: Array<string>;
+
+    /**
+     * The application type.
+     */
+    type?: string;
 
     updated_at?: string;
   }
 
-  export namespace AppLauncherApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
-
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
-       */
-      include?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
-       */
-      isolation_required?: boolean;
-
-      /**
-       * The name of the Access policy.
-       */
-      name?: string;
-
-      /**
-       * A custom message that will appear on the purpose justification screen.
-       */
-      purpose_justification_prompt?: string;
-
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
-
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRule>;
-
+  export namespace SaaSApplication {
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -4928,9 +2837,16 @@ export namespace ApplicationCreateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -4948,162 +2864,94 @@ export namespace ApplicationCreateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface DeviceEnrollmentPermissionsApplication {
+  export interface BrowserSSHApplication {
+    /**
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
+     */
+    domain: string;
+
     /**
      * The application type.
      */
-    type: ApplicationsAPI.ApplicationType;
+    type: string;
 
     /**
      * UUID
      */
     id?: string;
 
+    /**
+     * When set to true, users can authenticate to this application using their WARP
+     * session. When set to false this application will always require direct IdP
+     * authentication. This setting always overrides the organization setting for WARP
+     * authentication.
+     */
+    allow_authenticate_via_warp?: boolean;
+
     /**
      * The identity providers your users can select when connecting to this
      * application. Defaults to all IdPs configured in your account.
      */
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
+    /**
+     * Displays the application in the App Launcher.
+     */
+    app_launcher_visible?: boolean;
+
     /**
      * Audience tag.
      */
@@ -5115,26 +2963,100 @@ export namespace ApplicationCreateResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    cors_headers?: ApplicationsAPI.CORSHeaders;
+
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The custom error message shown to a user when they are denied access to the
+     * application.
      */
-    domain?: string;
+    custom_deny_message?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing identity-based rules.
+     */
+    custom_deny_url?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing non-identity rules.
+     */
+    custom_non_identity_deny_url?: string;
+
+    /**
+     * The custom pages that will be displayed when applicable for this application
+     */
+    custom_pages?: Array<string>;
+
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<BrowserSSHApplication.PublicDestination | BrowserSSHApplication.PrivateDestination>;
+
+    /**
+     * Enables the binding cookie, which increases security against compromised
+     * authorization tokens and CSRF attacks.
+     */
+    enable_binding_cookie?: boolean;
+
+    /**
+     * Enables the HttpOnly cookie attribute, which increases security against XSS
+     * attacks.
+     */
+    http_only_cookie_attribute?: boolean;
+
+    /**
+     * The image URL for the logo shown in the App Launcher dashboard.
+     */
+    logo_url?: string;
 
     /**
      * The name of the application.
      */
     name?: string;
 
-    policies?: Array<DeviceEnrollmentPermissionsApplication.Policy>;
+    /**
+     * Allows options preflight requests to bypass Access authentication and go
+     * directly to the origin. Cannot turn on if cors_headers is set.
+     */
+    options_preflight_bypass?: boolean;
+
+    /**
+     * Enables cookie paths to scope an application's JWT to the application path. If
+     * disabled, the JWT will scope to the hostname by default
+     */
+    path_cookie_attribute?: boolean;
+
+    policies?: Array<BrowserSSHApplication.Policy>;
+
+    /**
+     * Sets the SameSite cookie setting, which provides increased security against CSRF
+     * attacks.
+     */
+    same_site_cookie_attribute?: string;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: DeviceEnrollmentPermissionsApplication.SCIMConfig;
+    scim_config?: BrowserSSHApplication.SCIMConfig;
+
+    /**
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
+
+    /**
+     * Returns a 401 status code when the request is blocked by a Service Auth policy.
+     */
+    service_auth_401_redirect?: boolean;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -5143,82 +3065,77 @@ export namespace ApplicationCreateResponse {
      */
     session_duration?: string;
 
-    updated_at?: string;
-  }
-
-  export namespace DeviceEnrollmentPermissionsApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
+    /**
+     * Enables automatic authentication through cloudflared.
+     */
+    skip_interstitial?: boolean;
 
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
+    /**
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
+     */
+    tags?: Array<string>;
 
-      created_at?: string;
+    updated_at?: string;
+  }
 
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+  export namespace BrowserSSHApplication {
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
 
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      cidr?: string;
 
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      isolation_required?: boolean;
+      hostname?: string;
 
       /**
-       * The name of the Access policy.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      name?: string;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      purpose_justification_prompt?: string;
+      port_range?: string;
 
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
+      type?: 'private';
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      vnet_id?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -5242,9 +3159,16 @@ export namespace ApplicationCreateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -5262,162 +3186,94 @@ export namespace ApplicationCreateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface BrowserIsolationPermissionsApplication {
+  export interface BrowserVNCApplication {
+    /**
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
+     */
+    domain: string;
+
     /**
      * The application type.
      */
-    type: ApplicationsAPI.ApplicationType;
+    type: string;
 
     /**
      * UUID
      */
     id?: string;
 
+    /**
+     * When set to true, users can authenticate to this application using their WARP
+     * session. When set to false this application will always require direct IdP
+     * authentication. This setting always overrides the organization setting for WARP
+     * authentication.
+     */
+    allow_authenticate_via_warp?: boolean;
+
     /**
      * The identity providers your users can select when connecting to this
      * application. Defaults to all IdPs configured in your account.
      */
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
+    /**
+     * Displays the application in the App Launcher.
+     */
+    app_launcher_visible?: boolean;
+
     /**
      * Audience tag.
      */
@@ -5429,26 +3285,100 @@ export namespace ApplicationCreateResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    cors_headers?: ApplicationsAPI.CORSHeaders;
+
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The custom error message shown to a user when they are denied access to the
+     * application.
      */
-    domain?: string;
+    custom_deny_message?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing identity-based rules.
+     */
+    custom_deny_url?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing non-identity rules.
+     */
+    custom_non_identity_deny_url?: string;
+
+    /**
+     * The custom pages that will be displayed when applicable for this application
+     */
+    custom_pages?: Array<string>;
+
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<BrowserVNCApplication.PublicDestination | BrowserVNCApplication.PrivateDestination>;
+
+    /**
+     * Enables the binding cookie, which increases security against compromised
+     * authorization tokens and CSRF attacks.
+     */
+    enable_binding_cookie?: boolean;
+
+    /**
+     * Enables the HttpOnly cookie attribute, which increases security against XSS
+     * attacks.
+     */
+    http_only_cookie_attribute?: boolean;
+
+    /**
+     * The image URL for the logo shown in the App Launcher dashboard.
+     */
+    logo_url?: string;
 
     /**
      * The name of the application.
      */
     name?: string;
 
-    policies?: Array<BrowserIsolationPermissionsApplication.Policy>;
+    /**
+     * Allows options preflight requests to bypass Access authentication and go
+     * directly to the origin. Cannot turn on if cors_headers is set.
+     */
+    options_preflight_bypass?: boolean;
+
+    /**
+     * Enables cookie paths to scope an application's JWT to the application path. If
+     * disabled, the JWT will scope to the hostname by default
+     */
+    path_cookie_attribute?: boolean;
+
+    policies?: Array<BrowserVNCApplication.Policy>;
+
+    /**
+     * Sets the SameSite cookie setting, which provides increased security against CSRF
+     * attacks.
+     */
+    same_site_cookie_attribute?: string;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserIsolationPermissionsApplication.SCIMConfig;
+    scim_config?: BrowserVNCApplication.SCIMConfig;
+
+    /**
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
+
+    /**
+     * Returns a 401 status code when the request is blocked by a Service Auth policy.
+     */
+    service_auth_401_redirect?: boolean;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -5457,82 +3387,77 @@ export namespace ApplicationCreateResponse {
      */
     session_duration?: string;
 
-    updated_at?: string;
-  }
-
-  export namespace BrowserIsolationPermissionsApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
+    /**
+     * Enables automatic authentication through cloudflared.
+     */
+    skip_interstitial?: boolean;
 
-      created_at?: string;
+    /**
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
+     */
+    tags?: Array<string>;
 
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+    updated_at?: string;
+  }
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRule>;
+  export namespace BrowserVNCApplication {
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      include?: Array<AccessAPI.AccessRule>;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      isolation_required?: boolean;
+      cidr?: string;
 
       /**
-       * The name of the Access policy.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      name?: string;
+      hostname?: string;
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      purpose_justification_prompt?: string;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      purpose_justification_required?: boolean;
+      port_range?: string;
+
+      type?: 'private';
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      vnet_id?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -5556,9 +3481,16 @@ export namespace ApplicationCreateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -5576,199 +3508,198 @@ export namespace ApplicationCreateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface BookmarkApplication {
+  export interface AppLauncherApplication {
+    /**
+     * The application type.
+     */
+    type: ApplicationsAPI.ApplicationType;
+
     /**
      * UUID
      */
     id?: string;
 
     /**
-     * Displays the application in the App Launcher.
+     * The identity providers your users can select when connecting to this
+     * application. Defaults to all IdPs configured in your account.
      */
-    app_launcher_visible?: boolean;
+    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
+
+    /**
+     * The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
 
     /**
      * Audience tag.
      */
     aud?: string;
 
+    /**
+     * When set to `true`, users skip the identity provider selection step during
+     * login. You must specify only one identity provider in allowed_idps.
+     */
+    auto_redirect_to_identity?: boolean;
+
+    /**
+     * The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
     created_at?: string;
 
     /**
-     * The URL or domain of the bookmark.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain?: string;
 
     /**
-     * The image URL for the logo shown in the App Launcher dashboard.
+     * The links in the App Launcher footer.
      */
-    logo_url?: string;
+    footer_links?: Array<AppLauncherApplication.FooterLink>;
+
+    /**
+     * The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    landing_page_design?: AppLauncherApplication.LandingPageDesign;
 
     /**
      * The name of the application.
      */
     name?: string;
 
+    policies?: Array<AppLauncherApplication.Policy>;
+
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BookmarkApplication.SCIMConfig;
+    scim_config?: AppLauncherApplication.SCIMConfig;
 
     /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
+     * The amount of time that tokens issued for this application will be valid. Must
+     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+     * s, m, h.
      */
-    tags?: Array<string>;
+    session_duration?: string;
 
     /**
-     * The application type.
+     * Determines when to skip the App Launcher landing page.
      */
-    type?: string;
+    skip_app_launcher_login_page?: boolean;
 
     updated_at?: string;
   }
 
-  export namespace BookmarkApplication {
+  export namespace AppLauncherApplication {
+    export interface FooterLink {
+      /**
+       * The hypertext in the footer link.
+       */
+      name: string;
+
+      /**
+       * the hyperlink in the footer link.
+       */
+      url: string;
+    }
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
+      /**
+       * The background color of the log in button on the landing page.
+       */
+      button_color?: string;
+
+      /**
+       * The color of the text in the log in button on the landing page.
+       */
+      button_text_color?: string;
+
+      /**
+       * The URL of the image shown on the landing page.
+       */
+      image_url?: string;
+
+      /**
+       * The message shown on the landing page.
+       */
+      message?: string;
+
+      /**
+       * The title shown on the landing page.
+       */
+      title?: string;
+    }
+
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
+
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
@@ -5790,9 +3721,16 @@ export namespace ApplicationCreateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -5810,182 +3748,69 @@ export namespace ApplicationCreateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
-  }
-}
-
-export type ApplicationUpdateResponse =
-  | ApplicationUpdateResponse.SelfHostedApplication
-  | ApplicationUpdateResponse.SaaSApplication
-  | ApplicationUpdateResponse.BrowserSSHApplication
-  | ApplicationUpdateResponse.BrowserVncApplication
-  | ApplicationUpdateResponse.AppLauncherApplication
-  | ApplicationUpdateResponse.DeviceEnrollmentPermissionsApplication
-  | ApplicationUpdateResponse.BrowserIsolationPermissionsApplication
-  | ApplicationUpdateResponse.BookmarkApplication;
-
-export namespace ApplicationUpdateResponse {
-  export interface SelfHostedApplication {
-    /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
-     */
-    domain: string;
+        scheme: 'access_service_token';
+      }
+    }
+  }
 
+  export interface DeviceEnrollmentPermissionsApplication {
     /**
      * The application type.
      */
-    type: string;
+    type: ApplicationsAPI.ApplicationType;
 
     /**
      * UUID
      */
     id?: string;
 
-    /**
-     * When set to true, users can authenticate to this application using their WARP
-     * session. When set to false this application will always require direct IdP
-     * authentication. This setting always overrides the organization setting for WARP
-     * authentication.
-     */
-    allow_authenticate_via_warp?: boolean;
-
     /**
      * The identity providers your users can select when connecting to this
      * application. Defaults to all IdPs configured in your account.
@@ -5993,9 +3818,9 @@ export namespace ApplicationUpdateResponse {
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
     /**
-     * Displays the application in the App Launcher.
+     * The image URL of the logo shown in the App Launcher header.
      */
-    app_launcher_visible?: boolean;
+    app_launcher_logo_url?: string;
 
     /**
      * Audience tag.
@@ -6008,90 +3833,46 @@ export namespace ApplicationUpdateResponse {
      */
     auto_redirect_to_identity?: boolean;
 
-    cors_headers?: ApplicationsAPI.CORSHeaders;
-
-    created_at?: string;
-
-    /**
-     * The custom error message shown to a user when they are denied access to the
-     * application.
-     */
-    custom_deny_message?: string;
-
     /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing identity-based rules.
+     * The background color of the App Launcher page.
      */
-    custom_deny_url?: string;
+    bg_color?: string;
 
-    /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing non-identity rules.
-     */
-    custom_non_identity_deny_url?: string;
+    created_at?: string;
 
     /**
-     * The custom pages that will be displayed when applicable for this application
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
-    custom_pages?: Array<string>;
+    domain?: string;
 
     /**
-     * Enables the binding cookie, which increases security against compromised
-     * authorization tokens and CSRF attacks.
+     * The links in the App Launcher footer.
      */
-    enable_binding_cookie?: boolean;
+    footer_links?: Array<DeviceEnrollmentPermissionsApplication.FooterLink>;
 
     /**
-     * Enables the HttpOnly cookie attribute, which increases security against XSS
-     * attacks.
+     * The background color of the App Launcher header.
      */
-    http_only_cookie_attribute?: boolean;
+    header_bg_color?: string;
 
     /**
-     * The image URL for the logo shown in the App Launcher dashboard.
+     * The design of the App Launcher landing page shown to users when they log in.
      */
-    logo_url?: string;
+    landing_page_design?: DeviceEnrollmentPermissionsApplication.LandingPageDesign;
 
     /**
      * The name of the application.
      */
     name?: string;
 
-    /**
-     * Allows options preflight requests to bypass Access authentication and go
-     * directly to the origin. Cannot turn on if cors_headers is set.
-     */
-    options_preflight_bypass?: boolean;
-
-    /**
-     * Enables cookie paths to scope an application's JWT to the application path. If
-     * disabled, the JWT will scope to the hostname by default
-     */
-    path_cookie_attribute?: boolean;
-
-    policies?: Array<SelfHostedApplication.Policy>;
-
-    /**
-     * Sets the SameSite cookie setting, which provides increased security against CSRF
-     * attacks.
-     */
-    same_site_cookie_attribute?: string;
+    policies?: Array<DeviceEnrollmentPermissionsApplication.Policy>;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: SelfHostedApplication.SCIMConfig;
-
-    /**
-     * List of domains that Access will secure.
-     */
-    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
-
-    /**
-     * Returns a 401 status code when the request is blocked by a Service Auth policy.
-     */
-    service_auth_401_redirect?: boolean;
+    scim_config?: DeviceEnrollmentPermissionsApplication.SCIMConfig;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -6101,92 +3882,62 @@ export namespace ApplicationUpdateResponse {
     session_duration?: string;
 
     /**
-     * Enables automatic authentication through cloudflared.
-     */
-    skip_interstitial?: boolean;
-
-    /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
+     * Determines when to skip the App Launcher landing page.
      */
-    tags?: Array<string>;
+    skip_app_launcher_login_page?: boolean;
 
     updated_at?: string;
   }
 
-  export namespace SelfHostedApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
-
+  export namespace DeviceEnrollmentPermissionsApplication {
+    export interface FooterLink {
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The hypertext in the footer link.
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      name: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * the hyperlink in the footer link.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      url: string;
+    }
 
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The background color of the log in button on the landing page.
        */
-      isolation_required?: boolean;
+      button_color?: string;
 
       /**
-       * The name of the Access policy.
+       * The color of the text in the log in button on the landing page.
        */
-      name?: string;
+      button_text_color?: string;
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The URL of the image shown on the landing page.
        */
-      purpose_justification_prompt?: string;
+      image_url?: string;
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * The message shown on the landing page.
        */
-      purpose_justification_required?: boolean;
+      message?: string;
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The title shown on the landing page.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      title?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -6210,9 +3961,16 @@ export namespace ApplicationUpdateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -6230,146 +3988,64 @@ export namespace ApplicationUpdateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface SaaSApplication {
+  export interface BrowserIsolationPermissionsApplication {
+    /**
+     * The application type.
+     */
+    type: ApplicationsAPI.ApplicationType;
+
     /**
      * UUID
      */
@@ -6382,9 +4058,9 @@ export namespace ApplicationUpdateResponse {
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
     /**
-     * Displays the application in the App Launcher.
+     * The image URL of the logo shown in the App Launcher header.
      */
-    app_launcher_visible?: boolean;
+    app_launcher_logo_url?: string;
 
     /**
      * Audience tag.
@@ -6397,251 +4073,267 @@ export namespace ApplicationUpdateResponse {
      */
     auto_redirect_to_identity?: boolean;
 
-    created_at?: string;
-
-    /**
-     * The custom pages that will be displayed when applicable for this application
-     */
-    custom_pages?: Array<string>;
-
-    /**
-     * The image URL for the logo shown in the App Launcher dashboard.
-     */
-    logo_url?: string;
-
     /**
-     * The name of the application.
+     * The background color of the App Launcher page.
      */
-    name?: string;
-
-    policies?: Array<SaaSApplication.Policy>;
+    bg_color?: string;
 
-    saas_app?: ApplicationsAPI.SAMLSaaSApp | SaaSApplication.AccessOIDCSaaSApp;
+    created_at?: string;
 
     /**
-     * Configuration for provisioning to this application via SCIM. This is currently
-     * in closed beta.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
-    scim_config?: SaaSApplication.SCIMConfig;
+    domain?: string;
 
     /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
+     * The links in the App Launcher footer.
      */
-    tags?: Array<string>;
+    footer_links?: Array<BrowserIsolationPermissionsApplication.FooterLink>;
 
     /**
-     * The application type.
+     * The background color of the App Launcher header.
      */
-    type?: string;
-
-    updated_at?: string;
-  }
+    header_bg_color?: string;
 
-  export namespace SaaSApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    landing_page_design?: BrowserIsolationPermissionsApplication.LandingPageDesign;
 
-      created_at?: string;
+    /**
+     * The name of the application.
+     */
+    name?: string;
 
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+    policies?: Array<BrowserIsolationPermissionsApplication.Policy>;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRule>;
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    scim_config?: BrowserIsolationPermissionsApplication.SCIMConfig;
 
-      /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
-       */
-      include?: Array<AccessAPI.AccessRule>;
+    /**
+     * The amount of time that tokens issued for this application will be valid. Must
+     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+     * s, m, h.
+     */
+    session_duration?: string;
 
-      /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
-       */
-      isolation_required?: boolean;
+    /**
+     * Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
 
-      /**
-       * The name of the Access policy.
-       */
-      name?: string;
+    updated_at?: string;
+  }
 
+  export namespace BrowserIsolationPermissionsApplication {
+    export interface FooterLink {
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The hypertext in the footer link.
        */
-      purpose_justification_prompt?: string;
+      name: string;
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * the hyperlink in the footer link.
        */
-      purpose_justification_required?: boolean;
+      url: string;
+    }
 
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The background color of the log in button on the landing page.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      button_color?: string;
 
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The color of the text in the log in button on the landing page.
        */
-      session_duration?: string;
-
-      updated_at?: string;
-    }
+      button_text_color?: string;
 
-    export interface AccessOIDCSaaSApp {
       /**
-       * The lifetime of the OIDC Access Token after creation. Valid units are m,h. Must
-       * be greater than or equal to 1m and less than or equal to 24h.
+       * The URL of the image shown on the landing page.
        */
-      access_token_lifetime?: string;
+      image_url?: string;
 
       /**
-       * If client secret should be required on the token endpoint when
-       * authorization_code_with_pkce grant is used.
+       * The message shown on the landing page.
        */
-      allow_pkce_without_client_secret?: boolean;
+      message?: string;
 
       /**
-       * The URL where this applications tile redirects users
+       * The title shown on the landing page.
        */
-      app_launcher_url?: string;
+      title?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * Identifier of the authentication protocol used for the saas app. Required for
-       * OIDC.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      auth_type?: 'saml' | 'oidc';
+      precedence?: number;
+    }
 
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    export interface SCIMConfig {
       /**
-       * The application client id
+       * The UID of the IdP to use as the source for SCIM resources to provision to this
+       * application.
        */
-      client_id?: string;
+      idp_uid: string;
 
       /**
-       * The application client secret, only returned on POST request.
+       * The base URI for the application's SCIM-compatible API.
        */
-      client_secret?: string;
-
-      created_at?: string;
-
-      custom_claims?: AccessOIDCSaaSApp.CustomClaims;
+      remote_uri: string;
 
       /**
-       * The OIDC flows supported by this application
+       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * provisioning to an application.
        */
-      grant_types?: Array<
-        'authorization_code' | 'authorization_code_with_pkce' | 'refresh_tokens' | 'hybrid' | 'implicit'
-      >;
+      authentication?:
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
-       * A regex to filter Cloudflare groups returned in ID token and userinfo endpoint
+       * If false, propagates DELETE requests to the target application for SCIM
+       * resources. If true, sets 'active' to false on the SCIM resource. Note: Some
+       * targets do not support DELETE operations.
        */
-      group_filter_regex?: string;
-
-      hybrid_and_implicit_options?: AccessOIDCSaaSApp.HybridAndImplicitOptions;
+      deactivate_on_delete?: boolean;
 
       /**
-       * The Access public certificate that will be used to verify your identity.
+       * Whether SCIM provisioning is turned on for this application.
        */
-      public_key?: string;
+      enabled?: boolean;
 
       /**
-       * The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-       * tokens
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
        */
-      redirect_uris?: Array<string>;
-
-      refresh_token_options?: AccessOIDCSaaSApp.RefreshTokenOptions;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
+    }
 
+    export namespace SCIMConfig {
       /**
-       * Define the user information shared with access, "offline_access" scope will be
-       * automatically enabled if refresh tokens are enabled
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      scopes?: Array<'openid' | 'groups' | 'email' | 'profile'>;
-
-      updated_at?: string;
-    }
-
-    export namespace AccessOIDCSaaSApp {
-      export interface CustomClaims {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * The name of the claim.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        name?: string;
+        client_id: string;
 
         /**
-         * If the claim is required when building an OIDC token.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        required?: boolean;
+        client_secret: string;
 
         /**
-         * The scope of the claim.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        scope?: 'groups' | 'profile' | 'email' | 'openid';
-
-        source?: CustomClaims.Source;
-      }
-
-      export namespace CustomClaims {
-        export interface Source {
-          /**
-           * The name of the IdP claim.
-           */
-          name?: string;
-
-          /**
-           * A mapping from IdP ID to claim name.
-           */
-          name_by_idp?: Record<string, string>;
-        }
+        scheme: 'access_service_token';
       }
 
-      export interface HybridAndImplicitOptions {
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * If an Access Token should be returned from the OIDC Authorization endpoint
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        return_access_token_from_authorization_endpoint?: boolean;
+        client_id: string;
 
         /**
-         * If an ID Token should be returned from the OIDC Authorization endpoint
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        return_id_token_from_authorization_endpoint?: boolean;
-      }
+        client_secret: string;
 
-      export interface RefreshTokenOptions {
         /**
-         * How long a refresh token will be valid for after creation. Valid units are
-         * m,h,d. Must be longer than 1m.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        lifetime?: string;
+        scheme: 'access_service_token';
       }
     }
+  }
+
+  export interface BookmarkApplication {
+    /**
+     * UUID
+     */
+    id?: string;
+
+    /**
+     * Displays the application in the App Launcher.
+     */
+    app_launcher_visible?: boolean;
+
+    /**
+     * Audience tag.
+     */
+    aud?: string;
+
+    created_at?: string;
+
+    /**
+     * The URL or domain of the bookmark.
+     */
+    domain?: string;
+
+    /**
+     * The image URL for the logo shown in the App Launcher dashboard.
+     */
+    logo_url?: string;
+
+    /**
+     * The name of the application.
+     */
+    name?: string;
+
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    scim_config?: BookmarkApplication.SCIMConfig;
+
+    /**
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
+     */
+    tags?: Array<string>;
+
+    /**
+     * The application type.
+     */
+    type?: string;
+
+    updated_at?: string;
+  }
 
+  export namespace BookmarkApplication {
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
@@ -6663,9 +4355,16 @@ export namespace ApplicationUpdateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -6675,307 +4374,121 @@ export namespace ApplicationUpdateResponse {
       deactivate_on_delete?: boolean;
 
       /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
+       * Whether SCIM provisioning is turned on for this application.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
+      enabled?: boolean;
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
+    }
 
+    export namespace SCIMConfig {
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_id: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_secret: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface BrowserSSHApplication {
-    /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
-     */
-    domain: string;
+  export interface InfrastructureApplication {
+    target_criteria: Array<InfrastructureApplication.TargetCriterion>;
 
     /**
      * The application type.
      */
-    type: string;
+    type: ApplicationsAPI.ApplicationType;
 
     /**
      * UUID
      */
     id?: string;
 
-    /**
-     * When set to true, users can authenticate to this application using their WARP
-     * session. When set to false this application will always require direct IdP
-     * authentication. This setting always overrides the organization setting for WARP
-     * authentication.
-     */
-    allow_authenticate_via_warp?: boolean;
-
-    /**
-     * The identity providers your users can select when connecting to this
-     * application. Defaults to all IdPs configured in your account.
-     */
-    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
-
-    /**
-     * Displays the application in the App Launcher.
-     */
-    app_launcher_visible?: boolean;
-
     /**
      * Audience tag.
      */
     aud?: string;
 
-    /**
-     * When set to `true`, users skip the identity provider selection step during
-     * login. You must specify only one identity provider in allowed_idps.
-     */
-    auto_redirect_to_identity?: boolean;
-
-    cors_headers?: ApplicationsAPI.CORSHeaders;
-
     created_at?: string;
 
-    /**
-     * The custom error message shown to a user when they are denied access to the
-     * application.
-     */
-    custom_deny_message?: string;
-
-    /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing identity-based rules.
-     */
-    custom_deny_url?: string;
-
-    /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing non-identity rules.
-     */
-    custom_non_identity_deny_url?: string;
-
-    /**
-     * The custom pages that will be displayed when applicable for this application
-     */
-    custom_pages?: Array<string>;
-
-    /**
-     * Enables the binding cookie, which increases security against compromised
-     * authorization tokens and CSRF attacks.
-     */
-    enable_binding_cookie?: boolean;
-
-    /**
-     * Enables the HttpOnly cookie attribute, which increases security against XSS
-     * attacks.
-     */
-    http_only_cookie_attribute?: boolean;
-
-    /**
-     * The image URL for the logo shown in the App Launcher dashboard.
-     */
-    logo_url?: string;
-
     /**
      * The name of the application.
      */
     name?: string;
 
-    /**
-     * Allows options preflight requests to bypass Access authentication and go
-     * directly to the origin. Cannot turn on if cors_headers is set.
-     */
-    options_preflight_bypass?: boolean;
-
-    /**
-     * Enables cookie paths to scope an application's JWT to the application path. If
-     * disabled, the JWT will scope to the hostname by default
-     */
-    path_cookie_attribute?: boolean;
-
-    policies?: Array<BrowserSSHApplication.Policy>;
-
-    /**
-     * Sets the SameSite cookie setting, which provides increased security against CSRF
-     * attacks.
-     */
-    same_site_cookie_attribute?: string;
+    policies?: Array<InfrastructureApplication.Policy>;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserSSHApplication.SCIMConfig;
-
-    /**
-     * List of domains that Access will secure.
-     */
-    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
-
-    /**
-     * Returns a 401 status code when the request is blocked by a Service Auth policy.
-     */
-    service_auth_401_redirect?: boolean;
+    scim_config?: InfrastructureApplication.SCIMConfig;
 
-    /**
-     * The amount of time that tokens issued for this application will be valid. Must
-     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-     * s, m, h.
-     */
-    session_duration?: string;
+    updated_at?: string;
+  }
 
-    /**
-     * Enables automatic authentication through cloudflared.
-     */
-    skip_interstitial?: boolean;
+  export namespace InfrastructureApplication {
+    export interface TargetCriterion {
+      /**
+       * The port that the targets use for the chosen communication protocol. A port
+       * cannot be assigned to multiple protocols.
+       */
+      port: number;
 
-    /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
-     */
-    tags?: Array<string>;
+      /**
+       * The communication protocol your application secures.
+       */
+      protocol: 'ssh';
 
-    updated_at?: string;
-  }
+      /**
+       * Contains a map of target attribute keys to target attribute values.
+       */
+      target_attributes: Record<string, Array<string>>;
+    }
 
-  export namespace BrowserSSHApplication {
     export interface Policy {
       /**
        * The UUID of the policy
@@ -6983,20 +4496,16 @@ export namespace ApplicationUpdateResponse {
       id?: string;
 
       /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
+       * The rules that define how users may connect to the targets secured by your
+       * application.
        */
-      approval_required?: boolean;
+      connection_rules?: Policy.ConnectionRules;
 
       created_at?: string;
 
       /**
-       * The action Access will take if a user matches this policy.
+       * The action Access will take if a user matches this policy. Infrastructure
+       * application policies can only use the Allow action.
        */
       decision?: ApplicationsAPI.Decision;
 
@@ -7012,42 +4521,50 @@ export namespace ApplicationUpdateResponse {
        */
       include?: Array<AccessAPI.AccessRule>;
 
-      /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
-       */
-      isolation_required?: boolean;
-
       /**
        * The name of the Access policy.
        */
       name?: string;
 
-      /**
-       * A custom message that will appear on the purpose justification screen.
-       */
-      purpose_justification_prompt?: string;
-
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
-
       /**
        * Rules evaluated with an AND logical operator. To match the policy, a user must
        * meet all of the Require rules.
        */
       require?: Array<AccessAPI.AccessRule>;
 
+      updated_at?: string;
+    }
+
+    export namespace Policy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The rules that define how users may connect to the targets secured by your
+       * application.
        */
-      session_duration?: string;
+      export interface ConnectionRules {
+        /**
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
+         */
+        ssh?: ConnectionRules.SSH;
+      }
 
-      updated_at?: string;
+      export namespace ConnectionRules {
+        /**
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
+         */
+        export interface SSH {
+          /**
+           * Contains the Unix usernames that may be used when connecting over SSH.
+           */
+          usernames: Array<string>;
+
+          /**
+           * Enables using Identity Provider email alias as SSH username.
+           */
+          allow_email_alias?: boolean;
+        }
+      }
     }
 
     /**
@@ -7071,9 +4588,16 @@ export namespace ApplicationUpdateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -7091,149 +4615,75 @@ export namespace ApplicationUpdateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_id: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_secret: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
+}
+
+export type ApplicationUpdateResponse =
+  | ApplicationUpdateResponse.SelfHostedApplication
+  | ApplicationUpdateResponse.SaaSApplication
+  | ApplicationUpdateResponse.BrowserSSHApplication
+  | ApplicationUpdateResponse.BrowserVNCApplication
+  | ApplicationUpdateResponse.AppLauncherApplication
+  | ApplicationUpdateResponse.DeviceEnrollmentPermissionsApplication
+  | ApplicationUpdateResponse.BrowserIsolationPermissionsApplication
+  | ApplicationUpdateResponse.BookmarkApplication
+  | ApplicationUpdateResponse.InfrastructureApplication;
 
-  export interface BrowserVncApplication {
+export namespace ApplicationUpdateResponse {
+  export interface SelfHostedApplication {
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -7304,6 +4754,13 @@ export namespace ApplicationUpdateResponse {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<SelfHostedApplication.PublicDestination | SelfHostedApplication.PrivateDestination>;
+
     /**
      * Enables the binding cookie, which increases security against compromised
      * authorization tokens and CSRF attacks.
@@ -7338,7 +4795,7 @@ export namespace ApplicationUpdateResponse {
      */
     path_cookie_attribute?: boolean;
 
-    policies?: Array<BrowserVncApplication.Policy>;
+    policies?: Array<SelfHostedApplication.Policy>;
 
     /**
      * Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -7350,10 +4807,13 @@ export namespace ApplicationUpdateResponse {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserVncApplication.SCIMConfig;
+    scim_config?: SelfHostedApplication.SCIMConfig;
 
     /**
-     * List of domains that Access will secure.
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
     self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
 
@@ -7383,79 +4843,63 @@ export namespace ApplicationUpdateResponse {
     updated_at?: string;
   }
 
-  export namespace BrowserVncApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+  export namespace SelfHostedApplication {
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
 
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      cidr?: string;
 
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      isolation_required?: boolean;
+      hostname?: string;
 
       /**
-       * The name of the Access policy.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      name?: string;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      purpose_justification_prompt?: string;
+      port_range?: string;
 
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
+      type?: 'private';
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      vnet_id?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -7479,9 +4923,16 @@ export namespace ApplicationUpdateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -7499,162 +4950,272 @@ export namespace ApplicationUpdateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Password used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        password: string;
+        client_id: string;
 
         /**
-         * The authentication scheme to use when making SCIM requests to this application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        scheme: 'httpbasic';
+        client_secret: string;
 
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        user: string;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+        /**
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_id: string;
+
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
+    }
+  }
+
+  export interface SaaSApplication {
+    /**
+     * UUID
+     */
+    id?: string;
+
+    /**
+     * The identity providers your users can select when connecting to this
+     * application. Defaults to all IdPs configured in your account.
+     */
+    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
+
+    /**
+     * Displays the application in the App Launcher.
+     */
+    app_launcher_visible?: boolean;
+
+    /**
+     * Audience tag.
+     */
+    aud?: string;
+
+    /**
+     * When set to `true`, users skip the identity provider selection step during
+     * login. You must specify only one identity provider in allowed_idps.
+     */
+    auto_redirect_to_identity?: boolean;
+
+    created_at?: string;
+
+    /**
+     * The custom pages that will be displayed when applicable for this application
+     */
+    custom_pages?: Array<string>;
+
+    /**
+     * The image URL for the logo shown in the App Launcher dashboard.
+     */
+    logo_url?: string;
+
+    /**
+     * The name of the application.
+     */
+    name?: string;
+
+    policies?: Array<SaaSApplication.Policy>;
+
+    saas_app?: ApplicationsAPI.SAMLSaaSApp | ApplicationsAPI.OIDCSaaSApp;
+
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    scim_config?: SaaSApplication.SCIMConfig;
+
+    /**
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
+     */
+    tags?: Array<string>;
+
+    /**
+     * The application type.
+     */
+    type?: string;
+
+    updated_at?: string;
+  }
 
+  export namespace SaaSApplication {
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
+      precedence?: number;
+    }
 
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    export interface SCIMConfig {
+      /**
+       * The UID of the IdP to use as the source for SCIM resources to provision to this
+       * application.
+       */
+      idp_uid: string;
 
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
+      /**
+       * The base URI for the application's SCIM-compatible API.
+       */
+      remote_uri: string;
 
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
+      /**
+       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      authentication?:
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
+      /**
+       * If false, propagates DELETE requests to the target application for SCIM
+       * resources. If true, sets 'active' to false on the SCIM resource. Note: Some
+       * targets do not support DELETE operations.
+       */
+      deactivate_on_delete?: boolean;
 
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
+      /**
+       * Whether SCIM provisioning is turned on for this application.
+       */
+      enabled?: boolean;
+
+      /**
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
+       */
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
+    }
 
+    export namespace SCIMConfig {
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Which SCIM resource type this mapping applies to.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        schema: string;
+        client_id: string;
 
         /**
-         * Whether or not this mapping is enabled.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        enabled?: boolean;
+        client_secret: string;
 
         /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        filter?: string;
+        scheme: 'access_service_token';
+      }
 
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_id: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_secret: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface AppLauncherApplication {
+  export interface BrowserSSHApplication {
+    /**
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
+     */
+    domain: string;
+
     /**
      * The application type.
      */
-    type: ApplicationsAPI.ApplicationType;
+    type: string;
 
     /**
      * UUID
      */
     id?: string;
 
+    /**
+     * When set to true, users can authenticate to this application using their WARP
+     * session. When set to false this application will always require direct IdP
+     * authentication. This setting always overrides the organization setting for WARP
+     * authentication.
+     */
+    allow_authenticate_via_warp?: boolean;
+
     /**
      * The identity providers your users can select when connecting to this
      * application. Defaults to all IdPs configured in your account.
      */
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
+    /**
+     * Displays the application in the App Launcher.
+     */
+    app_launcher_visible?: boolean;
+
     /**
      * Audience tag.
      */
@@ -7666,26 +5227,100 @@ export namespace ApplicationUpdateResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    cors_headers?: ApplicationsAPI.CORSHeaders;
+
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The custom error message shown to a user when they are denied access to the
+     * application.
      */
-    domain?: string;
+    custom_deny_message?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing identity-based rules.
+     */
+    custom_deny_url?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing non-identity rules.
+     */
+    custom_non_identity_deny_url?: string;
+
+    /**
+     * The custom pages that will be displayed when applicable for this application
+     */
+    custom_pages?: Array<string>;
+
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<BrowserSSHApplication.PublicDestination | BrowserSSHApplication.PrivateDestination>;
+
+    /**
+     * Enables the binding cookie, which increases security against compromised
+     * authorization tokens and CSRF attacks.
+     */
+    enable_binding_cookie?: boolean;
+
+    /**
+     * Enables the HttpOnly cookie attribute, which increases security against XSS
+     * attacks.
+     */
+    http_only_cookie_attribute?: boolean;
+
+    /**
+     * The image URL for the logo shown in the App Launcher dashboard.
+     */
+    logo_url?: string;
 
     /**
      * The name of the application.
      */
     name?: string;
 
-    policies?: Array<AppLauncherApplication.Policy>;
+    /**
+     * Allows options preflight requests to bypass Access authentication and go
+     * directly to the origin. Cannot turn on if cors_headers is set.
+     */
+    options_preflight_bypass?: boolean;
+
+    /**
+     * Enables cookie paths to scope an application's JWT to the application path. If
+     * disabled, the JWT will scope to the hostname by default
+     */
+    path_cookie_attribute?: boolean;
+
+    policies?: Array<BrowserSSHApplication.Policy>;
+
+    /**
+     * Sets the SameSite cookie setting, which provides increased security against CSRF
+     * attacks.
+     */
+    same_site_cookie_attribute?: string;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: AppLauncherApplication.SCIMConfig;
+    scim_config?: BrowserSSHApplication.SCIMConfig;
+
+    /**
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
+
+    /**
+     * Returns a 401 status code when the request is blocked by a Service Auth policy.
+     */
+    service_auth_401_redirect?: boolean;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -7694,82 +5329,77 @@ export namespace ApplicationUpdateResponse {
      */
     session_duration?: string;
 
-    updated_at?: string;
-  }
-
-  export namespace AppLauncherApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
+    /**
+     * Enables automatic authentication through cloudflared.
+     */
+    skip_interstitial?: boolean;
 
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
+    /**
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
+     */
+    tags?: Array<string>;
 
-      created_at?: string;
+    updated_at?: string;
+  }
 
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+  export namespace BrowserSSHApplication {
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
 
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      cidr?: string;
 
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      isolation_required?: boolean;
+      hostname?: string;
 
       /**
-       * The name of the Access policy.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      name?: string;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      purpose_justification_prompt?: string;
+      port_range?: string;
 
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
+      type?: 'private';
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      vnet_id?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -7793,9 +5423,16 @@ export namespace ApplicationUpdateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -7813,155 +5450,82 @@ export namespace ApplicationUpdateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface DeviceEnrollmentPermissionsApplication {
+  export interface BrowserVNCApplication {
+    /**
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
+     */
+    domain: string;
+
     /**
      * The application type.
      */
-    type: ApplicationsAPI.ApplicationType;
+    type: string;
+
+    /**
+     * UUID
+     */
+    id?: string;
 
     /**
-     * UUID
+     * When set to true, users can authenticate to this application using their WARP
+     * session. When set to false this application will always require direct IdP
+     * authentication. This setting always overrides the organization setting for WARP
+     * authentication.
      */
-    id?: string;
+    allow_authenticate_via_warp?: boolean;
 
     /**
      * The identity providers your users can select when connecting to this
@@ -7969,6 +5533,11 @@ export namespace ApplicationUpdateResponse {
      */
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
+    /**
+     * Displays the application in the App Launcher.
+     */
+    app_launcher_visible?: boolean;
+
     /**
      * Audience tag.
      */
@@ -7980,26 +5549,100 @@ export namespace ApplicationUpdateResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    cors_headers?: ApplicationsAPI.CORSHeaders;
+
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The custom error message shown to a user when they are denied access to the
+     * application.
+     */
+    custom_deny_message?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing identity-based rules.
      */
-    domain?: string;
+    custom_deny_url?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing non-identity rules.
+     */
+    custom_non_identity_deny_url?: string;
+
+    /**
+     * The custom pages that will be displayed when applicable for this application
+     */
+    custom_pages?: Array<string>;
+
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<BrowserVNCApplication.PublicDestination | BrowserVNCApplication.PrivateDestination>;
+
+    /**
+     * Enables the binding cookie, which increases security against compromised
+     * authorization tokens and CSRF attacks.
+     */
+    enable_binding_cookie?: boolean;
+
+    /**
+     * Enables the HttpOnly cookie attribute, which increases security against XSS
+     * attacks.
+     */
+    http_only_cookie_attribute?: boolean;
+
+    /**
+     * The image URL for the logo shown in the App Launcher dashboard.
+     */
+    logo_url?: string;
 
     /**
      * The name of the application.
      */
     name?: string;
 
-    policies?: Array<DeviceEnrollmentPermissionsApplication.Policy>;
+    /**
+     * Allows options preflight requests to bypass Access authentication and go
+     * directly to the origin. Cannot turn on if cors_headers is set.
+     */
+    options_preflight_bypass?: boolean;
+
+    /**
+     * Enables cookie paths to scope an application's JWT to the application path. If
+     * disabled, the JWT will scope to the hostname by default
+     */
+    path_cookie_attribute?: boolean;
+
+    policies?: Array<BrowserVNCApplication.Policy>;
+
+    /**
+     * Sets the SameSite cookie setting, which provides increased security against CSRF
+     * attacks.
+     */
+    same_site_cookie_attribute?: string;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: DeviceEnrollmentPermissionsApplication.SCIMConfig;
+    scim_config?: BrowserVNCApplication.SCIMConfig;
+
+    /**
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
+
+    /**
+     * Returns a 401 status code when the request is blocked by a Service Auth policy.
+     */
+    service_auth_401_redirect?: boolean;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -8008,82 +5651,77 @@ export namespace ApplicationUpdateResponse {
      */
     session_duration?: string;
 
-    updated_at?: string;
-  }
-
-  export namespace DeviceEnrollmentPermissionsApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
+    /**
+     * Enables automatic authentication through cloudflared.
+     */
+    skip_interstitial?: boolean;
 
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
+    /**
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
+     */
+    tags?: Array<string>;
 
-      created_at?: string;
+    updated_at?: string;
+  }
 
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+  export namespace BrowserVNCApplication {
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
 
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      cidr?: string;
 
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      isolation_required?: boolean;
+      hostname?: string;
 
       /**
-       * The name of the Access policy.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      name?: string;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      purpose_justification_prompt?: string;
+      port_range?: string;
 
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
+      type?: 'private';
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      vnet_id?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -8107,9 +5745,16 @@ export namespace ApplicationUpdateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -8127,146 +5772,59 @@ export namespace ApplicationUpdateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface BrowserIsolationPermissionsApplication {
+  export interface AppLauncherApplication {
     /**
      * The application type.
      */
@@ -8283,6 +5841,11 @@ export namespace ApplicationUpdateResponse {
      */
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
+    /**
+     * The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
     /**
      * Audience tag.
      */
@@ -8294,26 +5857,46 @@ export namespace ApplicationUpdateResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    /**
+     * The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain?: string;
 
+    /**
+     * The links in the App Launcher footer.
+     */
+    footer_links?: Array<AppLauncherApplication.FooterLink>;
+
+    /**
+     * The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    landing_page_design?: AppLauncherApplication.LandingPageDesign;
+
     /**
      * The name of the application.
      */
     name?: string;
 
-    policies?: Array<BrowserIsolationPermissionsApplication.Policy>;
+    policies?: Array<AppLauncherApplication.Policy>;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserIsolationPermissionsApplication.SCIMConfig;
+    scim_config?: AppLauncherApplication.SCIMConfig;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -8322,82 +5905,63 @@ export namespace ApplicationUpdateResponse {
      */
     session_duration?: string;
 
-    updated_at?: string;
-  }
-
-  export namespace BrowserIsolationPermissionsApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
+    /**
+     * Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
 
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+    updated_at?: string;
+  }
 
+  export namespace AppLauncherApplication {
+    export interface FooterLink {
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The hypertext in the footer link.
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      name: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * the hyperlink in the footer link.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      url: string;
+    }
 
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The background color of the log in button on the landing page.
        */
-      isolation_required?: boolean;
+      button_color?: string;
 
       /**
-       * The name of the Access policy.
+       * The color of the text in the log in button on the landing page.
        */
-      name?: string;
+      button_text_color?: string;
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The URL of the image shown on the landing page.
        */
-      purpose_justification_prompt?: string;
+      image_url?: string;
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * The message shown on the landing page.
        */
-      purpose_justification_required?: boolean;
+      message?: string;
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The title shown on the landing page.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      title?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -8421,9 +5985,16 @@ export namespace ApplicationUpdateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -8441,199 +6012,198 @@ export namespace ApplicationUpdateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface BookmarkApplication {
+  export interface DeviceEnrollmentPermissionsApplication {
+    /**
+     * The application type.
+     */
+    type: ApplicationsAPI.ApplicationType;
+
     /**
      * UUID
      */
     id?: string;
 
     /**
-     * Displays the application in the App Launcher.
+     * The identity providers your users can select when connecting to this
+     * application. Defaults to all IdPs configured in your account.
      */
-    app_launcher_visible?: boolean;
+    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
+
+    /**
+     * The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
 
     /**
      * Audience tag.
      */
     aud?: string;
 
+    /**
+     * When set to `true`, users skip the identity provider selection step during
+     * login. You must specify only one identity provider in allowed_idps.
+     */
+    auto_redirect_to_identity?: boolean;
+
+    /**
+     * The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
     created_at?: string;
 
     /**
-     * The URL or domain of the bookmark.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain?: string;
 
     /**
-     * The image URL for the logo shown in the App Launcher dashboard.
+     * The links in the App Launcher footer.
      */
-    logo_url?: string;
+    footer_links?: Array<DeviceEnrollmentPermissionsApplication.FooterLink>;
+
+    /**
+     * The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    landing_page_design?: DeviceEnrollmentPermissionsApplication.LandingPageDesign;
 
     /**
      * The name of the application.
      */
     name?: string;
 
+    policies?: Array<DeviceEnrollmentPermissionsApplication.Policy>;
+
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BookmarkApplication.SCIMConfig;
+    scim_config?: DeviceEnrollmentPermissionsApplication.SCIMConfig;
 
     /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
+     * The amount of time that tokens issued for this application will be valid. Must
+     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+     * s, m, h.
      */
-    tags?: Array<string>;
+    session_duration?: string;
 
     /**
-     * The application type.
+     * Determines when to skip the App Launcher landing page.
      */
-    type?: string;
+    skip_app_launcher_login_page?: boolean;
 
     updated_at?: string;
   }
 
-  export namespace BookmarkApplication {
+  export namespace DeviceEnrollmentPermissionsApplication {
+    export interface FooterLink {
+      /**
+       * The hypertext in the footer link.
+       */
+      name: string;
+
+      /**
+       * the hyperlink in the footer link.
+       */
+      url: string;
+    }
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
+      /**
+       * The background color of the log in button on the landing page.
+       */
+      button_color?: string;
+
+      /**
+       * The color of the text in the log in button on the landing page.
+       */
+      button_text_color?: string;
+
+      /**
+       * The URL of the image shown on the landing page.
+       */
+      image_url?: string;
+
+      /**
+       * The message shown on the landing page.
+       */
+      message?: string;
+
+      /**
+       * The title shown on the landing page.
+       */
+      title?: string;
+    }
+
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
+
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
@@ -8655,9 +6225,16 @@ export namespace ApplicationUpdateResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -8675,182 +6252,69 @@ export namespace ApplicationUpdateResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_id: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
-  }
-}
-
-export type ApplicationListResponse =
-  | ApplicationListResponse.SelfHostedApplication
-  | ApplicationListResponse.SaaSApplication
-  | ApplicationListResponse.BrowserSSHApplication
-  | ApplicationListResponse.BrowserVncApplication
-  | ApplicationListResponse.AppLauncherApplication
-  | ApplicationListResponse.DeviceEnrollmentPermissionsApplication
-  | ApplicationListResponse.BrowserIsolationPermissionsApplication
-  | ApplicationListResponse.BookmarkApplication;
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_secret: string;
 
-export namespace ApplicationListResponse {
-  export interface SelfHostedApplication {
-    /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
-     */
-    domain: string;
+        /**
+         * The authentication scheme to use when making SCIM requests to this application.
+         */
+        scheme: 'access_service_token';
+      }
+    }
+  }
 
+  export interface BrowserIsolationPermissionsApplication {
     /**
      * The application type.
      */
-    type: string;
+    type: ApplicationsAPI.ApplicationType;
 
     /**
      * UUID
      */
     id?: string;
 
-    /**
-     * When set to true, users can authenticate to this application using their WARP
-     * session. When set to false this application will always require direct IdP
-     * authentication. This setting always overrides the organization setting for WARP
-     * authentication.
-     */
-    allow_authenticate_via_warp?: boolean;
-
     /**
      * The identity providers your users can select when connecting to this
      * application. Defaults to all IdPs configured in your account.
@@ -8858,9 +6322,9 @@ export namespace ApplicationListResponse {
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
     /**
-     * Displays the application in the App Launcher.
+     * The image URL of the logo shown in the App Launcher header.
      */
-    app_launcher_visible?: boolean;
+    app_launcher_logo_url?: string;
 
     /**
      * Audience tag.
@@ -8873,90 +6337,46 @@ export namespace ApplicationListResponse {
      */
     auto_redirect_to_identity?: boolean;
 
-    cors_headers?: ApplicationsAPI.CORSHeaders;
-
-    created_at?: string;
-
-    /**
-     * The custom error message shown to a user when they are denied access to the
-     * application.
-     */
-    custom_deny_message?: string;
-
     /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing identity-based rules.
+     * The background color of the App Launcher page.
      */
-    custom_deny_url?: string;
+    bg_color?: string;
 
-    /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing non-identity rules.
-     */
-    custom_non_identity_deny_url?: string;
+    created_at?: string;
 
     /**
-     * The custom pages that will be displayed when applicable for this application
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
-    custom_pages?: Array<string>;
+    domain?: string;
 
     /**
-     * Enables the binding cookie, which increases security against compromised
-     * authorization tokens and CSRF attacks.
+     * The links in the App Launcher footer.
      */
-    enable_binding_cookie?: boolean;
+    footer_links?: Array<BrowserIsolationPermissionsApplication.FooterLink>;
 
     /**
-     * Enables the HttpOnly cookie attribute, which increases security against XSS
-     * attacks.
+     * The background color of the App Launcher header.
      */
-    http_only_cookie_attribute?: boolean;
+    header_bg_color?: string;
 
     /**
-     * The image URL for the logo shown in the App Launcher dashboard.
+     * The design of the App Launcher landing page shown to users when they log in.
      */
-    logo_url?: string;
+    landing_page_design?: BrowserIsolationPermissionsApplication.LandingPageDesign;
 
     /**
      * The name of the application.
      */
     name?: string;
 
-    /**
-     * Allows options preflight requests to bypass Access authentication and go
-     * directly to the origin. Cannot turn on if cors_headers is set.
-     */
-    options_preflight_bypass?: boolean;
-
-    /**
-     * Enables cookie paths to scope an application's JWT to the application path. If
-     * disabled, the JWT will scope to the hostname by default
-     */
-    path_cookie_attribute?: boolean;
-
-    policies?: Array<SelfHostedApplication.Policy>;
-
-    /**
-     * Sets the SameSite cookie setting, which provides increased security against CSRF
-     * attacks.
-     */
-    same_site_cookie_attribute?: string;
+    policies?: Array<BrowserIsolationPermissionsApplication.Policy>;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: SelfHostedApplication.SCIMConfig;
-
-    /**
-     * List of domains that Access will secure.
-     */
-    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
-
-    /**
-     * Returns a 401 status code when the request is blocked by a Service Auth policy.
-     */
-    service_auth_401_redirect?: boolean;
+    scim_config?: BrowserIsolationPermissionsApplication.SCIMConfig;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -8966,94 +6386,218 @@ export namespace ApplicationListResponse {
     session_duration?: string;
 
     /**
-     * Enables automatic authentication through cloudflared.
-     */
-    skip_interstitial?: boolean;
-
-    /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
+     * Determines when to skip the App Launcher landing page.
      */
-    tags?: Array<string>;
+    skip_app_launcher_login_page?: boolean;
 
     updated_at?: string;
   }
 
-  export namespace SelfHostedApplication {
-    export interface Policy {
+  export namespace BrowserIsolationPermissionsApplication {
+    export interface FooterLink {
       /**
-       * The UUID of the policy
+       * The hypertext in the footer link.
        */
-      id?: string;
+      name: string;
 
       /**
-       * Administrators who can approve a temporary authentication request.
+       * the hyperlink in the footer link.
        */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
+      url: string;
+    }
 
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
       /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
+       * The background color of the log in button on the landing page.
        */
-      approval_required?: boolean;
+      button_color?: string;
 
-      created_at?: string;
+      /**
+       * The color of the text in the log in button on the landing page.
+       */
+      button_text_color?: string;
 
       /**
-       * The action Access will take if a user matches this policy.
+       * The URL of the image shown on the landing page.
        */
-      decision?: ApplicationsAPI.Decision;
+      image_url?: string;
 
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The message shown on the landing page.
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      message?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The title shown on the landing page.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      title?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      isolation_required?: boolean;
+      precedence?: number;
+    }
 
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    export interface SCIMConfig {
       /**
-       * The name of the Access policy.
+       * The UID of the IdP to use as the source for SCIM resources to provision to this
+       * application.
        */
-      name?: string;
+      idp_uid: string;
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The base URI for the application's SCIM-compatible API.
        */
-      purpose_justification_prompt?: string;
+      remote_uri: string;
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * provisioning to an application.
        */
-      purpose_justification_required?: boolean;
+      authentication?:
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * If false, propagates DELETE requests to the target application for SCIM
+       * resources. If true, sets 'active' to false on the SCIM resource. Note: Some
+       * targets do not support DELETE operations.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      deactivate_on_delete?: boolean;
 
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * Whether SCIM provisioning is turned on for this application.
        */
-      session_duration?: string;
+      enabled?: boolean;
 
-      updated_at?: string;
+      /**
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
+       */
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
+    }
+
+    export namespace SCIMConfig {
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+        /**
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_id: string;
+
+        /**
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_secret: string;
+
+        /**
+         * The authentication scheme to use when making SCIM requests to this application.
+         */
+        scheme: 'access_service_token';
+      }
+
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+        /**
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_id: string;
+
+        /**
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_secret: string;
+
+        /**
+         * The authentication scheme to use when making SCIM requests to this application.
+         */
+        scheme: 'access_service_token';
+      }
     }
+  }
+
+  export interface BookmarkApplication {
+    /**
+     * UUID
+     */
+    id?: string;
+
+    /**
+     * Displays the application in the App Launcher.
+     */
+    app_launcher_visible?: boolean;
+
+    /**
+     * Audience tag.
+     */
+    aud?: string;
+
+    created_at?: string;
+
+    /**
+     * The URL or domain of the bookmark.
+     */
+    domain?: string;
+
+    /**
+     * The image URL for the logo shown in the App Launcher dashboard.
+     */
+    logo_url?: string;
+
+    /**
+     * The name of the application.
+     */
+    name?: string;
+
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    scim_config?: BookmarkApplication.SCIMConfig;
+
+    /**
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
+     */
+    tags?: Array<string>;
+
+    /**
+     * The application type.
+     */
+    type?: string;
+
+    updated_at?: string;
+  }
 
+  export namespace BookmarkApplication {
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
@@ -9075,9 +6619,16 @@ export namespace ApplicationListResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -9095,236 +6646,130 @@ export namespace ApplicationListResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface SaaSApplication {
-    /**
-     * UUID
-     */
-    id?: string;
+  export interface InfrastructureApplication {
+    target_criteria: Array<InfrastructureApplication.TargetCriterion>;
 
     /**
-     * The identity providers your users can select when connecting to this
-     * application. Defaults to all IdPs configured in your account.
+     * The application type.
      */
-    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
+    type: ApplicationsAPI.ApplicationType;
 
     /**
-     * Displays the application in the App Launcher.
+     * UUID
      */
-    app_launcher_visible?: boolean;
+    id?: string;
 
     /**
      * Audience tag.
      */
     aud?: string;
 
-    /**
-     * When set to `true`, users skip the identity provider selection step during
-     * login. You must specify only one identity provider in allowed_idps.
-     */
-    auto_redirect_to_identity?: boolean;
-
     created_at?: string;
 
-    /**
-     * The custom pages that will be displayed when applicable for this application
-     */
-    custom_pages?: Array<string>;
-
-    /**
-     * The image URL for the logo shown in the App Launcher dashboard.
-     */
-    logo_url?: string;
-
     /**
      * The name of the application.
      */
     name?: string;
 
-    policies?: Array<SaaSApplication.Policy>;
-
-    saas_app?: ApplicationsAPI.SAMLSaaSApp | SaaSApplication.AccessOIDCSaaSApp;
+    policies?: Array<InfrastructureApplication.Policy>;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: SaaSApplication.SCIMConfig;
-
-    /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
-     */
-    tags?: Array<string>;
-
-    /**
-     * The application type.
-     */
-    type?: string;
+    scim_config?: InfrastructureApplication.SCIMConfig;
 
     updated_at?: string;
   }
 
-  export namespace SaaSApplication {
-    export interface Policy {
+  export namespace InfrastructureApplication {
+    export interface TargetCriterion {
       /**
-       * The UUID of the policy
+       * The port that the targets use for the chosen communication protocol. A port
+       * cannot be assigned to multiple protocols.
        */
-      id?: string;
+      port: number;
 
       /**
-       * Administrators who can approve a temporary authentication request.
+       * The communication protocol your application secures.
        */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
+      protocol: 'ssh';
 
       /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
+       * Contains a map of target attribute keys to target attribute values.
        */
-      approval_required?: boolean;
+      target_attributes: Record<string, Array<string>>;
+    }
+
+    export interface Policy {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The rules that define how users may connect to the targets secured by your
+       * application.
+       */
+      connection_rules?: Policy.ConnectionRules;
 
       created_at?: string;
 
       /**
-       * The action Access will take if a user matches this policy.
+       * The action Access will take if a user matches this policy. Infrastructure
+       * application policies can only use the Allow action.
        */
       decision?: ApplicationsAPI.Decision;
 
@@ -9340,170 +6785,49 @@ export namespace ApplicationListResponse {
        */
       include?: Array<AccessAPI.AccessRule>;
 
-      /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
-       */
-      isolation_required?: boolean;
-
       /**
        * The name of the Access policy.
        */
       name?: string;
 
-      /**
-       * A custom message that will appear on the purpose justification screen.
-       */
-      purpose_justification_prompt?: string;
-
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
-
       /**
        * Rules evaluated with an AND logical operator. To match the policy, a user must
        * meet all of the Require rules.
        */
       require?: Array<AccessAPI.AccessRule>;
 
-      /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
-       */
-      session_duration?: string;
-
       updated_at?: string;
     }
 
-    export interface AccessOIDCSaaSApp {
-      /**
-       * The lifetime of the OIDC Access Token after creation. Valid units are m,h. Must
-       * be greater than or equal to 1m and less than or equal to 24h.
-       */
-      access_token_lifetime?: string;
-
-      /**
-       * If client secret should be required on the token endpoint when
-       * authorization_code_with_pkce grant is used.
-       */
-      allow_pkce_without_client_secret?: boolean;
-
-      /**
-       * The URL where this applications tile redirects users
-       */
-      app_launcher_url?: string;
-
-      /**
-       * Identifier of the authentication protocol used for the saas app. Required for
-       * OIDC.
-       */
-      auth_type?: 'saml' | 'oidc';
-
-      /**
-       * The application client id
-       */
-      client_id?: string;
-
-      /**
-       * The application client secret, only returned on POST request.
-       */
-      client_secret?: string;
-
-      created_at?: string;
-
-      custom_claims?: AccessOIDCSaaSApp.CustomClaims;
-
-      /**
-       * The OIDC flows supported by this application
-       */
-      grant_types?: Array<
-        'authorization_code' | 'authorization_code_with_pkce' | 'refresh_tokens' | 'hybrid' | 'implicit'
-      >;
-
+    export namespace Policy {
       /**
-       * A regex to filter Cloudflare groups returned in ID token and userinfo endpoint
-       */
-      group_filter_regex?: string;
-
-      hybrid_and_implicit_options?: AccessOIDCSaaSApp.HybridAndImplicitOptions;
-
-      /**
-       * The Access public certificate that will be used to verify your identity.
-       */
-      public_key?: string;
-
-      /**
-       * The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-       * tokens
-       */
-      redirect_uris?: Array<string>;
-
-      refresh_token_options?: AccessOIDCSaaSApp.RefreshTokenOptions;
-
-      /**
-       * Define the user information shared with access, "offline_access" scope will be
-       * automatically enabled if refresh tokens are enabled
+       * The rules that define how users may connect to the targets secured by your
+       * application.
        */
-      scopes?: Array<'openid' | 'groups' | 'email' | 'profile'>;
-
-      updated_at?: string;
-    }
-
-    export namespace AccessOIDCSaaSApp {
-      export interface CustomClaims {
-        /**
-         * The name of the claim.
-         */
-        name?: string;
-
-        /**
-         * If the claim is required when building an OIDC token.
-         */
-        required?: boolean;
-
-        /**
-         * The scope of the claim.
-         */
-        scope?: 'groups' | 'profile' | 'email' | 'openid';
-
-        source?: CustomClaims.Source;
-      }
-
-      export namespace CustomClaims {
-        export interface Source {
-          /**
-           * The name of the IdP claim.
-           */
-          name?: string;
-
-          /**
-           * A mapping from IdP ID to claim name.
-           */
-          name_by_idp?: Record<string, string>;
-        }
-      }
-
-      export interface HybridAndImplicitOptions {
+      export interface ConnectionRules {
         /**
-         * If an Access Token should be returned from the OIDC Authorization endpoint
-         */
-        return_access_token_from_authorization_endpoint?: boolean;
-
-        /**
-         * If an ID Token should be returned from the OIDC Authorization endpoint
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
          */
-        return_id_token_from_authorization_endpoint?: boolean;
+        ssh?: ConnectionRules.SSH;
       }
 
-      export interface RefreshTokenOptions {
+      export namespace ConnectionRules {
         /**
-         * How long a refresh token will be valid for after creation. Valid units are
-         * m,h,d. Must be longer than 1m.
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
          */
-        lifetime?: string;
+        export interface SSH {
+          /**
+           * Contains the Unix usernames that may be used when connecting over SSH.
+           */
+          usernames: Array<string>;
+
+          /**
+           * Enables using Identity Provider email alias as SSH username.
+           */
+          allow_email_alias?: boolean;
+        }
       }
     }
 
@@ -9528,9 +6852,16 @@ export namespace ApplicationListResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -9548,149 +6879,75 @@ export namespace ApplicationListResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
+}
 
-  export interface BrowserSSHApplication {
+export type ApplicationListResponse =
+  | ApplicationListResponse.SelfHostedApplication
+  | ApplicationListResponse.SaaSApplication
+  | ApplicationListResponse.BrowserSSHApplication
+  | ApplicationListResponse.BrowserVNCApplication
+  | ApplicationListResponse.AppLauncherApplication
+  | ApplicationListResponse.DeviceEnrollmentPermissionsApplication
+  | ApplicationListResponse.BrowserIsolationPermissionsApplication
+  | ApplicationListResponse.BookmarkApplication
+  | ApplicationListResponse.InfrastructureApplication;
+
+export namespace ApplicationListResponse {
+  export interface SelfHostedApplication {
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -9761,6 +7018,13 @@ export namespace ApplicationListResponse {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<SelfHostedApplication.PublicDestination | SelfHostedApplication.PrivateDestination>;
+
     /**
      * Enables the binding cookie, which increases security against compromised
      * authorization tokens and CSRF attacks.
@@ -9795,7 +7059,7 @@ export namespace ApplicationListResponse {
      */
     path_cookie_attribute?: boolean;
 
-    policies?: Array<BrowserSSHApplication.Policy>;
+    policies?: Array<SelfHostedApplication.Policy>;
 
     /**
      * Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -9807,29 +7071,255 @@ export namespace ApplicationListResponse {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserSSHApplication.SCIMConfig;
+    scim_config?: SelfHostedApplication.SCIMConfig;
+
+    /**
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
+
+    /**
+     * Returns a 401 status code when the request is blocked by a Service Auth policy.
+     */
+    service_auth_401_redirect?: boolean;
+
+    /**
+     * The amount of time that tokens issued for this application will be valid. Must
+     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+     * s, m, h.
+     */
+    session_duration?: string;
+
+    /**
+     * Enables automatic authentication through cloudflared.
+     */
+    skip_interstitial?: boolean;
+
+    /**
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
+     */
+    tags?: Array<string>;
+
+    updated_at?: string;
+  }
+
+  export namespace SelfHostedApplication {
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
+
+      /**
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
+       */
+      uri?: string;
+    }
+
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
+      /**
+       * The CIDR range of the destination. Single IPs will be computed as /32.
+       */
+      cidr?: string;
+
+      /**
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
+       */
+      hostname?: string;
+
+      /**
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
+       */
+      l4_protocol?: 'tcp' | 'udp';
+
+      /**
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
+       */
+      port_range?: string;
+
+      type?: 'private';
+
+      /**
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
+       */
+      vnet_id?: string;
+    }
+
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
+
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    export interface SCIMConfig {
+      /**
+       * The UID of the IdP to use as the source for SCIM resources to provision to this
+       * application.
+       */
+      idp_uid: string;
+
+      /**
+       * The base URI for the application's SCIM-compatible API.
+       */
+      remote_uri: string;
+
+      /**
+       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      authentication?:
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
+
+      /**
+       * If false, propagates DELETE requests to the target application for SCIM
+       * resources. If true, sets 'active' to false on the SCIM resource. Note: Some
+       * targets do not support DELETE operations.
+       */
+      deactivate_on_delete?: boolean;
+
+      /**
+       * Whether SCIM provisioning is turned on for this application.
+       */
+      enabled?: boolean;
+
+      /**
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
+       */
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
+    }
+
+    export namespace SCIMConfig {
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+        /**
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_id: string;
+
+        /**
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_secret: string;
+
+        /**
+         * The authentication scheme to use when making SCIM requests to this application.
+         */
+        scheme: 'access_service_token';
+      }
+
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+        /**
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_id: string;
+
+        /**
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_secret: string;
+
+        /**
+         * The authentication scheme to use when making SCIM requests to this application.
+         */
+        scheme: 'access_service_token';
+      }
+    }
+  }
+
+  export interface SaaSApplication {
+    /**
+     * UUID
+     */
+    id?: string;
+
+    /**
+     * The identity providers your users can select when connecting to this
+     * application. Defaults to all IdPs configured in your account.
+     */
+    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
+
+    /**
+     * Displays the application in the App Launcher.
+     */
+    app_launcher_visible?: boolean;
+
+    /**
+     * Audience tag.
+     */
+    aud?: string;
+
+    /**
+     * When set to `true`, users skip the identity provider selection step during
+     * login. You must specify only one identity provider in allowed_idps.
+     */
+    auto_redirect_to_identity?: boolean;
+
+    created_at?: string;
 
     /**
-     * List of domains that Access will secure.
+     * The custom pages that will be displayed when applicable for this application
      */
-    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
+    custom_pages?: Array<string>;
 
     /**
-     * Returns a 401 status code when the request is blocked by a Service Auth policy.
+     * The image URL for the logo shown in the App Launcher dashboard.
      */
-    service_auth_401_redirect?: boolean;
+    logo_url?: string;
 
     /**
-     * The amount of time that tokens issued for this application will be valid. Must
-     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-     * s, m, h.
+     * The name of the application.
      */
-    session_duration?: string;
+    name?: string;
+
+    policies?: Array<SaaSApplication.Policy>;
+
+    saas_app?: ApplicationsAPI.SAMLSaaSApp | ApplicationsAPI.OIDCSaaSApp;
 
     /**
-     * Enables automatic authentication through cloudflared.
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
      */
-    skip_interstitial?: boolean;
+    scim_config?: SaaSApplication.SCIMConfig;
 
     /**
      * The tags you want assigned to an application. Tags are used to filter
@@ -9837,82 +7327,21 @@ export namespace ApplicationListResponse {
      */
     tags?: Array<string>;
 
+    /**
+     * The application type.
+     */
+    type?: string;
+
     updated_at?: string;
   }
 
-  export namespace BrowserSSHApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
-
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
-       */
-      include?: Array<AccessAPI.AccessRule>;
-
-      /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
-       */
-      isolation_required?: boolean;
-
-      /**
-       * The name of the Access policy.
-       */
-      name?: string;
-
-      /**
-       * A custom message that will appear on the purpose justification screen.
-       */
-      purpose_justification_prompt?: string;
-
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
-
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRule>;
-
+  export namespace SaaSApplication {
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -9936,9 +7365,16 @@ export namespace ApplicationListResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -9956,149 +7392,62 @@ export namespace ApplicationListResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface BrowserVncApplication {
+  export interface BrowserSSHApplication {
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -10169,6 +7518,13 @@ export namespace ApplicationListResponse {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<BrowserSSHApplication.PublicDestination | BrowserSSHApplication.PrivateDestination>;
+
     /**
      * Enables the binding cookie, which increases security against compromised
      * authorization tokens and CSRF attacks.
@@ -10203,7 +7559,7 @@ export namespace ApplicationListResponse {
      */
     path_cookie_attribute?: boolean;
 
-    policies?: Array<BrowserVncApplication.Policy>;
+    policies?: Array<BrowserSSHApplication.Policy>;
 
     /**
      * Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -10215,10 +7571,13 @@ export namespace ApplicationListResponse {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserVncApplication.SCIMConfig;
+    scim_config?: BrowserSSHApplication.SCIMConfig;
 
     /**
-     * List of domains that Access will secure.
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
     self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
 
@@ -10248,79 +7607,63 @@ export namespace ApplicationListResponse {
     updated_at?: string;
   }
 
-  export namespace BrowserVncApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+  export namespace BrowserSSHApplication {
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
 
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      cidr?: string;
 
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      isolation_required?: boolean;
+      hostname?: string;
 
       /**
-       * The name of the Access policy.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      name?: string;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      purpose_justification_prompt?: string;
+      port_range?: string;
 
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
+      type?: 'private';
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      vnet_id?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -10344,9 +7687,16 @@ export namespace ApplicationListResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -10364,162 +7714,94 @@ export namespace ApplicationListResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_id: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_secret: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface AppLauncherApplication {
+  export interface BrowserVNCApplication {
+    /**
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
+     */
+    domain: string;
+
     /**
      * The application type.
      */
-    type: ApplicationsAPI.ApplicationType;
+    type: string;
 
     /**
      * UUID
      */
     id?: string;
 
+    /**
+     * When set to true, users can authenticate to this application using their WARP
+     * session. When set to false this application will always require direct IdP
+     * authentication. This setting always overrides the organization setting for WARP
+     * authentication.
+     */
+    allow_authenticate_via_warp?: boolean;
+
     /**
      * The identity providers your users can select when connecting to this
      * application. Defaults to all IdPs configured in your account.
      */
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
+    /**
+     * Displays the application in the App Launcher.
+     */
+    app_launcher_visible?: boolean;
+
     /**
      * Audience tag.
      */
@@ -10531,26 +7813,100 @@ export namespace ApplicationListResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    cors_headers?: ApplicationsAPI.CORSHeaders;
+
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The custom error message shown to a user when they are denied access to the
+     * application.
      */
-    domain?: string;
+    custom_deny_message?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing identity-based rules.
+     */
+    custom_deny_url?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing non-identity rules.
+     */
+    custom_non_identity_deny_url?: string;
+
+    /**
+     * The custom pages that will be displayed when applicable for this application
+     */
+    custom_pages?: Array<string>;
+
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<BrowserVNCApplication.PublicDestination | BrowserVNCApplication.PrivateDestination>;
+
+    /**
+     * Enables the binding cookie, which increases security against compromised
+     * authorization tokens and CSRF attacks.
+     */
+    enable_binding_cookie?: boolean;
+
+    /**
+     * Enables the HttpOnly cookie attribute, which increases security against XSS
+     * attacks.
+     */
+    http_only_cookie_attribute?: boolean;
+
+    /**
+     * The image URL for the logo shown in the App Launcher dashboard.
+     */
+    logo_url?: string;
 
     /**
      * The name of the application.
      */
     name?: string;
 
-    policies?: Array<AppLauncherApplication.Policy>;
+    /**
+     * Allows options preflight requests to bypass Access authentication and go
+     * directly to the origin. Cannot turn on if cors_headers is set.
+     */
+    options_preflight_bypass?: boolean;
+
+    /**
+     * Enables cookie paths to scope an application's JWT to the application path. If
+     * disabled, the JWT will scope to the hostname by default
+     */
+    path_cookie_attribute?: boolean;
+
+    policies?: Array<BrowserVNCApplication.Policy>;
+
+    /**
+     * Sets the SameSite cookie setting, which provides increased security against CSRF
+     * attacks.
+     */
+    same_site_cookie_attribute?: string;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: AppLauncherApplication.SCIMConfig;
+    scim_config?: BrowserVNCApplication.SCIMConfig;
+
+    /**
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
+
+    /**
+     * Returns a 401 status code when the request is blocked by a Service Auth policy.
+     */
+    service_auth_401_redirect?: boolean;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -10559,82 +7915,77 @@ export namespace ApplicationListResponse {
      */
     session_duration?: string;
 
-    updated_at?: string;
-  }
-
-  export namespace AppLauncherApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
+    /**
+     * Enables automatic authentication through cloudflared.
+     */
+    skip_interstitial?: boolean;
 
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
+    /**
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
+     */
+    tags?: Array<string>;
 
-      created_at?: string;
+    updated_at?: string;
+  }
 
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+  export namespace BrowserVNCApplication {
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
 
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      cidr?: string;
 
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      isolation_required?: boolean;
+      hostname?: string;
 
       /**
-       * The name of the Access policy.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      name?: string;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      purpose_justification_prompt?: string;
+      port_range?: string;
 
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
+      type?: 'private';
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      vnet_id?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -10658,9 +8009,16 @@ export namespace ApplicationListResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -10678,146 +8036,59 @@ export namespace ApplicationListResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+         */
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface DeviceEnrollmentPermissionsApplication {
+  export interface AppLauncherApplication {
     /**
      * The application type.
      */
@@ -10834,6 +8105,11 @@ export namespace ApplicationListResponse {
      */
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
+    /**
+     * The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
     /**
      * Audience tag.
      */
@@ -10845,26 +8121,46 @@ export namespace ApplicationListResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    /**
+     * The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain?: string;
 
+    /**
+     * The links in the App Launcher footer.
+     */
+    footer_links?: Array<AppLauncherApplication.FooterLink>;
+
+    /**
+     * The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    landing_page_design?: AppLauncherApplication.LandingPageDesign;
+
     /**
      * The name of the application.
      */
     name?: string;
 
-    policies?: Array<DeviceEnrollmentPermissionsApplication.Policy>;
+    policies?: Array<AppLauncherApplication.Policy>;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: DeviceEnrollmentPermissionsApplication.SCIMConfig;
+    scim_config?: AppLauncherApplication.SCIMConfig;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -10873,82 +8169,63 @@ export namespace ApplicationListResponse {
      */
     session_duration?: string;
 
+    /**
+     * Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
+
     updated_at?: string;
   }
 
-  export namespace DeviceEnrollmentPermissionsApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
-
+  export namespace AppLauncherApplication {
+    export interface FooterLink {
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The hypertext in the footer link.
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      name: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * the hyperlink in the footer link.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      url: string;
+    }
 
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The background color of the log in button on the landing page.
        */
-      isolation_required?: boolean;
+      button_color?: string;
 
       /**
-       * The name of the Access policy.
+       * The color of the text in the log in button on the landing page.
        */
-      name?: string;
+      button_text_color?: string;
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The URL of the image shown on the landing page.
        */
-      purpose_justification_prompt?: string;
+      image_url?: string;
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * The message shown on the landing page.
        */
-      purpose_justification_required?: boolean;
+      message?: string;
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The title shown on the landing page.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      title?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -10972,9 +8249,16 @@ export namespace ApplicationListResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -10992,146 +8276,59 @@ export namespace ApplicationListResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface BrowserIsolationPermissionsApplication {
+  export interface DeviceEnrollmentPermissionsApplication {
     /**
      * The application type.
      */
@@ -11148,6 +8345,11 @@ export namespace ApplicationListResponse {
      */
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
+    /**
+     * The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
     /**
      * Audience tag.
      */
@@ -11159,26 +8361,46 @@ export namespace ApplicationListResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    /**
+     * The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain?: string;
 
+    /**
+     * The links in the App Launcher footer.
+     */
+    footer_links?: Array<DeviceEnrollmentPermissionsApplication.FooterLink>;
+
+    /**
+     * The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    landing_page_design?: DeviceEnrollmentPermissionsApplication.LandingPageDesign;
+
     /**
      * The name of the application.
      */
     name?: string;
 
-    policies?: Array<BrowserIsolationPermissionsApplication.Policy>;
+    policies?: Array<DeviceEnrollmentPermissionsApplication.Policy>;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserIsolationPermissionsApplication.SCIMConfig;
+    scim_config?: DeviceEnrollmentPermissionsApplication.SCIMConfig;
 
     /**
      * The amount of time that tokens issued for this application will be valid. Must
@@ -11187,82 +8409,63 @@ export namespace ApplicationListResponse {
      */
     session_duration?: string;
 
+    /**
+     * Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
+
     updated_at?: string;
   }
 
-  export namespace BrowserIsolationPermissionsApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
-
+  export namespace DeviceEnrollmentPermissionsApplication {
+    export interface FooterLink {
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The hypertext in the footer link.
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      name: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * the hyperlink in the footer link.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      url: string;
+    }
 
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The background color of the log in button on the landing page.
        */
-      isolation_required?: boolean;
+      button_color?: string;
 
       /**
-       * The name of the Access policy.
+       * The color of the text in the log in button on the landing page.
        */
-      name?: string;
+      button_text_color?: string;
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The URL of the image shown on the landing page.
        */
-      purpose_justification_prompt?: string;
+      image_url?: string;
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * The message shown on the landing page.
        */
-      purpose_justification_required?: boolean;
+      message?: string;
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The title shown on the landing page.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      title?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -11286,9 +8489,16 @@ export namespace ApplicationListResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -11303,202 +8513,201 @@ export namespace ApplicationListResponse {
       enabled?: boolean;
 
       /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
+    }
 
+    export namespace SCIMConfig {
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_id: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_secret: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface BookmarkApplication {
+  export interface BrowserIsolationPermissionsApplication {
+    /**
+     * The application type.
+     */
+    type: ApplicationsAPI.ApplicationType;
+
     /**
      * UUID
      */
     id?: string;
 
     /**
-     * Displays the application in the App Launcher.
+     * The identity providers your users can select when connecting to this
+     * application. Defaults to all IdPs configured in your account.
      */
-    app_launcher_visible?: boolean;
+    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
+
+    /**
+     * The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
 
     /**
      * Audience tag.
      */
     aud?: string;
 
+    /**
+     * When set to `true`, users skip the identity provider selection step during
+     * login. You must specify only one identity provider in allowed_idps.
+     */
+    auto_redirect_to_identity?: boolean;
+
+    /**
+     * The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
     created_at?: string;
 
     /**
-     * The URL or domain of the bookmark.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain?: string;
 
     /**
-     * The image URL for the logo shown in the App Launcher dashboard.
+     * The links in the App Launcher footer.
      */
-    logo_url?: string;
+    footer_links?: Array<BrowserIsolationPermissionsApplication.FooterLink>;
+
+    /**
+     * The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    landing_page_design?: BrowserIsolationPermissionsApplication.LandingPageDesign;
 
     /**
      * The name of the application.
      */
     name?: string;
 
+    policies?: Array<BrowserIsolationPermissionsApplication.Policy>;
+
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BookmarkApplication.SCIMConfig;
+    scim_config?: BrowserIsolationPermissionsApplication.SCIMConfig;
 
     /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
+     * The amount of time that tokens issued for this application will be valid. Must
+     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+     * s, m, h.
      */
-    tags?: Array<string>;
+    session_duration?: string;
 
     /**
-     * The application type.
+     * Determines when to skip the App Launcher landing page.
      */
-    type?: string;
+    skip_app_launcher_login_page?: boolean;
 
     updated_at?: string;
   }
 
-  export namespace BookmarkApplication {
+  export namespace BrowserIsolationPermissionsApplication {
+    export interface FooterLink {
+      /**
+       * The hypertext in the footer link.
+       */
+      name: string;
+
+      /**
+       * the hyperlink in the footer link.
+       */
+      url: string;
+    }
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
+      /**
+       * The background color of the log in button on the landing page.
+       */
+      button_color?: string;
+
+      /**
+       * The color of the text in the log in button on the landing page.
+       */
+      button_text_color?: string;
+
+      /**
+       * The URL of the image shown on the landing page.
+       */
+      image_url?: string;
+
+      /**
+       * The message shown on the landing page.
+       */
+      message?: string;
+
+      /**
+       * The title shown on the landing page.
+       */
+      title?: string;
+    }
+
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
+
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
@@ -11520,9 +8729,16 @@ export namespace ApplicationListResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -11540,249 +8756,80 @@ export namespace ApplicationListResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
-  }
-}
-
-export interface ApplicationDeleteResponse {
-  /**
-   * UUID
-   */
-  id?: string;
-}
-
-export type ApplicationGetResponse =
-  | ApplicationGetResponse.SelfHostedApplication
-  | ApplicationGetResponse.SaaSApplication
-  | ApplicationGetResponse.BrowserSSHApplication
-  | ApplicationGetResponse.BrowserVncApplication
-  | ApplicationGetResponse.AppLauncherApplication
-  | ApplicationGetResponse.DeviceEnrollmentPermissionsApplication
-  | ApplicationGetResponse.BrowserIsolationPermissionsApplication
-  | ApplicationGetResponse.BookmarkApplication;
-
-export namespace ApplicationGetResponse {
-  export interface SelfHostedApplication {
-    /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
-     */
-    domain: string;
-
-    /**
-     * The application type.
-     */
-    type: string;
-
-    /**
-     * UUID
-     */
-    id?: string;
-
-    /**
-     * When set to true, users can authenticate to this application using their WARP
-     * session. When set to false this application will always require direct IdP
-     * authentication. This setting always overrides the organization setting for WARP
-     * authentication.
-     */
-    allow_authenticate_via_warp?: boolean;
-
-    /**
-     * The identity providers your users can select when connecting to this
-     * application. Defaults to all IdPs configured in your account.
-     */
-    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
-
-    /**
-     * Displays the application in the App Launcher.
-     */
-    app_launcher_visible?: boolean;
-
-    /**
-     * Audience tag.
-     */
-    aud?: string;
-
-    /**
-     * When set to `true`, users skip the identity provider selection step during
-     * login. You must specify only one identity provider in allowed_idps.
-     */
-    auto_redirect_to_identity?: boolean;
-
-    cors_headers?: ApplicationsAPI.CORSHeaders;
+        client_id: string;
 
-    created_at?: string;
+        /**
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_secret: string;
 
-    /**
-     * The custom error message shown to a user when they are denied access to the
-     * application.
-     */
-    custom_deny_message?: string;
+        /**
+         * The authentication scheme to use when making SCIM requests to this application.
+         */
+        scheme: 'access_service_token';
+      }
+    }
+  }
 
+  export interface BookmarkApplication {
     /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing identity-based rules.
+     * UUID
      */
-    custom_deny_url?: string;
+    id?: string;
 
     /**
-     * The custom URL a user is redirected to when they are denied access to the
-     * application when failing non-identity rules.
+     * Displays the application in the App Launcher.
      */
-    custom_non_identity_deny_url?: string;
+    app_launcher_visible?: boolean;
 
     /**
-     * The custom pages that will be displayed when applicable for this application
+     * Audience tag.
      */
-    custom_pages?: Array<string>;
+    aud?: string;
 
-    /**
-     * Enables the binding cookie, which increases security against compromised
-     * authorization tokens and CSRF attacks.
-     */
-    enable_binding_cookie?: boolean;
+    created_at?: string;
 
     /**
-     * Enables the HttpOnly cookie attribute, which increases security against XSS
-     * attacks.
+     * The URL or domain of the bookmark.
      */
-    http_only_cookie_attribute?: boolean;
+    domain?: string;
 
     /**
      * The image URL for the logo shown in the App Launcher dashboard.
@@ -11795,84 +8842,198 @@ export namespace ApplicationGetResponse {
     name?: string;
 
     /**
-     * Allows options preflight requests to bypass Access authentication and go
-     * directly to the origin. Cannot turn on if cors_headers is set.
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
      */
-    options_preflight_bypass?: boolean;
+    scim_config?: BookmarkApplication.SCIMConfig;
 
     /**
-     * Enables cookie paths to scope an application's JWT to the application path. If
-     * disabled, the JWT will scope to the hostname by default
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
      */
-    path_cookie_attribute?: boolean;
-
-    policies?: Array<SelfHostedApplication.Policy>;
+    tags?: Array<string>;
 
     /**
-     * Sets the SameSite cookie setting, which provides increased security against CSRF
-     * attacks.
+     * The application type.
      */
-    same_site_cookie_attribute?: string;
+    type?: string;
+
+    updated_at?: string;
+  }
 
+  export namespace BookmarkApplication {
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: SelfHostedApplication.SCIMConfig;
+    export interface SCIMConfig {
+      /**
+       * The UID of the IdP to use as the source for SCIM resources to provision to this
+       * application.
+       */
+      idp_uid: string;
+
+      /**
+       * The base URI for the application's SCIM-compatible API.
+       */
+      remote_uri: string;
+
+      /**
+       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      authentication?:
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
+
+      /**
+       * If false, propagates DELETE requests to the target application for SCIM
+       * resources. If true, sets 'active' to false on the SCIM resource. Note: Some
+       * targets do not support DELETE operations.
+       */
+      deactivate_on_delete?: boolean;
+
+      /**
+       * Whether SCIM provisioning is turned on for this application.
+       */
+      enabled?: boolean;
+
+      /**
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
+       */
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
+    }
+
+    export namespace SCIMConfig {
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+        /**
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_id: string;
+
+        /**
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_secret: string;
+
+        /**
+         * The authentication scheme to use when making SCIM requests to this application.
+         */
+        scheme: 'access_service_token';
+      }
+
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+        /**
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_id: string;
+
+        /**
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_secret: string;
+
+        /**
+         * The authentication scheme to use when making SCIM requests to this application.
+         */
+        scheme: 'access_service_token';
+      }
+    }
+  }
+
+  export interface InfrastructureApplication {
+    target_criteria: Array<InfrastructureApplication.TargetCriterion>;
 
     /**
-     * List of domains that Access will secure.
+     * The application type.
      */
-    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
+    type: ApplicationsAPI.ApplicationType;
 
     /**
-     * Returns a 401 status code when the request is blocked by a Service Auth policy.
+     * UUID
      */
-    service_auth_401_redirect?: boolean;
+    id?: string;
 
     /**
-     * The amount of time that tokens issued for this application will be valid. Must
-     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-     * s, m, h.
+     * Audience tag.
      */
-    session_duration?: string;
+    aud?: string;
+
+    created_at?: string;
 
     /**
-     * Enables automatic authentication through cloudflared.
+     * The name of the application.
      */
-    skip_interstitial?: boolean;
+    name?: string;
+
+    policies?: Array<InfrastructureApplication.Policy>;
 
     /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
      */
-    tags?: Array<string>;
+    scim_config?: InfrastructureApplication.SCIMConfig;
 
     updated_at?: string;
   }
 
-  export namespace SelfHostedApplication {
-    export interface Policy {
+  export namespace InfrastructureApplication {
+    export interface TargetCriterion {
       /**
-       * The UUID of the policy
+       * The port that the targets use for the chosen communication protocol. A port
+       * cannot be assigned to multiple protocols.
        */
-      id?: string;
+      port: number;
 
       /**
-       * Administrators who can approve a temporary authentication request.
+       * The communication protocol your application secures.
        */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
+      protocol: 'ssh';
 
       /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
+       * Contains a map of target attribute keys to target attribute values.
        */
-      approval_required?: boolean;
+      target_attributes: Record<string, Array<string>>;
+    }
+
+    export interface Policy {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The rules that define how users may connect to the targets secured by your
+       * application.
+       */
+      connection_rules?: Policy.ConnectionRules;
 
       created_at?: string;
 
       /**
-       * The action Access will take if a user matches this policy.
+       * The action Access will take if a user matches this policy. Infrastructure
+       * application policies can only use the Allow action.
        */
       decision?: ApplicationsAPI.Decision;
 
@@ -11888,42 +9049,50 @@ export namespace ApplicationGetResponse {
        */
       include?: Array<AccessAPI.AccessRule>;
 
-      /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
-       */
-      isolation_required?: boolean;
-
       /**
        * The name of the Access policy.
        */
       name?: string;
 
-      /**
-       * A custom message that will appear on the purpose justification screen.
-       */
-      purpose_justification_prompt?: string;
-
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
-
       /**
        * Rules evaluated with an AND logical operator. To match the policy, a user must
        * meet all of the Require rules.
        */
       require?: Array<AccessAPI.AccessRule>;
 
+      updated_at?: string;
+    }
+
+    export namespace Policy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The rules that define how users may connect to the targets secured by your
+       * application.
        */
-      session_duration?: string;
+      export interface ConnectionRules {
+        /**
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
+         */
+        ssh?: ConnectionRules.SSH;
+      }
 
-      updated_at?: string;
+      export namespace ConnectionRules {
+        /**
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
+         */
+        export interface SSH {
+          /**
+           * Contains the Unix usernames that may be used when connecting over SSH.
+           */
+          usernames: Array<string>;
+
+          /**
+           * Enables using Identity Provider email alias as SSH username.
+           */
+          allow_email_alias?: boolean;
+        }
+      }
     }
 
     /**
@@ -11947,9 +9116,16 @@ export namespace ApplicationGetResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -11964,154 +9140,106 @@ export namespace ApplicationGetResponse {
       enabled?: boolean;
 
       /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
+    }
 
+    export namespace SCIMConfig {
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        filter?: string;
+        client_id: string;
 
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_secret: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        transform_jsonata?: string;
+        scheme: 'access_service_token';
       }
+    }
+  }
+}
 
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
+export interface ApplicationDeleteResponse {
+  /**
+   * UUID
+   */
+  id?: string;
+}
 
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
+export type ApplicationGetResponse =
+  | ApplicationGetResponse.SelfHostedApplication
+  | ApplicationGetResponse.SaaSApplication
+  | ApplicationGetResponse.BrowserSSHApplication
+  | ApplicationGetResponse.BrowserVNCApplication
+  | ApplicationGetResponse.AppLauncherApplication
+  | ApplicationGetResponse.DeviceEnrollmentPermissionsApplication
+  | ApplicationGetResponse.BrowserIsolationPermissionsApplication
+  | ApplicationGetResponse.BookmarkApplication
+  | ApplicationGetResponse.InfrastructureApplication;
 
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
-      }
-    }
-  }
+export namespace ApplicationGetResponse {
+  export interface SelfHostedApplication {
+    /**
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
+     */
+    domain: string;
+
+    /**
+     * The application type.
+     */
+    type: string;
 
-  export interface SaaSApplication {
     /**
      * UUID
      */
     id?: string;
 
+    /**
+     * When set to true, users can authenticate to this application using their WARP
+     * session. When set to false this application will always require direct IdP
+     * authentication. This setting always overrides the organization setting for WARP
+     * authentication.
+     */
+    allow_authenticate_via_warp?: boolean;
+
     /**
      * The identity providers your users can select when connecting to this
      * application. Defaults to all IdPs configured in your account.
@@ -12134,13 +9262,52 @@ export namespace ApplicationGetResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    cors_headers?: ApplicationsAPI.CORSHeaders;
+
     created_at?: string;
 
+    /**
+     * The custom error message shown to a user when they are denied access to the
+     * application.
+     */
+    custom_deny_message?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing identity-based rules.
+     */
+    custom_deny_url?: string;
+
+    /**
+     * The custom URL a user is redirected to when they are denied access to the
+     * application when failing non-identity rules.
+     */
+    custom_non_identity_deny_url?: string;
+
     /**
      * The custom pages that will be displayed when applicable for this application
      */
     custom_pages?: Array<string>;
 
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<SelfHostedApplication.PublicDestination | SelfHostedApplication.PrivateDestination>;
+
+    /**
+     * Enables the binding cookie, which increases security against compromised
+     * authorization tokens and CSRF attacks.
+     */
+    enable_binding_cookie?: boolean;
+
+    /**
+     * Enables the HttpOnly cookie attribute, which increases security against XSS
+     * attacks.
+     */
+    http_only_cookie_attribute?: boolean;
+
     /**
      * The image URL for the logo shown in the App Launcher dashboard.
      */
@@ -12151,233 +9318,302 @@ export namespace ApplicationGetResponse {
      */
     name?: string;
 
-    policies?: Array<SaaSApplication.Policy>;
+    /**
+     * Allows options preflight requests to bypass Access authentication and go
+     * directly to the origin. Cannot turn on if cors_headers is set.
+     */
+    options_preflight_bypass?: boolean;
+
+    /**
+     * Enables cookie paths to scope an application's JWT to the application path. If
+     * disabled, the JWT will scope to the hostname by default
+     */
+    path_cookie_attribute?: boolean;
 
-    saas_app?: ApplicationsAPI.SAMLSaaSApp | SaaSApplication.AccessOIDCSaaSApp;
+    policies?: Array<SelfHostedApplication.Policy>;
+
+    /**
+     * Sets the SameSite cookie setting, which provides increased security against CSRF
+     * attacks.
+     */
+    same_site_cookie_attribute?: string;
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: SaaSApplication.SCIMConfig;
+    scim_config?: SelfHostedApplication.SCIMConfig;
 
     /**
-     * The tags you want assigned to an application. Tags are used to filter
-     * applications in the App Launcher dashboard.
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
-    tags?: Array<string>;
+    self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
 
     /**
-     * The application type.
+     * Returns a 401 status code when the request is blocked by a Service Auth policy.
      */
-    type?: string;
-
-    updated_at?: string;
-  }
-
-  export namespace SaaSApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
+    service_auth_401_redirect?: boolean;
 
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
+    /**
+     * The amount of time that tokens issued for this application will be valid. Must
+     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+     * s, m, h.
+     */
+    session_duration?: string;
 
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
+    /**
+     * Enables automatic authentication through cloudflared.
+     */
+    skip_interstitial?: boolean;
 
-      created_at?: string;
+    /**
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
+     */
+    tags?: Array<string>;
 
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+    updated_at?: string;
+  }
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRule>;
+  export namespace SelfHostedApplication {
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      include?: Array<AccessAPI.AccessRule>;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      isolation_required?: boolean;
+      cidr?: string;
 
       /**
-       * The name of the Access policy.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      name?: string;
+      hostname?: string;
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      purpose_justification_prompt?: string;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      purpose_justification_required?: boolean;
+      port_range?: string;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRule>;
+      type?: 'private';
 
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      vnet_id?: string;
     }
 
-    export interface AccessOIDCSaaSApp {
-      /**
-       * The lifetime of the OIDC Access Token after creation. Valid units are m,h. Must
-       * be greater than or equal to 1m and less than or equal to 24h.
-       */
-      access_token_lifetime?: string;
-
-      /**
-       * If client secret should be required on the token endpoint when
-       * authorization_code_with_pkce grant is used.
-       */
-      allow_pkce_without_client_secret?: boolean;
-
-      /**
-       * The URL where this applications tile redirects users
-       */
-      app_launcher_url?: string;
-
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * Identifier of the authentication protocol used for the saas app. Required for
-       * OIDC.
-       */
-      auth_type?: 'saml' | 'oidc';
-
-      /**
-       * The application client id
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      client_id?: string;
+      precedence?: number;
+    }
 
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    export interface SCIMConfig {
       /**
-       * The application client secret, only returned on POST request.
+       * The UID of the IdP to use as the source for SCIM resources to provision to this
+       * application.
        */
-      client_secret?: string;
-
-      created_at?: string;
-
-      custom_claims?: AccessOIDCSaaSApp.CustomClaims;
+      idp_uid: string;
 
       /**
-       * The OIDC flows supported by this application
+       * The base URI for the application's SCIM-compatible API.
        */
-      grant_types?: Array<
-        'authorization_code' | 'authorization_code_with_pkce' | 'refresh_tokens' | 'hybrid' | 'implicit'
-      >;
+      remote_uri: string;
 
       /**
-       * A regex to filter Cloudflare groups returned in ID token and userinfo endpoint
+       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * provisioning to an application.
        */
-      group_filter_regex?: string;
-
-      hybrid_and_implicit_options?: AccessOIDCSaaSApp.HybridAndImplicitOptions;
+      authentication?:
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
-       * The Access public certificate that will be used to verify your identity.
+       * If false, propagates DELETE requests to the target application for SCIM
+       * resources. If true, sets 'active' to false on the SCIM resource. Note: Some
+       * targets do not support DELETE operations.
        */
-      public_key?: string;
+      deactivate_on_delete?: boolean;
 
       /**
-       * The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-       * tokens
+       * Whether SCIM provisioning is turned on for this application.
        */
-      redirect_uris?: Array<string>;
-
-      refresh_token_options?: AccessOIDCSaaSApp.RefreshTokenOptions;
+      enabled?: boolean;
 
       /**
-       * Define the user information shared with access, "offline_access" scope will be
-       * automatically enabled if refresh tokens are enabled
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
        */
-      scopes?: Array<'openid' | 'groups' | 'email' | 'profile'>;
-
-      updated_at?: string;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
-    export namespace AccessOIDCSaaSApp {
-      export interface CustomClaims {
+    export namespace SCIMConfig {
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * The name of the claim.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        name?: string;
+        client_id: string;
 
         /**
-         * If the claim is required when building an OIDC token.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        required?: boolean;
+        client_secret: string;
 
         /**
-         * The scope of the claim.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        scope?: 'groups' | 'profile' | 'email' | 'openid';
-
-        source?: CustomClaims.Source;
-      }
-
-      export namespace CustomClaims {
-        export interface Source {
-          /**
-           * The name of the IdP claim.
-           */
-          name?: string;
-
-          /**
-           * A mapping from IdP ID to claim name.
-           */
-          name_by_idp?: Record<string, string>;
-        }
+        scheme: 'access_service_token';
       }
 
-      export interface HybridAndImplicitOptions {
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * If an Access Token should be returned from the OIDC Authorization endpoint
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        return_access_token_from_authorization_endpoint?: boolean;
+        client_id: string;
 
         /**
-         * If an ID Token should be returned from the OIDC Authorization endpoint
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        return_id_token_from_authorization_endpoint?: boolean;
-      }
+        client_secret: string;
 
-      export interface RefreshTokenOptions {
         /**
-         * How long a refresh token will be valid for after creation. Valid units are
-         * m,h,d. Must be longer than 1m.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        lifetime?: string;
+        scheme: 'access_service_token';
       }
     }
+  }
+
+  export interface SaaSApplication {
+    /**
+     * UUID
+     */
+    id?: string;
+
+    /**
+     * The identity providers your users can select when connecting to this
+     * application. Defaults to all IdPs configured in your account.
+     */
+    allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
+
+    /**
+     * Displays the application in the App Launcher.
+     */
+    app_launcher_visible?: boolean;
+
+    /**
+     * Audience tag.
+     */
+    aud?: string;
+
+    /**
+     * When set to `true`, users skip the identity provider selection step during
+     * login. You must specify only one identity provider in allowed_idps.
+     */
+    auto_redirect_to_identity?: boolean;
+
+    created_at?: string;
+
+    /**
+     * The custom pages that will be displayed when applicable for this application
+     */
+    custom_pages?: Array<string>;
+
+    /**
+     * The image URL for the logo shown in the App Launcher dashboard.
+     */
+    logo_url?: string;
+
+    /**
+     * The name of the application.
+     */
+    name?: string;
+
+    policies?: Array<SaaSApplication.Policy>;
+
+    saas_app?: ApplicationsAPI.SAMLSaaSApp | ApplicationsAPI.OIDCSaaSApp;
+
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    scim_config?: SaaSApplication.SCIMConfig;
+
+    /**
+     * The tags you want assigned to an application. Tags are used to filter
+     * applications in the App Launcher dashboard.
+     */
+    tags?: Array<string>;
+
+    /**
+     * The application type.
+     */
+    type?: string;
+
+    updated_at?: string;
+  }
+
+  export namespace SaaSApplication {
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
@@ -12400,9 +9636,16 @@ export namespace ApplicationGetResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -12420,149 +9663,62 @@ export namespace ApplicationGetResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
   export interface BrowserSSHApplication {
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -12633,6 +9789,13 @@ export namespace ApplicationGetResponse {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<BrowserSSHApplication.PublicDestination | BrowserSSHApplication.PrivateDestination>;
+
     /**
      * Enables the binding cookie, which increases security against compromised
      * authorization tokens and CSRF attacks.
@@ -12682,7 +9845,10 @@ export namespace ApplicationGetResponse {
     scim_config?: BrowserSSHApplication.SCIMConfig;
 
     /**
-     * List of domains that Access will secure.
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
     self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
 
@@ -12713,78 +9879,62 @@ export namespace ApplicationGetResponse {
   }
 
   export namespace BrowserSSHApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
-
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRule>;
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      include?: Array<AccessAPI.AccessRule>;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      isolation_required?: boolean;
+      cidr?: string;
 
       /**
-       * The name of the Access policy.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      name?: string;
+      hostname?: string;
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      purpose_justification_prompt?: string;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      purpose_justification_required?: boolean;
+      port_range?: string;
+
+      type?: 'private';
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      vnet_id?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -12808,9 +9958,16 @@ export namespace ApplicationGetResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -12828,149 +9985,62 @@ export namespace ApplicationGetResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface BrowserVncApplication {
+  export interface BrowserVNCApplication {
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -13041,6 +10111,13 @@ export namespace ApplicationGetResponse {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * List of destinations secured by Access. This supersedes `self_hosted_domains` to
+     * allow for more flexibility in defining different types of domains. If
+     * `destinations` are provided, then `self_hosted_domains` will be ignored.
+     */
+    destinations?: Array<BrowserVNCApplication.PublicDestination | BrowserVNCApplication.PrivateDestination>;
+
     /**
      * Enables the binding cookie, which increases security against compromised
      * authorization tokens and CSRF attacks.
@@ -13075,7 +10152,7 @@ export namespace ApplicationGetResponse {
      */
     path_cookie_attribute?: boolean;
 
-    policies?: Array<BrowserVncApplication.Policy>;
+    policies?: Array<BrowserVNCApplication.Policy>;
 
     /**
      * Sets the SameSite cookie setting, which provides increased security against CSRF
@@ -13087,10 +10164,13 @@ export namespace ApplicationGetResponse {
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
      */
-    scim_config?: BrowserVncApplication.SCIMConfig;
+    scim_config?: BrowserVNCApplication.SCIMConfig;
 
     /**
-     * List of domains that Access will secure.
+     * @deprecated: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
     self_hosted_domains?: Array<ApplicationsAPI.SelfHostedDomains>;
 
@@ -13120,79 +10200,63 @@ export namespace ApplicationGetResponse {
     updated_at?: string;
   }
 
-  export namespace BrowserVncApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+  export namespace BrowserVNCApplication {
+    /**
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
+     */
+    export interface PublicDestination {
+      type?: 'public';
 
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      cidr?: string;
 
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      isolation_required?: boolean;
+      hostname?: string;
 
       /**
-       * The name of the Access policy.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      name?: string;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      purpose_justification_prompt?: string;
+      port_range?: string;
 
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
+      type?: 'private';
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      vnet_id?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -13216,9 +10280,16 @@ export namespace ApplicationGetResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -13236,141 +10307,54 @@ export namespace ApplicationGetResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -13392,6 +10376,11 @@ export namespace ApplicationGetResponse {
      */
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
+    /**
+     * The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
     /**
      * Audience tag.
      */
@@ -13403,14 +10392,34 @@ export namespace ApplicationGetResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    /**
+     * The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain?: string;
 
+    /**
+     * The links in the App Launcher footer.
+     */
+    footer_links?: Array<AppLauncherApplication.FooterLink>;
+
+    /**
+     * The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    landing_page_design?: AppLauncherApplication.LandingPageDesign;
+
     /**
      * The name of the application.
      */
@@ -13431,82 +10440,63 @@ export namespace ApplicationGetResponse {
      */
     session_duration?: string;
 
+    /**
+     * Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
+
     updated_at?: string;
   }
 
   export namespace AppLauncherApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
-
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRule>;
-
+    export interface FooterLink {
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The hypertext in the footer link.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      name: string;
 
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * the hyperlink in the footer link.
        */
-      isolation_required?: boolean;
+      url: string;
+    }
 
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
       /**
-       * The name of the Access policy.
+       * The background color of the log in button on the landing page.
        */
-      name?: string;
+      button_color?: string;
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The color of the text in the log in button on the landing page.
        */
-      purpose_justification_prompt?: string;
+      button_text_color?: string;
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * The URL of the image shown on the landing page.
        */
-      purpose_justification_required?: boolean;
+      image_url?: string;
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The message shown on the landing page.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      message?: string;
 
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The title shown on the landing page.
        */
-      session_duration?: string;
+      title?: string;
+    }
 
-      updated_at?: string;
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
     }
 
     /**
@@ -13530,9 +10520,16 @@ export namespace ApplicationGetResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -13550,141 +10547,54 @@ export namespace ApplicationGetResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -13706,6 +10616,11 @@ export namespace ApplicationGetResponse {
      */
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
+    /**
+     * The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
     /**
      * Audience tag.
      */
@@ -13717,14 +10632,34 @@ export namespace ApplicationGetResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    /**
+     * The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain?: string;
 
+    /**
+     * The links in the App Launcher footer.
+     */
+    footer_links?: Array<DeviceEnrollmentPermissionsApplication.FooterLink>;
+
+    /**
+     * The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    landing_page_design?: DeviceEnrollmentPermissionsApplication.LandingPageDesign;
+
     /**
      * The name of the application.
      */
@@ -13745,82 +10680,63 @@ export namespace ApplicationGetResponse {
      */
     session_duration?: string;
 
+    /**
+     * Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
+
     updated_at?: string;
   }
 
   export namespace DeviceEnrollmentPermissionsApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      created_at?: string;
-
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
-
+    export interface FooterLink {
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The hypertext in the footer link.
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      name: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * the hyperlink in the footer link.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      url: string;
+    }
 
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The background color of the log in button on the landing page.
        */
-      isolation_required?: boolean;
+      button_color?: string;
 
       /**
-       * The name of the Access policy.
+       * The color of the text in the log in button on the landing page.
        */
-      name?: string;
+      button_text_color?: string;
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The URL of the image shown on the landing page.
        */
-      purpose_justification_prompt?: string;
+      image_url?: string;
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * The message shown on the landing page.
        */
-      purpose_justification_required?: boolean;
+      message?: string;
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The title shown on the landing page.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      title?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -13844,9 +10760,16 @@ export namespace ApplicationGetResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -13864,141 +10787,54 @@ export namespace ApplicationGetResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -14020,6 +10856,11 @@ export namespace ApplicationGetResponse {
      */
     allowed_idps?: Array<ApplicationsAPI.AllowedIdPs>;
 
+    /**
+     * The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
     /**
      * Audience tag.
      */
@@ -14031,14 +10872,34 @@ export namespace ApplicationGetResponse {
      */
     auto_redirect_to_identity?: boolean;
 
+    /**
+     * The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
     created_at?: string;
 
     /**
-     * The primary hostname and path that Access will secure. If the app is visible in
-     * the App Launcher dashboard, this is the domain that will be displayed.
+     * The primary hostname and path secured by Access. This domain will be displayed
+     * if the app is visible in the App Launcher.
      */
     domain?: string;
 
+    /**
+     * The links in the App Launcher footer.
+     */
+    footer_links?: Array<BrowserIsolationPermissionsApplication.FooterLink>;
+
+    /**
+     * The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    landing_page_design?: BrowserIsolationPermissionsApplication.LandingPageDesign;
+
     /**
      * The name of the application.
      */
@@ -14052,89 +10913,70 @@ export namespace ApplicationGetResponse {
      */
     scim_config?: BrowserIsolationPermissionsApplication.SCIMConfig;
 
-    /**
-     * The amount of time that tokens issued for this application will be valid. Must
-     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
-     * s, m, h.
-     */
-    session_duration?: string;
-
-    updated_at?: string;
-  }
-
-  export namespace BrowserIsolationPermissionsApplication {
-    export interface Policy {
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroup>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
+    /**
+     * The amount of time that tokens issued for this application will be valid. Must
+     * be in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms,
+     * s, m, h.
+     */
+    session_duration?: string;
 
-      created_at?: string;
+    /**
+     * Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
 
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision?: ApplicationsAPI.Decision;
+    updated_at?: string;
+  }
 
+  export namespace BrowserIsolationPermissionsApplication {
+    export interface FooterLink {
       /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
+       * The hypertext in the footer link.
        */
-      exclude?: Array<AccessAPI.AccessRule>;
+      name: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * the hyperlink in the footer link.
        */
-      include?: Array<AccessAPI.AccessRule>;
+      url: string;
+    }
 
+    /**
+     * The design of the App Launcher landing page shown to users when they log in.
+     */
+    export interface LandingPageDesign {
       /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
+       * The background color of the log in button on the landing page.
        */
-      isolation_required?: boolean;
+      button_color?: string;
 
       /**
-       * The name of the Access policy.
+       * The color of the text in the log in button on the landing page.
        */
-      name?: string;
+      button_text_color?: string;
 
       /**
-       * A custom message that will appear on the purpose justification screen.
+       * The URL of the image shown on the landing page.
        */
-      purpose_justification_prompt?: string;
+      image_url?: string;
 
       /**
-       * Require users to enter a justification when they log in to the application.
+       * The message shown on the landing page.
        */
-      purpose_justification_required?: boolean;
+      message?: string;
 
       /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
+       * The title shown on the landing page.
        */
-      require?: Array<AccessAPI.AccessRule>;
+      title?: string;
+    }
 
+    export interface Policy extends ApplicationsAPI.ApplicationPolicy {
       /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      session_duration?: string;
-
-      updated_at?: string;
+      precedence?: number;
     }
 
     /**
@@ -14158,9 +11000,16 @@ export namespace ApplicationGetResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -14178,141 +11027,54 @@ export namespace ApplicationGetResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -14392,9 +11154,16 @@ export namespace ApplicationGetResponse {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -14412,141 +11181,287 @@ export namespace ApplicationGetResponse {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Password used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        password: string;
+        client_id: string;
 
         /**
-         * The authentication scheme to use when making SCIM requests to this application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        scheme: 'httpbasic';
+        client_secret: string;
 
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        user: string;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+        /**
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_id: string;
+
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
+      }
+    }
+  }
+
+  export interface InfrastructureApplication {
+    target_criteria: Array<InfrastructureApplication.TargetCriterion>;
+
+    /**
+     * The application type.
+     */
+    type: ApplicationsAPI.ApplicationType;
+
+    /**
+     * UUID
+     */
+    id?: string;
+
+    /**
+     * Audience tag.
+     */
+    aud?: string;
+
+    created_at?: string;
+
+    /**
+     * The name of the application.
+     */
+    name?: string;
+
+    policies?: Array<InfrastructureApplication.Policy>;
+
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    scim_config?: InfrastructureApplication.SCIMConfig;
+
+    updated_at?: string;
+  }
+
+  export namespace InfrastructureApplication {
+    export interface TargetCriterion {
+      /**
+       * The port that the targets use for the chosen communication protocol. A port
+       * cannot be assigned to multiple protocols.
+       */
+      port: number;
+
+      /**
+       * The communication protocol your application secures.
+       */
+      protocol: 'ssh';
+
+      /**
+       * Contains a map of target attribute keys to target attribute values.
+       */
+      target_attributes: Record<string, Array<string>>;
+    }
+
+    export interface Policy {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The rules that define how users may connect to the targets secured by your
+       * application.
+       */
+      connection_rules?: Policy.ConnectionRules;
+
+      created_at?: string;
+
+      /**
+       * The action Access will take if a user matches this policy. Infrastructure
+       * application policies can only use the Allow action.
+       */
+      decision?: ApplicationsAPI.Decision;
+
+      /**
+       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
+       * meet any of the Exclude rules.
+       */
+      exclude?: Array<AccessAPI.AccessRule>;
+
+      /**
+       * Rules evaluated with an OR logical operator. A user needs to meet only one of
+       * the Include rules.
+       */
+      include?: Array<AccessAPI.AccessRule>;
+
+      /**
+       * The name of the Access policy.
+       */
+      name?: string;
+
+      /**
+       * Rules evaluated with an AND logical operator. To match the policy, a user must
+       * meet all of the Require rules.
+       */
+      require?: Array<AccessAPI.AccessRule>;
+
+      updated_at?: string;
+    }
+
+    export namespace Policy {
+      /**
+       * The rules that define how users may connect to the targets secured by your
+       * application.
+       */
+      export interface ConnectionRules {
+        /**
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
+         */
+        ssh?: ConnectionRules.SSH;
+      }
+
+      export namespace ConnectionRules {
+        /**
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
+         */
+        export interface SSH {
+          /**
+           * Contains the Unix usernames that may be used when connecting over SSH.
+           */
+          usernames: Array<string>;
+
+          /**
+           * Enables using Identity Provider email alias as SSH username.
+           */
+          allow_email_alias?: boolean;
+        }
       }
+    }
+
+    /**
+     * Configuration for provisioning to this application via SCIM. This is currently
+     * in closed beta.
+     */
+    export interface SCIMConfig {
+      /**
+       * The UID of the IdP to use as the source for SCIM resources to provision to this
+       * application.
+       */
+      idp_uid: string;
+
+      /**
+       * The base URI for the application's SCIM-compatible API.
+       */
+      remote_uri: string;
+
+      /**
+       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      authentication?:
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasic
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerToken
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
+
+      /**
+       * If false, propagates DELETE requests to the target application for SCIM
+       * resources. If true, sets 'active' to false on the SCIM resource. Note: Some
+       * targets do not support DELETE operations.
+       */
+      deactivate_on_delete?: boolean;
+
+      /**
+       * Whether SCIM provisioning is turned on for this application.
+       */
+      enabled?: boolean;
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMapping>;
+    }
 
+    export namespace SCIMConfig {
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_id: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_secret: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -14558,18 +11473,18 @@ export type ApplicationCreateParams =
   | ApplicationCreateParams.SelfHostedApplication
   | ApplicationCreateParams.SaaSApplication
   | ApplicationCreateParams.BrowserSSHApplication
-  | ApplicationCreateParams.BrowserVncApplication
+  | ApplicationCreateParams.BrowserVNCApplication
   | ApplicationCreateParams.AppLauncherApplication
   | ApplicationCreateParams.DeviceEnrollmentPermissionsApplication
   | ApplicationCreateParams.BrowserIsolationPermissionsApplication
-  | ApplicationCreateParams.BookmarkApplication;
+  | ApplicationCreateParams.BookmarkApplication
+  | ApplicationCreateParams.InfrastructureApplication;
 
-export namespace ApplicationCreateParams {
+export declare namespace ApplicationCreateParams {
   export interface SelfHostedApplication {
     /**
-     * Body param: The primary hostname and path that Access will secure. If the app is
-     * visible in the App Launcher dashboard, this is the domain that will be
-     * displayed.
+     * Body param: The primary hostname and path secured by Access. This domain will be
+     * displayed if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -14644,6 +11559,17 @@ export namespace ApplicationCreateParams {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * Body param: List of destinations secured by Access. This supersedes
+     * `self_hosted_domains` to allow for more flexibility in defining different types
+     * of domains. If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    destinations?: Array<
+      | ApplicationCreateParams.SelfHostedApplication.PublicDestination
+      | ApplicationCreateParams.SelfHostedApplication.PrivateDestination
+    >;
+
     /**
      * Body param: Enables the binding cookie, which increases security against
      * compromised authorization tokens and CSRF attacks.
@@ -14679,9 +11605,9 @@ export namespace ApplicationCreateParams {
     path_cookie_attribute?: boolean;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationCreateParams.SelfHostedApplication.AccessAppPolicyLink
@@ -14702,7 +11628,10 @@ export namespace ApplicationCreateParams {
     scim_config?: ApplicationCreateParams.SelfHostedApplication.SCIMConfig;
 
     /**
-     * Body param: List of domains that Access will secure.
+     * Body param: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
     self_hosted_domains?: Array<SelfHostedDomainsParam>;
 
@@ -14733,38 +11662,72 @@ export namespace ApplicationCreateParams {
 
   export namespace SelfHostedApplication {
     /**
-     * A JSON that links a reusable policy to an application.
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
      */
-    export interface AccessAppPolicyLink {
+    export interface PublicDestination {
+      type?: 'public';
+
       /**
-       * The UUID of the policy
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      id?: string;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      precedence?: number;
-    }
+      cidr?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      hostname?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * The name of the Access policy.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      name: string;
+      port_range?: string;
+
+      type?: 'private';
+
+      /**
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
+       */
+      vnet_id?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -14781,12 +11744,6 @@ export namespace ApplicationCreateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -14810,12 +11767,6 @@ export namespace ApplicationCreateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -14845,9 +11796,16 @@ export namespace ApplicationCreateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -14865,141 +11823,54 @@ export namespace ApplicationCreateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -15051,9 +11922,9 @@ export namespace ApplicationCreateParams {
     name?: string;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationCreateParams.SaaSApplication.AccessAppPolicyLink
@@ -15064,7 +11935,7 @@ export namespace ApplicationCreateParams {
     /**
      * Body param:
      */
-    saas_app?: SAMLSaaSAppParam | ApplicationCreateParams.SaaSApplication.AccessOIDCSaaSApp;
+    saas_app?: SAMLSaaSAppParam | OIDCSaaSAppParam;
 
     /**
      * Body param: Configuration for provisioning to this application via SCIM. This is
@@ -15101,209 +11972,52 @@ export namespace ApplicationCreateParams {
       precedence?: number;
     }
 
-    export interface UnionMember2 {
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision: ApplicationsAPI.DecisionParam;
-
-      /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
-       */
-      include: Array<AccessAPI.AccessRuleParam>;
-
-      /**
-       * The name of the Access policy.
-       */
-      name: string;
-
-      /**
-       * The UUID of the policy
-       */
-      id?: string;
-
-      /**
-       * Administrators who can approve a temporary authentication request.
-       */
-      approval_groups?: Array<PoliciesAPI.ApprovalGroupParam>;
-
-      /**
-       * Requires the user to request access from an administrator at the start of each
-       * session.
-       */
-      approval_required?: boolean;
-
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
-      /**
-       * Require this application to be served in an isolated browser for users matching
-       * this policy. 'Client Web Isolation' must be on for the account in order to use
-       * this feature.
-       */
-      isolation_required?: boolean;
-
-      /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
-       */
-      precedence?: number;
-
-      /**
-       * A custom message that will appear on the purpose justification screen.
-       */
-      purpose_justification_prompt?: string;
-
-      /**
-       * Require users to enter a justification when they log in to the application.
-       */
-      purpose_justification_required?: boolean;
-
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
-      /**
-       * The amount of time that tokens issued for the application will be valid. Must be
-       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-       * m, h.
-       */
-      session_duration?: string;
-    }
-
-    export interface AccessOIDCSaaSApp {
-      /**
-       * The lifetime of the OIDC Access Token after creation. Valid units are m,h. Must
-       * be greater than or equal to 1m and less than or equal to 24h.
-       */
-      access_token_lifetime?: string;
-
-      /**
-       * If client secret should be required on the token endpoint when
-       * authorization_code_with_pkce grant is used.
-       */
-      allow_pkce_without_client_secret?: boolean;
-
-      /**
-       * The URL where this applications tile redirects users
-       */
-      app_launcher_url?: string;
-
+    export interface UnionMember2 {
       /**
-       * Identifier of the authentication protocol used for the saas app. Required for
-       * OIDC.
+       * The UUID of the policy
        */
-      auth_type?: 'saml' | 'oidc';
+      id?: string;
 
       /**
-       * The application client id
+       * Administrators who can approve a temporary authentication request.
        */
-      client_id?: string;
+      approval_groups?: Array<PoliciesAPI.ApprovalGroupParam>;
 
       /**
-       * The application client secret, only returned on POST request.
+       * Requires the user to request access from an administrator at the start of each
+       * session.
        */
-      client_secret?: string;
-
-      created_at?: string;
-
-      custom_claims?: AccessOIDCSaaSApp.CustomClaims;
+      approval_required?: boolean;
 
       /**
-       * The OIDC flows supported by this application
+       * Require this application to be served in an isolated browser for users matching
+       * this policy. 'Client Web Isolation' must be on for the account in order to use
+       * this feature.
        */
-      grant_types?: Array<
-        'authorization_code' | 'authorization_code_with_pkce' | 'refresh_tokens' | 'hybrid' | 'implicit'
-      >;
+      isolation_required?: boolean;
 
       /**
-       * A regex to filter Cloudflare groups returned in ID token and userinfo endpoint
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
        */
-      group_filter_regex?: string;
-
-      hybrid_and_implicit_options?: AccessOIDCSaaSApp.HybridAndImplicitOptions;
+      precedence?: number;
 
       /**
-       * The Access public certificate that will be used to verify your identity.
+       * A custom message that will appear on the purpose justification screen.
        */
-      public_key?: string;
+      purpose_justification_prompt?: string;
 
       /**
-       * The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-       * tokens
+       * Require users to enter a justification when they log in to the application.
        */
-      redirect_uris?: Array<string>;
-
-      refresh_token_options?: AccessOIDCSaaSApp.RefreshTokenOptions;
+      purpose_justification_required?: boolean;
 
       /**
-       * Define the user information shared with access, "offline_access" scope will be
-       * automatically enabled if refresh tokens are enabled
+       * The amount of time that tokens issued for the application will be valid. Must be
+       * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
+       * m, h.
        */
-      scopes?: Array<'openid' | 'groups' | 'email' | 'profile'>;
-
-      updated_at?: string;
-    }
-
-    export namespace AccessOIDCSaaSApp {
-      export interface CustomClaims {
-        /**
-         * The name of the claim.
-         */
-        name?: string;
-
-        /**
-         * If the claim is required when building an OIDC token.
-         */
-        required?: boolean;
-
-        /**
-         * The scope of the claim.
-         */
-        scope?: 'groups' | 'profile' | 'email' | 'openid';
-
-        source?: CustomClaims.Source;
-      }
-
-      export namespace CustomClaims {
-        export interface Source {
-          /**
-           * The name of the IdP claim.
-           */
-          name?: string;
-
-          /**
-           * A mapping from IdP ID to claim name.
-           */
-          name_by_idp?: Record<string, string>;
-        }
-      }
-
-      export interface HybridAndImplicitOptions {
-        /**
-         * If an Access Token should be returned from the OIDC Authorization endpoint
-         */
-        return_access_token_from_authorization_endpoint?: boolean;
-
-        /**
-         * If an ID Token should be returned from the OIDC Authorization endpoint
-         */
-        return_id_token_from_authorization_endpoint?: boolean;
-      }
-
-      export interface RefreshTokenOptions {
-        /**
-         * How long a refresh token will be valid for after creation. Valid units are
-         * m,h,d. Must be longer than 1m.
-         */
-        lifetime?: string;
-      }
+      session_duration?: string;
     }
 
     /**
@@ -15327,9 +12041,16 @@ export namespace ApplicationCreateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -15347,150 +12068,62 @@ export namespace ApplicationCreateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
   export interface BrowserSSHApplication {
     /**
-     * Body param: The primary hostname and path that Access will secure. If the app is
-     * visible in the App Launcher dashboard, this is the domain that will be
-     * displayed.
+     * Body param: The primary hostname and path secured by Access. This domain will be
+     * displayed if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -15565,6 +12198,17 @@ export namespace ApplicationCreateParams {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * Body param: List of destinations secured by Access. This supersedes
+     * `self_hosted_domains` to allow for more flexibility in defining different types
+     * of domains. If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    destinations?: Array<
+      | ApplicationCreateParams.BrowserSSHApplication.PublicDestination
+      | ApplicationCreateParams.BrowserSSHApplication.PrivateDestination
+    >;
+
     /**
      * Body param: Enables the binding cookie, which increases security against
      * compromised authorization tokens and CSRF attacks.
@@ -15600,9 +12244,9 @@ export namespace ApplicationCreateParams {
     path_cookie_attribute?: boolean;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationCreateParams.BrowserSSHApplication.AccessAppPolicyLink
@@ -15623,7 +12267,10 @@ export namespace ApplicationCreateParams {
     scim_config?: ApplicationCreateParams.BrowserSSHApplication.SCIMConfig;
 
     /**
-     * Body param: List of domains that Access will secure.
+     * Body param: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
     self_hosted_domains?: Array<SelfHostedDomainsParam>;
 
@@ -15654,38 +12301,72 @@ export namespace ApplicationCreateParams {
 
   export namespace BrowserSSHApplication {
     /**
-     * A JSON that links a reusable policy to an application.
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
      */
-    export interface AccessAppPolicyLink {
+    export interface PublicDestination {
+      type?: 'public';
+
       /**
-       * The UUID of the policy
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      id?: string;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      precedence?: number;
-    }
+      cidr?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      hostname?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * The name of the Access policy.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      name: string;
+      port_range?: string;
+
+      type?: 'private';
+
+      /**
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
+       */
+      vnet_id?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -15702,12 +12383,6 @@ export namespace ApplicationCreateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -15731,12 +12406,6 @@ export namespace ApplicationCreateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -15766,9 +12435,16 @@ export namespace ApplicationCreateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -15786,150 +12462,62 @@ export namespace ApplicationCreateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
-
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
-
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * The authentication scheme to use when making SCIM requests to this application.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        scheme: 'oauth2';
+        client_id: string;
 
         /**
-         * URL used to generate the token used to authenticate with the remote SCIM
+         * Client secret of the Access service token used to authenticate with the remote
          * service.
          */
-        token_url: string;
+        client_secret: string;
 
         /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_id: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_secret: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface BrowserVncApplication {
+  export interface BrowserVNCApplication {
     /**
-     * Body param: The primary hostname and path that Access will secure. If the app is
-     * visible in the App Launcher dashboard, this is the domain that will be
-     * displayed.
+     * Body param: The primary hostname and path secured by Access. This domain will be
+     * displayed if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -16004,6 +12592,17 @@ export namespace ApplicationCreateParams {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * Body param: List of destinations secured by Access. This supersedes
+     * `self_hosted_domains` to allow for more flexibility in defining different types
+     * of domains. If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    destinations?: Array<
+      | ApplicationCreateParams.BrowserVNCApplication.PublicDestination
+      | ApplicationCreateParams.BrowserVNCApplication.PrivateDestination
+    >;
+
     /**
      * Body param: Enables the binding cookie, which increases security against
      * compromised authorization tokens and CSRF attacks.
@@ -16039,14 +12638,14 @@ export namespace ApplicationCreateParams {
     path_cookie_attribute?: boolean;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
-      | ApplicationCreateParams.BrowserVncApplication.AccessAppPolicyLink
+      | ApplicationCreateParams.BrowserVNCApplication.AccessAppPolicyLink
       | string
-      | ApplicationCreateParams.BrowserVncApplication.UnionMember2
+      | ApplicationCreateParams.BrowserVNCApplication.UnionMember2
     >;
 
     /**
@@ -16059,10 +12658,13 @@ export namespace ApplicationCreateParams {
      * Body param: Configuration for provisioning to this application via SCIM. This is
      * currently in closed beta.
      */
-    scim_config?: ApplicationCreateParams.BrowserVncApplication.SCIMConfig;
+    scim_config?: ApplicationCreateParams.BrowserVNCApplication.SCIMConfig;
 
     /**
-     * Body param: List of domains that Access will secure.
+     * Body param: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
     self_hosted_domains?: Array<SelfHostedDomainsParam>;
 
@@ -16091,40 +12693,74 @@ export namespace ApplicationCreateParams {
     tags?: Array<string>;
   }
 
-  export namespace BrowserVncApplication {
+  export namespace BrowserVNCApplication {
     /**
-     * A JSON that links a reusable policy to an application.
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
      */
-    export interface AccessAppPolicyLink {
+    export interface PublicDestination {
+      type?: 'public';
+
       /**
-       * The UUID of the policy
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      id?: string;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      precedence?: number;
-    }
+      cidr?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      hostname?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * The name of the Access policy.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      name: string;
+      port_range?: string;
+
+      type?: 'private';
+
+      /**
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
+       */
+      vnet_id?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -16141,12 +12777,6 @@ export namespace ApplicationCreateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -16170,12 +12800,6 @@ export namespace ApplicationCreateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -16205,9 +12829,16 @@ export namespace ApplicationCreateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -16225,141 +12856,54 @@ export namespace ApplicationCreateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -16388,6 +12932,11 @@ export namespace ApplicationCreateParams {
      */
     allowed_idps?: Array<AllowedIdPsParam>;
 
+    /**
+     * Body param: The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
     /**
      * Body param: When set to `true`, users skip the identity provider selection step
      * during login. You must specify only one identity provider in allowed_idps.
@@ -16395,9 +12944,30 @@ export namespace ApplicationCreateParams {
     auto_redirect_to_identity?: boolean;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
+    /**
+     * Body param: The links in the App Launcher footer.
+     */
+    footer_links?: Array<ApplicationCreateParams.AppLauncherApplication.FooterLink>;
+
+    /**
+     * Body param: The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * Body param: The design of the App Launcher landing page shown to users when they
+     * log in.
+     */
+    landing_page_design?: ApplicationCreateParams.AppLauncherApplication.LandingPageDesign;
+
+    /**
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationCreateParams.AppLauncherApplication.AccessAppPolicyLink
@@ -16417,42 +12987,73 @@ export namespace ApplicationCreateParams {
      * (or µs), ms, s, m, h.
      */
     session_duration?: string;
+
+    /**
+     * Body param: Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
   }
 
   export namespace AppLauncherApplication {
+    export interface FooterLink {
+      /**
+       * The hypertext in the footer link.
+       */
+      name: string;
+
+      /**
+       * the hyperlink in the footer link.
+       */
+      url: string;
+    }
+
     /**
-     * A JSON that links a reusable policy to an application.
+     * The design of the App Launcher landing page shown to users when they log in.
      */
-    export interface AccessAppPolicyLink {
+    export interface LandingPageDesign {
       /**
-       * The UUID of the policy
+       * The background color of the log in button on the landing page.
        */
-      id?: string;
+      button_color?: string;
 
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The color of the text in the log in button on the landing page.
        */
-      precedence?: number;
-    }
+      button_text_color?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The URL of the image shown on the landing page.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      image_url?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The message shown on the landing page.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      message?: string;
 
       /**
-       * The name of the Access policy.
+       * The title shown on the landing page.
        */
-      name: string;
+      title?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
 
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
+
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -16469,12 +13070,6 @@ export namespace ApplicationCreateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -16498,12 +13093,6 @@ export namespace ApplicationCreateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -16533,9 +13122,16 @@ export namespace ApplicationCreateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -16553,141 +13149,54 @@ export namespace ApplicationCreateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
-
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * The authentication scheme to use when making SCIM requests to this application.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        scheme: 'oauth2';
+        client_id: string;
 
         /**
-         * URL used to generate the token used to authenticate with the remote SCIM
+         * Client secret of the Access service token used to authenticate with the remote
          * service.
          */
-        token_url: string;
+        client_secret: string;
 
         /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_id: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_secret: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -16716,6 +13225,11 @@ export namespace ApplicationCreateParams {
      */
     allowed_idps?: Array<AllowedIdPsParam>;
 
+    /**
+     * Body param: The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
     /**
      * Body param: When set to `true`, users skip the identity provider selection step
      * during login. You must specify only one identity provider in allowed_idps.
@@ -16723,9 +13237,30 @@ export namespace ApplicationCreateParams {
     auto_redirect_to_identity?: boolean;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
+    /**
+     * Body param: The links in the App Launcher footer.
+     */
+    footer_links?: Array<ApplicationCreateParams.DeviceEnrollmentPermissionsApplication.FooterLink>;
+
+    /**
+     * Body param: The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * Body param: The design of the App Launcher landing page shown to users when they
+     * log in.
+     */
+    landing_page_design?: ApplicationCreateParams.DeviceEnrollmentPermissionsApplication.LandingPageDesign;
+
+    /**
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationCreateParams.DeviceEnrollmentPermissionsApplication.AccessAppPolicyLink
@@ -16745,42 +13280,73 @@ export namespace ApplicationCreateParams {
      * (or µs), ms, s, m, h.
      */
     session_duration?: string;
+
+    /**
+     * Body param: Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
   }
 
   export namespace DeviceEnrollmentPermissionsApplication {
+    export interface FooterLink {
+      /**
+       * The hypertext in the footer link.
+       */
+      name: string;
+
+      /**
+       * the hyperlink in the footer link.
+       */
+      url: string;
+    }
+
     /**
-     * A JSON that links a reusable policy to an application.
+     * The design of the App Launcher landing page shown to users when they log in.
      */
-    export interface AccessAppPolicyLink {
+    export interface LandingPageDesign {
       /**
-       * The UUID of the policy
+       * The background color of the log in button on the landing page.
        */
-      id?: string;
+      button_color?: string;
 
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The color of the text in the log in button on the landing page.
        */
-      precedence?: number;
-    }
+      button_text_color?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The URL of the image shown on the landing page.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      image_url?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The message shown on the landing page.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      message?: string;
 
       /**
-       * The name of the Access policy.
+       * The title shown on the landing page.
        */
-      name: string;
+      title?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -16797,12 +13363,6 @@ export namespace ApplicationCreateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -16826,12 +13386,6 @@ export namespace ApplicationCreateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -16861,9 +13415,16 @@ export namespace ApplicationCreateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -16881,141 +13442,54 @@ export namespace ApplicationCreateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -17044,6 +13518,11 @@ export namespace ApplicationCreateParams {
      */
     allowed_idps?: Array<AllowedIdPsParam>;
 
+    /**
+     * Body param: The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
     /**
      * Body param: When set to `true`, users skip the identity provider selection step
      * during login. You must specify only one identity provider in allowed_idps.
@@ -17051,9 +13530,30 @@ export namespace ApplicationCreateParams {
     auto_redirect_to_identity?: boolean;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
+    /**
+     * Body param: The links in the App Launcher footer.
+     */
+    footer_links?: Array<ApplicationCreateParams.BrowserIsolationPermissionsApplication.FooterLink>;
+
+    /**
+     * Body param: The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * Body param: The design of the App Launcher landing page shown to users when they
+     * log in.
+     */
+    landing_page_design?: ApplicationCreateParams.BrowserIsolationPermissionsApplication.LandingPageDesign;
+
+    /**
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationCreateParams.BrowserIsolationPermissionsApplication.AccessAppPolicyLink
@@ -17073,42 +13573,73 @@ export namespace ApplicationCreateParams {
      * (or µs), ms, s, m, h.
      */
     session_duration?: string;
+
+    /**
+     * Body param: Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
   }
 
   export namespace BrowserIsolationPermissionsApplication {
+    export interface FooterLink {
+      /**
+       * The hypertext in the footer link.
+       */
+      name: string;
+
+      /**
+       * the hyperlink in the footer link.
+       */
+      url: string;
+    }
+
     /**
-     * A JSON that links a reusable policy to an application.
+     * The design of the App Launcher landing page shown to users when they log in.
      */
-    export interface AccessAppPolicyLink {
+    export interface LandingPageDesign {
       /**
-       * The UUID of the policy
+       * The background color of the log in button on the landing page.
        */
-      id?: string;
+      button_color?: string;
 
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The color of the text in the log in button on the landing page.
        */
-      precedence?: number;
-    }
+      button_text_color?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The URL of the image shown on the landing page.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      image_url?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The message shown on the landing page.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      message?: string;
 
       /**
-       * The name of the Access policy.
+       * The title shown on the landing page.
        */
-      name: string;
+      title?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -17125,12 +13656,6 @@ export namespace ApplicationCreateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -17154,12 +13679,6 @@ export namespace ApplicationCreateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -17189,9 +13708,16 @@ export namespace ApplicationCreateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -17202,148 +13728,61 @@ export namespace ApplicationCreateParams {
 
       /**
        * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
+       */
+      enabled?: boolean;
 
       /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
+    }
 
+    export namespace SCIMConfig {
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_id: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_secret: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -17421,9 +13860,16 @@ export namespace ApplicationCreateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -17441,140 +13887,176 @@ export namespace ApplicationCreateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Password used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        password: string;
+        client_id: string;
 
         /**
-         * The authentication scheme to use when making SCIM requests to this application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        scheme: 'httpbasic';
+        client_secret: string;
 
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        user: string;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+        /**
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_id: string;
+
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
+    }
+  }
+
+  export interface InfrastructureApplication {
+    /**
+     * Body param:
+     */
+    target_criteria: Array<ApplicationCreateParams.InfrastructureApplication.TargetCriterion>;
+
+    /**
+     * Body param: The application type.
+     */
+    type: ApplicationTypeParam;
+
+    /**
+     * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
+     * Zone ID.
+     */
+    account_id?: string;
+
+    /**
+     * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
+     * Account ID.
+     */
+    zone_id?: string;
+
+    /**
+     * Body param: The name of the application.
+     */
+    name?: string;
+
+    /**
+     * Body param: The policies that Access applies to the application.
+     */
+    policies?: Array<ApplicationCreateParams.InfrastructureApplication.Policy>;
+  }
 
+  export namespace InfrastructureApplication {
+    export interface TargetCriterion {
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * The port that the targets use for the chosen communication protocol. A port
+       * cannot be assigned to multiple protocols.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
+      port: number;
 
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
+      /**
+       * The communication protocol your application secures.
+       */
+      protocol: 'ssh';
 
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
+      /**
+       * Contains a map of target attribute keys to target attribute values.
+       */
+      target_attributes: Record<string, Array<string>>;
+    }
 
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
+    export interface Policy {
+      /**
+       * The action Access will take if a user matches this policy. Infrastructure
+       * application policies can only use the Allow action.
+       */
+      decision: ApplicationsAPI.DecisionParam;
 
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
+      /**
+       * Rules evaluated with an OR logical operator. A user needs to meet only one of
+       * the Include rules.
+       */
+      include: Array<AccessAPI.AccessRuleParam>;
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * The name of the Access policy.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
+      name: string;
 
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
+      /**
+       * The rules that define how users may connect to the targets secured by your
+       * application.
+       */
+      connection_rules?: Policy.ConnectionRules;
 
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
+      /**
+       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
+       * meet any of the Exclude rules.
+       */
+      exclude?: Array<AccessAPI.AccessRuleParam>;
 
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
+      /**
+       * Rules evaluated with an AND logical operator. To match the policy, a user must
+       * meet all of the Require rules.
+       */
+      require?: Array<AccessAPI.AccessRuleParam>;
+    }
 
+    export namespace Policy {
+      /**
+       * The rules that define how users may connect to the targets secured by your
+       * application.
+       */
+      export interface ConnectionRules {
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
          */
-        transform_jsonata?: string;
+        ssh?: ConnectionRules.SSH;
       }
 
-      export namespace Mapping {
+      export namespace ConnectionRules {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
+        export interface SSH {
           /**
-           * Whether or not this mapping applies to DELETE operations.
+           * Contains the Unix usernames that may be used when connecting over SSH.
            */
-          delete?: boolean;
+          usernames: Array<string>;
 
           /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
+           * Enables using Identity Provider email alias as SSH username.
            */
-          update?: boolean;
+          allow_email_alias?: boolean;
         }
       }
     }
@@ -17585,18 +14067,18 @@ export type ApplicationUpdateParams =
   | ApplicationUpdateParams.SelfHostedApplication
   | ApplicationUpdateParams.SaaSApplication
   | ApplicationUpdateParams.BrowserSSHApplication
-  | ApplicationUpdateParams.BrowserVncApplication
+  | ApplicationUpdateParams.BrowserVNCApplication
   | ApplicationUpdateParams.AppLauncherApplication
   | ApplicationUpdateParams.DeviceEnrollmentPermissionsApplication
   | ApplicationUpdateParams.BrowserIsolationPermissionsApplication
-  | ApplicationUpdateParams.BookmarkApplication;
+  | ApplicationUpdateParams.BookmarkApplication
+  | ApplicationUpdateParams.InfrastructureApplication;
 
-export namespace ApplicationUpdateParams {
+export declare namespace ApplicationUpdateParams {
   export interface SelfHostedApplication {
     /**
-     * Body param: The primary hostname and path that Access will secure. If the app is
-     * visible in the App Launcher dashboard, this is the domain that will be
-     * displayed.
+     * Body param: The primary hostname and path secured by Access. This domain will be
+     * displayed if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -17671,6 +14153,17 @@ export namespace ApplicationUpdateParams {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * Body param: List of destinations secured by Access. This supersedes
+     * `self_hosted_domains` to allow for more flexibility in defining different types
+     * of domains. If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    destinations?: Array<
+      | ApplicationUpdateParams.SelfHostedApplication.PublicDestination
+      | ApplicationUpdateParams.SelfHostedApplication.PrivateDestination
+    >;
+
     /**
      * Body param: Enables the binding cookie, which increases security against
      * compromised authorization tokens and CSRF attacks.
@@ -17706,9 +14199,9 @@ export namespace ApplicationUpdateParams {
     path_cookie_attribute?: boolean;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationUpdateParams.SelfHostedApplication.AccessAppPolicyLink
@@ -17729,7 +14222,10 @@ export namespace ApplicationUpdateParams {
     scim_config?: ApplicationUpdateParams.SelfHostedApplication.SCIMConfig;
 
     /**
-     * Body param: List of domains that Access will secure.
+     * Body param: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
     self_hosted_domains?: Array<SelfHostedDomainsParam>;
 
@@ -17760,38 +14256,72 @@ export namespace ApplicationUpdateParams {
 
   export namespace SelfHostedApplication {
     /**
-     * A JSON that links a reusable policy to an application.
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
      */
-    export interface AccessAppPolicyLink {
+    export interface PublicDestination {
+      type?: 'public';
+
       /**
-       * The UUID of the policy
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      id?: string;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      precedence?: number;
-    }
+      cidr?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      hostname?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * The name of the Access policy.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      name: string;
+      port_range?: string;
+
+      type?: 'private';
+
+      /**
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
+       */
+      vnet_id?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -17808,12 +14338,6 @@ export namespace ApplicationUpdateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -17837,12 +14361,6 @@ export namespace ApplicationUpdateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -17872,161 +14390,81 @@ export namespace ApplicationUpdateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
        * resources. If true, sets 'active' to false on the SCIM resource. Note: Some
        * targets do not support DELETE operations.
        */
-      deactivate_on_delete?: boolean;
-
-      /**
-       * Whether SCIM provisioning is turned on for this application.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of mappings to apply to SCIM resources before provisioning them in this
-       * application. These can transform or filter the resources to be provisioned.
-       */
-      mappings?: Array<SCIMConfig.Mapping>;
-    }
-
-    export namespace SCIMConfig {
-      /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
+      deactivate_on_delete?: boolean;
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Whether SCIM provisioning is turned on for this application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
+      enabled?: boolean;
+
+      /**
+       * A list of mappings to apply to SCIM resources before provisioning them in this
+       * application. These can transform or filter the resources to be provisioned.
+       */
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
+    }
 
+    export namespace SCIMConfig {
+      /**
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
+       */
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_id: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_secret: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -18078,9 +14516,9 @@ export namespace ApplicationUpdateParams {
     name?: string;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationUpdateParams.SaaSApplication.AccessAppPolicyLink
@@ -18091,7 +14529,7 @@ export namespace ApplicationUpdateParams {
     /**
      * Body param:
      */
-    saas_app?: SAMLSaaSAppParam | ApplicationUpdateParams.SaaSApplication.AccessOIDCSaaSApp;
+    saas_app?: SAMLSaaSAppParam | OIDCSaaSAppParam;
 
     /**
      * Body param: Configuration for provisioning to this application via SCIM. This is
@@ -18129,22 +14567,6 @@ export namespace ApplicationUpdateParams {
     }
 
     export interface UnionMember2 {
-      /**
-       * The action Access will take if a user matches this policy.
-       */
-      decision: ApplicationsAPI.DecisionParam;
-
-      /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
-       */
-      include: Array<AccessAPI.AccessRuleParam>;
-
-      /**
-       * The name of the Access policy.
-       */
-      name: string;
-
       /**
        * The UUID of the policy
        */
@@ -18161,12 +14583,6 @@ export namespace ApplicationUpdateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -18190,12 +14606,6 @@ export namespace ApplicationUpdateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -18204,135 +14614,6 @@ export namespace ApplicationUpdateParams {
       session_duration?: string;
     }
 
-    export interface AccessOIDCSaaSApp {
-      /**
-       * The lifetime of the OIDC Access Token after creation. Valid units are m,h. Must
-       * be greater than or equal to 1m and less than or equal to 24h.
-       */
-      access_token_lifetime?: string;
-
-      /**
-       * If client secret should be required on the token endpoint when
-       * authorization_code_with_pkce grant is used.
-       */
-      allow_pkce_without_client_secret?: boolean;
-
-      /**
-       * The URL where this applications tile redirects users
-       */
-      app_launcher_url?: string;
-
-      /**
-       * Identifier of the authentication protocol used for the saas app. Required for
-       * OIDC.
-       */
-      auth_type?: 'saml' | 'oidc';
-
-      /**
-       * The application client id
-       */
-      client_id?: string;
-
-      /**
-       * The application client secret, only returned on POST request.
-       */
-      client_secret?: string;
-
-      created_at?: string;
-
-      custom_claims?: AccessOIDCSaaSApp.CustomClaims;
-
-      /**
-       * The OIDC flows supported by this application
-       */
-      grant_types?: Array<
-        'authorization_code' | 'authorization_code_with_pkce' | 'refresh_tokens' | 'hybrid' | 'implicit'
-      >;
-
-      /**
-       * A regex to filter Cloudflare groups returned in ID token and userinfo endpoint
-       */
-      group_filter_regex?: string;
-
-      hybrid_and_implicit_options?: AccessOIDCSaaSApp.HybridAndImplicitOptions;
-
-      /**
-       * The Access public certificate that will be used to verify your identity.
-       */
-      public_key?: string;
-
-      /**
-       * The permitted URL's for Cloudflare to return Authorization codes and Access/ID
-       * tokens
-       */
-      redirect_uris?: Array<string>;
-
-      refresh_token_options?: AccessOIDCSaaSApp.RefreshTokenOptions;
-
-      /**
-       * Define the user information shared with access, "offline_access" scope will be
-       * automatically enabled if refresh tokens are enabled
-       */
-      scopes?: Array<'openid' | 'groups' | 'email' | 'profile'>;
-
-      updated_at?: string;
-    }
-
-    export namespace AccessOIDCSaaSApp {
-      export interface CustomClaims {
-        /**
-         * The name of the claim.
-         */
-        name?: string;
-
-        /**
-         * If the claim is required when building an OIDC token.
-         */
-        required?: boolean;
-
-        /**
-         * The scope of the claim.
-         */
-        scope?: 'groups' | 'profile' | 'email' | 'openid';
-
-        source?: CustomClaims.Source;
-      }
-
-      export namespace CustomClaims {
-        export interface Source {
-          /**
-           * The name of the IdP claim.
-           */
-          name?: string;
-
-          /**
-           * A mapping from IdP ID to claim name.
-           */
-          name_by_idp?: Record<string, string>;
-        }
-      }
-
-      export interface HybridAndImplicitOptions {
-        /**
-         * If an Access Token should be returned from the OIDC Authorization endpoint
-         */
-        return_access_token_from_authorization_endpoint?: boolean;
-
-        /**
-         * If an ID Token should be returned from the OIDC Authorization endpoint
-         */
-        return_id_token_from_authorization_endpoint?: boolean;
-      }
-
-      export interface RefreshTokenOptions {
-        /**
-         * How long a refresh token will be valid for after creation. Valid units are
-         * m,h,d. Must be longer than 1m.
-         */
-        lifetime?: string;
-      }
-    }
-
     /**
      * Configuration for provisioning to this application via SCIM. This is currently
      * in closed beta.
@@ -18354,9 +14635,16 @@ export namespace ApplicationUpdateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -18374,150 +14662,62 @@ export namespace ApplicationUpdateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
   export interface BrowserSSHApplication {
     /**
-     * Body param: The primary hostname and path that Access will secure. If the app is
-     * visible in the App Launcher dashboard, this is the domain that will be
-     * displayed.
+     * Body param: The primary hostname and path secured by Access. This domain will be
+     * displayed if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -18592,6 +14792,17 @@ export namespace ApplicationUpdateParams {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * Body param: List of destinations secured by Access. This supersedes
+     * `self_hosted_domains` to allow for more flexibility in defining different types
+     * of domains. If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    destinations?: Array<
+      | ApplicationUpdateParams.BrowserSSHApplication.PublicDestination
+      | ApplicationUpdateParams.BrowserSSHApplication.PrivateDestination
+    >;
+
     /**
      * Body param: Enables the binding cookie, which increases security against
      * compromised authorization tokens and CSRF attacks.
@@ -18627,9 +14838,9 @@ export namespace ApplicationUpdateParams {
     path_cookie_attribute?: boolean;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationUpdateParams.BrowserSSHApplication.AccessAppPolicyLink
@@ -18650,7 +14861,10 @@ export namespace ApplicationUpdateParams {
     scim_config?: ApplicationUpdateParams.BrowserSSHApplication.SCIMConfig;
 
     /**
-     * Body param: List of domains that Access will secure.
+     * Body param: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
     self_hosted_domains?: Array<SelfHostedDomainsParam>;
 
@@ -18681,38 +14895,72 @@ export namespace ApplicationUpdateParams {
 
   export namespace BrowserSSHApplication {
     /**
-     * A JSON that links a reusable policy to an application.
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
      */
-    export interface AccessAppPolicyLink {
+    export interface PublicDestination {
+      type?: 'public';
+
       /**
-       * The UUID of the policy
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      id?: string;
+      uri?: string;
+    }
 
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The CIDR range of the destination. Single IPs will be computed as /32.
        */
-      precedence?: number;
-    }
+      cidr?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      hostname?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * The name of the Access policy.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      name: string;
+      port_range?: string;
+
+      type?: 'private';
+
+      /**
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
+       */
+      vnet_id?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -18729,12 +14977,6 @@ export namespace ApplicationUpdateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -18758,12 +15000,6 @@ export namespace ApplicationUpdateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -18793,9 +15029,16 @@ export namespace ApplicationUpdateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -18813,150 +15056,62 @@ export namespace ApplicationUpdateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
 
-  export interface BrowserVncApplication {
+  export interface BrowserVNCApplication {
     /**
-     * Body param: The primary hostname and path that Access will secure. If the app is
-     * visible in the App Launcher dashboard, this is the domain that will be
-     * displayed.
+     * Body param: The primary hostname and path secured by Access. This domain will be
+     * displayed if the app is visible in the App Launcher.
      */
     domain: string;
 
@@ -19031,6 +15186,17 @@ export namespace ApplicationUpdateParams {
      */
     custom_pages?: Array<string>;
 
+    /**
+     * Body param: List of destinations secured by Access. This supersedes
+     * `self_hosted_domains` to allow for more flexibility in defining different types
+     * of domains. If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
+     */
+    destinations?: Array<
+      | ApplicationUpdateParams.BrowserVNCApplication.PublicDestination
+      | ApplicationUpdateParams.BrowserVNCApplication.PrivateDestination
+    >;
+
     /**
      * Body param: Enables the binding cookie, which increases security against
      * compromised authorization tokens and CSRF attacks.
@@ -19066,14 +15232,14 @@ export namespace ApplicationUpdateParams {
     path_cookie_attribute?: boolean;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
-      | ApplicationUpdateParams.BrowserVncApplication.AccessAppPolicyLink
+      | ApplicationUpdateParams.BrowserVNCApplication.AccessAppPolicyLink
       | string
-      | ApplicationUpdateParams.BrowserVncApplication.UnionMember2
+      | ApplicationUpdateParams.BrowserVNCApplication.UnionMember2
     >;
 
     /**
@@ -19086,10 +15252,13 @@ export namespace ApplicationUpdateParams {
      * Body param: Configuration for provisioning to this application via SCIM. This is
      * currently in closed beta.
      */
-    scim_config?: ApplicationUpdateParams.BrowserVncApplication.SCIMConfig;
+    scim_config?: ApplicationUpdateParams.BrowserVNCApplication.SCIMConfig;
 
     /**
-     * Body param: List of domains that Access will secure.
+     * Body param: List of public domains that Access will secure. This field is
+     * deprecated in favor of `destinations` and will be supported until **November
+     * 21, 2025.** If `destinations` are provided, then `self_hosted_domains` will be
+     * ignored.
      */
     self_hosted_domains?: Array<SelfHostedDomainsParam>;
 
@@ -19118,40 +15287,74 @@ export namespace ApplicationUpdateParams {
     tags?: Array<string>;
   }
 
-  export namespace BrowserVncApplication {
+  export namespace BrowserVNCApplication {
     /**
-     * A JSON that links a reusable policy to an application.
+     * A public hostname that Access will secure. Public destinations support
+     * sub-domain and path. Wildcard '\*' can be used in the definition.
      */
-    export interface AccessAppPolicyLink {
+    export interface PublicDestination {
+      type?: 'public';
+
       /**
-       * The UUID of the policy
+       * The URI of the destination. Public destinations' URIs can include a domain and
+       * path with
+       * [wildcards](https://developers.cloudflare.com/cloudflare-one/policies/access/app-paths/).
        */
-      id?: string;
+      uri?: string;
+    }
+
+    /**
+     * Private destinations are an early access feature and gated behind a feature
+     * flag.
+     */
+    export interface PrivateDestination {
+      /**
+       * The CIDR range of the destination. Single IPs will be computed as /32.
+       */
+      cidr?: string;
 
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The hostname of the destination. Matches a valid SNI served by an HTTPS origin.
        */
-      precedence?: number;
-    }
+      hostname?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The L4 protocol of the destination. When omitted, both UDP and TCP traffic will
+       * match.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      l4_protocol?: 'tcp' | 'udp';
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The port range of the destination. Can be a single port or a range of ports.
+       * When omitted, all ports will match.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      port_range?: string;
+
+      type?: 'private';
 
       /**
-       * The name of the Access policy.
+       * The VNET ID to match the destination. When omitted, all VNETs will match.
        */
-      name: string;
+      vnet_id?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -19168,12 +15371,6 @@ export namespace ApplicationUpdateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -19197,12 +15394,6 @@ export namespace ApplicationUpdateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -19232,9 +15423,16 @@ export namespace ApplicationUpdateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -19252,141 +15450,54 @@ export namespace ApplicationUpdateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -19407,24 +15518,50 @@ export namespace ApplicationUpdateParams {
      * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
      * Account ID.
      */
-    zone_id?: string;
+    zone_id?: string;
+
+    /**
+     * Body param: The identity providers your users can select when connecting to this
+     * application. Defaults to all IdPs configured in your account.
+     */
+    allowed_idps?: Array<AllowedIdPsParam>;
+
+    /**
+     * Body param: The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
+    /**
+     * Body param: When set to `true`, users skip the identity provider selection step
+     * during login. You must specify only one identity provider in allowed_idps.
+     */
+    auto_redirect_to_identity?: boolean;
+
+    /**
+     * Body param: The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
+    /**
+     * Body param: The links in the App Launcher footer.
+     */
+    footer_links?: Array<ApplicationUpdateParams.AppLauncherApplication.FooterLink>;
 
     /**
-     * Body param: The identity providers your users can select when connecting to this
-     * application. Defaults to all IdPs configured in your account.
+     * Body param: The background color of the App Launcher header.
      */
-    allowed_idps?: Array<AllowedIdPsParam>;
+    header_bg_color?: string;
 
     /**
-     * Body param: When set to `true`, users skip the identity provider selection step
-     * during login. You must specify only one identity provider in allowed_idps.
+     * Body param: The design of the App Launcher landing page shown to users when they
+     * log in.
      */
-    auto_redirect_to_identity?: boolean;
+    landing_page_design?: ApplicationUpdateParams.AppLauncherApplication.LandingPageDesign;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationUpdateParams.AppLauncherApplication.AccessAppPolicyLink
@@ -19444,42 +15581,73 @@ export namespace ApplicationUpdateParams {
      * (or µs), ms, s, m, h.
      */
     session_duration?: string;
+
+    /**
+     * Body param: Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
   }
 
   export namespace AppLauncherApplication {
+    export interface FooterLink {
+      /**
+       * The hypertext in the footer link.
+       */
+      name: string;
+
+      /**
+       * the hyperlink in the footer link.
+       */
+      url: string;
+    }
+
     /**
-     * A JSON that links a reusable policy to an application.
+     * The design of the App Launcher landing page shown to users when they log in.
      */
-    export interface AccessAppPolicyLink {
+    export interface LandingPageDesign {
       /**
-       * The UUID of the policy
+       * The background color of the log in button on the landing page.
        */
-      id?: string;
+      button_color?: string;
 
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The color of the text in the log in button on the landing page.
        */
-      precedence?: number;
-    }
+      button_text_color?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The URL of the image shown on the landing page.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      image_url?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The message shown on the landing page.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      message?: string;
 
       /**
-       * The name of the Access policy.
+       * The title shown on the landing page.
        */
-      name: string;
+      title?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -19496,12 +15664,6 @@ export namespace ApplicationUpdateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -19525,12 +15687,6 @@ export namespace ApplicationUpdateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -19560,9 +15716,16 @@ export namespace ApplicationUpdateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -19580,141 +15743,54 @@ export namespace ApplicationUpdateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -19743,6 +15819,11 @@ export namespace ApplicationUpdateParams {
      */
     allowed_idps?: Array<AllowedIdPsParam>;
 
+    /**
+     * Body param: The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
     /**
      * Body param: When set to `true`, users skip the identity provider selection step
      * during login. You must specify only one identity provider in allowed_idps.
@@ -19750,9 +15831,30 @@ export namespace ApplicationUpdateParams {
     auto_redirect_to_identity?: boolean;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
+    /**
+     * Body param: The links in the App Launcher footer.
+     */
+    footer_links?: Array<ApplicationUpdateParams.DeviceEnrollmentPermissionsApplication.FooterLink>;
+
+    /**
+     * Body param: The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * Body param: The design of the App Launcher landing page shown to users when they
+     * log in.
+     */
+    landing_page_design?: ApplicationUpdateParams.DeviceEnrollmentPermissionsApplication.LandingPageDesign;
+
+    /**
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationUpdateParams.DeviceEnrollmentPermissionsApplication.AccessAppPolicyLink
@@ -19772,42 +15874,73 @@ export namespace ApplicationUpdateParams {
      * (or µs), ms, s, m, h.
      */
     session_duration?: string;
+
+    /**
+     * Body param: Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
   }
 
   export namespace DeviceEnrollmentPermissionsApplication {
+    export interface FooterLink {
+      /**
+       * The hypertext in the footer link.
+       */
+      name: string;
+
+      /**
+       * the hyperlink in the footer link.
+       */
+      url: string;
+    }
+
     /**
-     * A JSON that links a reusable policy to an application.
+     * The design of the App Launcher landing page shown to users when they log in.
      */
-    export interface AccessAppPolicyLink {
+    export interface LandingPageDesign {
       /**
-       * The UUID of the policy
+       * The background color of the log in button on the landing page.
        */
-      id?: string;
+      button_color?: string;
 
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The color of the text in the log in button on the landing page.
        */
-      precedence?: number;
-    }
+      button_text_color?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The URL of the image shown on the landing page.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      image_url?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The message shown on the landing page.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      message?: string;
 
       /**
-       * The name of the Access policy.
+       * The title shown on the landing page.
        */
-      name: string;
+      title?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -19824,12 +15957,6 @@ export namespace ApplicationUpdateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -19853,12 +15980,6 @@ export namespace ApplicationUpdateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -19888,9 +16009,16 @@ export namespace ApplicationUpdateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -19908,141 +16036,54 @@ export namespace ApplicationUpdateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
-        /**
-         * User name used to authenticate with the remote SCIM service.
-         */
-        user: string;
-      }
-
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
-        /**
-         * Token used to authenticate with the remote SCIM service.
-         */
-        token: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauthbearertoken';
-      }
-
-      /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        operations?: Mapping.Operations;
+        client_id: string;
 
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        transform_jsonata?: string;
-      }
+        client_secret: string;
 
-      export namespace Mapping {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+         * The authentication scheme to use when making SCIM requests to this application.
+         */
+        scheme: 'access_service_token';
       }
     }
   }
@@ -20071,6 +16112,11 @@ export namespace ApplicationUpdateParams {
      */
     allowed_idps?: Array<AllowedIdPsParam>;
 
+    /**
+     * Body param: The image URL of the logo shown in the App Launcher header.
+     */
+    app_launcher_logo_url?: string;
+
     /**
      * Body param: When set to `true`, users skip the identity provider selection step
      * during login. You must specify only one identity provider in allowed_idps.
@@ -20078,9 +16124,30 @@ export namespace ApplicationUpdateParams {
     auto_redirect_to_identity?: boolean;
 
     /**
-     * Body param: The policies that will apply to the application, in ascending order
-     * of precedence. Items can reference existing policies or create new policies
-     * exclusive to the application.
+     * Body param: The background color of the App Launcher page.
+     */
+    bg_color?: string;
+
+    /**
+     * Body param: The links in the App Launcher footer.
+     */
+    footer_links?: Array<ApplicationUpdateParams.BrowserIsolationPermissionsApplication.FooterLink>;
+
+    /**
+     * Body param: The background color of the App Launcher header.
+     */
+    header_bg_color?: string;
+
+    /**
+     * Body param: The design of the App Launcher landing page shown to users when they
+     * log in.
+     */
+    landing_page_design?: ApplicationUpdateParams.BrowserIsolationPermissionsApplication.LandingPageDesign;
+
+    /**
+     * Body param: The policies that Access applies to the application, in ascending
+     * order of precedence. Items can reference existing policies or create new
+     * policies exclusive to the application.
      */
     policies?: Array<
       | ApplicationUpdateParams.BrowserIsolationPermissionsApplication.AccessAppPolicyLink
@@ -20100,42 +16167,73 @@ export namespace ApplicationUpdateParams {
      * (or µs), ms, s, m, h.
      */
     session_duration?: string;
+
+    /**
+     * Body param: Determines when to skip the App Launcher landing page.
+     */
+    skip_app_launcher_login_page?: boolean;
   }
 
   export namespace BrowserIsolationPermissionsApplication {
+    export interface FooterLink {
+      /**
+       * The hypertext in the footer link.
+       */
+      name: string;
+
+      /**
+       * the hyperlink in the footer link.
+       */
+      url: string;
+    }
+
     /**
-     * A JSON that links a reusable policy to an application.
+     * The design of the App Launcher landing page shown to users when they log in.
      */
-    export interface AccessAppPolicyLink {
+    export interface LandingPageDesign {
       /**
-       * The UUID of the policy
+       * The background color of the log in button on the landing page.
        */
-      id?: string;
+      button_color?: string;
 
       /**
-       * The order of execution for this policy. Must be unique for each policy within an
-       * app.
+       * The color of the text in the log in button on the landing page.
        */
-      precedence?: number;
-    }
+      button_text_color?: string;
 
-    export interface UnionMember2 {
       /**
-       * The action Access will take if a user matches this policy.
+       * The URL of the image shown on the landing page.
        */
-      decision: ApplicationsAPI.DecisionParam;
+      image_url?: string;
 
       /**
-       * Rules evaluated with an OR logical operator. A user needs to meet only one of
-       * the Include rules.
+       * The message shown on the landing page.
        */
-      include: Array<AccessAPI.AccessRuleParam>;
+      message?: string;
 
       /**
-       * The name of the Access policy.
+       * The title shown on the landing page.
        */
-      name: string;
+      title?: string;
+    }
+
+    /**
+     * A JSON that links a reusable policy to an application.
+     */
+    export interface AccessAppPolicyLink {
+      /**
+       * The UUID of the policy
+       */
+      id?: string;
+
+      /**
+       * The order of execution for this policy. Must be unique for each policy within an
+       * app.
+       */
+      precedence?: number;
+    }
 
+    export interface UnionMember2 {
       /**
        * The UUID of the policy
        */
@@ -20152,12 +16250,6 @@ export namespace ApplicationUpdateParams {
        */
       approval_required?: boolean;
 
-      /**
-       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-       * meet any of the Exclude rules.
-       */
-      exclude?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * Require this application to be served in an isolated browser for users matching
        * this policy. 'Client Web Isolation' must be on for the account in order to use
@@ -20181,12 +16273,6 @@ export namespace ApplicationUpdateParams {
        */
       purpose_justification_required?: boolean;
 
-      /**
-       * Rules evaluated with an AND logical operator. To match the policy, a user must
-       * meet all of the Require rules.
-       */
-      require?: Array<AccessAPI.AccessRuleParam>;
-
       /**
        * The amount of time that tokens issued for the application will be valid. Must be
        * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
@@ -20216,9 +16302,16 @@ export namespace ApplicationUpdateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -20236,141 +16329,54 @@ export namespace ApplicationUpdateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
-        /**
-         * Password used to authenticate with the remote SCIM service.
-         */
-        password: string;
-
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'httpbasic';
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        user: string;
-      }
+        client_id: string;
 
-      /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
-       * provisioning to an application.
-       */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
+       * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
         client_id: string;
 
         /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
         client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauth2';
-
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
-
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
-
-      /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
-       */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
-
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
-
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
-
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
-
-        /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
-         */
-        transform_jsonata?: string;
-      }
-
-      export namespace Mapping {
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
-          /**
-           * Whether or not this mapping applies to DELETE operations.
-           */
-          delete?: boolean;
-
-          /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
-           */
-          update?: boolean;
-        }
+        scheme: 'access_service_token';
       }
     }
   }
@@ -20448,9 +16454,16 @@ export namespace ApplicationUpdateParams {
        * provisioning to an application.
        */
       authentication?:
-        | SCIMConfig.AccessSCIMConfigAuthenticationHTTPBasic
-        | SCIMConfig.AccessSCIMConfigAuthenticationOAuthBearerToken
-        | SCIMConfig.AccessSCIMConfigAuthenticationOauth2;
+        | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+        | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+        | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+        | Array<
+            | ApplicationsAPI.SCIMConfigAuthenticationHTTPBasicParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOAuthBearerTokenParam
+            | ApplicationsAPI.SCIMConfigAuthenticationOauth2Param
+            | SCIMConfig.AccessSCIMConfigAuthenticationAccessServiceToken
+          >;
 
       /**
        * If false, propagates DELETE requests to the target application for SCIM
@@ -20468,140 +16481,176 @@ export namespace ApplicationUpdateParams {
        * A list of mappings to apply to SCIM resources before provisioning them in this
        * application. These can transform or filter the resources to be provisioned.
        */
-      mappings?: Array<SCIMConfig.Mapping>;
+      mappings?: Array<ApplicationsAPI.SCIMConfigMappingParam>;
     }
 
     export namespace SCIMConfig {
       /**
-       * Attributes for configuring HTTP Basic authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationHTTPBasic {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
         /**
-         * Password used to authenticate with the remote SCIM service.
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
          */
-        password: string;
+        client_id: string;
 
         /**
-         * The authentication scheme to use when making SCIM requests to this application.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        scheme: 'httpbasic';
+        client_secret: string;
 
         /**
-         * User name used to authenticate with the remote SCIM service.
+         * The authentication scheme to use when making SCIM requests to this application.
          */
-        user: string;
+        scheme: 'access_service_token';
       }
 
       /**
-       * Attributes for configuring OAuth Bearer Token authentication scheme for SCIM
+       * Attributes for configuring Access Service Token authentication scheme for SCIM
        * provisioning to an application.
        */
-      export interface AccessSCIMConfigAuthenticationOAuthBearerToken {
+      export interface AccessSCIMConfigAuthenticationAccessServiceToken {
+        /**
+         * Client ID of the Access service token used to authenticate with the remote
+         * service.
+         */
+        client_id: string;
+
         /**
-         * Token used to authenticate with the remote SCIM service.
+         * Client secret of the Access service token used to authenticate with the remote
+         * service.
          */
-        token: string;
+        client_secret: string;
 
         /**
          * The authentication scheme to use when making SCIM requests to this application.
          */
-        scheme: 'oauthbearertoken';
+        scheme: 'access_service_token';
       }
+    }
+  }
+
+  export interface InfrastructureApplication {
+    /**
+     * Body param:
+     */
+    target_criteria: Array<ApplicationUpdateParams.InfrastructureApplication.TargetCriterion>;
+
+    /**
+     * Body param: The application type.
+     */
+    type: ApplicationTypeParam;
+
+    /**
+     * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
+     * Zone ID.
+     */
+    account_id?: string;
+
+    /**
+     * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
+     * Account ID.
+     */
+    zone_id?: string;
+
+    /**
+     * Body param: The name of the application.
+     */
+    name?: string;
+
+    /**
+     * Body param: The policies that Access applies to the application.
+     */
+    policies?: Array<ApplicationUpdateParams.InfrastructureApplication.Policy>;
+  }
 
+  export namespace InfrastructureApplication {
+    export interface TargetCriterion {
       /**
-       * Attributes for configuring OAuth 2 authentication scheme for SCIM provisioning
-       * to an application.
+       * The port that the targets use for the chosen communication protocol. A port
+       * cannot be assigned to multiple protocols.
        */
-      export interface AccessSCIMConfigAuthenticationOauth2 {
-        /**
-         * URL used to generate the auth code used during token generation.
-         */
-        authorization_url: string;
-
-        /**
-         * Client ID used to authenticate when generating a token for authenticating with
-         * the remote SCIM service.
-         */
-        client_id: string;
+      port: number;
 
-        /**
-         * Secret used to authenticate when generating a token for authenticating with the
-         * remove SCIM service.
-         */
-        client_secret: string;
+      /**
+       * The communication protocol your application secures.
+       */
+      protocol: 'ssh';
 
-        /**
-         * The authentication scheme to use when making SCIM requests to this application.
-         */
-        scheme: 'oauth2';
+      /**
+       * Contains a map of target attribute keys to target attribute values.
+       */
+      target_attributes: Record<string, Array<string>>;
+    }
 
-        /**
-         * URL used to generate the token used to authenticate with the remote SCIM
-         * service.
-         */
-        token_url: string;
+    export interface Policy {
+      /**
+       * The action Access will take if a user matches this policy. Infrastructure
+       * application policies can only use the Allow action.
+       */
+      decision: ApplicationsAPI.DecisionParam;
 
-        /**
-         * The authorization scopes to request when generating the token used to
-         * authenticate with the remove SCIM service.
-         */
-        scopes?: Array<string>;
-      }
+      /**
+       * Rules evaluated with an OR logical operator. A user needs to meet only one of
+       * the Include rules.
+       */
+      include: Array<AccessAPI.AccessRuleParam>;
 
       /**
-       * Transformations and filters applied to resources before they are provisioned in
-       * the remote SCIM service.
+       * The name of the Access policy.
        */
-      export interface Mapping {
-        /**
-         * Which SCIM resource type this mapping applies to.
-         */
-        schema: string;
+      name: string;
 
-        /**
-         * Whether or not this mapping is enabled.
-         */
-        enabled?: boolean;
+      /**
+       * The rules that define how users may connect to the targets secured by your
+       * application.
+       */
+      connection_rules?: Policy.ConnectionRules;
 
-        /**
-         * A
-         * [SCIM filter expression](https://datatracker.ietf.org/doc/html/rfc7644#section-3.4.2.2)
-         * that matches resources that should be provisioned to this application.
-         */
-        filter?: string;
+      /**
+       * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
+       * meet any of the Exclude rules.
+       */
+      exclude?: Array<AccessAPI.AccessRuleParam>;
 
-        /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
-         */
-        operations?: Mapping.Operations;
+      /**
+       * Rules evaluated with an AND logical operator. To match the policy, a user must
+       * meet all of the Require rules.
+       */
+      require?: Array<AccessAPI.AccessRuleParam>;
+    }
 
+    export namespace Policy {
+      /**
+       * The rules that define how users may connect to the targets secured by your
+       * application.
+       */
+      export interface ConnectionRules {
         /**
-         * A [JSONata](https://jsonata.org/) expression that transforms the resource before
-         * provisioning it in the application.
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
          */
-        transform_jsonata?: string;
+        ssh?: ConnectionRules.SSH;
       }
 
-      export namespace Mapping {
+      export namespace ConnectionRules {
         /**
-         * Whether or not this mapping applies to creates, updates, or deletes.
+         * The SSH-specific rules that define how users may connect to the targets secured
+         * by your application.
          */
-        export interface Operations {
-          /**
-           * Whether or not this mapping applies to create (POST) operations.
-           */
-          create?: boolean;
-
+        export interface SSH {
           /**
-           * Whether or not this mapping applies to DELETE operations.
+           * Contains the Unix usernames that may be used when connecting over SSH.
            */
-          delete?: boolean;
+          usernames: Array<string>;
 
           /**
-           * Whether or not this mapping applies to update (PATCH/PUT) operations.
+           * Enables using Identity Provider email alias as SSH username.
            */
-          update?: boolean;
+          allow_email_alias?: boolean;
         }
       }
     }
@@ -20610,14 +16659,36 @@ export namespace ApplicationUpdateParams {
 
 export interface ApplicationListParams {
   /**
-   * The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+   * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
+   * Zone ID.
    */
   account_id?: string;
 
   /**
-   * The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+   * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
+   * Account ID.
    */
   zone_id?: string;
+
+  /**
+   * Query param: The aud of the app.
+   */
+  aud?: string;
+
+  /**
+   * Query param: The domain of the app.
+   */
+  domain?: string;
+
+  /**
+   * Query param: The name of the app.
+   */
+  name?: string;
+
+  /**
+   * Query param: Search for apps by other listed query parameters.
+   */
+  search?: string;
 }
 
 export interface ApplicationDeleteParams {
@@ -20656,60 +16727,88 @@ export interface ApplicationRevokeTokensParams {
   zone_id?: string;
 }
 
-export namespace Applications {
-  export import AllowedHeaders = ApplicationsAPI.AllowedHeaders;
-  export import AllowedIdPs = ApplicationsAPI.AllowedIdPs;
-  export import AllowedMethods = ApplicationsAPI.AllowedMethods;
-  export import AllowedOrigins = ApplicationsAPI.AllowedOrigins;
-  export import AppID = ApplicationsAPI.AppID;
-  export import Application = ApplicationsAPI.Application;
-  export import ApplicationType = ApplicationsAPI.ApplicationType;
-  export import CORSHeaders = ApplicationsAPI.CORSHeaders;
-  export import Decision = ApplicationsAPI.Decision;
-  export import SaaSAppNameFormat = ApplicationsAPI.SaaSAppNameFormat;
-  export import SaaSAppNameIDFormat = ApplicationsAPI.SaaSAppNameIDFormat;
-  export import SaaSAppSource = ApplicationsAPI.SaaSAppSource;
-  export import SAMLSaaSApp = ApplicationsAPI.SAMLSaaSApp;
-  export import SelfHostedDomains = ApplicationsAPI.SelfHostedDomains;
-  export import ApplicationCreateResponse = ApplicationsAPI.ApplicationCreateResponse;
-  export import ApplicationUpdateResponse = ApplicationsAPI.ApplicationUpdateResponse;
-  export import ApplicationListResponse = ApplicationsAPI.ApplicationListResponse;
-  export import ApplicationDeleteResponse = ApplicationsAPI.ApplicationDeleteResponse;
-  export import ApplicationGetResponse = ApplicationsAPI.ApplicationGetResponse;
-  export import ApplicationRevokeTokensResponse = ApplicationsAPI.ApplicationRevokeTokensResponse;
-  export import ApplicationListResponsesSinglePage = ApplicationsAPI.ApplicationListResponsesSinglePage;
-  export import ApplicationCreateParams = ApplicationsAPI.ApplicationCreateParams;
-  export import ApplicationUpdateParams = ApplicationsAPI.ApplicationUpdateParams;
-  export import ApplicationListParams = ApplicationsAPI.ApplicationListParams;
-  export import ApplicationDeleteParams = ApplicationsAPI.ApplicationDeleteParams;
-  export import ApplicationGetParams = ApplicationsAPI.ApplicationGetParams;
-  export import ApplicationRevokeTokensParams = ApplicationsAPI.ApplicationRevokeTokensParams;
-  export import CAs = CAsAPI.CAs;
-  export import CA = CAsAPI.CA;
-  export import CACreateResponse = CAsAPI.CACreateResponse;
-  export import CADeleteResponse = CAsAPI.CADeleteResponse;
-  export import CAGetResponse = CAsAPI.CAGetResponse;
-  export import CAsSinglePage = CAsAPI.CAsSinglePage;
-  export import CACreateParams = CAsAPI.CACreateParams;
-  export import CAListParams = CAsAPI.CAListParams;
-  export import CADeleteParams = CAsAPI.CADeleteParams;
-  export import CAGetParams = CAsAPI.CAGetParams;
-  export import UserPolicyChecks = UserPolicyChecksAPI.UserPolicyChecks;
-  export import UserPolicyCheckGeo = UserPolicyChecksAPI.UserPolicyCheckGeo;
-  export import UserPolicyCheckListResponse = UserPolicyChecksAPI.UserPolicyCheckListResponse;
-  export import UserPolicyCheckListParams = UserPolicyChecksAPI.UserPolicyCheckListParams;
-  export import Policies = PoliciesAPI.Policies;
-  export import ApprovalGroup = PoliciesAPI.ApprovalGroup;
-  export import Policy = PoliciesAPI.Policy;
-  export import PolicyCreateResponse = PoliciesAPI.PolicyCreateResponse;
-  export import PolicyUpdateResponse = PoliciesAPI.PolicyUpdateResponse;
-  export import PolicyListResponse = PoliciesAPI.PolicyListResponse;
-  export import PolicyDeleteResponse = PoliciesAPI.PolicyDeleteResponse;
-  export import PolicyGetResponse = PoliciesAPI.PolicyGetResponse;
-  export import PolicyListResponsesSinglePage = PoliciesAPI.PolicyListResponsesSinglePage;
-  export import PolicyCreateParams = PoliciesAPI.PolicyCreateParams;
-  export import PolicyUpdateParams = PoliciesAPI.PolicyUpdateParams;
-  export import PolicyListParams = PoliciesAPI.PolicyListParams;
-  export import PolicyDeleteParams = PoliciesAPI.PolicyDeleteParams;
-  export import PolicyGetParams = PoliciesAPI.PolicyGetParams;
+Applications.ApplicationListResponsesSinglePage = ApplicationListResponsesSinglePage;
+Applications.CAs = CAs;
+Applications.CAsSinglePage = CAsSinglePage;
+Applications.UserPolicyChecks = UserPolicyChecks;
+Applications.Policies = Policies;
+Applications.PolicyListResponsesSinglePage = PolicyListResponsesSinglePage;
+Applications.PolicyTests = PolicyTests;
+
+export declare namespace Applications {
+  export {
+    type AllowedHeaders as AllowedHeaders,
+    type AllowedIdPs as AllowedIdPs,
+    type AllowedMethods as AllowedMethods,
+    type AllowedOrigins as AllowedOrigins,
+    type AppID as AppID,
+    type Application as Application,
+    type ApplicationPolicy as ApplicationPolicy,
+    type ApplicationSCIMConfig as ApplicationSCIMConfig,
+    type ApplicationType as ApplicationType,
+    type CORSHeaders as CORSHeaders,
+    type Decision as Decision,
+    type OIDCSaaSApp as OIDCSaaSApp,
+    type SaaSAppNameIDFormat as SaaSAppNameIDFormat,
+    type SAMLSaaSApp as SAMLSaaSApp,
+    type SCIMConfigAuthenticationHTTPBasic as SCIMConfigAuthenticationHTTPBasic,
+    type SCIMConfigAuthenticationOAuthBearerToken as SCIMConfigAuthenticationOAuthBearerToken,
+    type SCIMConfigAuthenticationOauth2 as SCIMConfigAuthenticationOauth2,
+    type SCIMConfigMapping as SCIMConfigMapping,
+    type SelfHostedDomains as SelfHostedDomains,
+    type ApplicationCreateResponse as ApplicationCreateResponse,
+    type ApplicationUpdateResponse as ApplicationUpdateResponse,
+    type ApplicationListResponse as ApplicationListResponse,
+    type ApplicationDeleteResponse as ApplicationDeleteResponse,
+    type ApplicationGetResponse as ApplicationGetResponse,
+    type ApplicationRevokeTokensResponse as ApplicationRevokeTokensResponse,
+    ApplicationListResponsesSinglePage as ApplicationListResponsesSinglePage,
+    type ApplicationCreateParams as ApplicationCreateParams,
+    type ApplicationUpdateParams as ApplicationUpdateParams,
+    type ApplicationListParams as ApplicationListParams,
+    type ApplicationDeleteParams as ApplicationDeleteParams,
+    type ApplicationGetParams as ApplicationGetParams,
+    type ApplicationRevokeTokensParams as ApplicationRevokeTokensParams,
+  };
+
+  export {
+    CAs as CAs,
+    type CA as CA,
+    type CADeleteResponse as CADeleteResponse,
+    CAsSinglePage as CAsSinglePage,
+    type CACreateParams as CACreateParams,
+    type CAListParams as CAListParams,
+    type CADeleteParams as CADeleteParams,
+    type CAGetParams as CAGetParams,
+  };
+
+  export {
+    UserPolicyChecks as UserPolicyChecks,
+    type UserPolicyCheckGeo as UserPolicyCheckGeo,
+    type UserPolicyCheckListResponse as UserPolicyCheckListResponse,
+    type UserPolicyCheckListParams as UserPolicyCheckListParams,
+  };
+
+  export {
+    Policies as Policies,
+    type PolicyCreateResponse as PolicyCreateResponse,
+    type PolicyUpdateResponse as PolicyUpdateResponse,
+    type PolicyListResponse as PolicyListResponse,
+    type PolicyDeleteResponse as PolicyDeleteResponse,
+    type PolicyGetResponse as PolicyGetResponse,
+    PolicyListResponsesSinglePage as PolicyListResponsesSinglePage,
+    type PolicyCreateParams as PolicyCreateParams,
+    type PolicyUpdateParams as PolicyUpdateParams,
+    type PolicyListParams as PolicyListParams,
+    type PolicyDeleteParams as PolicyDeleteParams,
+    type PolicyGetParams as PolicyGetParams,
+  };
+
+  export {
+    PolicyTests as PolicyTests,
+    type PolicyTestCreateResponse as PolicyTestCreateResponse,
+    type PolicyTestGetResponse as PolicyTestGetResponse,
+    type PolicyTestCreateParams as PolicyTestCreateParams,
+    type PolicyTestGetParams as PolicyTestGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/applications/cas.ts b/src/resources/zero-trust/access/applications/cas.ts
index 7404491149..2262c35ab9 100644
--- a/src/resources/zero-trust/access/applications/cas.ts
+++ b/src/resources/zero-trust/access/applications/cas.ts
@@ -3,25 +3,20 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import { CloudflareError } from '../../../../error';
-import * as CAsAPI from './cas';
+import { CloudflareError } from 'cloudflare/error';
 import { SinglePage } from '../../../../pagination';
 
 export class CAs extends APIResource {
   /**
    * Generates a new short-lived certificate CA and public key.
    */
-  create(
-    appId: string,
-    params?: CACreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<CACreateResponse>;
-  create(appId: string, options?: Core.RequestOptions): Core.APIPromise<CACreateResponse>;
+  create(appId: string, params?: CACreateParams, options?: Core.RequestOptions): Core.APIPromise<CA>;
+  create(appId: string, options?: Core.RequestOptions): Core.APIPromise<CA>;
   create(
     appId: string,
     params: CACreateParams | Core.RequestOptions = {},
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CACreateResponse> {
+  ): Core.APIPromise<CA> {
     if (isRequestOptions(params)) {
       return this.create(appId, {}, params);
     }
@@ -46,7 +41,7 @@ export class CAs extends APIResource {
       this._client.post(
         `/${accountOrZone}/${accountOrZoneId}/access/apps/${appId}/ca`,
         options,
-      ) as Core.APIPromise<{ result: CACreateResponse }>
+      ) as Core.APIPromise<{ result: CA }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -131,13 +126,13 @@ export class CAs extends APIResource {
   /**
    * Fetches a short-lived certificate CA and its public key.
    */
-  get(appId: string, params?: CAGetParams, options?: Core.RequestOptions): Core.APIPromise<CAGetResponse>;
-  get(appId: string, options?: Core.RequestOptions): Core.APIPromise<CAGetResponse>;
+  get(appId: string, params?: CAGetParams, options?: Core.RequestOptions): Core.APIPromise<CA>;
+  get(appId: string, options?: Core.RequestOptions): Core.APIPromise<CA>;
   get(
     appId: string,
     params: CAGetParams | Core.RequestOptions = {},
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CAGetResponse> {
+  ): Core.APIPromise<CA> {
     if (isRequestOptions(params)) {
       return this.get(appId, {}, params);
     }
@@ -162,7 +157,7 @@ export class CAs extends APIResource {
       this._client.get(
         `/${accountOrZone}/${accountOrZoneId}/access/apps/${appId}/ca`,
         options,
-      ) as Core.APIPromise<{ result: CAGetResponse }>
+      ) as Core.APIPromise<{ result: CA }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -187,8 +182,6 @@ export interface CA {
   public_key?: string;
 }
 
-export type CACreateResponse = unknown | string | null;
-
 export interface CADeleteResponse {
   /**
    * The ID of the CA.
@@ -196,8 +189,6 @@ export interface CADeleteResponse {
   id?: string;
 }
 
-export type CAGetResponse = unknown | string | null;
-
 export interface CACreateParams {
   /**
    * The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
@@ -246,14 +237,16 @@ export interface CAGetParams {
   zone_id?: string;
 }
 
-export namespace CAs {
-  export import CA = CAsAPI.CA;
-  export import CACreateResponse = CAsAPI.CACreateResponse;
-  export import CADeleteResponse = CAsAPI.CADeleteResponse;
-  export import CAGetResponse = CAsAPI.CAGetResponse;
-  export import CAsSinglePage = CAsAPI.CAsSinglePage;
-  export import CACreateParams = CAsAPI.CACreateParams;
-  export import CAListParams = CAsAPI.CAListParams;
-  export import CADeleteParams = CAsAPI.CADeleteParams;
-  export import CAGetParams = CAsAPI.CAGetParams;
+CAs.CAsSinglePage = CAsSinglePage;
+
+export declare namespace CAs {
+  export {
+    type CA as CA,
+    type CADeleteResponse as CADeleteResponse,
+    CAsSinglePage as CAsSinglePage,
+    type CACreateParams as CACreateParams,
+    type CAListParams as CAListParams,
+    type CADeleteParams as CADeleteParams,
+    type CAGetParams as CAGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/applications/index.ts b/src/resources/zero-trust/access/applications/index.ts
index ed76c33146..6821aed5c6 100644
--- a/src/resources/zero-trust/access/applications/index.ts
+++ b/src/resources/zero-trust/access/applications/index.ts
@@ -1,66 +1,74 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AllowedHeaders,
-  AllowedIdPs,
-  AllowedMethods,
-  AllowedOrigins,
-  AppID,
-  Application,
-  ApplicationType,
-  CORSHeaders,
-  Decision,
-  SaaSAppNameFormat,
-  SaaSAppNameIDFormat,
-  SaaSAppSource,
-  SAMLSaaSApp,
-  SelfHostedDomains,
-  ApplicationCreateResponse,
-  ApplicationUpdateResponse,
-  ApplicationListResponse,
-  ApplicationDeleteResponse,
-  ApplicationGetResponse,
-  ApplicationRevokeTokensResponse,
-  ApplicationCreateParams,
-  ApplicationUpdateParams,
-  ApplicationListParams,
-  ApplicationDeleteParams,
-  ApplicationGetParams,
-  ApplicationRevokeTokensParams,
   ApplicationListResponsesSinglePage,
   Applications,
+  type AllowedHeaders,
+  type AllowedIdPs,
+  type AllowedMethods,
+  type AllowedOrigins,
+  type AppID,
+  type Application,
+  type ApplicationPolicy,
+  type ApplicationSCIMConfig,
+  type ApplicationType,
+  type CORSHeaders,
+  type Decision,
+  type OIDCSaaSApp,
+  type SaaSAppNameIDFormat,
+  type SAMLSaaSApp,
+  type SCIMConfigAuthenticationHTTPBasic,
+  type SCIMConfigAuthenticationOAuthBearerToken,
+  type SCIMConfigAuthenticationOauth2,
+  type SCIMConfigMapping,
+  type SelfHostedDomains,
+  type ApplicationCreateResponse,
+  type ApplicationUpdateResponse,
+  type ApplicationListResponse,
+  type ApplicationDeleteResponse,
+  type ApplicationGetResponse,
+  type ApplicationRevokeTokensResponse,
+  type ApplicationCreateParams,
+  type ApplicationUpdateParams,
+  type ApplicationListParams,
+  type ApplicationDeleteParams,
+  type ApplicationGetParams,
+  type ApplicationRevokeTokensParams,
 } from './applications';
 export {
-  ApprovalGroup,
-  Policy,
-  PolicyCreateResponse,
-  PolicyUpdateResponse,
-  PolicyListResponse,
-  PolicyDeleteResponse,
-  PolicyGetResponse,
-  PolicyCreateParams,
-  PolicyUpdateParams,
-  PolicyListParams,
-  PolicyDeleteParams,
-  PolicyGetParams,
+  CAsSinglePage,
+  CAs,
+  type CA,
+  type CADeleteResponse,
+  type CACreateParams,
+  type CAListParams,
+  type CADeleteParams,
+  type CAGetParams,
+} from './cas';
+export {
   PolicyListResponsesSinglePage,
   Policies,
+  type PolicyCreateResponse,
+  type PolicyUpdateResponse,
+  type PolicyListResponse,
+  type PolicyDeleteResponse,
+  type PolicyGetResponse,
+  type PolicyCreateParams,
+  type PolicyUpdateParams,
+  type PolicyListParams,
+  type PolicyDeleteParams,
+  type PolicyGetParams,
 } from './policies';
 export {
-  CA,
-  CACreateResponse,
-  CADeleteResponse,
-  CAGetResponse,
-  CACreateParams,
-  CAListParams,
-  CADeleteParams,
-  CAGetParams,
-  CAsSinglePage,
-  CAs,
-} from './cas';
+  PolicyTests,
+  type PolicyTestCreateResponse,
+  type PolicyTestGetResponse,
+  type PolicyTestCreateParams,
+  type PolicyTestGetParams,
+} from './policy-tests/index';
 export {
-  UserPolicyCheckGeo,
-  UserPolicyCheckListResponse,
-  UserPolicyCheckListParams,
   UserPolicyChecks,
+  type UserPolicyCheckGeo,
+  type UserPolicyCheckListResponse,
+  type UserPolicyCheckListParams,
 } from './user-policy-checks';
diff --git a/src/resources/zero-trust/access/applications/policies.ts b/src/resources/zero-trust/access/applications/policies.ts
index 88931a9900..6f34b94f4a 100644
--- a/src/resources/zero-trust/access/applications/policies.ts
+++ b/src/resources/zero-trust/access/applications/policies.ts
@@ -3,9 +3,8 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import { CloudflareError } from '../../../../error';
-import * as PoliciesAPI from './policies';
-import * as AccessAPI from '../access';
+import { CloudflareError } from 'cloudflare/error';
+import * as PoliciesAPI from '../policies';
 import * as ApplicationsAPI from './applications';
 import { SinglePage } from '../../../../pagination';
 
@@ -223,359 +222,28 @@ export class Policies extends APIResource {
 
 export class PolicyListResponsesSinglePage extends SinglePage<PolicyListResponse> {}
 
-/**
- * A group of email addresses that can approve a temporary authentication request.
- */
-export interface ApprovalGroup {
+export interface PolicyCreateResponse extends ApplicationsAPI.ApplicationPolicy {
   /**
-   * The number of approvals needed to obtain access.
-   */
-  approvals_needed: number;
-
-  /**
-   * A list of emails that can approve the access request.
-   */
-  email_addresses?: Array<string>;
-
-  /**
-   * The UUID of an re-usable email list.
-   */
-  email_list_uuid?: string;
-}
-
-/**
- * A group of email addresses that can approve a temporary authentication request.
- */
-export interface ApprovalGroupParam {
-  /**
-   * The number of approvals needed to obtain access.
-   */
-  approvals_needed: number;
-
-  /**
-   * A list of emails that can approve the access request.
-   */
-  email_addresses?: Array<string>;
-
-  /**
-   * The UUID of an re-usable email list.
-   */
-  email_list_uuid?: string;
-}
-
-export interface Policy {
-  /**
-   * UUID
-   */
-  id?: string;
-
-  /**
-   * Administrators who can approve a temporary authentication request.
-   */
-  approval_groups?: Array<Policy.ApprovalGroup>;
-
-  /**
-   * Requires the user to request access from an administrator at the start of each
-   * session.
-   */
-  approval_required?: boolean;
-
-  created_at?: string;
-
-  /**
-   * The action Access will take if a user matches this policy.
-   */
-  decision?: ApplicationsAPI.Decision;
-
-  /**
-   * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-   * meet any of the Exclude rules.
-   */
-  exclude?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * Rules evaluated with an OR logical operator. A user needs to meet only one of
-   * the Include rules.
-   */
-  include?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * Require this application to be served in an isolated browser for users matching
-   * this policy.
-   */
-  isolation_required?: boolean;
-
-  /**
-   * The name of the Access policy.
-   */
-  name?: string;
-
-  /**
-   * The order of execution for this policy. Must be unique for each policy.
+   * The order of execution for this policy. Must be unique for each policy within an
+   * app.
    */
   precedence?: number;
-
-  /**
-   * A custom message that will appear on the purpose justification screen.
-   */
-  purpose_justification_prompt?: string;
-
-  /**
-   * Require users to enter a justification when they log in to the application.
-   */
-  purpose_justification_required?: boolean;
-
-  /**
-   * Rules evaluated with an AND logical operator. To match the policy, a user must
-   * meet all of the Require rules.
-   */
-  require?: Array<AccessAPI.AccessRule>;
-
-  updated_at?: string;
-}
-
-export namespace Policy {
-  /**
-   * A group of email addresses that can approve a temporary authentication request.
-   */
-  export interface ApprovalGroup {
-    /**
-     * The number of approvals needed to obtain access.
-     */
-    approvals_needed: number;
-
-    /**
-     * A list of emails that can approve the access request.
-     */
-    email_addresses?: Array<unknown>;
-
-    /**
-     * The UUID of an re-usable email list.
-     */
-    email_list_uuid?: string;
-  }
 }
 
-export interface PolicyCreateResponse {
+export interface PolicyUpdateResponse extends ApplicationsAPI.ApplicationPolicy {
   /**
-   * The UUID of the policy
+   * The order of execution for this policy. Must be unique for each policy within an
+   * app.
    */
-  id?: string;
-
-  /**
-   * Administrators who can approve a temporary authentication request.
-   */
-  approval_groups?: Array<ApprovalGroup>;
-
-  /**
-   * Requires the user to request access from an administrator at the start of each
-   * session.
-   */
-  approval_required?: boolean;
-
-  created_at?: string;
-
-  /**
-   * The action Access will take if a user matches this policy.
-   */
-  decision?: ApplicationsAPI.Decision;
-
-  /**
-   * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-   * meet any of the Exclude rules.
-   */
-  exclude?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * Rules evaluated with an OR logical operator. A user needs to meet only one of
-   * the Include rules.
-   */
-  include?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * Require this application to be served in an isolated browser for users matching
-   * this policy. 'Client Web Isolation' must be on for the account in order to use
-   * this feature.
-   */
-  isolation_required?: boolean;
-
-  /**
-   * The name of the Access policy.
-   */
-  name?: string;
-
-  /**
-   * A custom message that will appear on the purpose justification screen.
-   */
-  purpose_justification_prompt?: string;
-
-  /**
-   * Require users to enter a justification when they log in to the application.
-   */
-  purpose_justification_required?: boolean;
-
-  /**
-   * Rules evaluated with an AND logical operator. To match the policy, a user must
-   * meet all of the Require rules.
-   */
-  require?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * The amount of time that tokens issued for the application will be valid. Must be
-   * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-   * m, h.
-   */
-  session_duration?: string;
-
-  updated_at?: string;
-}
-
-export interface PolicyUpdateResponse {
-  /**
-   * The UUID of the policy
-   */
-  id?: string;
-
-  /**
-   * Administrators who can approve a temporary authentication request.
-   */
-  approval_groups?: Array<ApprovalGroup>;
-
-  /**
-   * Requires the user to request access from an administrator at the start of each
-   * session.
-   */
-  approval_required?: boolean;
-
-  created_at?: string;
-
-  /**
-   * The action Access will take if a user matches this policy.
-   */
-  decision?: ApplicationsAPI.Decision;
-
-  /**
-   * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-   * meet any of the Exclude rules.
-   */
-  exclude?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * Rules evaluated with an OR logical operator. A user needs to meet only one of
-   * the Include rules.
-   */
-  include?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * Require this application to be served in an isolated browser for users matching
-   * this policy. 'Client Web Isolation' must be on for the account in order to use
-   * this feature.
-   */
-  isolation_required?: boolean;
-
-  /**
-   * The name of the Access policy.
-   */
-  name?: string;
-
-  /**
-   * A custom message that will appear on the purpose justification screen.
-   */
-  purpose_justification_prompt?: string;
-
-  /**
-   * Require users to enter a justification when they log in to the application.
-   */
-  purpose_justification_required?: boolean;
-
-  /**
-   * Rules evaluated with an AND logical operator. To match the policy, a user must
-   * meet all of the Require rules.
-   */
-  require?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * The amount of time that tokens issued for the application will be valid. Must be
-   * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-   * m, h.
-   */
-  session_duration?: string;
-
-  updated_at?: string;
+  precedence?: number;
 }
 
-export interface PolicyListResponse {
+export interface PolicyListResponse extends ApplicationsAPI.ApplicationPolicy {
   /**
-   * The UUID of the policy
+   * The order of execution for this policy. Must be unique for each policy within an
+   * app.
    */
-  id?: string;
-
-  /**
-   * Administrators who can approve a temporary authentication request.
-   */
-  approval_groups?: Array<ApprovalGroup>;
-
-  /**
-   * Requires the user to request access from an administrator at the start of each
-   * session.
-   */
-  approval_required?: boolean;
-
-  created_at?: string;
-
-  /**
-   * The action Access will take if a user matches this policy.
-   */
-  decision?: ApplicationsAPI.Decision;
-
-  /**
-   * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-   * meet any of the Exclude rules.
-   */
-  exclude?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * Rules evaluated with an OR logical operator. A user needs to meet only one of
-   * the Include rules.
-   */
-  include?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * Require this application to be served in an isolated browser for users matching
-   * this policy. 'Client Web Isolation' must be on for the account in order to use
-   * this feature.
-   */
-  isolation_required?: boolean;
-
-  /**
-   * The name of the Access policy.
-   */
-  name?: string;
-
-  /**
-   * A custom message that will appear on the purpose justification screen.
-   */
-  purpose_justification_prompt?: string;
-
-  /**
-   * Require users to enter a justification when they log in to the application.
-   */
-  purpose_justification_required?: boolean;
-
-  /**
-   * Rules evaluated with an AND logical operator. To match the policy, a user must
-   * meet all of the Require rules.
-   */
-  require?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * The amount of time that tokens issued for the application will be valid. Must be
-   * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-   * m, h.
-   */
-  session_duration?: string;
-
-  updated_at?: string;
+  precedence?: number;
 }
 
 export interface PolicyDeleteResponse {
@@ -585,97 +253,15 @@ export interface PolicyDeleteResponse {
   id?: string;
 }
 
-export interface PolicyGetResponse {
-  /**
-   * The UUID of the policy
-   */
-  id?: string;
-
-  /**
-   * Administrators who can approve a temporary authentication request.
-   */
-  approval_groups?: Array<ApprovalGroup>;
-
-  /**
-   * Requires the user to request access from an administrator at the start of each
-   * session.
-   */
-  approval_required?: boolean;
-
-  created_at?: string;
-
-  /**
-   * The action Access will take if a user matches this policy.
-   */
-  decision?: ApplicationsAPI.Decision;
-
-  /**
-   * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
-   * meet any of the Exclude rules.
-   */
-  exclude?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * Rules evaluated with an OR logical operator. A user needs to meet only one of
-   * the Include rules.
-   */
-  include?: Array<AccessAPI.AccessRule>;
-
-  /**
-   * Require this application to be served in an isolated browser for users matching
-   * this policy. 'Client Web Isolation' must be on for the account in order to use
-   * this feature.
-   */
-  isolation_required?: boolean;
-
-  /**
-   * The name of the Access policy.
-   */
-  name?: string;
-
-  /**
-   * A custom message that will appear on the purpose justification screen.
-   */
-  purpose_justification_prompt?: string;
-
-  /**
-   * Require users to enter a justification when they log in to the application.
-   */
-  purpose_justification_required?: boolean;
-
-  /**
-   * Rules evaluated with an AND logical operator. To match the policy, a user must
-   * meet all of the Require rules.
-   */
-  require?: Array<AccessAPI.AccessRule>;
-
+export interface PolicyGetResponse extends ApplicationsAPI.ApplicationPolicy {
   /**
-   * The amount of time that tokens issued for the application will be valid. Must be
-   * in the format `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s,
-   * m, h.
+   * The order of execution for this policy. Must be unique for each policy within an
+   * app.
    */
-  session_duration?: string;
-
-  updated_at?: string;
+  precedence?: number;
 }
 
 export interface PolicyCreateParams {
-  /**
-   * Body param: The action Access will take if a user matches this policy.
-   */
-  decision: ApplicationsAPI.DecisionParam;
-
-  /**
-   * Body param: Rules evaluated with an OR logical operator. A user needs to meet
-   * only one of the Include rules.
-   */
-  include: Array<AccessAPI.AccessRuleParam>;
-
-  /**
-   * Body param: The name of the Access policy.
-   */
-  name: string;
-
   /**
    * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
    * Zone ID.
@@ -691,7 +277,7 @@ export interface PolicyCreateParams {
   /**
    * Body param: Administrators who can approve a temporary authentication request.
    */
-  approval_groups?: Array<ApprovalGroupParam>;
+  approval_groups?: Array<PoliciesAPI.ApprovalGroupParam>;
 
   /**
    * Body param: Requires the user to request access from an administrator at the
@@ -699,12 +285,6 @@ export interface PolicyCreateParams {
    */
   approval_required?: boolean;
 
-  /**
-   * Body param: Rules evaluated with a NOT logical operator. To match the policy, a
-   * user cannot meet any of the Exclude rules.
-   */
-  exclude?: Array<AccessAPI.AccessRuleParam>;
-
   /**
    * Body param: Require this application to be served in an isolated browser for
    * users matching this policy. 'Client Web Isolation' must be on for the account in
@@ -730,12 +310,6 @@ export interface PolicyCreateParams {
    */
   purpose_justification_required?: boolean;
 
-  /**
-   * Body param: Rules evaluated with an AND logical operator. To match the policy, a
-   * user must meet all of the Require rules.
-   */
-  require?: Array<AccessAPI.AccessRuleParam>;
-
   /**
    * Body param: The amount of time that tokens issued for the application will be
    * valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us
@@ -745,22 +319,6 @@ export interface PolicyCreateParams {
 }
 
 export interface PolicyUpdateParams {
-  /**
-   * Body param: The action Access will take if a user matches this policy.
-   */
-  decision: ApplicationsAPI.DecisionParam;
-
-  /**
-   * Body param: Rules evaluated with an OR logical operator. A user needs to meet
-   * only one of the Include rules.
-   */
-  include: Array<AccessAPI.AccessRuleParam>;
-
-  /**
-   * Body param: The name of the Access policy.
-   */
-  name: string;
-
   /**
    * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
    * Zone ID.
@@ -776,7 +334,7 @@ export interface PolicyUpdateParams {
   /**
    * Body param: Administrators who can approve a temporary authentication request.
    */
-  approval_groups?: Array<ApprovalGroupParam>;
+  approval_groups?: Array<PoliciesAPI.ApprovalGroupParam>;
 
   /**
    * Body param: Requires the user to request access from an administrator at the
@@ -784,12 +342,6 @@ export interface PolicyUpdateParams {
    */
   approval_required?: boolean;
 
-  /**
-   * Body param: Rules evaluated with a NOT logical operator. To match the policy, a
-   * user cannot meet any of the Exclude rules.
-   */
-  exclude?: Array<AccessAPI.AccessRuleParam>;
-
   /**
    * Body param: Require this application to be served in an isolated browser for
    * users matching this policy. 'Client Web Isolation' must be on for the account in
@@ -815,12 +367,6 @@ export interface PolicyUpdateParams {
    */
   purpose_justification_required?: boolean;
 
-  /**
-   * Body param: Rules evaluated with an AND logical operator. To match the policy, a
-   * user must meet all of the Require rules.
-   */
-  require?: Array<AccessAPI.AccessRuleParam>;
-
   /**
    * Body param: The amount of time that tokens issued for the application will be
    * valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us
@@ -865,18 +411,20 @@ export interface PolicyGetParams {
   zone_id?: string;
 }
 
-export namespace Policies {
-  export import ApprovalGroup = PoliciesAPI.ApprovalGroup;
-  export import Policy = PoliciesAPI.Policy;
-  export import PolicyCreateResponse = PoliciesAPI.PolicyCreateResponse;
-  export import PolicyUpdateResponse = PoliciesAPI.PolicyUpdateResponse;
-  export import PolicyListResponse = PoliciesAPI.PolicyListResponse;
-  export import PolicyDeleteResponse = PoliciesAPI.PolicyDeleteResponse;
-  export import PolicyGetResponse = PoliciesAPI.PolicyGetResponse;
-  export import PolicyListResponsesSinglePage = PoliciesAPI.PolicyListResponsesSinglePage;
-  export import PolicyCreateParams = PoliciesAPI.PolicyCreateParams;
-  export import PolicyUpdateParams = PoliciesAPI.PolicyUpdateParams;
-  export import PolicyListParams = PoliciesAPI.PolicyListParams;
-  export import PolicyDeleteParams = PoliciesAPI.PolicyDeleteParams;
-  export import PolicyGetParams = PoliciesAPI.PolicyGetParams;
+Policies.PolicyListResponsesSinglePage = PolicyListResponsesSinglePage;
+
+export declare namespace Policies {
+  export {
+    type PolicyCreateResponse as PolicyCreateResponse,
+    type PolicyUpdateResponse as PolicyUpdateResponse,
+    type PolicyListResponse as PolicyListResponse,
+    type PolicyDeleteResponse as PolicyDeleteResponse,
+    type PolicyGetResponse as PolicyGetResponse,
+    PolicyListResponsesSinglePage as PolicyListResponsesSinglePage,
+    type PolicyCreateParams as PolicyCreateParams,
+    type PolicyUpdateParams as PolicyUpdateParams,
+    type PolicyListParams as PolicyListParams,
+    type PolicyDeleteParams as PolicyDeleteParams,
+    type PolicyGetParams as PolicyGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/applications/policy-tests/index.ts b/src/resources/zero-trust/access/applications/policy-tests/index.ts
new file mode 100755
index 0000000000..2ccb921594
--- /dev/null
+++ b/src/resources/zero-trust/access/applications/policy-tests/index.ts
@@ -0,0 +1,10 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  PolicyTests,
+  type PolicyTestCreateResponse,
+  type PolicyTestGetResponse,
+  type PolicyTestCreateParams,
+  type PolicyTestGetParams,
+} from './policy-tests';
+export { Users, type UserListResponse, type UserListParams } from './users';
diff --git a/src/resources/zero-trust/access/applications/policy-tests/policy-tests.ts b/src/resources/zero-trust/access/applications/policy-tests/policy-tests.ts
new file mode 100755
index 0000000000..f34e1628ba
--- /dev/null
+++ b/src/resources/zero-trust/access/applications/policy-tests/policy-tests.ts
@@ -0,0 +1,193 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+import * as AccessAPI from '../../access';
+import * as PoliciesAPI from '../../policies';
+import * as ApplicationsAPI from '../applications';
+import * as UsersAPI from './users';
+import { UserListParams, UserListResponse, Users } from './users';
+
+export class PolicyTests extends APIResource {
+  users: UsersAPI.Users = new UsersAPI.Users(this._client);
+
+  /**
+   * Starts an Access policy test.
+   */
+  create(
+    params: PolicyTestCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PolicyTestCreateResponse> {
+    const { account_id, ...body } = params;
+    return this._client.post(`/accounts/${account_id}/access/policy-tests`, { body, ...options });
+  }
+
+  /**
+   * Fetches the current status of a given Access policy test.
+   */
+  get(
+    policyTestId: string,
+    params: PolicyTestGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PolicyTestGetResponse> {
+    const { account_id } = params;
+    return this._client.get(`/accounts/${account_id}/access/policy-tests/${policyTestId}`, options);
+  }
+}
+
+export interface PolicyTestCreateResponse {
+  /**
+   * The UUID of the policy test.
+   */
+  id?: string;
+
+  /**
+   * The status of the policy test request.
+   */
+  status?: 'success';
+}
+
+export interface PolicyTestGetResponse {
+  /**
+   * The UUID of the policy test.
+   */
+  id?: string;
+
+  /**
+   * The number of pages of (processed) users.
+   */
+  pages_processed?: number;
+
+  /**
+   * The percentage of (processed) users approved based on policy evaluation results.
+   */
+  percent_approved?: number;
+
+  /**
+   * The percentage of (processed) users blocked based on policy evaluation results.
+   */
+  percent_blocked?: number;
+
+  /**
+   * The percentage of users processed so far (of the entire user base).
+   */
+  percent_users_processed?: number;
+
+  /**
+   * The status of the policy test.
+   */
+  status?: 'blocked' | 'processing' | 'complete';
+
+  /**
+   * The total number of users in the user base.
+   */
+  total_users?: number;
+
+  /**
+   * The number of (processed) users approved based on policy evaluation results.
+   */
+  users_approved?: number;
+
+  /**
+   * The number of (processed) users blocked based on policy evaluation results.
+   */
+  users_blocked?: number;
+}
+
+export interface PolicyTestCreateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: The UUID of the policy
+   */
+  id?: string;
+
+  /**
+   * Body param: Administrators who can approve a temporary authentication request.
+   */
+  approval_groups?: Array<PoliciesAPI.ApprovalGroupParam>;
+
+  /**
+   * Body param: Requires the user to request access from an administrator at the
+   * start of each session.
+   */
+  approval_required?: boolean;
+
+  /**
+   * Body param: The action Access will take if a user matches this policy.
+   * Infrastructure application policies can only use the Allow action.
+   */
+  decision?: ApplicationsAPI.DecisionParam;
+
+  /**
+   * Body param: Rules evaluated with a NOT logical operator. To match the policy, a
+   * user cannot meet any of the Exclude rules.
+   */
+  exclude?: Array<AccessAPI.AccessRuleParam>;
+
+  /**
+   * Body param: Rules evaluated with an OR logical operator. A user needs to meet
+   * only one of the Include rules.
+   */
+  include?: Array<AccessAPI.AccessRuleParam>;
+
+  /**
+   * Body param: Require this application to be served in an isolated browser for
+   * users matching this policy. 'Client Web Isolation' must be on for the account in
+   * order to use this feature.
+   */
+  isolation_required?: boolean;
+
+  /**
+   * Body param: The name of the Access policy.
+   */
+  name?: string;
+
+  /**
+   * Body param: A custom message that will appear on the purpose justification
+   * screen.
+   */
+  purpose_justification_prompt?: string;
+
+  /**
+   * Body param: Require users to enter a justification when they log in to the
+   * application.
+   */
+  purpose_justification_required?: boolean;
+
+  /**
+   * Body param: Rules evaluated with an AND logical operator. To match the policy, a
+   * user must meet all of the Require rules.
+   */
+  require?: Array<AccessAPI.AccessRuleParam>;
+
+  /**
+   * Body param: The amount of time that tokens issued for the application will be
+   * valid. Must be in the format `300ms` or `2h45m`. Valid time units are: ns, us
+   * (or µs), ms, s, m, h.
+   */
+  session_duration?: string;
+}
+
+export interface PolicyTestGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+PolicyTests.Users = Users;
+
+export declare namespace PolicyTests {
+  export {
+    type PolicyTestCreateResponse as PolicyTestCreateResponse,
+    type PolicyTestGetResponse as PolicyTestGetResponse,
+    type PolicyTestCreateParams as PolicyTestCreateParams,
+    type PolicyTestGetParams as PolicyTestGetParams,
+  };
+
+  export { Users as Users, type UserListResponse as UserListResponse, type UserListParams as UserListParams };
+}
diff --git a/src/resources/zero-trust/access/applications/policy-tests/users.ts b/src/resources/zero-trust/access/applications/policy-tests/users.ts
new file mode 100755
index 0000000000..c7202984ee
--- /dev/null
+++ b/src/resources/zero-trust/access/applications/policy-tests/users.ts
@@ -0,0 +1,58 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+
+export class Users extends APIResource {
+  /**
+   * Fetches a single page of user results from an Access policy test.
+   */
+  list(
+    policyTestId: string,
+    params: UserListParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<UserListResponse> {
+    const { account_id } = params;
+    return this._client.get(`/accounts/${account_id}/access/policy-tests/${policyTestId}/users`, options);
+  }
+}
+
+/**
+ * Page of processed users.
+ */
+export type UserListResponse = Array<UserListResponse.UserListResponseItem>;
+
+export namespace UserListResponse {
+  export interface UserListResponseItem {
+    /**
+     * UUID
+     */
+    id?: string;
+
+    /**
+     * The email of the user.
+     */
+    email?: string;
+
+    /**
+     * The name of the user.
+     */
+    name?: string;
+
+    /**
+     * Policy evaluation result for an individual user.
+     */
+    status?: 'approved' | 'blocked';
+  }
+}
+
+export interface UserListParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace Users {
+  export { type UserListResponse as UserListResponse, type UserListParams as UserListParams };
+}
diff --git a/src/resources/zero-trust/access/applications/user-policy-checks.ts b/src/resources/zero-trust/access/applications/user-policy-checks.ts
index 85c668c01e..5b55527ec1 100644
--- a/src/resources/zero-trust/access/applications/user-policy-checks.ts
+++ b/src/resources/zero-trust/access/applications/user-policy-checks.ts
@@ -3,7 +3,7 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import { CloudflareError } from '../../../../error';
+import { CloudflareError } from 'cloudflare/error';
 import * as UserPolicyChecksAPI from './user-policy-checks';
 import * as ApplicationsAPI from './applications';
 
@@ -122,8 +122,10 @@ export interface UserPolicyCheckListParams {
   zone_id?: string;
 }
 
-export namespace UserPolicyChecks {
-  export import UserPolicyCheckGeo = UserPolicyChecksAPI.UserPolicyCheckGeo;
-  export import UserPolicyCheckListResponse = UserPolicyChecksAPI.UserPolicyCheckListResponse;
-  export import UserPolicyCheckListParams = UserPolicyChecksAPI.UserPolicyCheckListParams;
+export declare namespace UserPolicyChecks {
+  export {
+    type UserPolicyCheckGeo as UserPolicyCheckGeo,
+    type UserPolicyCheckListResponse as UserPolicyCheckListResponse,
+    type UserPolicyCheckListParams as UserPolicyCheckListParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/bookmarks.ts b/src/resources/zero-trust/access/bookmarks.ts
index 2dc4a00f5d..858852a601 100644
--- a/src/resources/zero-trust/access/bookmarks.ts
+++ b/src/resources/zero-trust/access/bookmarks.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as BookmarksAPI from './bookmarks';
 import { SinglePage } from '../../../pagination';
 
 export class Bookmarks extends APIResource {
@@ -161,13 +160,17 @@ export interface BookmarkGetParams {
   account_id: string;
 }
 
-export namespace Bookmarks {
-  export import Bookmark = BookmarksAPI.Bookmark;
-  export import BookmarkDeleteResponse = BookmarksAPI.BookmarkDeleteResponse;
-  export import BookmarksSinglePage = BookmarksAPI.BookmarksSinglePage;
-  export import BookmarkCreateParams = BookmarksAPI.BookmarkCreateParams;
-  export import BookmarkUpdateParams = BookmarksAPI.BookmarkUpdateParams;
-  export import BookmarkListParams = BookmarksAPI.BookmarkListParams;
-  export import BookmarkDeleteParams = BookmarksAPI.BookmarkDeleteParams;
-  export import BookmarkGetParams = BookmarksAPI.BookmarkGetParams;
+Bookmarks.BookmarksSinglePage = BookmarksSinglePage;
+
+export declare namespace Bookmarks {
+  export {
+    type Bookmark as Bookmark,
+    type BookmarkDeleteResponse as BookmarkDeleteResponse,
+    BookmarksSinglePage as BookmarksSinglePage,
+    type BookmarkCreateParams as BookmarkCreateParams,
+    type BookmarkUpdateParams as BookmarkUpdateParams,
+    type BookmarkListParams as BookmarkListParams,
+    type BookmarkDeleteParams as BookmarkDeleteParams,
+    type BookmarkGetParams as BookmarkGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/certificates/certificates.ts b/src/resources/zero-trust/access/certificates/certificates.ts
index ef29389901..a681a45856 100644
--- a/src/resources/zero-trust/access/certificates/certificates.ts
+++ b/src/resources/zero-trust/access/certificates/certificates.ts
@@ -3,9 +3,16 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import { CloudflareError } from '../../../../error';
-import * as CertificatesAPI from './certificates';
+import { CloudflareError } from 'cloudflare/error';
 import * as SettingsAPI from './settings';
+import {
+  CertificateSettings,
+  SettingGetParams,
+  SettingGetResponse,
+  SettingUpdateParams,
+  SettingUpdateResponse,
+  Settings,
+} from './settings';
 import { SinglePage } from '../../../../pagination';
 
 export class Certificates extends APIResource {
@@ -333,20 +340,28 @@ export interface CertificateGetParams {
   zone_id?: string;
 }
 
-export namespace Certificates {
-  export import AssociatedHostnames = CertificatesAPI.AssociatedHostnames;
-  export import Certificate = CertificatesAPI.Certificate;
-  export import CertificateDeleteResponse = CertificatesAPI.CertificateDeleteResponse;
-  export import CertificatesSinglePage = CertificatesAPI.CertificatesSinglePage;
-  export import CertificateCreateParams = CertificatesAPI.CertificateCreateParams;
-  export import CertificateUpdateParams = CertificatesAPI.CertificateUpdateParams;
-  export import CertificateListParams = CertificatesAPI.CertificateListParams;
-  export import CertificateDeleteParams = CertificatesAPI.CertificateDeleteParams;
-  export import CertificateGetParams = CertificatesAPI.CertificateGetParams;
-  export import Settings = SettingsAPI.Settings;
-  export import CertificateSettings = SettingsAPI.CertificateSettings;
-  export import SettingUpdateResponse = SettingsAPI.SettingUpdateResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingUpdateParams = SettingsAPI.SettingUpdateParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
+Certificates.CertificatesSinglePage = CertificatesSinglePage;
+Certificates.Settings = Settings;
+
+export declare namespace Certificates {
+  export {
+    type AssociatedHostnames as AssociatedHostnames,
+    type Certificate as Certificate,
+    type CertificateDeleteResponse as CertificateDeleteResponse,
+    CertificatesSinglePage as CertificatesSinglePage,
+    type CertificateCreateParams as CertificateCreateParams,
+    type CertificateUpdateParams as CertificateUpdateParams,
+    type CertificateListParams as CertificateListParams,
+    type CertificateDeleteParams as CertificateDeleteParams,
+    type CertificateGetParams as CertificateGetParams,
+  };
+
+  export {
+    Settings as Settings,
+    type CertificateSettings as CertificateSettings,
+    type SettingUpdateResponse as SettingUpdateResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingUpdateParams as SettingUpdateParams,
+    type SettingGetParams as SettingGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/certificates/index.ts b/src/resources/zero-trust/access/certificates/index.ts
index 3c2abc1cbf..538a8925f1 100644
--- a/src/resources/zero-trust/access/certificates/index.ts
+++ b/src/resources/zero-trust/access/certificates/index.ts
@@ -1,22 +1,22 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AssociatedHostnames,
-  Certificate,
-  CertificateDeleteResponse,
-  CertificateCreateParams,
-  CertificateUpdateParams,
-  CertificateListParams,
-  CertificateDeleteParams,
-  CertificateGetParams,
   CertificatesSinglePage,
   Certificates,
+  type AssociatedHostnames,
+  type Certificate,
+  type CertificateDeleteResponse,
+  type CertificateCreateParams,
+  type CertificateUpdateParams,
+  type CertificateListParams,
+  type CertificateDeleteParams,
+  type CertificateGetParams,
 } from './certificates';
 export {
-  CertificateSettings,
-  SettingUpdateResponse,
-  SettingGetResponse,
-  SettingUpdateParams,
-  SettingGetParams,
   Settings,
+  type CertificateSettings,
+  type SettingUpdateResponse,
+  type SettingGetResponse,
+  type SettingUpdateParams,
+  type SettingGetParams,
 } from './settings';
diff --git a/src/resources/zero-trust/access/certificates/settings.ts b/src/resources/zero-trust/access/certificates/settings.ts
index d8d591d998..084a351f06 100644
--- a/src/resources/zero-trust/access/certificates/settings.ts
+++ b/src/resources/zero-trust/access/certificates/settings.ts
@@ -3,17 +3,13 @@
 import { APIResource } from '../../../../resource';
 import { isRequestOptions } from '../../../../core';
 import * as Core from '../../../../core';
-import { CloudflareError } from '../../../../error';
-import * as SettingsAPI from './settings';
+import { CloudflareError } from 'cloudflare/error';
 
 export class Settings extends APIResource {
   /**
    * Updates an mTLS certificate's hostname settings.
    */
-  update(
-    params: SettingUpdateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SettingUpdateResponse | null> {
+  update(params: SettingUpdateParams, options?: Core.RequestOptions): Core.APIPromise<SettingUpdateResponse> {
     const { account_id, zone_id, ...body } = params;
     if (!account_id && !zone_id) {
       throw new CloudflareError('You must provide either account_id or zone_id.');
@@ -35,19 +31,19 @@ export class Settings extends APIResource {
       this._client.put(`/${accountOrZone}/${accountOrZoneId}/access/certificates/settings`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: SettingUpdateResponse | null }>
+      }) as Core.APIPromise<{ result: SettingUpdateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
    * List all mTLS hostname settings for this account or zone.
    */
-  get(params?: SettingGetParams, options?: Core.RequestOptions): Core.APIPromise<SettingGetResponse | null>;
-  get(options?: Core.RequestOptions): Core.APIPromise<SettingGetResponse | null>;
+  get(params?: SettingGetParams, options?: Core.RequestOptions): Core.APIPromise<SettingGetResponse>;
+  get(options?: Core.RequestOptions): Core.APIPromise<SettingGetResponse>;
   get(
     params: SettingGetParams | Core.RequestOptions = {},
     options?: Core.RequestOptions,
-  ): Core.APIPromise<SettingGetResponse | null> {
+  ): Core.APIPromise<SettingGetResponse> {
     if (isRequestOptions(params)) {
       return this.get({}, params);
     }
@@ -72,7 +68,7 @@ export class Settings extends APIResource {
       this._client.get(
         `/${accountOrZone}/${accountOrZoneId}/access/certificates/settings`,
         options,
-      ) as Core.APIPromise<{ result: SettingGetResponse | null }>
+      ) as Core.APIPromise<{ result: SettingGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -152,10 +148,12 @@ export interface SettingGetParams {
   zone_id?: string;
 }
 
-export namespace Settings {
-  export import CertificateSettings = SettingsAPI.CertificateSettings;
-  export import SettingUpdateResponse = SettingsAPI.SettingUpdateResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingUpdateParams = SettingsAPI.SettingUpdateParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
+export declare namespace Settings {
+  export {
+    type CertificateSettings as CertificateSettings,
+    type SettingUpdateResponse as SettingUpdateResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingUpdateParams as SettingUpdateParams,
+    type SettingGetParams as SettingGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/custom-pages.ts b/src/resources/zero-trust/access/custom-pages.ts
index a23a83215d..48cebcb115 100644
--- a/src/resources/zero-trust/access/custom-pages.ts
+++ b/src/resources/zero-trust/access/custom-pages.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as CustomPagesAPI from './custom-pages';
 import { SinglePage } from '../../../pagination';
 
 export class CustomPages extends APIResource {
@@ -180,21 +179,6 @@ export interface CustomPageCreateParams {
    * Body param: Number of apps the custom page is assigned to.
    */
   app_count?: number;
-
-  /**
-   * Body param:
-   */
-  created_at?: string;
-
-  /**
-   * Body param: UUID
-   */
-  uid?: string;
-
-  /**
-   * Body param:
-   */
-  updated_at?: string;
 }
 
 export interface CustomPageUpdateParams {
@@ -222,21 +206,6 @@ export interface CustomPageUpdateParams {
    * Body param: Number of apps the custom page is assigned to.
    */
   app_count?: number;
-
-  /**
-   * Body param:
-   */
-  created_at?: string;
-
-  /**
-   * Body param: UUID
-   */
-  uid?: string;
-
-  /**
-   * Body param:
-   */
-  updated_at?: string;
 }
 
 export interface CustomPageListParams {
@@ -260,14 +229,18 @@ export interface CustomPageGetParams {
   account_id: string;
 }
 
-export namespace CustomPages {
-  export import CustomPage = CustomPagesAPI.CustomPage;
-  export import CustomPageWithoutHTML = CustomPagesAPI.CustomPageWithoutHTML;
-  export import CustomPageDeleteResponse = CustomPagesAPI.CustomPageDeleteResponse;
-  export import CustomPageWithoutHTMLsSinglePage = CustomPagesAPI.CustomPageWithoutHTMLsSinglePage;
-  export import CustomPageCreateParams = CustomPagesAPI.CustomPageCreateParams;
-  export import CustomPageUpdateParams = CustomPagesAPI.CustomPageUpdateParams;
-  export import CustomPageListParams = CustomPagesAPI.CustomPageListParams;
-  export import CustomPageDeleteParams = CustomPagesAPI.CustomPageDeleteParams;
-  export import CustomPageGetParams = CustomPagesAPI.CustomPageGetParams;
+CustomPages.CustomPageWithoutHTMLsSinglePage = CustomPageWithoutHTMLsSinglePage;
+
+export declare namespace CustomPages {
+  export {
+    type CustomPage as CustomPage,
+    type CustomPageWithoutHTML as CustomPageWithoutHTML,
+    type CustomPageDeleteResponse as CustomPageDeleteResponse,
+    CustomPageWithoutHTMLsSinglePage as CustomPageWithoutHTMLsSinglePage,
+    type CustomPageCreateParams as CustomPageCreateParams,
+    type CustomPageUpdateParams as CustomPageUpdateParams,
+    type CustomPageListParams as CustomPageListParams,
+    type CustomPageDeleteParams as CustomPageDeleteParams,
+    type CustomPageGetParams as CustomPageGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/gateway-ca.ts b/src/resources/zero-trust/access/gateway-ca.ts
new file mode 100644
index 0000000000..47eb85fb33
--- /dev/null
+++ b/src/resources/zero-trust/access/gateway-ca.ts
@@ -0,0 +1,122 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import { SinglePage } from '../../../pagination';
+
+export class GatewayCA extends APIResource {
+  /**
+   * Adds a new SSH Certificate Authority (CA).
+   */
+  create(
+    params: GatewayCACreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<GatewayCACreateResponse> {
+    const { account_id } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/access/gateway_ca`, options) as Core.APIPromise<{
+        result: GatewayCACreateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists SSH Certificate Authorities (CA).
+   */
+  list(
+    params: GatewayCAListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<GatewayCAListResponsesSinglePage, GatewayCAListResponse> {
+    const { account_id } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/access/gateway_ca`,
+      GatewayCAListResponsesSinglePage,
+      options,
+    );
+  }
+
+  /**
+   * Deletes an SSH Certificate Authority.
+   */
+  delete(
+    certificateId: string,
+    params: GatewayCADeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<GatewayCADeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(
+        `/accounts/${account_id}/access/gateway_ca/${certificateId}`,
+        options,
+      ) as Core.APIPromise<{ result: GatewayCADeleteResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class GatewayCAListResponsesSinglePage extends SinglePage<GatewayCAListResponse> {}
+
+export interface GatewayCACreateResponse {
+  /**
+   * The key ID of this certificate.
+   */
+  id?: string;
+
+  /**
+   * The public key of this certificate.
+   */
+  public_key?: string;
+}
+
+export interface GatewayCAListResponse {
+  /**
+   * The key ID of this certificate.
+   */
+  id?: string;
+
+  /**
+   * The public key of this certificate.
+   */
+  public_key?: string;
+}
+
+export interface GatewayCADeleteResponse {
+  /**
+   * UUID
+   */
+  id?: string;
+}
+
+export interface GatewayCACreateParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface GatewayCAListParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export interface GatewayCADeleteParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+GatewayCA.GatewayCAListResponsesSinglePage = GatewayCAListResponsesSinglePage;
+
+export declare namespace GatewayCA {
+  export {
+    type GatewayCACreateResponse as GatewayCACreateResponse,
+    type GatewayCAListResponse as GatewayCAListResponse,
+    type GatewayCADeleteResponse as GatewayCADeleteResponse,
+    GatewayCAListResponsesSinglePage as GatewayCAListResponsesSinglePage,
+    type GatewayCACreateParams as GatewayCACreateParams,
+    type GatewayCAListParams as GatewayCAListParams,
+    type GatewayCADeleteParams as GatewayCADeleteParams,
+  };
+}
diff --git a/src/resources/zero-trust/access/groups.ts b/src/resources/zero-trust/access/groups.ts
index db020375fe..290f14e4ae 100644
--- a/src/resources/zero-trust/access/groups.ts
+++ b/src/resources/zero-trust/access/groups.ts
@@ -3,8 +3,7 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import { CloudflareError } from '../../../error';
-import * as GroupsAPI from './groups';
+import { CloudflareError } from 'cloudflare/error';
 import * as AccessAPI from './access';
 import { SinglePage } from '../../../pagination';
 
@@ -86,7 +85,7 @@ export class Groups extends APIResource {
     if (isRequestOptions(params)) {
       return this.list({}, params);
     }
-    const { account_id, zone_id } = params;
+    const { account_id, zone_id, ...query } = params;
     if (!account_id && !zone_id) {
       throw new CloudflareError('You must provide either account_id or zone_id.');
     }
@@ -106,7 +105,7 @@ export class Groups extends APIResource {
     return this._client.getAPIList(
       `/${accountOrZone}/${accountOrZoneId}/access/groups`,
       ZeroTrustGroupsSinglePage,
-      options,
+      { query, ...options },
     );
   }
 
@@ -330,14 +329,26 @@ export interface GroupUpdateParams {
 
 export interface GroupListParams {
   /**
-   * The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+   * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
+   * Zone ID.
    */
   account_id?: string;
 
   /**
-   * The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+   * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
+   * Account ID.
    */
   zone_id?: string;
+
+  /**
+   * Query param: The name of the group.
+   */
+  name?: string;
+
+  /**
+   * Query param: Search for groups by other listed query parameters.
+   */
+  search?: string;
 }
 
 export interface GroupDeleteParams {
@@ -364,13 +375,17 @@ export interface GroupGetParams {
   zone_id?: string;
 }
 
-export namespace Groups {
-  export import ZeroTrustGroup = GroupsAPI.ZeroTrustGroup;
-  export import GroupDeleteResponse = GroupsAPI.GroupDeleteResponse;
-  export import ZeroTrustGroupsSinglePage = GroupsAPI.ZeroTrustGroupsSinglePage;
-  export import GroupCreateParams = GroupsAPI.GroupCreateParams;
-  export import GroupUpdateParams = GroupsAPI.GroupUpdateParams;
-  export import GroupListParams = GroupsAPI.GroupListParams;
-  export import GroupDeleteParams = GroupsAPI.GroupDeleteParams;
-  export import GroupGetParams = GroupsAPI.GroupGetParams;
+Groups.ZeroTrustGroupsSinglePage = ZeroTrustGroupsSinglePage;
+
+export declare namespace Groups {
+  export {
+    type ZeroTrustGroup as ZeroTrustGroup,
+    type GroupDeleteResponse as GroupDeleteResponse,
+    ZeroTrustGroupsSinglePage as ZeroTrustGroupsSinglePage,
+    type GroupCreateParams as GroupCreateParams,
+    type GroupUpdateParams as GroupUpdateParams,
+    type GroupListParams as GroupListParams,
+    type GroupDeleteParams as GroupDeleteParams,
+    type GroupGetParams as GroupGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/index.ts b/src/resources/zero-trust/access/index.ts
index 245c27d7e2..e08a27a233 100644
--- a/src/resources/zero-trust/access/index.ts
+++ b/src/resources/zero-trust/access/index.ts
@@ -1,151 +1,169 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AccessDevicePostureRule,
-  AccessRule,
-  AnyValidServiceTokenRule,
-  AuthenticationMethodRule,
-  AzureGroupRule,
-  CertificateRule,
-  CountryRule,
-  DomainRule,
-  EmailListRule,
-  EmailRule,
-  EveryoneRule,
-  ExternalEvaluationRule,
-  GitHubOrganizationRule,
-  GroupRule,
-  GSuiteGroupRule,
-  IPListRule,
-  IPRule,
-  OktaGroupRule,
-  SAMLGroupRule,
-  ServiceTokenRule,
   Access,
+  type AccessDevicePostureRule,
+  type AccessRule,
+  type AnyValidServiceTokenRule,
+  type AuthenticationMethodRule,
+  type AzureGroupRule,
+  type CertificateRule,
+  type CountryRule,
+  type DomainRule,
+  type EmailListRule,
+  type EmailRule,
+  type EveryoneRule,
+  type ExternalEvaluationRule,
+  type GitHubOrganizationRule,
+  type GroupRule,
+  type GSuiteGroupRule,
+  type IPListRule,
+  type IPRule,
+  type OktaGroupRule,
+  type SAMLGroupRule,
+  type ServiceTokenRule,
 } from './access';
-export { AccessUser, UserListParams, AccessUsersSinglePage, Users } from './users/index';
+export { AccessUsersSinglePage, Users, type AccessUser, type UserListParams } from './users/index';
 export {
-  AllowedHeaders,
-  AllowedIdPs,
-  AllowedMethods,
-  AllowedOrigins,
-  AppID,
-  Application,
-  ApplicationType,
-  CORSHeaders,
-  Decision,
-  SaaSAppNameFormat,
-  SaaSAppNameIDFormat,
-  SaaSAppSource,
-  SAMLSaaSApp,
-  SelfHostedDomains,
-  ApplicationCreateResponse,
-  ApplicationUpdateResponse,
-  ApplicationListResponse,
-  ApplicationDeleteResponse,
-  ApplicationGetResponse,
-  ApplicationRevokeTokensResponse,
-  ApplicationCreateParams,
-  ApplicationUpdateParams,
-  ApplicationListParams,
-  ApplicationDeleteParams,
-  ApplicationGetParams,
-  ApplicationRevokeTokensParams,
   ApplicationListResponsesSinglePage,
   Applications,
+  type AllowedHeaders,
+  type AllowedIdPs,
+  type AllowedMethods,
+  type AllowedOrigins,
+  type AppID,
+  type Application,
+  type ApplicationPolicy,
+  type ApplicationSCIMConfig,
+  type ApplicationType,
+  type CORSHeaders,
+  type Decision,
+  type OIDCSaaSApp,
+  type SaaSAppNameIDFormat,
+  type SAMLSaaSApp,
+  type SCIMConfigAuthenticationHTTPBasic,
+  type SCIMConfigAuthenticationOAuthBearerToken,
+  type SCIMConfigAuthenticationOauth2,
+  type SCIMConfigMapping,
+  type SelfHostedDomains,
+  type ApplicationCreateResponse,
+  type ApplicationUpdateResponse,
+  type ApplicationListResponse,
+  type ApplicationDeleteResponse,
+  type ApplicationGetResponse,
+  type ApplicationRevokeTokensResponse,
+  type ApplicationCreateParams,
+  type ApplicationUpdateParams,
+  type ApplicationListParams,
+  type ApplicationDeleteParams,
+  type ApplicationGetParams,
+  type ApplicationRevokeTokensParams,
 } from './applications/index';
 export {
-  AssociatedHostnames,
-  Certificate,
-  CertificateDeleteResponse,
-  CertificateCreateParams,
-  CertificateUpdateParams,
-  CertificateListParams,
-  CertificateDeleteParams,
-  CertificateGetParams,
-  CertificatesSinglePage,
-  Certificates,
-} from './certificates/index';
-export {
-  Bookmark,
-  BookmarkDeleteResponse,
-  BookmarkCreateParams,
-  BookmarkUpdateParams,
-  BookmarkListParams,
-  BookmarkDeleteParams,
-  BookmarkGetParams,
   BookmarksSinglePage,
   Bookmarks,
+  type Bookmark,
+  type BookmarkDeleteResponse,
+  type BookmarkCreateParams,
+  type BookmarkUpdateParams,
+  type BookmarkListParams,
+  type BookmarkDeleteParams,
+  type BookmarkGetParams,
 } from './bookmarks';
 export {
-  CustomPage,
-  CustomPageWithoutHTML,
-  CustomPageDeleteResponse,
-  CustomPageCreateParams,
-  CustomPageUpdateParams,
-  CustomPageListParams,
-  CustomPageDeleteParams,
-  CustomPageGetParams,
+  CertificatesSinglePage,
+  Certificates,
+  type AssociatedHostnames,
+  type Certificate,
+  type CertificateDeleteResponse,
+  type CertificateCreateParams,
+  type CertificateUpdateParams,
+  type CertificateListParams,
+  type CertificateDeleteParams,
+  type CertificateGetParams,
+} from './certificates/index';
+export {
   CustomPageWithoutHTMLsSinglePage,
   CustomPages,
+  type CustomPage,
+  type CustomPageWithoutHTML,
+  type CustomPageDeleteResponse,
+  type CustomPageCreateParams,
+  type CustomPageUpdateParams,
+  type CustomPageListParams,
+  type CustomPageDeleteParams,
+  type CustomPageGetParams,
 } from './custom-pages';
 export {
-  KeyUpdateResponse,
-  KeyGetResponse,
-  KeyRotateResponse,
-  KeyUpdateParams,
-  KeyGetParams,
-  KeyRotateParams,
+  GatewayCAListResponsesSinglePage,
+  GatewayCA,
+  type GatewayCACreateResponse,
+  type GatewayCAListResponse,
+  type GatewayCADeleteResponse,
+  type GatewayCACreateParams,
+  type GatewayCAListParams,
+  type GatewayCADeleteParams,
+} from './gateway-ca';
+export { Infrastructure } from './infrastructure/index';
+export {
   Keys,
+  type KeyUpdateResponse,
+  type KeyGetResponse,
+  type KeyRotateResponse,
+  type KeyUpdateParams,
+  type KeyGetParams,
+  type KeyRotateParams,
 } from './keys';
 export { Logs } from './logs/index';
 export {
-  PolicyCreateResponse,
-  PolicyUpdateResponse,
-  PolicyListResponse,
-  PolicyDeleteResponse,
-  PolicyGetResponse,
-  PolicyCreateParams,
-  PolicyUpdateParams,
-  PolicyListParams,
-  PolicyDeleteParams,
-  PolicyGetParams,
   PolicyListResponsesSinglePage,
   Policies,
+  type ApprovalGroup,
+  type Policy,
+  type PolicyCreateResponse,
+  type PolicyUpdateResponse,
+  type PolicyListResponse,
+  type PolicyDeleteResponse,
+  type PolicyGetResponse,
+  type PolicyCreateParams,
+  type PolicyUpdateParams,
+  type PolicyListParams,
+  type PolicyDeleteParams,
+  type PolicyGetParams,
 } from './policies';
 export {
-  ServiceToken,
-  ServiceTokenCreateResponse,
-  ServiceTokenRotateResponse,
-  ServiceTokenCreateParams,
-  ServiceTokenUpdateParams,
-  ServiceTokenListParams,
-  ServiceTokenDeleteParams,
-  ServiceTokenGetParams,
-  ServiceTokenRefreshParams,
-  ServiceTokenRotateParams,
   ServiceTokensSinglePage,
   ServiceTokens,
+  type ServiceToken,
+  type ServiceTokenCreateResponse,
+  type ServiceTokenRotateResponse,
+  type ServiceTokenCreateParams,
+  type ServiceTokenUpdateParams,
+  type ServiceTokenListParams,
+  type ServiceTokenDeleteParams,
+  type ServiceTokenGetParams,
+  type ServiceTokenRefreshParams,
+  type ServiceTokenRotateParams,
 } from './service-tokens';
 export {
-  Tag,
-  TagDeleteResponse,
-  TagCreateParams,
-  TagUpdateParams,
-  TagListParams,
-  TagDeleteParams,
-  TagGetParams,
   TagsSinglePage,
   Tags,
+  type Tag,
+  type TagDeleteResponse,
+  type TagCreateParams,
+  type TagUpdateParams,
+  type TagListParams,
+  type TagDeleteParams,
+  type TagGetParams,
 } from './tags';
 export {
-  ZeroTrustGroup,
-  GroupDeleteResponse,
-  GroupCreateParams,
-  GroupUpdateParams,
-  GroupListParams,
-  GroupDeleteParams,
-  GroupGetParams,
   ZeroTrustGroupsSinglePage,
   Groups,
+  type ZeroTrustGroup,
+  type GroupDeleteResponse,
+  type GroupCreateParams,
+  type GroupUpdateParams,
+  type GroupListParams,
+  type GroupDeleteParams,
+  type GroupGetParams,
 } from './groups';
diff --git a/src/resources/zero-trust/access/infrastructure/index.ts b/src/resources/zero-trust/access/infrastructure/index.ts
new file mode 100644
index 0000000000..6c3197b90b
--- /dev/null
+++ b/src/resources/zero-trust/access/infrastructure/index.ts
@@ -0,0 +1,19 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Infrastructure } from './infrastructure';
+export {
+  TargetListResponsesV4PagePaginationArray,
+  Targets,
+  type TargetCreateResponse,
+  type TargetUpdateResponse,
+  type TargetListResponse,
+  type TargetBulkUpdateResponse,
+  type TargetGetResponse,
+  type TargetCreateParams,
+  type TargetUpdateParams,
+  type TargetListParams,
+  type TargetDeleteParams,
+  type TargetBulkDeleteParams,
+  type TargetBulkUpdateParams,
+  type TargetGetParams,
+} from './targets';
diff --git a/src/resources/zero-trust/access/infrastructure/infrastructure.ts b/src/resources/zero-trust/access/infrastructure/infrastructure.ts
new file mode 100644
index 0000000000..216bcf0c0f
--- /dev/null
+++ b/src/resources/zero-trust/access/infrastructure/infrastructure.ts
@@ -0,0 +1,46 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as TargetsAPI from './targets';
+import {
+  TargetBulkDeleteParams,
+  TargetBulkUpdateParams,
+  TargetBulkUpdateResponse,
+  TargetCreateParams,
+  TargetCreateResponse,
+  TargetDeleteParams,
+  TargetGetParams,
+  TargetGetResponse,
+  TargetListParams,
+  TargetListResponse,
+  TargetListResponsesV4PagePaginationArray,
+  TargetUpdateParams,
+  TargetUpdateResponse,
+  Targets,
+} from './targets';
+
+export class Infrastructure extends APIResource {
+  targets: TargetsAPI.Targets = new TargetsAPI.Targets(this._client);
+}
+
+Infrastructure.Targets = Targets;
+Infrastructure.TargetListResponsesV4PagePaginationArray = TargetListResponsesV4PagePaginationArray;
+
+export declare namespace Infrastructure {
+  export {
+    Targets as Targets,
+    type TargetCreateResponse as TargetCreateResponse,
+    type TargetUpdateResponse as TargetUpdateResponse,
+    type TargetListResponse as TargetListResponse,
+    type TargetBulkUpdateResponse as TargetBulkUpdateResponse,
+    type TargetGetResponse as TargetGetResponse,
+    TargetListResponsesV4PagePaginationArray as TargetListResponsesV4PagePaginationArray,
+    type TargetCreateParams as TargetCreateParams,
+    type TargetUpdateParams as TargetUpdateParams,
+    type TargetListParams as TargetListParams,
+    type TargetDeleteParams as TargetDeleteParams,
+    type TargetBulkDeleteParams as TargetBulkDeleteParams,
+    type TargetBulkUpdateParams as TargetBulkUpdateParams,
+    type TargetGetParams as TargetGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/access/infrastructure/targets.ts b/src/resources/zero-trust/access/infrastructure/targets.ts
new file mode 100644
index 0000000000..427e7636e9
--- /dev/null
+++ b/src/resources/zero-trust/access/infrastructure/targets.ts
@@ -0,0 +1,833 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../../pagination';
+
+export class Targets extends APIResource {
+  /**
+   * Create new target
+   */
+  create(params: TargetCreateParams, options?: Core.RequestOptions): Core.APIPromise<TargetCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/infrastructure/targets`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: TargetCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update target
+   */
+  update(
+    targetId: string,
+    params: TargetUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TargetUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/infrastructure/targets/${targetId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: TargetUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists and sorts an account’s targets. Filters are optional and are ORed
+   * together. However, when a timestamp is specified with both its before and after
+   * counterparts, the timestamp filters are ANDed.
+   */
+  list(
+    params: TargetListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<TargetListResponsesV4PagePaginationArray, TargetListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/infrastructure/targets`,
+      TargetListResponsesV4PagePaginationArray,
+      { query, ...options },
+    );
+  }
+
+  /**
+   * Delete target
+   */
+  delete(targetId: string, params: TargetDeleteParams, options?: Core.RequestOptions): Core.APIPromise<void> {
+    const { account_id } = params;
+    return this._client.delete(`/accounts/${account_id}/infrastructure/targets/${targetId}`, {
+      ...options,
+      headers: { Accept: '*/*', ...options?.headers },
+    });
+  }
+
+  /**
+   * Removes one or more targets.
+   */
+  bulkDelete(params: TargetBulkDeleteParams, options?: Core.RequestOptions): Core.APIPromise<void> {
+    const { account_id } = params;
+    return this._client.delete(`/accounts/${account_id}/infrastructure/targets/batch`, {
+      ...options,
+      headers: { Accept: '*/*', ...options?.headers },
+    });
+  }
+
+  /**
+   * Adds one or more targets.
+   */
+  bulkUpdate(
+    params: TargetBulkUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TargetBulkUpdateResponse> {
+    const { account_id, body } = params;
+    return this._client.put(`/accounts/${account_id}/infrastructure/targets/batch`, {
+      body: body,
+      ...options,
+    });
+  }
+
+  /**
+   * Get target
+   */
+  get(
+    targetId: string,
+    params: TargetGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<TargetGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/infrastructure/targets/${targetId}`,
+        options,
+      ) as Core.APIPromise<{ result: TargetGetResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class TargetListResponsesV4PagePaginationArray extends V4PagePaginationArray<TargetListResponse> {}
+
+export interface TargetCreateResponse {
+  /**
+   * Target identifier
+   */
+  id: string;
+
+  /**
+   * Date and time at which the target was created
+   */
+  created_at: string;
+
+  /**
+   * A non-unique field that refers to a target
+   */
+  hostname: string;
+
+  /**
+   * The IPv4/IPv6 address that identifies where to reach a target
+   */
+  ip: TargetCreateResponse.IP;
+
+  /**
+   * Date and time at which the target was modified
+   */
+  modified_at: string;
+}
+
+export namespace TargetCreateResponse {
+  /**
+   * The IPv4/IPv6 address that identifies where to reach a target
+   */
+  export interface IP {
+    /**
+     * The target's IPv4 address
+     */
+    ipv4?: IP.IPV4;
+
+    /**
+     * The target's IPv6 address
+     */
+    ipv6?: IP.IPV6;
+  }
+
+  export namespace IP {
+    /**
+     * The target's IPv4 address
+     */
+    export interface IPV4 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+
+    /**
+     * The target's IPv6 address
+     */
+    export interface IPV6 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+  }
+}
+
+export interface TargetUpdateResponse {
+  /**
+   * Target identifier
+   */
+  id: string;
+
+  /**
+   * Date and time at which the target was created
+   */
+  created_at: string;
+
+  /**
+   * A non-unique field that refers to a target
+   */
+  hostname: string;
+
+  /**
+   * The IPv4/IPv6 address that identifies where to reach a target
+   */
+  ip: TargetUpdateResponse.IP;
+
+  /**
+   * Date and time at which the target was modified
+   */
+  modified_at: string;
+}
+
+export namespace TargetUpdateResponse {
+  /**
+   * The IPv4/IPv6 address that identifies where to reach a target
+   */
+  export interface IP {
+    /**
+     * The target's IPv4 address
+     */
+    ipv4?: IP.IPV4;
+
+    /**
+     * The target's IPv6 address
+     */
+    ipv6?: IP.IPV6;
+  }
+
+  export namespace IP {
+    /**
+     * The target's IPv4 address
+     */
+    export interface IPV4 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+
+    /**
+     * The target's IPv6 address
+     */
+    export interface IPV6 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+  }
+}
+
+export interface TargetListResponse {
+  /**
+   * Target identifier
+   */
+  id: string;
+
+  /**
+   * Date and time at which the target was created
+   */
+  created_at: string;
+
+  /**
+   * A non-unique field that refers to a target
+   */
+  hostname: string;
+
+  /**
+   * The IPv4/IPv6 address that identifies where to reach a target
+   */
+  ip: TargetListResponse.IP;
+
+  /**
+   * Date and time at which the target was modified
+   */
+  modified_at: string;
+}
+
+export namespace TargetListResponse {
+  /**
+   * The IPv4/IPv6 address that identifies where to reach a target
+   */
+  export interface IP {
+    /**
+     * The target's IPv4 address
+     */
+    ipv4?: IP.IPV4;
+
+    /**
+     * The target's IPv6 address
+     */
+    ipv6?: IP.IPV6;
+  }
+
+  export namespace IP {
+    /**
+     * The target's IPv4 address
+     */
+    export interface IPV4 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+
+    /**
+     * The target's IPv6 address
+     */
+    export interface IPV6 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+  }
+}
+
+export type TargetBulkUpdateResponse = Array<TargetBulkUpdateResponse.TargetBulkUpdateResponseItem>;
+
+export namespace TargetBulkUpdateResponse {
+  export interface TargetBulkUpdateResponseItem {
+    /**
+     * Target identifier
+     */
+    id: string;
+
+    /**
+     * Date and time at which the target was created
+     */
+    created_at: string;
+
+    /**
+     * A non-unique field that refers to a target
+     */
+    hostname: string;
+
+    /**
+     * The IPv4/IPv6 address that identifies where to reach a target
+     */
+    ip: TargetBulkUpdateResponseItem.IP;
+
+    /**
+     * Date and time at which the target was modified
+     */
+    modified_at: string;
+  }
+
+  export namespace TargetBulkUpdateResponseItem {
+    /**
+     * The IPv4/IPv6 address that identifies where to reach a target
+     */
+    export interface IP {
+      /**
+       * The target's IPv4 address
+       */
+      ipv4?: IP.IPV4;
+
+      /**
+       * The target's IPv6 address
+       */
+      ipv6?: IP.IPV6;
+    }
+
+    export namespace IP {
+      /**
+       * The target's IPv4 address
+       */
+      export interface IPV4 {
+        /**
+         * IP address of the target
+         */
+        ip_addr?: string;
+
+        /**
+         * (optional) Private virtual network identifier for the target. If omitted, the
+         * default virtual network ID will be used.
+         */
+        virtual_network_id?: string;
+      }
+
+      /**
+       * The target's IPv6 address
+       */
+      export interface IPV6 {
+        /**
+         * IP address of the target
+         */
+        ip_addr?: string;
+
+        /**
+         * (optional) Private virtual network identifier for the target. If omitted, the
+         * default virtual network ID will be used.
+         */
+        virtual_network_id?: string;
+      }
+    }
+  }
+}
+
+export interface TargetGetResponse {
+  /**
+   * Target identifier
+   */
+  id: string;
+
+  /**
+   * Date and time at which the target was created
+   */
+  created_at: string;
+
+  /**
+   * A non-unique field that refers to a target
+   */
+  hostname: string;
+
+  /**
+   * The IPv4/IPv6 address that identifies where to reach a target
+   */
+  ip: TargetGetResponse.IP;
+
+  /**
+   * Date and time at which the target was modified
+   */
+  modified_at: string;
+}
+
+export namespace TargetGetResponse {
+  /**
+   * The IPv4/IPv6 address that identifies where to reach a target
+   */
+  export interface IP {
+    /**
+     * The target's IPv4 address
+     */
+    ipv4?: IP.IPV4;
+
+    /**
+     * The target's IPv6 address
+     */
+    ipv6?: IP.IPV6;
+  }
+
+  export namespace IP {
+    /**
+     * The target's IPv4 address
+     */
+    export interface IPV4 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+
+    /**
+     * The target's IPv6 address
+     */
+    export interface IPV6 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+  }
+}
+
+export interface TargetCreateParams {
+  /**
+   * Path param: Account identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: A non-unique field that refers to a target. Case insensitive,
+   * maximum length of 255 characters, supports the use of special characters dash
+   * and period, does not support spaces, and must start and end with an alphanumeric
+   * character.
+   */
+  hostname: string;
+
+  /**
+   * Body param: The IPv4/IPv6 address that identifies where to reach a target
+   */
+  ip: TargetCreateParams.IP;
+}
+
+export namespace TargetCreateParams {
+  /**
+   * The IPv4/IPv6 address that identifies where to reach a target
+   */
+  export interface IP {
+    /**
+     * The target's IPv4 address
+     */
+    ipv4?: IP.IPV4;
+
+    /**
+     * The target's IPv6 address
+     */
+    ipv6?: IP.IPV6;
+  }
+
+  export namespace IP {
+    /**
+     * The target's IPv4 address
+     */
+    export interface IPV4 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+
+    /**
+     * The target's IPv6 address
+     */
+    export interface IPV6 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+  }
+}
+
+export interface TargetUpdateParams {
+  /**
+   * Path param: Account identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: A non-unique field that refers to a target. Case insensitive,
+   * maximum length of 255 characters, supports the use of special characters dash
+   * and period, does not support spaces, and must start and end with an alphanumeric
+   * character.
+   */
+  hostname: string;
+
+  /**
+   * Body param: The IPv4/IPv6 address that identifies where to reach a target
+   */
+  ip: TargetUpdateParams.IP;
+}
+
+export namespace TargetUpdateParams {
+  /**
+   * The IPv4/IPv6 address that identifies where to reach a target
+   */
+  export interface IP {
+    /**
+     * The target's IPv4 address
+     */
+    ipv4?: IP.IPV4;
+
+    /**
+     * The target's IPv6 address
+     */
+    ipv6?: IP.IPV6;
+  }
+
+  export namespace IP {
+    /**
+     * The target's IPv4 address
+     */
+    export interface IPV4 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+
+    /**
+     * The target's IPv6 address
+     */
+    export interface IPV6 {
+      /**
+       * IP address of the target
+       */
+      ip_addr?: string;
+
+      /**
+       * (optional) Private virtual network identifier for the target. If omitted, the
+       * default virtual network ID will be used.
+       */
+      virtual_network_id?: string;
+    }
+  }
+}
+
+export interface TargetListParams extends V4PagePaginationArrayParams {
+  /**
+   * Path param: Account identifier
+   */
+  account_id: string;
+
+  /**
+   * Query param: Date and time at which the target was created after (inclusive)
+   */
+  created_after?: string | null;
+
+  /**
+   * Query param: Date and time at which the target was created before (inclusive)
+   */
+  created_before?: string | null;
+
+  /**
+   * Query param: The sorting direction.
+   */
+  direction?: 'asc' | 'desc';
+
+  /**
+   * Query param: Hostname of a target
+   */
+  hostname?: string | null;
+
+  /**
+   * Query param: Partial match to the hostname of a target
+   */
+  hostname_contains?: string | null;
+
+  /**
+   * Query param: IPv4 address of the target
+   */
+  ip_v4?: string | null;
+
+  /**
+   * Query param: IPv6 address of the target
+   */
+  ip_v6?: string | null;
+
+  /**
+   * Query param: Filters for targets that have any of the following IP addresses.
+   * Specify `ips` multiple times in query parameter to build list of candidates.
+   */
+  ips?: Array<string>;
+
+  /**
+   * Query param: Date and time at which the target was modified after (inclusive)
+   */
+  modified_after?: string | null;
+
+  /**
+   * Query param: Date and time at which the target was modified before (inclusive)
+   */
+  modified_before?: string | null;
+
+  /**
+   * Query param: The field to sort by.
+   */
+  order?: 'hostname' | 'created_at';
+
+  /**
+   * Query param: Private virtual network identifier of the target
+   */
+  virtual_network_id?: string | null;
+}
+
+export interface TargetDeleteParams {
+  /**
+   * Account identifier
+   */
+  account_id: string;
+}
+
+export interface TargetBulkDeleteParams {
+  /**
+   * Account identifier
+   */
+  account_id: string;
+}
+
+export interface TargetBulkUpdateParams {
+  /**
+   * Path param: Account identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: Array<TargetBulkUpdateParams.Body>;
+}
+
+export namespace TargetBulkUpdateParams {
+  export interface Body {
+    /**
+     * A non-unique field that refers to a target. Case insensitive, maximum length of
+     * 255 characters, supports the use of special characters dash and period, does not
+     * support spaces, and must start and end with an alphanumeric character.
+     */
+    hostname: string;
+
+    /**
+     * The IPv4/IPv6 address that identifies where to reach a target
+     */
+    ip: Body.IP;
+  }
+
+  export namespace Body {
+    /**
+     * The IPv4/IPv6 address that identifies where to reach a target
+     */
+    export interface IP {
+      /**
+       * The target's IPv4 address
+       */
+      ipv4?: IP.IPV4;
+
+      /**
+       * The target's IPv6 address
+       */
+      ipv6?: IP.IPV6;
+    }
+
+    export namespace IP {
+      /**
+       * The target's IPv4 address
+       */
+      export interface IPV4 {
+        /**
+         * IP address of the target
+         */
+        ip_addr?: string;
+
+        /**
+         * (optional) Private virtual network identifier for the target. If omitted, the
+         * default virtual network ID will be used.
+         */
+        virtual_network_id?: string;
+      }
+
+      /**
+       * The target's IPv6 address
+       */
+      export interface IPV6 {
+        /**
+         * IP address of the target
+         */
+        ip_addr?: string;
+
+        /**
+         * (optional) Private virtual network identifier for the target. If omitted, the
+         * default virtual network ID will be used.
+         */
+        virtual_network_id?: string;
+      }
+    }
+  }
+}
+
+export interface TargetGetParams {
+  /**
+   * Account identifier
+   */
+  account_id: string;
+}
+
+Targets.TargetListResponsesV4PagePaginationArray = TargetListResponsesV4PagePaginationArray;
+
+export declare namespace Targets {
+  export {
+    type TargetCreateResponse as TargetCreateResponse,
+    type TargetUpdateResponse as TargetUpdateResponse,
+    type TargetListResponse as TargetListResponse,
+    type TargetBulkUpdateResponse as TargetBulkUpdateResponse,
+    type TargetGetResponse as TargetGetResponse,
+    TargetListResponsesV4PagePaginationArray as TargetListResponsesV4PagePaginationArray,
+    type TargetCreateParams as TargetCreateParams,
+    type TargetUpdateParams as TargetUpdateParams,
+    type TargetListParams as TargetListParams,
+    type TargetDeleteParams as TargetDeleteParams,
+    type TargetBulkDeleteParams as TargetBulkDeleteParams,
+    type TargetBulkUpdateParams as TargetBulkUpdateParams,
+    type TargetGetParams as TargetGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/access/keys.ts b/src/resources/zero-trust/access/keys.ts
index 4cf1f5755a..f7cd0834d7 100644
--- a/src/resources/zero-trust/access/keys.ts
+++ b/src/resources/zero-trust/access/keys.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as KeysAPI from './keys';
 
 export class Keys extends APIResource {
   /**
@@ -42,11 +41,56 @@ export class Keys extends APIResource {
   }
 }
 
-export type KeyUpdateResponse = unknown | string;
+export interface KeyUpdateResponse {
+  /**
+   * The number of days until the next key rotation.
+   */
+  days_until_next_rotation?: number;
+
+  /**
+   * The number of days between key rotations.
+   */
+  key_rotation_interval_days?: number;
+
+  /**
+   * The timestamp of the previous key rotation.
+   */
+  last_key_rotation_at?: string;
+}
 
-export type KeyGetResponse = unknown | string;
+export interface KeyGetResponse {
+  /**
+   * The number of days until the next key rotation.
+   */
+  days_until_next_rotation?: number;
+
+  /**
+   * The number of days between key rotations.
+   */
+  key_rotation_interval_days?: number;
 
-export type KeyRotateResponse = unknown | string;
+  /**
+   * The timestamp of the previous key rotation.
+   */
+  last_key_rotation_at?: string;
+}
+
+export interface KeyRotateResponse {
+  /**
+   * The number of days until the next key rotation.
+   */
+  days_until_next_rotation?: number;
+
+  /**
+   * The number of days between key rotations.
+   */
+  key_rotation_interval_days?: number;
+
+  /**
+   * The timestamp of the previous key rotation.
+   */
+  last_key_rotation_at?: string;
+}
 
 export interface KeyUpdateParams {
   /**
@@ -74,11 +118,13 @@ export interface KeyRotateParams {
   account_id: string;
 }
 
-export namespace Keys {
-  export import KeyUpdateResponse = KeysAPI.KeyUpdateResponse;
-  export import KeyGetResponse = KeysAPI.KeyGetResponse;
-  export import KeyRotateResponse = KeysAPI.KeyRotateResponse;
-  export import KeyUpdateParams = KeysAPI.KeyUpdateParams;
-  export import KeyGetParams = KeysAPI.KeyGetParams;
-  export import KeyRotateParams = KeysAPI.KeyRotateParams;
+export declare namespace Keys {
+  export {
+    type KeyUpdateResponse as KeyUpdateResponse,
+    type KeyGetResponse as KeyGetResponse,
+    type KeyRotateResponse as KeyRotateResponse,
+    type KeyUpdateParams as KeyUpdateParams,
+    type KeyGetParams as KeyGetParams,
+    type KeyRotateParams as KeyRotateParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/logs/access-requests.ts b/src/resources/zero-trust/access/logs/access-requests.ts
index bfc3dd115f..d42124ffa1 100644
--- a/src/resources/zero-trust/access/logs/access-requests.ts
+++ b/src/resources/zero-trust/access/logs/access-requests.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as AccessRequestsAPI from './access-requests';
 
 export class AccessRequests extends APIResource {
   /**
@@ -95,8 +94,10 @@ export interface AccessRequestListParams {
   until?: string;
 }
 
-export namespace AccessRequests {
-  export import AccessRequests = AccessRequestsAPI.AccessRequests;
-  export import AccessRequestListResponse = AccessRequestsAPI.AccessRequestListResponse;
-  export import AccessRequestListParams = AccessRequestsAPI.AccessRequestListParams;
+export declare namespace AccessRequests {
+  export {
+    type AccessRequests as AccessRequests,
+    type AccessRequestListResponse as AccessRequestListResponse,
+    type AccessRequestListParams as AccessRequestListParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/logs/index.ts b/src/resources/zero-trust/access/logs/index.ts
index 3ccda1b1ea..3aec2fb291 100644
--- a/src/resources/zero-trust/access/logs/index.ts
+++ b/src/resources/zero-trust/access/logs/index.ts
@@ -1,4 +1,8 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { AccessRequests, AccessRequestListResponse, AccessRequestListParams } from './access-requests';
+export {
+  AccessRequests,
+  type AccessRequestListResponse,
+  type AccessRequestListParams,
+} from './access-requests';
 export { Logs } from './logs';
diff --git a/src/resources/zero-trust/access/logs/logs.ts b/src/resources/zero-trust/access/logs/logs.ts
index 58f51aa461..17efb0e7a8 100644
--- a/src/resources/zero-trust/access/logs/logs.ts
+++ b/src/resources/zero-trust/access/logs/logs.ts
@@ -2,13 +2,16 @@
 
 import { APIResource } from '../../../../resource';
 import * as AccessRequestsAPI from './access-requests';
+import { AccessRequestListParams, AccessRequestListResponse, AccessRequests } from './access-requests';
 
 export class Logs extends APIResource {
   accessRequests: AccessRequestsAPI.AccessRequests = new AccessRequestsAPI.AccessRequests(this._client);
 }
 
-export namespace Logs {
-  export import AccessRequests = AccessRequestsAPI.AccessRequests;
-  export import AccessRequestListResponse = AccessRequestsAPI.AccessRequestListResponse;
-  export import AccessRequestListParams = AccessRequestsAPI.AccessRequestListParams;
+export declare namespace Logs {
+  export {
+    type AccessRequests as AccessRequests,
+    type AccessRequestListResponse as AccessRequestListResponse,
+    type AccessRequestListParams as AccessRequestListParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/policies.ts b/src/resources/zero-trust/access/policies.ts
index 750a5987dc..b3b7d03c16 100644
--- a/src/resources/zero-trust/access/policies.ts
+++ b/src/resources/zero-trust/access/policies.ts
@@ -2,10 +2,8 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as PoliciesAPI from './policies';
 import * as AccessAPI from './access';
 import * as ApplicationsAPI from './applications/applications';
-import * as ApplicationsPoliciesAPI from './applications/policies';
 import { SinglePage } from '../../../pagination';
 
 export class Policies extends APIResource {
@@ -88,6 +86,139 @@ export class Policies extends APIResource {
 
 export class PolicyListResponsesSinglePage extends SinglePage<PolicyListResponse> {}
 
+/**
+ * A group of email addresses that can approve a temporary authentication request.
+ */
+export interface ApprovalGroup {
+  /**
+   * The number of approvals needed to obtain access.
+   */
+  approvals_needed: number;
+
+  /**
+   * A list of emails that can approve the access request.
+   */
+  email_addresses?: Array<string>;
+
+  /**
+   * The UUID of an re-usable email list.
+   */
+  email_list_uuid?: string;
+}
+
+/**
+ * A group of email addresses that can approve a temporary authentication request.
+ */
+export interface ApprovalGroupParam {
+  /**
+   * The number of approvals needed to obtain access.
+   */
+  approvals_needed: number;
+
+  /**
+   * A list of emails that can approve the access request.
+   */
+  email_addresses?: Array<string>;
+
+  /**
+   * The UUID of an re-usable email list.
+   */
+  email_list_uuid?: string;
+}
+
+export interface Policy {
+  /**
+   * UUID
+   */
+  id?: string;
+
+  /**
+   * Administrators who can approve a temporary authentication request.
+   */
+  approval_groups?: Array<Policy.ApprovalGroup>;
+
+  /**
+   * Requires the user to request access from an administrator at the start of each
+   * session.
+   */
+  approval_required?: boolean;
+
+  created_at?: string;
+
+  /**
+   * The action Access will take if a user matches this policy.
+   */
+  decision?: 'allow' | 'deny' | 'non_identity' | 'bypass';
+
+  /**
+   * Rules evaluated with a NOT logical operator. To match the policy, a user cannot
+   * meet any of the Exclude rules.
+   */
+  exclude?: Array<AccessAPI.AccessRule>;
+
+  /**
+   * Rules evaluated with an OR logical operator. A user needs to meet only one of
+   * the Include rules.
+   */
+  include?: Array<AccessAPI.AccessRule>;
+
+  /**
+   * Require this application to be served in an isolated browser for users matching
+   * this policy.
+   */
+  isolation_required?: boolean;
+
+  /**
+   * The name of the Access policy.
+   */
+  name?: string;
+
+  /**
+   * The order of execution for this policy. Must be unique for each policy.
+   */
+  precedence?: number;
+
+  /**
+   * A custom message that will appear on the purpose justification screen.
+   */
+  purpose_justification_prompt?: string;
+
+  /**
+   * Require users to enter a justification when they log in to the application.
+   */
+  purpose_justification_required?: boolean;
+
+  /**
+   * Rules evaluated with an AND logical operator. To match the policy, a user must
+   * meet all of the Require rules.
+   */
+  require?: Array<AccessAPI.AccessRule>;
+
+  updated_at?: string;
+}
+
+export namespace Policy {
+  /**
+   * A group of email addresses that can approve a temporary authentication request.
+   */
+  export interface ApprovalGroup {
+    /**
+     * The number of approvals needed to obtain access.
+     */
+    approvals_needed: number;
+
+    /**
+     * A list of emails that can approve the access request.
+     */
+    email_addresses?: Array<unknown>;
+
+    /**
+     * The UUID of an re-usable email list.
+     */
+    email_list_uuid?: string;
+  }
+}
+
 export interface PolicyCreateResponse {
   /**
    * The UUID of the policy
@@ -102,7 +233,7 @@ export interface PolicyCreateResponse {
   /**
    * Administrators who can approve a temporary authentication request.
    */
-  approval_groups?: Array<ApplicationsPoliciesAPI.ApprovalGroup>;
+  approval_groups?: Array<ApprovalGroup>;
 
   /**
    * Requires the user to request access from an administrator at the start of each
@@ -113,7 +244,8 @@ export interface PolicyCreateResponse {
   created_at?: string;
 
   /**
-   * The action Access will take if a user matches this policy.
+   * The action Access will take if a user matches this policy. Infrastructure
+   * application policies can only use the Allow action.
    */
   decision?: ApplicationsAPI.Decision;
 
@@ -183,7 +315,7 @@ export interface PolicyUpdateResponse {
   /**
    * Administrators who can approve a temporary authentication request.
    */
-  approval_groups?: Array<ApplicationsPoliciesAPI.ApprovalGroup>;
+  approval_groups?: Array<ApprovalGroup>;
 
   /**
    * Requires the user to request access from an administrator at the start of each
@@ -194,7 +326,8 @@ export interface PolicyUpdateResponse {
   created_at?: string;
 
   /**
-   * The action Access will take if a user matches this policy.
+   * The action Access will take if a user matches this policy. Infrastructure
+   * application policies can only use the Allow action.
    */
   decision?: ApplicationsAPI.Decision;
 
@@ -264,7 +397,7 @@ export interface PolicyListResponse {
   /**
    * Administrators who can approve a temporary authentication request.
    */
-  approval_groups?: Array<ApplicationsPoliciesAPI.ApprovalGroup>;
+  approval_groups?: Array<ApprovalGroup>;
 
   /**
    * Requires the user to request access from an administrator at the start of each
@@ -275,7 +408,8 @@ export interface PolicyListResponse {
   created_at?: string;
 
   /**
-   * The action Access will take if a user matches this policy.
+   * The action Access will take if a user matches this policy. Infrastructure
+   * application policies can only use the Allow action.
    */
   decision?: ApplicationsAPI.Decision;
 
@@ -352,7 +486,7 @@ export interface PolicyGetResponse {
   /**
    * Administrators who can approve a temporary authentication request.
    */
-  approval_groups?: Array<ApplicationsPoliciesAPI.ApprovalGroup>;
+  approval_groups?: Array<ApprovalGroup>;
 
   /**
    * Requires the user to request access from an administrator at the start of each
@@ -363,7 +497,8 @@ export interface PolicyGetResponse {
   created_at?: string;
 
   /**
-   * The action Access will take if a user matches this policy.
+   * The action Access will take if a user matches this policy. Infrastructure
+   * application policies can only use the Allow action.
    */
   decision?: ApplicationsAPI.Decision;
 
@@ -427,6 +562,7 @@ export interface PolicyCreateParams {
 
   /**
    * Body param: The action Access will take if a user matches this policy.
+   * Infrastructure application policies can only use the Allow action.
    */
   decision: ApplicationsAPI.DecisionParam;
 
@@ -444,7 +580,7 @@ export interface PolicyCreateParams {
   /**
    * Body param: Administrators who can approve a temporary authentication request.
    */
-  approval_groups?: Array<ApplicationsPoliciesAPI.ApprovalGroupParam>;
+  approval_groups?: Array<ApprovalGroupParam>;
 
   /**
    * Body param: Requires the user to request access from an administrator at the
@@ -499,6 +635,7 @@ export interface PolicyUpdateParams {
 
   /**
    * Body param: The action Access will take if a user matches this policy.
+   * Infrastructure application policies can only use the Allow action.
    */
   decision: ApplicationsAPI.DecisionParam;
 
@@ -516,7 +653,7 @@ export interface PolicyUpdateParams {
   /**
    * Body param: Administrators who can approve a temporary authentication request.
    */
-  approval_groups?: Array<ApplicationsPoliciesAPI.ApprovalGroupParam>;
+  approval_groups?: Array<ApprovalGroupParam>;
 
   /**
    * Body param: Requires the user to request access from an administrator at the
@@ -584,16 +721,22 @@ export interface PolicyGetParams {
   account_id: string;
 }
 
-export namespace Policies {
-  export import PolicyCreateResponse = PoliciesAPI.PolicyCreateResponse;
-  export import PolicyUpdateResponse = PoliciesAPI.PolicyUpdateResponse;
-  export import PolicyListResponse = PoliciesAPI.PolicyListResponse;
-  export import PolicyDeleteResponse = PoliciesAPI.PolicyDeleteResponse;
-  export import PolicyGetResponse = PoliciesAPI.PolicyGetResponse;
-  export import PolicyListResponsesSinglePage = PoliciesAPI.PolicyListResponsesSinglePage;
-  export import PolicyCreateParams = PoliciesAPI.PolicyCreateParams;
-  export import PolicyUpdateParams = PoliciesAPI.PolicyUpdateParams;
-  export import PolicyListParams = PoliciesAPI.PolicyListParams;
-  export import PolicyDeleteParams = PoliciesAPI.PolicyDeleteParams;
-  export import PolicyGetParams = PoliciesAPI.PolicyGetParams;
+Policies.PolicyListResponsesSinglePage = PolicyListResponsesSinglePage;
+
+export declare namespace Policies {
+  export {
+    type ApprovalGroup as ApprovalGroup,
+    type Policy as Policy,
+    type PolicyCreateResponse as PolicyCreateResponse,
+    type PolicyUpdateResponse as PolicyUpdateResponse,
+    type PolicyListResponse as PolicyListResponse,
+    type PolicyDeleteResponse as PolicyDeleteResponse,
+    type PolicyGetResponse as PolicyGetResponse,
+    PolicyListResponsesSinglePage as PolicyListResponsesSinglePage,
+    type PolicyCreateParams as PolicyCreateParams,
+    type PolicyUpdateParams as PolicyUpdateParams,
+    type PolicyListParams as PolicyListParams,
+    type PolicyDeleteParams as PolicyDeleteParams,
+    type PolicyGetParams as PolicyGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/service-tokens.ts b/src/resources/zero-trust/access/service-tokens.ts
index 1ad9f79050..582c1fcff9 100644
--- a/src/resources/zero-trust/access/service-tokens.ts
+++ b/src/resources/zero-trust/access/service-tokens.ts
@@ -3,8 +3,7 @@
 import { APIResource } from '../../../resource';
 import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import { CloudflareError } from '../../../error';
-import * as ServiceTokensAPI from './service-tokens';
+import { CloudflareError } from 'cloudflare/error';
 import { SinglePage } from '../../../pagination';
 
 export class ServiceTokens extends APIResource {
@@ -90,7 +89,7 @@ export class ServiceTokens extends APIResource {
     if (isRequestOptions(params)) {
       return this.list({}, params);
     }
-    const { account_id, zone_id } = params;
+    const { account_id, zone_id, ...query } = params;
     if (!account_id && !zone_id) {
       throw new CloudflareError('You must provide either account_id or zone_id.');
     }
@@ -110,7 +109,7 @@ export class ServiceTokens extends APIResource {
     return this._client.getAPIList(
       `/${accountOrZone}/${accountOrZoneId}/access/service_tokens`,
       ServiceTokensSinglePage,
-      options,
+      { query, ...options },
     );
   }
 
@@ -256,6 +255,8 @@ export interface ServiceToken {
    */
   duration?: string;
 
+  expires_at?: string;
+
   /**
    * The name of the service token.
    */
@@ -388,14 +389,26 @@ export interface ServiceTokenUpdateParams {
 
 export interface ServiceTokenListParams {
   /**
-   * The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+   * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
+   * Zone ID.
    */
   account_id?: string;
 
   /**
-   * The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+   * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
+   * Account ID.
    */
   zone_id?: string;
+
+  /**
+   * Query param: The name of the service token.
+   */
+  name?: string;
+
+  /**
+   * Query param: Search for service tokens by other listed query parameters.
+   */
+  search?: string;
 }
 
 export interface ServiceTokenDeleteParams {
@@ -436,16 +449,20 @@ export interface ServiceTokenRotateParams {
   account_id: string;
 }
 
-export namespace ServiceTokens {
-  export import ServiceToken = ServiceTokensAPI.ServiceToken;
-  export import ServiceTokenCreateResponse = ServiceTokensAPI.ServiceTokenCreateResponse;
-  export import ServiceTokenRotateResponse = ServiceTokensAPI.ServiceTokenRotateResponse;
-  export import ServiceTokensSinglePage = ServiceTokensAPI.ServiceTokensSinglePage;
-  export import ServiceTokenCreateParams = ServiceTokensAPI.ServiceTokenCreateParams;
-  export import ServiceTokenUpdateParams = ServiceTokensAPI.ServiceTokenUpdateParams;
-  export import ServiceTokenListParams = ServiceTokensAPI.ServiceTokenListParams;
-  export import ServiceTokenDeleteParams = ServiceTokensAPI.ServiceTokenDeleteParams;
-  export import ServiceTokenGetParams = ServiceTokensAPI.ServiceTokenGetParams;
-  export import ServiceTokenRefreshParams = ServiceTokensAPI.ServiceTokenRefreshParams;
-  export import ServiceTokenRotateParams = ServiceTokensAPI.ServiceTokenRotateParams;
+ServiceTokens.ServiceTokensSinglePage = ServiceTokensSinglePage;
+
+export declare namespace ServiceTokens {
+  export {
+    type ServiceToken as ServiceToken,
+    type ServiceTokenCreateResponse as ServiceTokenCreateResponse,
+    type ServiceTokenRotateResponse as ServiceTokenRotateResponse,
+    ServiceTokensSinglePage as ServiceTokensSinglePage,
+    type ServiceTokenCreateParams as ServiceTokenCreateParams,
+    type ServiceTokenUpdateParams as ServiceTokenUpdateParams,
+    type ServiceTokenListParams as ServiceTokenListParams,
+    type ServiceTokenDeleteParams as ServiceTokenDeleteParams,
+    type ServiceTokenGetParams as ServiceTokenGetParams,
+    type ServiceTokenRefreshParams as ServiceTokenRefreshParams,
+    type ServiceTokenRotateParams as ServiceTokenRotateParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/tags.ts b/src/resources/zero-trust/access/tags.ts
index b2c85781a2..e0f2fb86d7 100644
--- a/src/resources/zero-trust/access/tags.ts
+++ b/src/resources/zero-trust/access/tags.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as TagsAPI from './tags';
 import { SinglePage } from '../../../pagination';
 
 export class Tags extends APIResource {
@@ -105,17 +104,7 @@ export interface TagCreateParams {
   /**
    * Body param: The name of the tag
    */
-  name: string;
-
-  /**
-   * Body param:
-   */
-  created_at?: string;
-
-  /**
-   * Body param:
-   */
-  updated_at?: string;
+  name?: string;
 }
 
 export interface TagUpdateParams {
@@ -128,16 +117,6 @@ export interface TagUpdateParams {
    * Body param: The name of the tag
    */
   name: string;
-
-  /**
-   * Body param:
-   */
-  created_at?: string;
-
-  /**
-   * Body param:
-   */
-  updated_at?: string;
 }
 
 export interface TagListParams {
@@ -161,13 +140,17 @@ export interface TagGetParams {
   account_id: string;
 }
 
-export namespace Tags {
-  export import Tag = TagsAPI.Tag;
-  export import TagDeleteResponse = TagsAPI.TagDeleteResponse;
-  export import TagsSinglePage = TagsAPI.TagsSinglePage;
-  export import TagCreateParams = TagsAPI.TagCreateParams;
-  export import TagUpdateParams = TagsAPI.TagUpdateParams;
-  export import TagListParams = TagsAPI.TagListParams;
-  export import TagDeleteParams = TagsAPI.TagDeleteParams;
-  export import TagGetParams = TagsAPI.TagGetParams;
+Tags.TagsSinglePage = TagsSinglePage;
+
+export declare namespace Tags {
+  export {
+    type Tag as Tag,
+    type TagDeleteResponse as TagDeleteResponse,
+    TagsSinglePage as TagsSinglePage,
+    type TagCreateParams as TagCreateParams,
+    type TagUpdateParams as TagUpdateParams,
+    type TagListParams as TagListParams,
+    type TagDeleteParams as TagDeleteParams,
+    type TagGetParams as TagGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/users/active-sessions.ts b/src/resources/zero-trust/access/users/active-sessions.ts
index 10fdfd6b15..293defd2cc 100644
--- a/src/resources/zero-trust/access/users/active-sessions.ts
+++ b/src/resources/zero-trust/access/users/active-sessions.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as ActiveSessionsAPI from './active-sessions';
 import * as UserPolicyChecksAPI from '../applications/user-policy-checks';
 import { SinglePage } from '../../../../pagination';
 
@@ -184,10 +183,14 @@ export interface ActiveSessionGetParams {
   account_id: string;
 }
 
-export namespace ActiveSessions {
-  export import ActiveSessionListResponse = ActiveSessionsAPI.ActiveSessionListResponse;
-  export import ActiveSessionGetResponse = ActiveSessionsAPI.ActiveSessionGetResponse;
-  export import ActiveSessionListResponsesSinglePage = ActiveSessionsAPI.ActiveSessionListResponsesSinglePage;
-  export import ActiveSessionListParams = ActiveSessionsAPI.ActiveSessionListParams;
-  export import ActiveSessionGetParams = ActiveSessionsAPI.ActiveSessionGetParams;
+ActiveSessions.ActiveSessionListResponsesSinglePage = ActiveSessionListResponsesSinglePage;
+
+export declare namespace ActiveSessions {
+  export {
+    type ActiveSessionListResponse as ActiveSessionListResponse,
+    type ActiveSessionGetResponse as ActiveSessionGetResponse,
+    ActiveSessionListResponsesSinglePage as ActiveSessionListResponsesSinglePage,
+    type ActiveSessionListParams as ActiveSessionListParams,
+    type ActiveSessionGetParams as ActiveSessionGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/users/failed-logins.ts b/src/resources/zero-trust/access/users/failed-logins.ts
index e9d7670b33..30074bd414 100644
--- a/src/resources/zero-trust/access/users/failed-logins.ts
+++ b/src/resources/zero-trust/access/users/failed-logins.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as FailedLoginsAPI from './failed-logins';
 import { SinglePage } from '../../../../pagination';
 
 export class FailedLogins extends APIResource {
@@ -38,8 +37,12 @@ export interface FailedLoginListParams {
   account_id: string;
 }
 
-export namespace FailedLogins {
-  export import FailedLoginListResponse = FailedLoginsAPI.FailedLoginListResponse;
-  export import FailedLoginListResponsesSinglePage = FailedLoginsAPI.FailedLoginListResponsesSinglePage;
-  export import FailedLoginListParams = FailedLoginsAPI.FailedLoginListParams;
+FailedLogins.FailedLoginListResponsesSinglePage = FailedLoginListResponsesSinglePage;
+
+export declare namespace FailedLogins {
+  export {
+    type FailedLoginListResponse as FailedLoginListResponse,
+    FailedLoginListResponsesSinglePage as FailedLoginListResponsesSinglePage,
+    type FailedLoginListParams as FailedLoginListParams,
+  };
 }
diff --git a/src/resources/zero-trust/access/users/index.ts b/src/resources/zero-trust/access/users/index.ts
index f3226f721e..cd3ccc5c9f 100644
--- a/src/resources/zero-trust/access/users/index.ts
+++ b/src/resources/zero-trust/access/users/index.ts
@@ -1,18 +1,18 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { AccessUser, UserListParams, AccessUsersSinglePage, Users } from './users';
+export { AccessUsersSinglePage, Users, type AccessUser, type UserListParams } from './users';
 export {
-  ActiveSessionListResponse,
-  ActiveSessionGetResponse,
-  ActiveSessionListParams,
-  ActiveSessionGetParams,
   ActiveSessionListResponsesSinglePage,
   ActiveSessions,
+  type ActiveSessionListResponse,
+  type ActiveSessionGetResponse,
+  type ActiveSessionListParams,
+  type ActiveSessionGetParams,
 } from './active-sessions';
 export {
-  FailedLoginListResponse,
-  FailedLoginListParams,
   FailedLoginListResponsesSinglePage,
   FailedLogins,
+  type FailedLoginListResponse,
+  type FailedLoginListParams,
 } from './failed-logins';
-export { Identity, LastSeenIdentityGetParams, LastSeenIdentity } from './last-seen-identity';
+export { LastSeenIdentity, type Identity, type LastSeenIdentityGetParams } from './last-seen-identity';
diff --git a/src/resources/zero-trust/access/users/last-seen-identity.ts b/src/resources/zero-trust/access/users/last-seen-identity.ts
index 6fd7bc980a..6a22e52a67 100644
--- a/src/resources/zero-trust/access/users/last-seen-identity.ts
+++ b/src/resources/zero-trust/access/users/last-seen-identity.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as LastSeenIdentityAPI from './last-seen-identity';
 import * as UserPolicyChecksAPI from '../applications/user-policy-checks';
 
 export class LastSeenIdentity extends APIResource {
@@ -121,7 +120,6 @@ export interface LastSeenIdentityGetParams {
   account_id: string;
 }
 
-export namespace LastSeenIdentity {
-  export import Identity = LastSeenIdentityAPI.Identity;
-  export import LastSeenIdentityGetParams = LastSeenIdentityAPI.LastSeenIdentityGetParams;
+export declare namespace LastSeenIdentity {
+  export { type Identity as Identity, type LastSeenIdentityGetParams as LastSeenIdentityGetParams };
 }
diff --git a/src/resources/zero-trust/access/users/users.ts b/src/resources/zero-trust/access/users/users.ts
index ba0e39822e..6550b4bce0 100644
--- a/src/resources/zero-trust/access/users/users.ts
+++ b/src/resources/zero-trust/access/users/users.ts
@@ -2,10 +2,24 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as UsersAPI from './users';
 import * as ActiveSessionsAPI from './active-sessions';
+import {
+  ActiveSessionGetParams,
+  ActiveSessionGetResponse,
+  ActiveSessionListParams,
+  ActiveSessionListResponse,
+  ActiveSessionListResponsesSinglePage,
+  ActiveSessions,
+} from './active-sessions';
 import * as FailedLoginsAPI from './failed-logins';
+import {
+  FailedLoginListParams,
+  FailedLoginListResponse,
+  FailedLoginListResponsesSinglePage,
+  FailedLogins,
+} from './failed-logins';
 import * as LastSeenIdentityAPI from './last-seen-identity';
+import { Identity, LastSeenIdentity, LastSeenIdentityGetParams } from './last-seen-identity';
 import { SinglePage } from '../../../../pagination';
 
 export class Users extends APIResource {
@@ -22,8 +36,11 @@ export class Users extends APIResource {
     params: UserListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<AccessUsersSinglePage, AccessUser> {
-    const { account_id } = params;
-    return this._client.getAPIList(`/accounts/${account_id}/access/users`, AccessUsersSinglePage, options);
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(`/accounts/${account_id}/access/users`, AccessUsersSinglePage, {
+      query,
+      ...options,
+    });
   }
 }
 
@@ -82,26 +99,59 @@ export interface AccessUser {
 
 export interface UserListParams {
   /**
-   * Identifier
+   * Path param: Identifier
    */
   account_id: string;
+
+  /**
+   * Query param: The email of the user.
+   */
+  email?: string;
+
+  /**
+   * Query param: The name of the user.
+   */
+  name?: string;
+
+  /**
+   * Query param: Search for users by other listed query parameters.
+   */
+  search?: string;
 }
 
-export namespace Users {
-  export import AccessUser = UsersAPI.AccessUser;
-  export import AccessUsersSinglePage = UsersAPI.AccessUsersSinglePage;
-  export import UserListParams = UsersAPI.UserListParams;
-  export import ActiveSessions = ActiveSessionsAPI.ActiveSessions;
-  export import ActiveSessionListResponse = ActiveSessionsAPI.ActiveSessionListResponse;
-  export import ActiveSessionGetResponse = ActiveSessionsAPI.ActiveSessionGetResponse;
-  export import ActiveSessionListResponsesSinglePage = ActiveSessionsAPI.ActiveSessionListResponsesSinglePage;
-  export import ActiveSessionListParams = ActiveSessionsAPI.ActiveSessionListParams;
-  export import ActiveSessionGetParams = ActiveSessionsAPI.ActiveSessionGetParams;
-  export import LastSeenIdentity = LastSeenIdentityAPI.LastSeenIdentity;
-  export import Identity = LastSeenIdentityAPI.Identity;
-  export import LastSeenIdentityGetParams = LastSeenIdentityAPI.LastSeenIdentityGetParams;
-  export import FailedLogins = FailedLoginsAPI.FailedLogins;
-  export import FailedLoginListResponse = FailedLoginsAPI.FailedLoginListResponse;
-  export import FailedLoginListResponsesSinglePage = FailedLoginsAPI.FailedLoginListResponsesSinglePage;
-  export import FailedLoginListParams = FailedLoginsAPI.FailedLoginListParams;
+Users.AccessUsersSinglePage = AccessUsersSinglePage;
+Users.ActiveSessions = ActiveSessions;
+Users.ActiveSessionListResponsesSinglePage = ActiveSessionListResponsesSinglePage;
+Users.LastSeenIdentity = LastSeenIdentity;
+Users.FailedLogins = FailedLogins;
+Users.FailedLoginListResponsesSinglePage = FailedLoginListResponsesSinglePage;
+
+export declare namespace Users {
+  export {
+    type AccessUser as AccessUser,
+    AccessUsersSinglePage as AccessUsersSinglePage,
+    type UserListParams as UserListParams,
+  };
+
+  export {
+    ActiveSessions as ActiveSessions,
+    type ActiveSessionListResponse as ActiveSessionListResponse,
+    type ActiveSessionGetResponse as ActiveSessionGetResponse,
+    ActiveSessionListResponsesSinglePage as ActiveSessionListResponsesSinglePage,
+    type ActiveSessionListParams as ActiveSessionListParams,
+    type ActiveSessionGetParams as ActiveSessionGetParams,
+  };
+
+  export {
+    LastSeenIdentity as LastSeenIdentity,
+    type Identity as Identity,
+    type LastSeenIdentityGetParams as LastSeenIdentityGetParams,
+  };
+
+  export {
+    FailedLogins as FailedLogins,
+    type FailedLoginListResponse as FailedLoginListResponse,
+    FailedLoginListResponsesSinglePage as FailedLoginListResponsesSinglePage,
+    type FailedLoginListParams as FailedLoginListParams,
+  };
 }
diff --git a/src/resources/zero-trust/connectivity-settings.ts b/src/resources/zero-trust/connectivity-settings.ts
index 90c34b32cd..876ffd6cd8 100644
--- a/src/resources/zero-trust/connectivity-settings.ts
+++ b/src/resources/zero-trust/connectivity-settings.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ConnectivitySettingsAPI from './connectivity-settings';
 
 export class ConnectivitySettings extends APIResource {
   /**
@@ -86,9 +85,11 @@ export interface ConnectivitySettingGetParams {
   account_id: string;
 }
 
-export namespace ConnectivitySettings {
-  export import ConnectivitySettingEditResponse = ConnectivitySettingsAPI.ConnectivitySettingEditResponse;
-  export import ConnectivitySettingGetResponse = ConnectivitySettingsAPI.ConnectivitySettingGetResponse;
-  export import ConnectivitySettingEditParams = ConnectivitySettingsAPI.ConnectivitySettingEditParams;
-  export import ConnectivitySettingGetParams = ConnectivitySettingsAPI.ConnectivitySettingGetParams;
+export declare namespace ConnectivitySettings {
+  export {
+    type ConnectivitySettingEditResponse as ConnectivitySettingEditResponse,
+    type ConnectivitySettingGetResponse as ConnectivitySettingGetResponse,
+    type ConnectivitySettingEditParams as ConnectivitySettingEditParams,
+    type ConnectivitySettingGetParams as ConnectivitySettingGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/devices/devices.ts b/src/resources/zero-trust/devices/devices.ts
index 4916a0c75e..0e0b0888eb 100644
--- a/src/resources/zero-trust/devices/devices.ts
+++ b/src/resources/zero-trust/devices/devices.ts
@@ -2,20 +2,93 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as DevicesAPI from './devices';
 import * as DEXTestsAPI from './dex-tests';
+import {
+  DEXTest,
+  DEXTestCreateParams,
+  DEXTestDeleteParams,
+  DEXTestDeleteResponse,
+  DEXTestGetParams,
+  DEXTestListParams,
+  DEXTestUpdateParams,
+  DEXTests,
+  SchemaData,
+  SchemaHTTP,
+  SchemaHTTPSSinglePage,
+} from './dex-tests';
+import * as FleetStatusAPI from './fleet-status';
+import { FleetStatus, FleetStatusGetParams, FleetStatusGetResponse } from './fleet-status';
 import * as NetworksAPI from './networks';
+import {
+  DeviceNetwork,
+  DeviceNetworksSinglePage,
+  NetworkCreateParams,
+  NetworkDeleteParams,
+  NetworkDeleteResponse,
+  NetworkGetParams,
+  NetworkListParams,
+  NetworkUpdateParams,
+  Networks,
+} from './networks';
 import * as OverrideCodesAPI from './override-codes';
+import { OverrideCodeListParams, OverrideCodeListResponse, OverrideCodes } from './override-codes';
 import * as RevokeAPI from './revoke';
+import { Revoke, RevokeCreateParams, RevokeCreateResponse } from './revoke';
 import * as SettingsAPI from './settings';
+import {
+  DeviceSettings,
+  SettingEditParams,
+  SettingListParams,
+  SettingUpdateParams,
+  Settings,
+} from './settings';
 import * as UnrevokeAPI from './unrevoke';
+import { Unrevoke, UnrevokeCreateParams, UnrevokeCreateResponse } from './unrevoke';
 import * as PoliciesAPI from './policies/policies';
+import {
+  DevicePolicyCertificates,
+  FallbackDomain,
+  FallbackDomainPolicy,
+  Policies,
+  SettingsPolicy,
+  SplitTunnelExclude,
+  SplitTunnelInclude,
+} from './policies/policies';
 import * as PostureAPI from './posture/posture';
+import {
+  CarbonblackInput,
+  ClientCertificateInput,
+  CrowdstrikeInput,
+  DeviceInput,
+  DeviceMatch,
+  DevicePostureRule,
+  DevicePostureRulesSinglePage,
+  DiskEncryptionInput,
+  DomainJoinedInput,
+  FileInput,
+  FirewallInput,
+  IntuneInput,
+  KolideInput,
+  OSVersionInput,
+  Posture,
+  PostureCreateParams,
+  PostureDeleteParams,
+  PostureDeleteResponse,
+  PostureGetParams,
+  PostureListParams,
+  PostureUpdateParams,
+  SentineloneInput,
+  SentineloneS2sInput,
+  TaniumInput,
+  UniqueClientIDInput,
+  WorkspaceOneInput,
+} from './posture/posture';
 import { SinglePage } from '../../../pagination';
 
 export class Devices extends APIResource {
   dexTests: DEXTestsAPI.DEXTests = new DEXTestsAPI.DEXTests(this._client);
   networks: NetworksAPI.Networks = new NetworksAPI.Networks(this._client);
+  fleetStatus: FleetStatusAPI.FleetStatus = new FleetStatusAPI.FleetStatus(this._client);
   policies: PoliciesAPI.Policies = new PoliciesAPI.Policies(this._client);
   posture: PostureAPI.Posture = new PostureAPI.Posture(this._client);
   revoke: RevokeAPI.Revoke = new RevokeAPI.Revoke(this._client);
@@ -38,11 +111,11 @@ export class Devices extends APIResource {
     deviceId: string,
     params: DeviceGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<DeviceGetResponse> {
+  ): Core.APIPromise<DeviceGetResponse | null> {
     const { account_id } = params;
     return (
       this._client.get(`/accounts/${account_id}/devices/${deviceId}`, options) as Core.APIPromise<{
-        result: DeviceGetResponse;
+        result: DeviceGetResponse | null;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -165,7 +238,129 @@ export namespace Device {
   }
 }
 
-export type DeviceGetResponse = unknown | string | null;
+export interface DeviceGetResponse {
+  /**
+   * Device ID.
+   */
+  id?: string;
+
+  account?: DeviceGetResponse.Account;
+
+  /**
+   * When the device was created.
+   */
+  created?: string;
+
+  /**
+   * True if the device was deleted.
+   */
+  deleted?: boolean;
+
+  device_type?: string;
+
+  /**
+   * @deprecated
+   */
+  gateway_device_id?: string;
+
+  /**
+   * IPv4 or IPv6 address.
+   */
+  ip?: string;
+
+  /**
+   * The device's public key.
+   */
+  key?: string;
+
+  /**
+   * Type of the key.
+   */
+  key_type?: string;
+
+  /**
+   * When the device last connected to Cloudflare services.
+   */
+  last_seen?: string;
+
+  /**
+   * The device mac address.
+   */
+  mac_address?: string;
+
+  /**
+   * The device model name.
+   */
+  model?: string;
+
+  /**
+   * The device name.
+   */
+  name?: string;
+
+  /**
+   * The operating system version.
+   */
+  os_version?: string;
+
+  /**
+   * The device serial number.
+   */
+  serial_number?: string;
+
+  /**
+   * Type of the tunnel connection used.
+   */
+  tunnel_type?: string;
+
+  /**
+   * When the device was updated.
+   */
+  updated?: string;
+
+  user?: DeviceGetResponse.User;
+
+  /**
+   * The WARP client version.
+   */
+  version?: string;
+}
+
+export namespace DeviceGetResponse {
+  export interface Account {
+    /**
+     * @deprecated
+     */
+    id?: string;
+
+    /**
+     * @deprecated
+     */
+    account_type?: string;
+
+    /**
+     * The name of the enrolled account.
+     */
+    name?: string;
+  }
+
+  export interface User {
+    /**
+     * UUID
+     */
+    id?: string;
+
+    /**
+     * The contact email address of the user.
+     */
+    email?: string;
+
+    /**
+     * The enrolled device user's name.
+     */
+    name?: string;
+  }
+}
 
 export interface DeviceListParams {
   account_id: string;
@@ -175,78 +370,123 @@ export interface DeviceGetParams {
   account_id: string;
 }
 
-export namespace Devices {
-  export import Device = DevicesAPI.Device;
-  export import DeviceGetResponse = DevicesAPI.DeviceGetResponse;
-  export import DevicesSinglePage = DevicesAPI.DevicesSinglePage;
-  export import DeviceListParams = DevicesAPI.DeviceListParams;
-  export import DeviceGetParams = DevicesAPI.DeviceGetParams;
-  export import DEXTests = DEXTestsAPI.DEXTests;
-  export import DEXTest = DEXTestsAPI.DEXTest;
-  export import SchemaData = DEXTestsAPI.SchemaData;
-  export import SchemaHTTP = DEXTestsAPI.SchemaHTTP;
-  export import DEXTestDeleteResponse = DEXTestsAPI.DEXTestDeleteResponse;
-  export import SchemaHTTPSSinglePage = DEXTestsAPI.SchemaHTTPSSinglePage;
-  export import DEXTestCreateParams = DEXTestsAPI.DEXTestCreateParams;
-  export import DEXTestUpdateParams = DEXTestsAPI.DEXTestUpdateParams;
-  export import DEXTestListParams = DEXTestsAPI.DEXTestListParams;
-  export import DEXTestDeleteParams = DEXTestsAPI.DEXTestDeleteParams;
-  export import DEXTestGetParams = DEXTestsAPI.DEXTestGetParams;
-  export import Networks = NetworksAPI.Networks;
-  export import DeviceNetwork = NetworksAPI.DeviceNetwork;
-  export import NetworkDeleteResponse = NetworksAPI.NetworkDeleteResponse;
-  export import DeviceNetworksSinglePage = NetworksAPI.DeviceNetworksSinglePage;
-  export import NetworkCreateParams = NetworksAPI.NetworkCreateParams;
-  export import NetworkUpdateParams = NetworksAPI.NetworkUpdateParams;
-  export import NetworkListParams = NetworksAPI.NetworkListParams;
-  export import NetworkDeleteParams = NetworksAPI.NetworkDeleteParams;
-  export import NetworkGetParams = NetworksAPI.NetworkGetParams;
-  export import Policies = PoliciesAPI.Policies;
-  export import SettingsPolicy = PoliciesAPI.SettingsPolicy;
-  export import PolicyDeleteResponse = PoliciesAPI.PolicyDeleteResponse;
-  export import SettingsPoliciesSinglePage = PoliciesAPI.SettingsPoliciesSinglePage;
-  export import PolicyCreateParams = PoliciesAPI.PolicyCreateParams;
-  export import PolicyListParams = PoliciesAPI.PolicyListParams;
-  export import PolicyDeleteParams = PoliciesAPI.PolicyDeleteParams;
-  export import PolicyEditParams = PoliciesAPI.PolicyEditParams;
-  export import PolicyGetParams = PoliciesAPI.PolicyGetParams;
-  export import Posture = PostureAPI.Posture;
-  export import CarbonblackInput = PostureAPI.CarbonblackInput;
-  export import ClientCertificateInput = PostureAPI.ClientCertificateInput;
-  export import CrowdstrikeInput = PostureAPI.CrowdstrikeInput;
-  export import DeviceInput = PostureAPI.DeviceInput;
-  export import DeviceMatch = PostureAPI.DeviceMatch;
-  export import DevicePostureRule = PostureAPI.DevicePostureRule;
-  export import DiskEncryptionInput = PostureAPI.DiskEncryptionInput;
-  export import DomainJoinedInput = PostureAPI.DomainJoinedInput;
-  export import FileInput = PostureAPI.FileInput;
-  export import FirewallInput = PostureAPI.FirewallInput;
-  export import IntuneInput = PostureAPI.IntuneInput;
-  export import KolideInput = PostureAPI.KolideInput;
-  export import OSVersionInput = PostureAPI.OSVersionInput;
-  export import SentineloneInput = PostureAPI.SentineloneInput;
-  export import SentineloneS2sInput = PostureAPI.SentineloneS2sInput;
-  export import TaniumInput = PostureAPI.TaniumInput;
-  export import UniqueClientIDInput = PostureAPI.UniqueClientIDInput;
-  export import WorkspaceOneInput = PostureAPI.WorkspaceOneInput;
-  export import PostureDeleteResponse = PostureAPI.PostureDeleteResponse;
-  export import DevicePostureRulesSinglePage = PostureAPI.DevicePostureRulesSinglePage;
-  export import PostureCreateParams = PostureAPI.PostureCreateParams;
-  export import PostureUpdateParams = PostureAPI.PostureUpdateParams;
-  export import PostureListParams = PostureAPI.PostureListParams;
-  export import PostureDeleteParams = PostureAPI.PostureDeleteParams;
-  export import PostureGetParams = PostureAPI.PostureGetParams;
-  export import Revoke = RevokeAPI.Revoke;
-  export import RevokeCreateResponse = RevokeAPI.RevokeCreateResponse;
-  export import RevokeCreateParams = RevokeAPI.RevokeCreateParams;
-  export import Settings = SettingsAPI.Settings;
-  export import DeviceSettings = SettingsAPI.DeviceSettings;
-  export import SettingUpdateParams = SettingsAPI.SettingUpdateParams;
-  export import SettingListParams = SettingsAPI.SettingListParams;
-  export import Unrevoke = UnrevokeAPI.Unrevoke;
-  export import UnrevokeCreateResponse = UnrevokeAPI.UnrevokeCreateResponse;
-  export import UnrevokeCreateParams = UnrevokeAPI.UnrevokeCreateParams;
-  export import OverrideCodes = OverrideCodesAPI.OverrideCodes;
-  export import OverrideCodeListResponse = OverrideCodesAPI.OverrideCodeListResponse;
-  export import OverrideCodeListParams = OverrideCodesAPI.OverrideCodeListParams;
+Devices.DevicesSinglePage = DevicesSinglePage;
+Devices.DEXTests = DEXTests;
+Devices.SchemaHTTPSSinglePage = SchemaHTTPSSinglePage;
+Devices.Networks = Networks;
+Devices.DeviceNetworksSinglePage = DeviceNetworksSinglePage;
+Devices.FleetStatus = FleetStatus;
+Devices.Policies = Policies;
+Devices.Posture = Posture;
+Devices.DevicePostureRulesSinglePage = DevicePostureRulesSinglePage;
+Devices.Revoke = Revoke;
+Devices.Settings = Settings;
+Devices.Unrevoke = Unrevoke;
+Devices.OverrideCodes = OverrideCodes;
+
+export declare namespace Devices {
+  export {
+    type Device as Device,
+    type DeviceGetResponse as DeviceGetResponse,
+    DevicesSinglePage as DevicesSinglePage,
+    type DeviceListParams as DeviceListParams,
+    type DeviceGetParams as DeviceGetParams,
+  };
+
+  export {
+    DEXTests as DEXTests,
+    type DEXTest as DEXTest,
+    type SchemaData as SchemaData,
+    type SchemaHTTP as SchemaHTTP,
+    type DEXTestDeleteResponse as DEXTestDeleteResponse,
+    SchemaHTTPSSinglePage as SchemaHTTPSSinglePage,
+    type DEXTestCreateParams as DEXTestCreateParams,
+    type DEXTestUpdateParams as DEXTestUpdateParams,
+    type DEXTestListParams as DEXTestListParams,
+    type DEXTestDeleteParams as DEXTestDeleteParams,
+    type DEXTestGetParams as DEXTestGetParams,
+  };
+
+  export {
+    Networks as Networks,
+    type DeviceNetwork as DeviceNetwork,
+    type NetworkDeleteResponse as NetworkDeleteResponse,
+    DeviceNetworksSinglePage as DeviceNetworksSinglePage,
+    type NetworkCreateParams as NetworkCreateParams,
+    type NetworkUpdateParams as NetworkUpdateParams,
+    type NetworkListParams as NetworkListParams,
+    type NetworkDeleteParams as NetworkDeleteParams,
+    type NetworkGetParams as NetworkGetParams,
+  };
+
+  export {
+    FleetStatus as FleetStatus,
+    type FleetStatusGetResponse as FleetStatusGetResponse,
+    type FleetStatusGetParams as FleetStatusGetParams,
+  };
+
+  export {
+    Policies as Policies,
+    type DevicePolicyCertificates as DevicePolicyCertificates,
+    type FallbackDomain as FallbackDomain,
+    type FallbackDomainPolicy as FallbackDomainPolicy,
+    type SettingsPolicy as SettingsPolicy,
+    type SplitTunnelExclude as SplitTunnelExclude,
+    type SplitTunnelInclude as SplitTunnelInclude,
+  };
+
+  export {
+    Posture as Posture,
+    type CarbonblackInput as CarbonblackInput,
+    type ClientCertificateInput as ClientCertificateInput,
+    type CrowdstrikeInput as CrowdstrikeInput,
+    type DeviceInput as DeviceInput,
+    type DeviceMatch as DeviceMatch,
+    type DevicePostureRule as DevicePostureRule,
+    type DiskEncryptionInput as DiskEncryptionInput,
+    type DomainJoinedInput as DomainJoinedInput,
+    type FileInput as FileInput,
+    type FirewallInput as FirewallInput,
+    type IntuneInput as IntuneInput,
+    type KolideInput as KolideInput,
+    type OSVersionInput as OSVersionInput,
+    type SentineloneInput as SentineloneInput,
+    type SentineloneS2sInput as SentineloneS2sInput,
+    type TaniumInput as TaniumInput,
+    type UniqueClientIDInput as UniqueClientIDInput,
+    type WorkspaceOneInput as WorkspaceOneInput,
+    type PostureDeleteResponse as PostureDeleteResponse,
+    DevicePostureRulesSinglePage as DevicePostureRulesSinglePage,
+    type PostureCreateParams as PostureCreateParams,
+    type PostureUpdateParams as PostureUpdateParams,
+    type PostureListParams as PostureListParams,
+    type PostureDeleteParams as PostureDeleteParams,
+    type PostureGetParams as PostureGetParams,
+  };
+
+  export {
+    Revoke as Revoke,
+    type RevokeCreateResponse as RevokeCreateResponse,
+    type RevokeCreateParams as RevokeCreateParams,
+  };
+
+  export {
+    Settings as Settings,
+    type DeviceSettings as DeviceSettings,
+    type SettingUpdateParams as SettingUpdateParams,
+    type SettingListParams as SettingListParams,
+    type SettingEditParams as SettingEditParams,
+  };
+
+  export {
+    Unrevoke as Unrevoke,
+    type UnrevokeCreateResponse as UnrevokeCreateResponse,
+    type UnrevokeCreateParams as UnrevokeCreateParams,
+  };
+
+  export {
+    OverrideCodes as OverrideCodes,
+    type OverrideCodeListResponse as OverrideCodeListResponse,
+    type OverrideCodeListParams as OverrideCodeListParams,
+  };
 }
diff --git a/src/resources/zero-trust/devices/dex-tests.ts b/src/resources/zero-trust/devices/dex-tests.ts
index efe80b2c0d..1f7e2ddd2d 100644
--- a/src/resources/zero-trust/devices/dex-tests.ts
+++ b/src/resources/zero-trust/devices/dex-tests.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as DEXTestsAPI from './dex-tests';
 import { SinglePage } from '../../../pagination';
 
 export class DEXTests extends APIResource {
@@ -59,13 +58,13 @@ export class DEXTests extends APIResource {
     dexTestId: string,
     params: DEXTestDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<DEXTestDeleteResponse | null> {
+  ): Core.APIPromise<DEXTestDeleteResponse> {
     const { account_id } = params;
     return (
       this._client.delete(
         `/accounts/${account_id}/devices/dex_tests/${dexTestId}`,
         options,
-      ) as Core.APIPromise<{ result: DEXTestDeleteResponse | null }>
+      ) as Core.APIPromise<{ result: DEXTestDeleteResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -121,6 +120,11 @@ export interface DEXTest {
   target_policies?: Array<DEXTest.TargetPolicy>;
 
   targeted?: boolean;
+
+  /**
+   * The unique identifier for the test.
+   */
+  test_id?: string;
 }
 
 export namespace DEXTest {
@@ -217,6 +221,11 @@ export interface SchemaHTTP {
   target_policies?: Array<SchemaHTTP.TargetPolicy>;
 
   targeted?: boolean;
+
+  /**
+   * The unique identifier for the test.
+   */
+  test_id?: string;
 }
 
 export namespace SchemaHTTP {
@@ -238,7 +247,9 @@ export namespace SchemaHTTP {
   }
 }
 
-export type DEXTestDeleteResponse = Array<SchemaHTTP>;
+export interface DEXTestDeleteResponse {
+  dex_tests?: Array<SchemaHTTP>;
+}
 
 export interface DEXTestCreateParams {
   /**
@@ -376,15 +387,19 @@ export interface DEXTestGetParams {
   account_id: string;
 }
 
-export namespace DEXTests {
-  export import DEXTest = DEXTestsAPI.DEXTest;
-  export import SchemaData = DEXTestsAPI.SchemaData;
-  export import SchemaHTTP = DEXTestsAPI.SchemaHTTP;
-  export import DEXTestDeleteResponse = DEXTestsAPI.DEXTestDeleteResponse;
-  export import SchemaHTTPSSinglePage = DEXTestsAPI.SchemaHTTPSSinglePage;
-  export import DEXTestCreateParams = DEXTestsAPI.DEXTestCreateParams;
-  export import DEXTestUpdateParams = DEXTestsAPI.DEXTestUpdateParams;
-  export import DEXTestListParams = DEXTestsAPI.DEXTestListParams;
-  export import DEXTestDeleteParams = DEXTestsAPI.DEXTestDeleteParams;
-  export import DEXTestGetParams = DEXTestsAPI.DEXTestGetParams;
+DEXTests.SchemaHTTPSSinglePage = SchemaHTTPSSinglePage;
+
+export declare namespace DEXTests {
+  export {
+    type DEXTest as DEXTest,
+    type SchemaData as SchemaData,
+    type SchemaHTTP as SchemaHTTP,
+    type DEXTestDeleteResponse as DEXTestDeleteResponse,
+    SchemaHTTPSSinglePage as SchemaHTTPSSinglePage,
+    type DEXTestCreateParams as DEXTestCreateParams,
+    type DEXTestUpdateParams as DEXTestUpdateParams,
+    type DEXTestListParams as DEXTestListParams,
+    type DEXTestDeleteParams as DEXTestDeleteParams,
+    type DEXTestGetParams as DEXTestGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/devices/fleet-status.ts b/src/resources/zero-trust/devices/fleet-status.ts
new file mode 100644
index 0000000000..a4e14bf711
--- /dev/null
+++ b/src/resources/zero-trust/devices/fleet-status.ts
@@ -0,0 +1,326 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class FleetStatus extends APIResource {
+  /**
+   * Get the live status of a latest device given device_id from the device_state
+   * table
+   */
+  get(
+    deviceId: string,
+    params: FleetStatusGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FleetStatusGetResponse> {
+    const { account_id, ...query } = params;
+    return this._client.get(`/accounts/${account_id}/dex/devices/${deviceId}/fleet-status/live`, {
+      query,
+      ...options,
+    });
+  }
+}
+
+export interface FleetStatusGetResponse {
+  /**
+   * Cloudflare colo
+   */
+  colo: string;
+
+  /**
+   * Device identifier (UUID v4)
+   */
+  deviceId: string;
+
+  /**
+   * The mode under which the WARP client is run
+   */
+  mode: string;
+
+  /**
+   * Operating system
+   */
+  platform: string;
+
+  /**
+   * Network status
+   */
+  status: string;
+
+  /**
+   * Timestamp in ISO format
+   */
+  timestamp: string;
+
+  /**
+   * WARP client version
+   */
+  version: string;
+
+  alwaysOn?: boolean | null;
+
+  batteryCharging?: boolean | null;
+
+  batteryCycles?: number | null;
+
+  batteryPct?: number | null;
+
+  connectionType?: string | null;
+
+  cpuPct?: number | null;
+
+  cpuPctByApp?: Array<Array<FleetStatusGetResponse.CPUPctByApp>> | null;
+
+  deviceIpv4?: FleetStatusGetResponse.DeviceIPV4;
+
+  deviceIpv6?: FleetStatusGetResponse.DeviceIPV6;
+
+  /**
+   * Device identifier (human readable)
+   */
+  deviceName?: string;
+
+  diskReadBps?: number | null;
+
+  diskUsagePct?: number | null;
+
+  diskWriteBps?: number | null;
+
+  dohSubdomain?: string | null;
+
+  estimatedLossPct?: number | null;
+
+  firewallEnabled?: boolean | null;
+
+  gatewayIpv4?: FleetStatusGetResponse.GatewayIPV4;
+
+  gatewayIpv6?: FleetStatusGetResponse.GatewayIPV6;
+
+  handshakeLatencyMs?: number | null;
+
+  ispIpv4?: FleetStatusGetResponse.ISPIPV4;
+
+  ispIpv6?: FleetStatusGetResponse.ISPIPV6;
+
+  metal?: string | null;
+
+  networkRcvdBps?: number | null;
+
+  networkSentBps?: number | null;
+
+  networkSsid?: string | null;
+
+  /**
+   * User contact email address
+   */
+  personEmail?: string;
+
+  ramAvailableKb?: number | null;
+
+  ramUsedPct?: number | null;
+
+  ramUsedPctByApp?: Array<Array<FleetStatusGetResponse.RamUsedPctByApp>> | null;
+
+  switchLocked?: boolean | null;
+
+  wifiStrengthDbm?: number | null;
+}
+
+export namespace FleetStatusGetResponse {
+  export interface CPUPctByApp {
+    cpu_pct?: number;
+
+    name?: string;
+  }
+
+  export interface DeviceIPV4 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: DeviceIPV4.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace DeviceIPV4 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface DeviceIPV6 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: DeviceIPV6.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace DeviceIPV6 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface GatewayIPV4 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: GatewayIPV4.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace GatewayIPV4 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface GatewayIPV6 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: GatewayIPV6.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace GatewayIPV6 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface ISPIPV4 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: ISPIPV4.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace ISPIPV4 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface ISPIPV6 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: ISPIPV6.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace ISPIPV6 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface RamUsedPctByApp {
+    name?: string;
+
+    ram_used_pct?: number;
+  }
+}
+
+export interface FleetStatusGetParams {
+  /**
+   * Path param: Unique identifier for account
+   */
+  account_id: string;
+
+  /**
+   * Query param: Number of minutes before current time
+   */
+  since_minutes: number;
+
+  /**
+   * Query param: List of data centers to filter results
+   */
+  colo?: string;
+
+  /**
+   * Query param: Number of minutes before current time
+   */
+  time_now?: string;
+}
+
+export declare namespace FleetStatus {
+  export {
+    type FleetStatusGetResponse as FleetStatusGetResponse,
+    type FleetStatusGetParams as FleetStatusGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/devices/index.ts b/src/resources/zero-trust/devices/index.ts
index 65be863edb..9179033d74 100644
--- a/src/resources/zero-trust/devices/index.ts
+++ b/src/resources/zero-trust/devices/index.ts
@@ -1,77 +1,83 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  CarbonblackInput,
-  ClientCertificateInput,
-  CrowdstrikeInput,
-  DeviceInput,
-  DeviceMatch,
-  DevicePostureRule,
-  DiskEncryptionInput,
-  DomainJoinedInput,
-  FileInput,
-  FirewallInput,
-  IntuneInput,
-  KolideInput,
-  OSVersionInput,
-  SentineloneInput,
-  SentineloneS2sInput,
-  TaniumInput,
-  UniqueClientIDInput,
-  WorkspaceOneInput,
-  PostureDeleteResponse,
-  PostureCreateParams,
-  PostureUpdateParams,
-  PostureListParams,
-  PostureDeleteParams,
-  PostureGetParams,
+  DeviceNetworksSinglePage,
+  Networks,
+  type DeviceNetwork,
+  type NetworkDeleteResponse,
+  type NetworkCreateParams,
+  type NetworkUpdateParams,
+  type NetworkListParams,
+  type NetworkDeleteParams,
+  type NetworkGetParams,
+} from './networks';
+export {
   DevicePostureRulesSinglePage,
   Posture,
+  type CarbonblackInput,
+  type ClientCertificateInput,
+  type CrowdstrikeInput,
+  type DeviceInput,
+  type DeviceMatch,
+  type DevicePostureRule,
+  type DiskEncryptionInput,
+  type DomainJoinedInput,
+  type FileInput,
+  type FirewallInput,
+  type IntuneInput,
+  type KolideInput,
+  type OSVersionInput,
+  type SentineloneInput,
+  type SentineloneS2sInput,
+  type TaniumInput,
+  type UniqueClientIDInput,
+  type WorkspaceOneInput,
+  type PostureDeleteResponse,
+  type PostureCreateParams,
+  type PostureUpdateParams,
+  type PostureListParams,
+  type PostureDeleteParams,
+  type PostureGetParams,
 } from './posture/index';
 export {
-  DEXTest,
-  SchemaData,
-  SchemaHTTP,
-  DEXTestDeleteResponse,
-  DEXTestCreateParams,
-  DEXTestUpdateParams,
-  DEXTestListParams,
-  DEXTestDeleteParams,
-  DEXTestGetParams,
-  SchemaHTTPSSinglePage,
-  DEXTests,
-} from './dex-tests';
-export {
-  Device,
-  DeviceGetResponse,
-  DeviceListParams,
-  DeviceGetParams,
   DevicesSinglePage,
   Devices,
+  type Device,
+  type DeviceGetResponse,
+  type DeviceListParams,
+  type DeviceGetParams,
 } from './devices';
+export { FleetStatus, type FleetStatusGetResponse, type FleetStatusGetParams } from './fleet-status';
+export { OverrideCodes, type OverrideCodeListResponse, type OverrideCodeListParams } from './override-codes';
+export { Revoke, type RevokeCreateResponse, type RevokeCreateParams } from './revoke';
 export {
-  DeviceNetwork,
-  NetworkDeleteResponse,
-  NetworkCreateParams,
-  NetworkUpdateParams,
-  NetworkListParams,
-  NetworkDeleteParams,
-  NetworkGetParams,
-  DeviceNetworksSinglePage,
-  Networks,
-} from './networks';
-export { DeviceSettings, SettingUpdateParams, SettingListParams, Settings } from './settings';
-export { OverrideCodeListResponse, OverrideCodeListParams, OverrideCodes } from './override-codes';
-export { RevokeCreateResponse, RevokeCreateParams, Revoke } from './revoke';
+  SchemaHTTPSSinglePage,
+  DEXTests,
+  type DEXTest,
+  type SchemaData,
+  type SchemaHTTP,
+  type DEXTestDeleteResponse,
+  type DEXTestCreateParams,
+  type DEXTestUpdateParams,
+  type DEXTestListParams,
+  type DEXTestDeleteParams,
+  type DEXTestGetParams,
+} from './dex-tests';
+export {
+  Settings,
+  type DeviceSettings,
+  type SettingUpdateParams,
+  type SettingListParams,
+  type SettingEditParams,
+} from './settings';
 export {
-  SettingsPolicy,
-  PolicyDeleteResponse,
-  PolicyCreateParams,
-  PolicyListParams,
-  PolicyDeleteParams,
-  PolicyEditParams,
-  PolicyGetParams,
   SettingsPoliciesSinglePage,
   Policies,
+  type DevicePolicyCertificates,
+  type FallbackDomain,
+  type FallbackDomainPolicy,
+  type SettingsPolicy,
+  type SplitTunnelExclude,
+  type SplitTunnelInclude,
 } from './policies/index';
-export { UnrevokeCreateResponse, UnrevokeCreateParams, Unrevoke } from './unrevoke';
+export { Unrevoke, type UnrevokeCreateResponse, type UnrevokeCreateParams } from './unrevoke';
diff --git a/src/resources/zero-trust/devices/networks.ts b/src/resources/zero-trust/devices/networks.ts
index b87ed15400..325fc60a84 100644
--- a/src/resources/zero-trust/devices/networks.ts
+++ b/src/resources/zero-trust/devices/networks.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as NetworksAPI from './networks';
 import { SinglePage } from '../../../pagination';
 
 export class Networks extends APIResource {
@@ -140,8 +139,7 @@ export interface NetworkCreateParams {
   account_id: string;
 
   /**
-   * Body param: The configuration object containing information for the WARP client
-   * to detect the managed network.
+   * Body param:
    */
   config: NetworkCreateParams.Config;
 
@@ -157,10 +155,6 @@ export interface NetworkCreateParams {
 }
 
 export namespace NetworkCreateParams {
-  /**
-   * The configuration object containing information for the WARP client to detect
-   * the managed network.
-   */
   export interface Config {
     /**
      * A network address of the form "host:port" that the WARP client will use to
@@ -184,8 +178,7 @@ export interface NetworkUpdateParams {
   account_id: string;
 
   /**
-   * Body param: The configuration object containing information for the WARP client
-   * to detect the managed network.
+   * Body param:
    */
   config?: NetworkUpdateParams.Config;
 
@@ -201,10 +194,6 @@ export interface NetworkUpdateParams {
 }
 
 export namespace NetworkUpdateParams {
-  /**
-   * The configuration object containing information for the WARP client to detect
-   * the managed network.
-   */
   export interface Config {
     /**
      * A network address of the form "host:port" that the WARP client will use to
@@ -233,13 +222,17 @@ export interface NetworkGetParams {
   account_id: string;
 }
 
-export namespace Networks {
-  export import DeviceNetwork = NetworksAPI.DeviceNetwork;
-  export import NetworkDeleteResponse = NetworksAPI.NetworkDeleteResponse;
-  export import DeviceNetworksSinglePage = NetworksAPI.DeviceNetworksSinglePage;
-  export import NetworkCreateParams = NetworksAPI.NetworkCreateParams;
-  export import NetworkUpdateParams = NetworksAPI.NetworkUpdateParams;
-  export import NetworkListParams = NetworksAPI.NetworkListParams;
-  export import NetworkDeleteParams = NetworksAPI.NetworkDeleteParams;
-  export import NetworkGetParams = NetworksAPI.NetworkGetParams;
+Networks.DeviceNetworksSinglePage = DeviceNetworksSinglePage;
+
+export declare namespace Networks {
+  export {
+    type DeviceNetwork as DeviceNetwork,
+    type NetworkDeleteResponse as NetworkDeleteResponse,
+    DeviceNetworksSinglePage as DeviceNetworksSinglePage,
+    type NetworkCreateParams as NetworkCreateParams,
+    type NetworkUpdateParams as NetworkUpdateParams,
+    type NetworkListParams as NetworkListParams,
+    type NetworkDeleteParams as NetworkDeleteParams,
+    type NetworkGetParams as NetworkGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/devices/override-codes.ts b/src/resources/zero-trust/devices/override-codes.ts
index 654cec7da9..21d151afb2 100644
--- a/src/resources/zero-trust/devices/override-codes.ts
+++ b/src/resources/zero-trust/devices/override-codes.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as OverrideCodesAPI from './override-codes';
 
 export class OverrideCodes extends APIResource {
   /**
@@ -61,7 +60,9 @@ export interface OverrideCodeListParams {
   account_id: string;
 }
 
-export namespace OverrideCodes {
-  export import OverrideCodeListResponse = OverrideCodesAPI.OverrideCodeListResponse;
-  export import OverrideCodeListParams = OverrideCodesAPI.OverrideCodeListParams;
+export declare namespace OverrideCodes {
+  export {
+    type OverrideCodeListResponse as OverrideCodeListResponse,
+    type OverrideCodeListParams as OverrideCodeListParams,
+  };
 }
diff --git a/src/resources/zero-trust/devices/policies/custom/custom.ts b/src/resources/zero-trust/devices/policies/custom/custom.ts
new file mode 100644
index 0000000000..1b6812e033
--- /dev/null
+++ b/src/resources/zero-trust/devices/policies/custom/custom.ts
@@ -0,0 +1,400 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+import * as PoliciesAPI from '../policies';
+import { SettingsPoliciesSinglePage } from '../policies';
+import * as ExcludesAPI from './excludes';
+import {
+  ExcludeGetParams,
+  ExcludeGetResponse,
+  ExcludeUpdateParams,
+  ExcludeUpdateResponse,
+  Excludes,
+} from './excludes';
+import * as FallbackDomainsAPI from './fallback-domains';
+import {
+  FallbackDomainGetParams,
+  FallbackDomainGetResponse,
+  FallbackDomainUpdateParams,
+  FallbackDomainUpdateResponse,
+  FallbackDomains,
+} from './fallback-domains';
+import * as IncludesAPI from './includes';
+import {
+  IncludeGetParams,
+  IncludeGetResponse,
+  IncludeUpdateParams,
+  IncludeUpdateResponse,
+  Includes,
+} from './includes';
+
+export class Custom extends APIResource {
+  excludes: ExcludesAPI.Excludes = new ExcludesAPI.Excludes(this._client);
+  includes: IncludesAPI.Includes = new IncludesAPI.Includes(this._client);
+  fallbackDomains: FallbackDomainsAPI.FallbackDomains = new FallbackDomainsAPI.FallbackDomains(this._client);
+
+  /**
+   * Creates a device settings profile to be applied to certain devices matching the
+   * criteria.
+   */
+  create(
+    params: CustomCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PoliciesAPI.SettingsPolicy | null> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/devices/policy`, { body, ...options }) as Core.APIPromise<{
+        result: PoliciesAPI.SettingsPolicy | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches a list of the device settings profiles for an account.
+   */
+  list(
+    params: CustomListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<SettingsPoliciesSinglePage, PoliciesAPI.SettingsPolicy> {
+    const { account_id } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/devices/policies`,
+      SettingsPoliciesSinglePage,
+      options,
+    );
+  }
+
+  /**
+   * Deletes a device settings profile and fetches a list of the remaining profiles
+   * for an account.
+   */
+  delete(
+    policyId: string,
+    params: CustomDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CustomDeleteResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}/devices/policy/${policyId}`, options) as Core.APIPromise<{
+        result: CustomDeleteResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Updates a configured device settings profile.
+   */
+  edit(
+    policyId: string,
+    params: CustomEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PoliciesAPI.SettingsPolicy | null> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/devices/policy/${policyId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: PoliciesAPI.SettingsPolicy | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches a device settings profile by ID.
+   */
+  get(
+    policyId: string,
+    params: CustomGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<PoliciesAPI.SettingsPolicy | null> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/devices/policy/${policyId}`, options) as Core.APIPromise<{
+        result: PoliciesAPI.SettingsPolicy | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type CustomDeleteResponse = Array<PoliciesAPI.SettingsPolicy>;
+
+export interface CustomCreateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param: The wirefilter expression to match devices.
+   */
+  match: string;
+
+  /**
+   * Body param: The name of the device settings profile.
+   */
+  name: string;
+
+  /**
+   * Body param: The precedence of the policy. Lower values indicate higher
+   * precedence. Policies will be evaluated in ascending order of this field.
+   */
+  precedence: number;
+
+  /**
+   * Body param: Whether to allow the user to switch WARP between modes.
+   */
+  allow_mode_switch?: boolean;
+
+  /**
+   * Body param: Whether to receive update notifications when a new version of the
+   * client is available.
+   */
+  allow_updates?: boolean;
+
+  /**
+   * Body param: Whether to allow devices to leave the organization.
+   */
+  allowed_to_leave?: boolean;
+
+  /**
+   * Body param: The amount of time in minutes to reconnect after having been
+   * disabled.
+   */
+  auto_connect?: number;
+
+  /**
+   * Body param: Turn on the captive portal after the specified amount of time.
+   */
+  captive_portal?: number;
+
+  /**
+   * Body param: A description of the policy.
+   */
+  description?: string;
+
+  /**
+   * Body param: If the `dns_server` field of a fallback domain is not present, the
+   * client will fall back to a best guess of the default/system DNS resolvers unless
+   * this policy option is set to `true`.
+   */
+  disable_auto_fallback?: boolean;
+
+  /**
+   * Body param: Whether the policy will be applied to matching devices.
+   */
+  enabled?: boolean;
+
+  /**
+   * Body param: Whether to add Microsoft IPs to Split Tunnel exclusions.
+   */
+  exclude_office_ips?: boolean;
+
+  /**
+   * Body param: The amount of time in minutes a user is allowed access to their LAN.
+   * A value of 0 will allow LAN access until the next WARP reconnection, such as a
+   * reboot or a laptop waking from sleep. Note that this field is omitted from the
+   * response if null or unset.
+   */
+  lan_allow_minutes?: number;
+
+  /**
+   * Body param: The size of the subnet for the local access network. Note that this
+   * field is omitted from the response if null or unset.
+   */
+  lan_allow_subnet_size?: number;
+
+  /**
+   * Body param:
+   */
+  service_mode_v2?: CustomCreateParams.ServiceModeV2;
+
+  /**
+   * Body param: The URL to launch when the Send Feedback button is clicked.
+   */
+  support_url?: string;
+
+  /**
+   * Body param: Whether to allow the user to turn off the WARP switch and disconnect
+   * the client.
+   */
+  switch_locked?: boolean;
+
+  /**
+   * Body param: Determines which tunnel protocol to use.
+   */
+  tunnel_protocol?: string;
+}
+
+export namespace CustomCreateParams {
+  export interface ServiceModeV2 {
+    /**
+     * The mode to run the WARP client under.
+     */
+    mode?: string;
+
+    /**
+     * The port number when used with proxy mode.
+     */
+    port?: number;
+  }
+}
+
+export interface CustomListParams {
+  account_id: string;
+}
+
+export interface CustomDeleteParams {
+  account_id: string;
+}
+
+export interface CustomEditParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param: Whether to allow the user to switch WARP between modes.
+   */
+  allow_mode_switch?: boolean;
+
+  /**
+   * Body param: Whether to receive update notifications when a new version of the
+   * client is available.
+   */
+  allow_updates?: boolean;
+
+  /**
+   * Body param: Whether to allow devices to leave the organization.
+   */
+  allowed_to_leave?: boolean;
+
+  /**
+   * Body param: The amount of time in minutes to reconnect after having been
+   * disabled.
+   */
+  auto_connect?: number;
+
+  /**
+   * Body param: Turn on the captive portal after the specified amount of time.
+   */
+  captive_portal?: number;
+
+  /**
+   * Body param: A description of the policy.
+   */
+  description?: string;
+
+  /**
+   * Body param: If the `dns_server` field of a fallback domain is not present, the
+   * client will fall back to a best guess of the default/system DNS resolvers unless
+   * this policy option is set to `true`.
+   */
+  disable_auto_fallback?: boolean;
+
+  /**
+   * Body param: Whether the policy will be applied to matching devices.
+   */
+  enabled?: boolean;
+
+  /**
+   * Body param: Whether to add Microsoft IPs to Split Tunnel exclusions.
+   */
+  exclude_office_ips?: boolean;
+
+  /**
+   * Body param: The wirefilter expression to match devices.
+   */
+  match?: string;
+
+  /**
+   * Body param: The name of the device settings profile.
+   */
+  name?: string;
+
+  /**
+   * Body param: The precedence of the policy. Lower values indicate higher
+   * precedence. Policies will be evaluated in ascending order of this field.
+   */
+  precedence?: number;
+
+  /**
+   * Body param:
+   */
+  service_mode_v2?: CustomEditParams.ServiceModeV2;
+
+  /**
+   * Body param: The URL to launch when the Send Feedback button is clicked.
+   */
+  support_url?: string;
+
+  /**
+   * Body param: Whether to allow the user to turn off the WARP switch and disconnect
+   * the client.
+   */
+  switch_locked?: boolean;
+
+  /**
+   * Body param: Determines which tunnel protocol to use.
+   */
+  tunnel_protocol?: string;
+}
+
+export namespace CustomEditParams {
+  export interface ServiceModeV2 {
+    /**
+     * The mode to run the WARP client under.
+     */
+    mode?: string;
+
+    /**
+     * The port number when used with proxy mode.
+     */
+    port?: number;
+  }
+}
+
+export interface CustomGetParams {
+  account_id: string;
+}
+
+Custom.Excludes = Excludes;
+Custom.Includes = Includes;
+Custom.FallbackDomains = FallbackDomains;
+
+export declare namespace Custom {
+  export {
+    type CustomDeleteResponse as CustomDeleteResponse,
+    type CustomCreateParams as CustomCreateParams,
+    type CustomListParams as CustomListParams,
+    type CustomDeleteParams as CustomDeleteParams,
+    type CustomEditParams as CustomEditParams,
+    type CustomGetParams as CustomGetParams,
+  };
+
+  export {
+    Excludes as Excludes,
+    type ExcludeUpdateResponse as ExcludeUpdateResponse,
+    type ExcludeGetResponse as ExcludeGetResponse,
+    type ExcludeUpdateParams as ExcludeUpdateParams,
+    type ExcludeGetParams as ExcludeGetParams,
+  };
+
+  export {
+    Includes as Includes,
+    type IncludeUpdateResponse as IncludeUpdateResponse,
+    type IncludeGetResponse as IncludeGetResponse,
+    type IncludeUpdateParams as IncludeUpdateParams,
+    type IncludeGetParams as IncludeGetParams,
+  };
+
+  export {
+    FallbackDomains as FallbackDomains,
+    type FallbackDomainUpdateResponse as FallbackDomainUpdateResponse,
+    type FallbackDomainGetResponse as FallbackDomainGetResponse,
+    type FallbackDomainUpdateParams as FallbackDomainUpdateParams,
+    type FallbackDomainGetParams as FallbackDomainGetParams,
+  };
+}
+
+export { SettingsPoliciesSinglePage };
diff --git a/src/resources/zero-trust/devices/policies/custom/excludes.ts b/src/resources/zero-trust/devices/policies/custom/excludes.ts
new file mode 100644
index 0000000000..08344bf610
--- /dev/null
+++ b/src/resources/zero-trust/devices/policies/custom/excludes.ts
@@ -0,0 +1,72 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+import * as PoliciesAPI from '../policies';
+
+export class Excludes extends APIResource {
+  /**
+   * Sets the list of routes excluded from the WARP client's tunnel for a specific
+   * device settings profile.
+   */
+  update(
+    policyId: string,
+    params: ExcludeUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ExcludeUpdateResponse | null> {
+    const { account_id, body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/devices/policy/${policyId}/exclude`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: ExcludeUpdateResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches the list of routes excluded from the WARP client's tunnel for a specific
+   * device settings profile.
+   */
+  get(
+    policyId: string,
+    params: ExcludeGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ExcludeGetResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/devices/policy/${policyId}/exclude`,
+        options,
+      ) as Core.APIPromise<{ result: ExcludeGetResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type ExcludeUpdateResponse = Array<PoliciesAPI.SplitTunnelExclude>;
+
+export type ExcludeGetResponse = Array<PoliciesAPI.SplitTunnelExclude>;
+
+export interface ExcludeUpdateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: Array<PoliciesAPI.SplitTunnelExcludeParam>;
+}
+
+export interface ExcludeGetParams {
+  account_id: string;
+}
+
+export declare namespace Excludes {
+  export {
+    type ExcludeUpdateResponse as ExcludeUpdateResponse,
+    type ExcludeGetResponse as ExcludeGetResponse,
+    type ExcludeUpdateParams as ExcludeUpdateParams,
+    type ExcludeGetParams as ExcludeGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/devices/policies/custom/fallback-domains.ts b/src/resources/zero-trust/devices/policies/custom/fallback-domains.ts
new file mode 100644
index 0000000000..cc91069714
--- /dev/null
+++ b/src/resources/zero-trust/devices/policies/custom/fallback-domains.ts
@@ -0,0 +1,74 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+import * as PoliciesAPI from '../policies';
+
+export class FallbackDomains extends APIResource {
+  /**
+   * Sets the list of domains to bypass Gateway DNS resolution. These domains will
+   * use the specified local DNS resolver instead. This will only apply to the
+   * specified device settings profile.
+   */
+  update(
+    policyId: string,
+    params: FallbackDomainUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FallbackDomainUpdateResponse | null> {
+    const { account_id, domains } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/devices/policy/${policyId}/fallback_domains`, {
+        body: domains,
+        ...options,
+      }) as Core.APIPromise<{ result: FallbackDomainUpdateResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches the list of domains to bypass Gateway DNS resolution from a specified
+   * device settings profile. These domains will use the specified local DNS resolver
+   * instead.
+   */
+  get(
+    policyId: string,
+    params: FallbackDomainGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FallbackDomainGetResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/devices/policy/${policyId}/fallback_domains`,
+        options,
+      ) as Core.APIPromise<{ result: FallbackDomainGetResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type FallbackDomainUpdateResponse = Array<PoliciesAPI.FallbackDomain>;
+
+export type FallbackDomainGetResponse = Array<PoliciesAPI.FallbackDomain>;
+
+export interface FallbackDomainUpdateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  domains: Array<PoliciesAPI.FallbackDomainParam>;
+}
+
+export interface FallbackDomainGetParams {
+  account_id: string;
+}
+
+export declare namespace FallbackDomains {
+  export {
+    type FallbackDomainUpdateResponse as FallbackDomainUpdateResponse,
+    type FallbackDomainGetResponse as FallbackDomainGetResponse,
+    type FallbackDomainUpdateParams as FallbackDomainUpdateParams,
+    type FallbackDomainGetParams as FallbackDomainGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/devices/policies/custom/includes.ts b/src/resources/zero-trust/devices/policies/custom/includes.ts
new file mode 100644
index 0000000000..7e8e98eca2
--- /dev/null
+++ b/src/resources/zero-trust/devices/policies/custom/includes.ts
@@ -0,0 +1,72 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+import * as PoliciesAPI from '../policies';
+
+export class Includes extends APIResource {
+  /**
+   * Sets the list of routes included in the WARP client's tunnel for a specific
+   * device settings profile.
+   */
+  update(
+    policyId: string,
+    params: IncludeUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<IncludeUpdateResponse | null> {
+    const { account_id, body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/devices/policy/${policyId}/include`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: IncludeUpdateResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches the list of routes included in the WARP client's tunnel for a specific
+   * device settings profile.
+   */
+  get(
+    policyId: string,
+    params: IncludeGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<IncludeGetResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/devices/policy/${policyId}/include`,
+        options,
+      ) as Core.APIPromise<{ result: IncludeGetResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type IncludeUpdateResponse = Array<PoliciesAPI.SplitTunnelInclude>;
+
+export type IncludeGetResponse = Array<PoliciesAPI.SplitTunnelInclude>;
+
+export interface IncludeUpdateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: Array<PoliciesAPI.SplitTunnelIncludeParam>;
+}
+
+export interface IncludeGetParams {
+  account_id: string;
+}
+
+export declare namespace Includes {
+  export {
+    type IncludeUpdateResponse as IncludeUpdateResponse,
+    type IncludeGetResponse as IncludeGetResponse,
+    type IncludeUpdateParams as IncludeUpdateParams,
+    type IncludeGetParams as IncludeGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/devices/policies/custom/index.ts b/src/resources/zero-trust/devices/policies/custom/index.ts
new file mode 100644
index 0000000000..7a7e47f9d7
--- /dev/null
+++ b/src/resources/zero-trust/devices/policies/custom/index.ts
@@ -0,0 +1,32 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  Custom,
+  type CustomDeleteResponse,
+  type CustomCreateParams,
+  type CustomListParams,
+  type CustomDeleteParams,
+  type CustomEditParams,
+  type CustomGetParams,
+} from './custom';
+export {
+  Excludes,
+  type ExcludeUpdateResponse,
+  type ExcludeGetResponse,
+  type ExcludeUpdateParams,
+  type ExcludeGetParams,
+} from './excludes';
+export {
+  FallbackDomains,
+  type FallbackDomainUpdateResponse,
+  type FallbackDomainGetResponse,
+  type FallbackDomainUpdateParams,
+  type FallbackDomainGetParams,
+} from './fallback-domains';
+export {
+  Includes,
+  type IncludeUpdateResponse,
+  type IncludeGetResponse,
+  type IncludeUpdateParams,
+  type IncludeGetParams,
+} from './includes';
diff --git a/src/resources/zero-trust/devices/policies/default-policy.ts b/src/resources/zero-trust/devices/policies/default-policy.ts
deleted file mode 100644
index 0864ebbb7e..0000000000
--- a/src/resources/zero-trust/devices/policies/default-policy.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../../resource';
-import * as Core from '../../../../core';
-import * as DefaultPolicyAPI from './default-policy';
-
-export class DefaultPolicy extends APIResource {
-  /**
-   * Fetches the default device settings profile for an account.
-   */
-  get(
-    params: DefaultPolicyGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<DefaultPolicyGetResponse | null> {
-    const { account_id } = params;
-    return (
-      this._client.get(`/accounts/${account_id}/devices/policy`, options) as Core.APIPromise<{
-        result: DefaultPolicyGetResponse | null;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export type DefaultPolicyGetResponse = Array<unknown>;
-
-export interface DefaultPolicyGetParams {
-  account_id: string;
-}
-
-export namespace DefaultPolicy {
-  export import DefaultPolicyGetResponse = DefaultPolicyAPI.DefaultPolicyGetResponse;
-  export import DefaultPolicyGetParams = DefaultPolicyAPI.DefaultPolicyGetParams;
-}
diff --git a/src/resources/zero-trust/devices/policies/default/certificates.ts b/src/resources/zero-trust/devices/policies/default/certificates.ts
new file mode 100644
index 0000000000..4185ff9ca9
--- /dev/null
+++ b/src/resources/zero-trust/devices/policies/default/certificates.ts
@@ -0,0 +1,69 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+
+export class Certificates extends APIResource {
+  /**
+   * Enable Zero Trust Clients to provision a certificate, containing a x509 subject,
+   * and referenced by Access device posture policies when the client visits MTLS
+   * protected domains. This facilitates device posture without a WARP session.
+   */
+  edit(
+    params: CertificateEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CertificateEditResponse | null> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.patch(`/zones/${zone_id}/devices/policy/certificates`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: CertificateEditResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches device certificate provisioning
+   */
+  get(
+    params: CertificateGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CertificateGetResponse | null> {
+    const { zone_id } = params;
+    return (
+      this._client.get(`/zones/${zone_id}/devices/policy/certificates`, options) as Core.APIPromise<{
+        result: CertificateGetResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type CertificateEditResponse = unknown | string;
+
+export type CertificateGetResponse = unknown | string;
+
+export interface CertificateEditParams {
+  /**
+   * Path param:
+   */
+  zone_id: string;
+
+  /**
+   * Body param: The current status of the device policy certificate provisioning
+   * feature for WARP clients.
+   */
+  enabled: boolean;
+}
+
+export interface CertificateGetParams {
+  zone_id: string;
+}
+
+export declare namespace Certificates {
+  export {
+    type CertificateEditResponse as CertificateEditResponse,
+    type CertificateGetResponse as CertificateGetResponse,
+    type CertificateEditParams as CertificateEditParams,
+    type CertificateGetParams as CertificateGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/devices/policies/default/default.ts b/src/resources/zero-trust/devices/policies/default/default.ts
new file mode 100644
index 0000000000..9827c81011
--- /dev/null
+++ b/src/resources/zero-trust/devices/policies/default/default.ts
@@ -0,0 +1,380 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+import * as PoliciesAPI from '../policies';
+import * as CertificatesAPI from './certificates';
+import {
+  CertificateEditParams,
+  CertificateEditResponse,
+  CertificateGetParams,
+  CertificateGetResponse,
+  Certificates,
+} from './certificates';
+import * as ExcludesAPI from './excludes';
+import {
+  ExcludeGetParams,
+  ExcludeGetResponse,
+  ExcludeUpdateParams,
+  ExcludeUpdateResponse,
+  Excludes,
+} from './excludes';
+import * as FallbackDomainsAPI from './fallback-domains';
+import {
+  FallbackDomainGetParams,
+  FallbackDomainGetResponse,
+  FallbackDomainUpdateParams,
+  FallbackDomainUpdateResponse,
+  FallbackDomains,
+} from './fallback-domains';
+import * as IncludesAPI from './includes';
+import {
+  IncludeGetParams,
+  IncludeGetResponse,
+  IncludeUpdateParams,
+  IncludeUpdateResponse,
+  Includes,
+} from './includes';
+
+export class Default extends APIResource {
+  excludes: ExcludesAPI.Excludes = new ExcludesAPI.Excludes(this._client);
+  includes: IncludesAPI.Includes = new IncludesAPI.Includes(this._client);
+  fallbackDomains: FallbackDomainsAPI.FallbackDomains = new FallbackDomainsAPI.FallbackDomains(this._client);
+  certificates: CertificatesAPI.Certificates = new CertificatesAPI.Certificates(this._client);
+
+  /**
+   * Updates the default device settings profile for an account.
+   */
+  edit(
+    params: DefaultEditParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<DefaultEditResponse | null> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/devices/policy`, { body, ...options }) as Core.APIPromise<{
+        result: DefaultEditResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches the default device settings profile for an account.
+   */
+  get(params: DefaultGetParams, options?: Core.RequestOptions): Core.APIPromise<DefaultGetResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/devices/policy`, options) as Core.APIPromise<{
+        result: DefaultGetResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface DefaultEditResponse {
+  /**
+   * Whether to allow the user to switch WARP between modes.
+   */
+  allow_mode_switch?: boolean;
+
+  /**
+   * Whether to receive update notifications when a new version of the client is
+   * available.
+   */
+  allow_updates?: boolean;
+
+  /**
+   * Whether to allow devices to leave the organization.
+   */
+  allowed_to_leave?: boolean;
+
+  /**
+   * The amount of time in minutes to reconnect after having been disabled.
+   */
+  auto_connect?: number;
+
+  /**
+   * Turn on the captive portal after the specified amount of time.
+   */
+  captive_portal?: number;
+
+  /**
+   * Whether the policy will be applied to matching devices.
+   */
+  default?: boolean;
+
+  /**
+   * If the `dns_server` field of a fallback domain is not present, the client will
+   * fall back to a best guess of the default/system DNS resolvers unless this policy
+   * option is set to `true`.
+   */
+  disable_auto_fallback?: boolean;
+
+  /**
+   * Whether the policy will be applied to matching devices.
+   */
+  enabled?: boolean;
+
+  exclude?: Array<PoliciesAPI.SplitTunnelExclude>;
+
+  /**
+   * Whether to add Microsoft IPs to Split Tunnel exclusions.
+   */
+  exclude_office_ips?: boolean;
+
+  fallback_domains?: Array<PoliciesAPI.FallbackDomain>;
+
+  gateway_unique_id?: string;
+
+  include?: Array<PoliciesAPI.SplitTunnelInclude>;
+
+  service_mode_v2?: DefaultEditResponse.ServiceModeV2;
+
+  /**
+   * The URL to launch when the Send Feedback button is clicked.
+   */
+  support_url?: string;
+
+  /**
+   * Whether to allow the user to turn off the WARP switch and disconnect the client.
+   */
+  switch_locked?: boolean;
+
+  /**
+   * Determines which tunnel protocol to use.
+   */
+  tunnel_protocol?: string;
+}
+
+export namespace DefaultEditResponse {
+  export interface ServiceModeV2 {
+    /**
+     * The mode to run the WARP client under.
+     */
+    mode?: string;
+
+    /**
+     * The port number when used with proxy mode.
+     */
+    port?: number;
+  }
+}
+
+export interface DefaultGetResponse {
+  /**
+   * Whether to allow the user to switch WARP between modes.
+   */
+  allow_mode_switch?: boolean;
+
+  /**
+   * Whether to receive update notifications when a new version of the client is
+   * available.
+   */
+  allow_updates?: boolean;
+
+  /**
+   * Whether to allow devices to leave the organization.
+   */
+  allowed_to_leave?: boolean;
+
+  /**
+   * The amount of time in minutes to reconnect after having been disabled.
+   */
+  auto_connect?: number;
+
+  /**
+   * Turn on the captive portal after the specified amount of time.
+   */
+  captive_portal?: number;
+
+  /**
+   * Whether the policy will be applied to matching devices.
+   */
+  default?: boolean;
+
+  /**
+   * If the `dns_server` field of a fallback domain is not present, the client will
+   * fall back to a best guess of the default/system DNS resolvers unless this policy
+   * option is set to `true`.
+   */
+  disable_auto_fallback?: boolean;
+
+  /**
+   * Whether the policy will be applied to matching devices.
+   */
+  enabled?: boolean;
+
+  exclude?: Array<PoliciesAPI.SplitTunnelExclude>;
+
+  /**
+   * Whether to add Microsoft IPs to Split Tunnel exclusions.
+   */
+  exclude_office_ips?: boolean;
+
+  fallback_domains?: Array<PoliciesAPI.FallbackDomain>;
+
+  gateway_unique_id?: string;
+
+  include?: Array<PoliciesAPI.SplitTunnelInclude>;
+
+  service_mode_v2?: DefaultGetResponse.ServiceModeV2;
+
+  /**
+   * The URL to launch when the Send Feedback button is clicked.
+   */
+  support_url?: string;
+
+  /**
+   * Whether to allow the user to turn off the WARP switch and disconnect the client.
+   */
+  switch_locked?: boolean;
+
+  /**
+   * Determines which tunnel protocol to use.
+   */
+  tunnel_protocol?: string;
+}
+
+export namespace DefaultGetResponse {
+  export interface ServiceModeV2 {
+    /**
+     * The mode to run the WARP client under.
+     */
+    mode?: string;
+
+    /**
+     * The port number when used with proxy mode.
+     */
+    port?: number;
+  }
+}
+
+export interface DefaultEditParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param: Whether to allow the user to switch WARP between modes.
+   */
+  allow_mode_switch?: boolean;
+
+  /**
+   * Body param: Whether to receive update notifications when a new version of the
+   * client is available.
+   */
+  allow_updates?: boolean;
+
+  /**
+   * Body param: Whether to allow devices to leave the organization.
+   */
+  allowed_to_leave?: boolean;
+
+  /**
+   * Body param: The amount of time in minutes to reconnect after having been
+   * disabled.
+   */
+  auto_connect?: number;
+
+  /**
+   * Body param: Turn on the captive portal after the specified amount of time.
+   */
+  captive_portal?: number;
+
+  /**
+   * Body param: If the `dns_server` field of a fallback domain is not present, the
+   * client will fall back to a best guess of the default/system DNS resolvers unless
+   * this policy option is set to `true`.
+   */
+  disable_auto_fallback?: boolean;
+
+  /**
+   * Body param: Whether to add Microsoft IPs to Split Tunnel exclusions.
+   */
+  exclude_office_ips?: boolean;
+
+  /**
+   * Body param:
+   */
+  service_mode_v2?: DefaultEditParams.ServiceModeV2;
+
+  /**
+   * Body param: The URL to launch when the Send Feedback button is clicked.
+   */
+  support_url?: string;
+
+  /**
+   * Body param: Whether to allow the user to turn off the WARP switch and disconnect
+   * the client.
+   */
+  switch_locked?: boolean;
+
+  /**
+   * Body param: Determines which tunnel protocol to use.
+   */
+  tunnel_protocol?: string;
+}
+
+export namespace DefaultEditParams {
+  export interface ServiceModeV2 {
+    /**
+     * The mode to run the WARP client under.
+     */
+    mode?: string;
+
+    /**
+     * The port number when used with proxy mode.
+     */
+    port?: number;
+  }
+}
+
+export interface DefaultGetParams {
+  account_id: string;
+}
+
+Default.Excludes = Excludes;
+Default.Includes = Includes;
+Default.FallbackDomains = FallbackDomains;
+Default.Certificates = Certificates;
+
+export declare namespace Default {
+  export {
+    type DefaultEditResponse as DefaultEditResponse,
+    type DefaultGetResponse as DefaultGetResponse,
+    type DefaultEditParams as DefaultEditParams,
+    type DefaultGetParams as DefaultGetParams,
+  };
+
+  export {
+    Excludes as Excludes,
+    type ExcludeUpdateResponse as ExcludeUpdateResponse,
+    type ExcludeGetResponse as ExcludeGetResponse,
+    type ExcludeUpdateParams as ExcludeUpdateParams,
+    type ExcludeGetParams as ExcludeGetParams,
+  };
+
+  export {
+    Includes as Includes,
+    type IncludeUpdateResponse as IncludeUpdateResponse,
+    type IncludeGetResponse as IncludeGetResponse,
+    type IncludeUpdateParams as IncludeUpdateParams,
+    type IncludeGetParams as IncludeGetParams,
+  };
+
+  export {
+    FallbackDomains as FallbackDomains,
+    type FallbackDomainUpdateResponse as FallbackDomainUpdateResponse,
+    type FallbackDomainGetResponse as FallbackDomainGetResponse,
+    type FallbackDomainUpdateParams as FallbackDomainUpdateParams,
+    type FallbackDomainGetParams as FallbackDomainGetParams,
+  };
+
+  export {
+    Certificates as Certificates,
+    type CertificateEditResponse as CertificateEditResponse,
+    type CertificateGetResponse as CertificateGetResponse,
+    type CertificateEditParams as CertificateEditParams,
+    type CertificateGetParams as CertificateGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/devices/policies/default/excludes.ts b/src/resources/zero-trust/devices/policies/default/excludes.ts
new file mode 100644
index 0000000000..447ddd1fff
--- /dev/null
+++ b/src/resources/zero-trust/devices/policies/default/excludes.ts
@@ -0,0 +1,64 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+import * as PoliciesAPI from '../policies';
+
+export class Excludes extends APIResource {
+  /**
+   * Sets the list of routes excluded from the WARP client's tunnel.
+   */
+  update(
+    params: ExcludeUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ExcludeUpdateResponse | null> {
+    const { account_id, body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/devices/policy/exclude`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: ExcludeUpdateResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches the list of routes excluded from the WARP client's tunnel.
+   */
+  get(params: ExcludeGetParams, options?: Core.RequestOptions): Core.APIPromise<ExcludeGetResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/devices/policy/exclude`, options) as Core.APIPromise<{
+        result: ExcludeGetResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type ExcludeUpdateResponse = Array<PoliciesAPI.SplitTunnelExclude>;
+
+export type ExcludeGetResponse = Array<PoliciesAPI.SplitTunnelExclude>;
+
+export interface ExcludeUpdateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: Array<PoliciesAPI.SplitTunnelExcludeParam>;
+}
+
+export interface ExcludeGetParams {
+  account_id: string;
+}
+
+export declare namespace Excludes {
+  export {
+    type ExcludeUpdateResponse as ExcludeUpdateResponse,
+    type ExcludeGetResponse as ExcludeGetResponse,
+    type ExcludeUpdateParams as ExcludeUpdateParams,
+    type ExcludeGetParams as ExcludeGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/devices/policies/default/fallback-domains.ts b/src/resources/zero-trust/devices/policies/default/fallback-domains.ts
new file mode 100644
index 0000000000..715252eac5
--- /dev/null
+++ b/src/resources/zero-trust/devices/policies/default/fallback-domains.ts
@@ -0,0 +1,70 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+import * as PoliciesAPI from '../policies';
+
+export class FallbackDomains extends APIResource {
+  /**
+   * Sets the list of domains to bypass Gateway DNS resolution. These domains will
+   * use the specified local DNS resolver instead.
+   */
+  update(
+    params: FallbackDomainUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FallbackDomainUpdateResponse | null> {
+    const { account_id, domains } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/devices/policy/fallback_domains`, {
+        body: domains,
+        ...options,
+      }) as Core.APIPromise<{ result: FallbackDomainUpdateResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches a list of domains to bypass Gateway DNS resolution. These domains will
+   * use the specified local DNS resolver instead.
+   */
+  get(
+    params: FallbackDomainGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<FallbackDomainGetResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/devices/policy/fallback_domains`,
+        options,
+      ) as Core.APIPromise<{ result: FallbackDomainGetResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type FallbackDomainUpdateResponse = Array<PoliciesAPI.FallbackDomain>;
+
+export type FallbackDomainGetResponse = Array<PoliciesAPI.FallbackDomain>;
+
+export interface FallbackDomainUpdateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  domains: Array<PoliciesAPI.FallbackDomainParam>;
+}
+
+export interface FallbackDomainGetParams {
+  account_id: string;
+}
+
+export declare namespace FallbackDomains {
+  export {
+    type FallbackDomainUpdateResponse as FallbackDomainUpdateResponse,
+    type FallbackDomainGetResponse as FallbackDomainGetResponse,
+    type FallbackDomainUpdateParams as FallbackDomainUpdateParams,
+    type FallbackDomainGetParams as FallbackDomainGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/devices/policies/default/includes.ts b/src/resources/zero-trust/devices/policies/default/includes.ts
new file mode 100644
index 0000000000..c7ad63f532
--- /dev/null
+++ b/src/resources/zero-trust/devices/policies/default/includes.ts
@@ -0,0 +1,64 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+import * as PoliciesAPI from '../policies';
+
+export class Includes extends APIResource {
+  /**
+   * Sets the list of routes included in the WARP client's tunnel.
+   */
+  update(
+    params: IncludeUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<IncludeUpdateResponse | null> {
+    const { account_id, body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/devices/policy/include`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: IncludeUpdateResponse | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches the list of routes included in the WARP client's tunnel.
+   */
+  get(params: IncludeGetParams, options?: Core.RequestOptions): Core.APIPromise<IncludeGetResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/devices/policy/include`, options) as Core.APIPromise<{
+        result: IncludeGetResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type IncludeUpdateResponse = Array<PoliciesAPI.SplitTunnelInclude>;
+
+export type IncludeGetResponse = Array<PoliciesAPI.SplitTunnelInclude>;
+
+export interface IncludeUpdateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: Array<PoliciesAPI.SplitTunnelIncludeParam>;
+}
+
+export interface IncludeGetParams {
+  account_id: string;
+}
+
+export declare namespace Includes {
+  export {
+    type IncludeUpdateResponse as IncludeUpdateResponse,
+    type IncludeGetResponse as IncludeGetResponse,
+    type IncludeUpdateParams as IncludeUpdateParams,
+    type IncludeGetParams as IncludeGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/devices/policies/default/index.ts b/src/resources/zero-trust/devices/policies/default/index.ts
new file mode 100644
index 0000000000..f2d56a9054
--- /dev/null
+++ b/src/resources/zero-trust/devices/policies/default/index.ts
@@ -0,0 +1,37 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  Certificates,
+  type CertificateEditResponse,
+  type CertificateGetResponse,
+  type CertificateEditParams,
+  type CertificateGetParams,
+} from './certificates';
+export {
+  Default,
+  type DefaultEditResponse,
+  type DefaultGetResponse,
+  type DefaultEditParams,
+  type DefaultGetParams,
+} from './default';
+export {
+  Excludes,
+  type ExcludeUpdateResponse,
+  type ExcludeGetResponse,
+  type ExcludeUpdateParams,
+  type ExcludeGetParams,
+} from './excludes';
+export {
+  FallbackDomains,
+  type FallbackDomainUpdateResponse,
+  type FallbackDomainGetResponse,
+  type FallbackDomainUpdateParams,
+  type FallbackDomainGetParams,
+} from './fallback-domains';
+export {
+  Includes,
+  type IncludeUpdateResponse,
+  type IncludeGetResponse,
+  type IncludeUpdateParams,
+  type IncludeGetParams,
+} from './includes';
diff --git a/src/resources/zero-trust/devices/policies/excludes.ts b/src/resources/zero-trust/devices/policies/excludes.ts
deleted file mode 100644
index bf190c2a40..0000000000
--- a/src/resources/zero-trust/devices/policies/excludes.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../../resource';
-import * as Core from '../../../../core';
-import * as ExcludesAPI from './excludes';
-import { SinglePage } from '../../../../pagination';
-
-export class Excludes extends APIResource {
-  /**
-   * Sets the list of routes excluded from the WARP client's tunnel.
-   */
-  update(
-    params: ExcludeUpdateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<ExcludeUpdateResponse | null> {
-    const { account_id, body } = params;
-    return (
-      this._client.put(`/accounts/${account_id}/devices/policy/exclude`, {
-        body: body,
-        ...options,
-      }) as Core.APIPromise<{ result: ExcludeUpdateResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Fetches the list of routes excluded from the WARP client's tunnel.
-   */
-  list(
-    params: ExcludeListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<SplitTunnelExcludesSinglePage, SplitTunnelExclude> {
-    const { account_id } = params;
-    return this._client.getAPIList(
-      `/accounts/${account_id}/devices/policy/exclude`,
-      SplitTunnelExcludesSinglePage,
-      options,
-    );
-  }
-
-  /**
-   * Fetches the list of routes excluded from the WARP client's tunnel for a specific
-   * device settings profile.
-   */
-  get(
-    policyId: string,
-    params: ExcludeGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<ExcludeGetResponse | null> {
-    const { account_id } = params;
-    return (
-      this._client.get(
-        `/accounts/${account_id}/devices/policy/${policyId}/exclude`,
-        options,
-      ) as Core.APIPromise<{ result: ExcludeGetResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export class SplitTunnelExcludesSinglePage extends SinglePage<SplitTunnelExclude> {}
-
-export interface SplitTunnelExclude {
-  /**
-   * The address in CIDR format to exclude from the tunnel. If `address` is present,
-   * `host` must not be present.
-   */
-  address: string;
-
-  /**
-   * A description of the Split Tunnel item, displayed in the client UI.
-   */
-  description: string;
-
-  /**
-   * The domain name to exclude from the tunnel. If `host` is present, `address` must
-   * not be present.
-   */
-  host?: string;
-}
-
-export interface SplitTunnelExcludeParam {
-  /**
-   * The address in CIDR format to exclude from the tunnel. If `address` is present,
-   * `host` must not be present.
-   */
-  address: string;
-
-  /**
-   * A description of the Split Tunnel item, displayed in the client UI.
-   */
-  description: string;
-
-  /**
-   * The domain name to exclude from the tunnel. If `host` is present, `address` must
-   * not be present.
-   */
-  host?: string;
-}
-
-export type ExcludeUpdateResponse = Array<SplitTunnelExclude>;
-
-export type ExcludeGetResponse = Array<SplitTunnelExclude>;
-
-export interface ExcludeUpdateParams {
-  /**
-   * Path param:
-   */
-  account_id: string;
-
-  /**
-   * Body param:
-   */
-  body: Array<SplitTunnelExcludeParam>;
-}
-
-export interface ExcludeListParams {
-  account_id: string;
-}
-
-export interface ExcludeGetParams {
-  account_id: string;
-}
-
-export namespace Excludes {
-  export import SplitTunnelExclude = ExcludesAPI.SplitTunnelExclude;
-  export import ExcludeUpdateResponse = ExcludesAPI.ExcludeUpdateResponse;
-  export import ExcludeGetResponse = ExcludesAPI.ExcludeGetResponse;
-  export import SplitTunnelExcludesSinglePage = ExcludesAPI.SplitTunnelExcludesSinglePage;
-  export import ExcludeUpdateParams = ExcludesAPI.ExcludeUpdateParams;
-  export import ExcludeListParams = ExcludesAPI.ExcludeListParams;
-  export import ExcludeGetParams = ExcludesAPI.ExcludeGetParams;
-}
diff --git a/src/resources/zero-trust/devices/policies/fallback-domains.ts b/src/resources/zero-trust/devices/policies/fallback-domains.ts
deleted file mode 100644
index c1ee03d226..0000000000
--- a/src/resources/zero-trust/devices/policies/fallback-domains.ts
+++ /dev/null
@@ -1,135 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../../resource';
-import * as Core from '../../../../core';
-import * as FallbackDomainsAPI from './fallback-domains';
-import { SinglePage } from '../../../../pagination';
-
-export class FallbackDomains extends APIResource {
-  /**
-   * Sets the list of domains to bypass Gateway DNS resolution. These domains will
-   * use the specified local DNS resolver instead. This will only apply to the
-   * specified device settings profile.
-   */
-  update(
-    policyId: string,
-    params: FallbackDomainUpdateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<FallbackDomainUpdateResponse | null> {
-    const { account_id, body } = params;
-    return (
-      this._client.put(`/accounts/${account_id}/devices/policy/${policyId}/fallback_domains`, {
-        body: body,
-        ...options,
-      }) as Core.APIPromise<{ result: FallbackDomainUpdateResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Fetches a list of domains to bypass Gateway DNS resolution. These domains will
-   * use the specified local DNS resolver instead.
-   */
-  list(
-    params: FallbackDomainListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<FallbackDomainsSinglePage, FallbackDomain> {
-    const { account_id } = params;
-    return this._client.getAPIList(
-      `/accounts/${account_id}/devices/policy/fallback_domains`,
-      FallbackDomainsSinglePage,
-      options,
-    );
-  }
-
-  /**
-   * Fetches the list of domains to bypass Gateway DNS resolution from a specified
-   * device settings profile. These domains will use the specified local DNS resolver
-   * instead.
-   */
-  get(
-    policyId: string,
-    params: FallbackDomainGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<FallbackDomainGetResponse | null> {
-    const { account_id } = params;
-    return (
-      this._client.get(
-        `/accounts/${account_id}/devices/policy/${policyId}/fallback_domains`,
-        options,
-      ) as Core.APIPromise<{ result: FallbackDomainGetResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export class FallbackDomainsSinglePage extends SinglePage<FallbackDomain> {}
-
-export interface FallbackDomain {
-  /**
-   * The domain suffix to match when resolving locally.
-   */
-  suffix: string;
-
-  /**
-   * A description of the fallback domain, displayed in the client UI.
-   */
-  description?: string;
-
-  /**
-   * A list of IP addresses to handle domain resolution.
-   */
-  dns_server?: Array<unknown>;
-}
-
-export interface FallbackDomainParam {
-  /**
-   * The domain suffix to match when resolving locally.
-   */
-  suffix: string;
-
-  /**
-   * A description of the fallback domain, displayed in the client UI.
-   */
-  description?: string;
-
-  /**
-   * A list of IP addresses to handle domain resolution.
-   */
-  dns_server?: Array<unknown>;
-}
-
-export type FallbackDomainPolicy = Array<FallbackDomain>;
-
-export type FallbackDomainUpdateResponse = Array<FallbackDomain>;
-
-export type FallbackDomainGetResponse = Array<FallbackDomain>;
-
-export interface FallbackDomainUpdateParams {
-  /**
-   * Path param:
-   */
-  account_id: string;
-
-  /**
-   * Body param:
-   */
-  body: Array<FallbackDomainParam>;
-}
-
-export interface FallbackDomainListParams {
-  account_id: string;
-}
-
-export interface FallbackDomainGetParams {
-  account_id: string;
-}
-
-export namespace FallbackDomains {
-  export import FallbackDomain = FallbackDomainsAPI.FallbackDomain;
-  export import FallbackDomainPolicy = FallbackDomainsAPI.FallbackDomainPolicy;
-  export import FallbackDomainUpdateResponse = FallbackDomainsAPI.FallbackDomainUpdateResponse;
-  export import FallbackDomainGetResponse = FallbackDomainsAPI.FallbackDomainGetResponse;
-  export import FallbackDomainsSinglePage = FallbackDomainsAPI.FallbackDomainsSinglePage;
-  export import FallbackDomainUpdateParams = FallbackDomainsAPI.FallbackDomainUpdateParams;
-  export import FallbackDomainListParams = FallbackDomainsAPI.FallbackDomainListParams;
-  export import FallbackDomainGetParams = FallbackDomainsAPI.FallbackDomainGetParams;
-}
diff --git a/src/resources/zero-trust/devices/policies/includes.ts b/src/resources/zero-trust/devices/policies/includes.ts
deleted file mode 100644
index 55789afc8f..0000000000
--- a/src/resources/zero-trust/devices/policies/includes.ts
+++ /dev/null
@@ -1,131 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import { APIResource } from '../../../../resource';
-import * as Core from '../../../../core';
-import * as IncludesAPI from './includes';
-import { SinglePage } from '../../../../pagination';
-
-export class Includes extends APIResource {
-  /**
-   * Sets the list of routes included in the WARP client's tunnel.
-   */
-  update(
-    params: IncludeUpdateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<IncludeUpdateResponse | null> {
-    const { account_id, body } = params;
-    return (
-      this._client.put(`/accounts/${account_id}/devices/policy/include`, {
-        body: body,
-        ...options,
-      }) as Core.APIPromise<{ result: IncludeUpdateResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-
-  /**
-   * Fetches the list of routes included in the WARP client's tunnel.
-   */
-  list(
-    params: IncludeListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<SplitTunnelIncludesSinglePage, SplitTunnelInclude> {
-    const { account_id } = params;
-    return this._client.getAPIList(
-      `/accounts/${account_id}/devices/policy/include`,
-      SplitTunnelIncludesSinglePage,
-      options,
-    );
-  }
-
-  /**
-   * Fetches the list of routes included in the WARP client's tunnel for a specific
-   * device settings profile.
-   */
-  get(
-    policyId: string,
-    params: IncludeGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<IncludeGetResponse | null> {
-    const { account_id } = params;
-    return (
-      this._client.get(
-        `/accounts/${account_id}/devices/policy/${policyId}/include`,
-        options,
-      ) as Core.APIPromise<{ result: IncludeGetResponse | null }>
-    )._thenUnwrap((obj) => obj.result);
-  }
-}
-
-export class SplitTunnelIncludesSinglePage extends SinglePage<SplitTunnelInclude> {}
-
-export interface SplitTunnelInclude {
-  /**
-   * The address in CIDR format to include in the tunnel. If address is present, host
-   * must not be present.
-   */
-  address: string;
-
-  /**
-   * A description of the split tunnel item, displayed in the client UI.
-   */
-  description: string;
-
-  /**
-   * The domain name to include in the tunnel. If host is present, address must not
-   * be present.
-   */
-  host?: string;
-}
-
-export interface SplitTunnelIncludeParam {
-  /**
-   * The address in CIDR format to include in the tunnel. If address is present, host
-   * must not be present.
-   */
-  address: string;
-
-  /**
-   * A description of the split tunnel item, displayed in the client UI.
-   */
-  description: string;
-
-  /**
-   * The domain name to include in the tunnel. If host is present, address must not
-   * be present.
-   */
-  host?: string;
-}
-
-export type IncludeUpdateResponse = Array<SplitTunnelInclude>;
-
-export type IncludeGetResponse = Array<SplitTunnelInclude>;
-
-export interface IncludeUpdateParams {
-  /**
-   * Path param:
-   */
-  account_id: string;
-
-  /**
-   * Body param:
-   */
-  body: Array<SplitTunnelIncludeParam>;
-}
-
-export interface IncludeListParams {
-  account_id: string;
-}
-
-export interface IncludeGetParams {
-  account_id: string;
-}
-
-export namespace Includes {
-  export import SplitTunnelInclude = IncludesAPI.SplitTunnelInclude;
-  export import IncludeUpdateResponse = IncludesAPI.IncludeUpdateResponse;
-  export import IncludeGetResponse = IncludesAPI.IncludeGetResponse;
-  export import SplitTunnelIncludesSinglePage = IncludesAPI.SplitTunnelIncludesSinglePage;
-  export import IncludeUpdateParams = IncludesAPI.IncludeUpdateParams;
-  export import IncludeListParams = IncludesAPI.IncludeListParams;
-  export import IncludeGetParams = IncludesAPI.IncludeGetParams;
-}
diff --git a/src/resources/zero-trust/devices/policies/index.ts b/src/resources/zero-trust/devices/policies/index.ts
index 881256b580..2b1f5dc024 100644
--- a/src/resources/zero-trust/devices/policies/index.ts
+++ b/src/resources/zero-trust/devices/policies/index.ts
@@ -1,45 +1,28 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { DefaultPolicyGetResponse, DefaultPolicyGetParams, DefaultPolicy } from './default-policy';
 export {
-  FallbackDomain,
-  FallbackDomainPolicy,
-  FallbackDomainUpdateResponse,
-  FallbackDomainGetResponse,
-  FallbackDomainUpdateParams,
-  FallbackDomainListParams,
-  FallbackDomainGetParams,
-  FallbackDomainsSinglePage,
-  FallbackDomains,
-} from './fallback-domains';
+  Custom,
+  type CustomDeleteResponse,
+  type CustomCreateParams,
+  type CustomListParams,
+  type CustomDeleteParams,
+  type CustomEditParams,
+  type CustomGetParams,
+} from './custom/index';
+export {
+  Default,
+  type DefaultEditResponse,
+  type DefaultGetResponse,
+  type DefaultEditParams,
+  type DefaultGetParams,
+} from './default/index';
 export {
-  SettingsPolicy,
-  PolicyDeleteResponse,
-  PolicyCreateParams,
-  PolicyListParams,
-  PolicyDeleteParams,
-  PolicyEditParams,
-  PolicyGetParams,
   SettingsPoliciesSinglePage,
   Policies,
+  type DevicePolicyCertificates,
+  type FallbackDomain,
+  type FallbackDomainPolicy,
+  type SettingsPolicy,
+  type SplitTunnelExclude,
+  type SplitTunnelInclude,
 } from './policies';
-export {
-  SplitTunnelExclude,
-  ExcludeUpdateResponse,
-  ExcludeGetResponse,
-  ExcludeUpdateParams,
-  ExcludeListParams,
-  ExcludeGetParams,
-  SplitTunnelExcludesSinglePage,
-  Excludes,
-} from './excludes';
-export {
-  SplitTunnelInclude,
-  IncludeUpdateResponse,
-  IncludeGetResponse,
-  IncludeUpdateParams,
-  IncludeListParams,
-  IncludeGetParams,
-  SplitTunnelIncludesSinglePage,
-  Includes,
-} from './includes';
diff --git a/src/resources/zero-trust/devices/policies/policies.ts b/src/resources/zero-trust/devices/policies/policies.ts
index 65c6ccaead..3b709581aa 100644
--- a/src/resources/zero-trust/devices/policies/policies.ts
+++ b/src/resources/zero-trust/devices/policies/policies.ts
@@ -1,100 +1,76 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../../resource';
-import * as Core from '../../../../core';
-import * as PoliciesAPI from './policies';
-import * as DefaultPolicyAPI from './default-policy';
-import * as ExcludesAPI from './excludes';
-import * as FallbackDomainsAPI from './fallback-domains';
-import * as IncludesAPI from './includes';
+import * as CustomAPI from './custom/custom';
+import {
+  Custom,
+  CustomCreateParams,
+  CustomDeleteParams,
+  CustomDeleteResponse,
+  CustomEditParams,
+  CustomGetParams,
+  CustomListParams,
+} from './custom/custom';
+import * as DefaultAPI from './default/default';
+import {
+  Default,
+  DefaultEditParams,
+  DefaultEditResponse,
+  DefaultGetParams,
+  DefaultGetResponse,
+} from './default/default';
 import { SinglePage } from '../../../../pagination';
 
 export class Policies extends APIResource {
-  defaultPolicy: DefaultPolicyAPI.DefaultPolicy = new DefaultPolicyAPI.DefaultPolicy(this._client);
-  excludes: ExcludesAPI.Excludes = new ExcludesAPI.Excludes(this._client);
-  fallbackDomains: FallbackDomainsAPI.FallbackDomains = new FallbackDomainsAPI.FallbackDomains(this._client);
-  includes: IncludesAPI.Includes = new IncludesAPI.Includes(this._client);
-
-  /**
-   * Creates a device settings profile to be applied to certain devices matching the
-   * criteria.
-   */
-  create(params: PolicyCreateParams, options?: Core.RequestOptions): Core.APIPromise<SettingsPolicy | null> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.post(`/accounts/${account_id}/devices/policy`, { body, ...options }) as Core.APIPromise<{
-        result: SettingsPolicy | null;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
+  default: DefaultAPI.Default = new DefaultAPI.Default(this._client);
+  custom: CustomAPI.Custom = new CustomAPI.Custom(this._client);
+}
 
+export class SettingsPoliciesSinglePage extends SinglePage<SettingsPolicy> {}
+
+export interface DevicePolicyCertificates {
   /**
-   * Fetches a list of the device settings profiles for an account.
+   * The current status of the device policy certificate provisioning feature for
+   * WARP clients.
    */
-  list(
-    params: PolicyListParams,
-    options?: Core.RequestOptions,
-  ): Core.PagePromise<SettingsPoliciesSinglePage, SettingsPolicy> {
-    const { account_id } = params;
-    return this._client.getAPIList(
-      `/accounts/${account_id}/devices/policies`,
-      SettingsPoliciesSinglePage,
-      options,
-    );
-  }
+  enabled: boolean;
+}
 
+export interface FallbackDomain {
   /**
-   * Deletes a device settings profile and fetches a list of the remaining profiles
-   * for an account.
-   */
-  delete(
-    policyId: string,
-    params: PolicyDeleteParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<PolicyDeleteResponse | null> {
-    const { account_id } = params;
-    return (
-      this._client.delete(`/accounts/${account_id}/devices/policy/${policyId}`, options) as Core.APIPromise<{
-        result: PolicyDeleteResponse | null;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
+   * The domain suffix to match when resolving locally.
+   */
+  suffix: string;
 
   /**
-   * Updates a configured device settings profile.
-   */
-  edit(
-    policyId: string,
-    params: PolicyEditParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SettingsPolicy | null> {
-    const { account_id, ...body } = params;
-    return (
-      this._client.patch(`/accounts/${account_id}/devices/policy/${policyId}`, {
-        body,
-        ...options,
-      }) as Core.APIPromise<{ result: SettingsPolicy | null }>
-    )._thenUnwrap((obj) => obj.result);
-  }
+   * A description of the fallback domain, displayed in the client UI.
+   */
+  description?: string;
 
   /**
-   * Fetches a device settings profile by ID.
+   * A list of IP addresses to handle domain resolution.
    */
-  get(
-    policyId: string,
-    params: PolicyGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SettingsPolicy | null> {
-    const { account_id } = params;
-    return (
-      this._client.get(`/accounts/${account_id}/devices/policy/${policyId}`, options) as Core.APIPromise<{
-        result: SettingsPolicy | null;
-      }>
-    )._thenUnwrap((obj) => obj.result);
-  }
+  dns_server?: Array<string>;
 }
 
-export class SettingsPoliciesSinglePage extends SinglePage<SettingsPolicy> {}
+export interface FallbackDomainParam {
+  /**
+   * The domain suffix to match when resolving locally.
+   */
+  suffix: string;
+
+  /**
+   * A description of the fallback domain, displayed in the client UI.
+   */
+  description?: string;
+
+  /**
+   * A list of IP addresses to handle domain resolution.
+   */
+  dns_server?: Array<string>;
+}
+
+export type FallbackDomainPolicy = Array<FallbackDomain>;
 
 export interface SettingsPolicy {
   /**
@@ -145,18 +121,18 @@ export interface SettingsPolicy {
    */
   enabled?: boolean;
 
-  exclude?: Array<ExcludesAPI.SplitTunnelExclude>;
+  exclude?: Array<SplitTunnelExclude>;
 
   /**
    * Whether to add Microsoft IPs to Split Tunnel exclusions.
    */
   exclude_office_ips?: boolean;
 
-  fallback_domains?: Array<FallbackDomainsAPI.FallbackDomain>;
+  fallback_domains?: Array<FallbackDomain>;
 
   gateway_unique_id?: string;
 
-  include?: Array<IncludesAPI.SplitTunnelInclude>;
+  include?: Array<SplitTunnelInclude>;
 
   /**
    * The amount of time in minutes a user is allowed access to their LAN. A value of
@@ -206,6 +182,11 @@ export interface SettingsPolicy {
   switch_locked?: boolean;
 
   target_tests?: Array<SettingsPolicy.TargetTest>;
+
+  /**
+   * Determines which tunnel protocol to use.
+   */
+  tunnel_protocol?: string;
 }
 
 export namespace SettingsPolicy {
@@ -234,273 +215,110 @@ export namespace SettingsPolicy {
   }
 }
 
-export type PolicyDeleteResponse = Array<SettingsPolicy>;
-
-export interface PolicyCreateParams {
-  /**
-   * Path param:
-   */
-  account_id: string;
-
-  /**
-   * Body param: The wirefilter expression to match devices.
-   */
-  match: string;
-
-  /**
-   * Body param: The name of the device settings profile.
-   */
-  name: string;
-
-  /**
-   * Body param: The precedence of the policy. Lower values indicate higher
-   * precedence. Policies will be evaluated in ascending order of this field.
-   */
-  precedence: number;
-
-  /**
-   * Body param: Whether to allow the user to switch WARP between modes.
-   */
-  allow_mode_switch?: boolean;
-
-  /**
-   * Body param: Whether to receive update notifications when a new version of the
-   * client is available.
-   */
-  allow_updates?: boolean;
-
-  /**
-   * Body param: Whether to allow devices to leave the organization.
-   */
-  allowed_to_leave?: boolean;
-
-  /**
-   * Body param: The amount of time in minutes to reconnect after having been
-   * disabled.
-   */
-  auto_connect?: number;
-
+export interface SplitTunnelExclude {
   /**
-   * Body param: Turn on the captive portal after the specified amount of time.
+   * The address in CIDR format to exclude from the tunnel. If `address` is present,
+   * `host` must not be present.
    */
-  captive_portal?: number;
+  address: string;
 
   /**
-   * Body param: A description of the policy.
+   * A description of the Split Tunnel item, displayed in the client UI.
    */
-  description?: string;
-
-  /**
-   * Body param: If the `dns_server` field of a fallback domain is not present, the
-   * client will fall back to a best guess of the default/system DNS resolvers unless
-   * this policy option is set to `true`.
-   */
-  disable_auto_fallback?: boolean;
-
-  /**
-   * Body param: Whether the policy will be applied to matching devices.
-   */
-  enabled?: boolean;
-
-  /**
-   * Body param: Whether to add Microsoft IPs to Split Tunnel exclusions.
-   */
-  exclude_office_ips?: boolean;
-
-  /**
-   * Body param: The amount of time in minutes a user is allowed access to their LAN.
-   * A value of 0 will allow LAN access until the next WARP reconnection, such as a
-   * reboot or a laptop waking from sleep. Note that this field is omitted from the
-   * response if null or unset.
-   */
-  lan_allow_minutes?: number;
-
-  /**
-   * Body param: The size of the subnet for the local access network. Note that this
-   * field is omitted from the response if null or unset.
-   */
-  lan_allow_subnet_size?: number;
+  description: string;
 
   /**
-   * Body param:
+   * The domain name to exclude from the tunnel. If `host` is present, `address` must
+   * not be present.
    */
-  service_mode_v2?: PolicyCreateParams.ServiceModeV2;
-
-  /**
-   * Body param: The URL to launch when the Send Feedback button is clicked.
-   */
-  support_url?: string;
-
-  /**
-   * Body param: Whether to allow the user to turn off the WARP switch and disconnect
-   * the client.
-   */
-  switch_locked?: boolean;
+  host?: string;
 }
 
-export namespace PolicyCreateParams {
-  export interface ServiceModeV2 {
-    /**
-     * The mode to run the WARP client under.
-     */
-    mode?: string;
-
-    /**
-     * The port number when used with proxy mode.
-     */
-    port?: number;
-  }
-}
-
-export interface PolicyListParams {
-  account_id: string;
-}
-
-export interface PolicyDeleteParams {
-  account_id: string;
-}
-
-export interface PolicyEditParams {
+export interface SplitTunnelExcludeParam {
   /**
-   * Path param:
+   * The address in CIDR format to exclude from the tunnel. If `address` is present,
+   * `host` must not be present.
    */
-  account_id: string;
+  address: string;
 
   /**
-   * Body param: Whether to allow the user to switch WARP between modes.
+   * A description of the Split Tunnel item, displayed in the client UI.
    */
-  allow_mode_switch?: boolean;
-
-  /**
-   * Body param: Whether to receive update notifications when a new version of the
-   * client is available.
-   */
-  allow_updates?: boolean;
+  description: string;
 
   /**
-   * Body param: Whether to allow devices to leave the organization.
+   * The domain name to exclude from the tunnel. If `host` is present, `address` must
+   * not be present.
    */
-  allowed_to_leave?: boolean;
-
-  /**
-   * Body param: The amount of time in minutes to reconnect after having been
-   * disabled.
-   */
-  auto_connect?: number;
-
-  /**
-   * Body param: Turn on the captive portal after the specified amount of time.
-   */
-  captive_portal?: number;
-
-  /**
-   * Body param: A description of the policy.
-   */
-  description?: string;
-
-  /**
-   * Body param: If the `dns_server` field of a fallback domain is not present, the
-   * client will fall back to a best guess of the default/system DNS resolvers unless
-   * this policy option is set to `true`.
-   */
-  disable_auto_fallback?: boolean;
-
-  /**
-   * Body param: Whether the policy will be applied to matching devices.
-   */
-  enabled?: boolean;
-
-  /**
-   * Body param: Whether to add Microsoft IPs to Split Tunnel exclusions.
-   */
-  exclude_office_ips?: boolean;
+  host?: string;
+}
 
+export interface SplitTunnelInclude {
   /**
-   * Body param: The wirefilter expression to match devices.
+   * The address in CIDR format to include in the tunnel. If address is present, host
+   * must not be present.
    */
-  match?: string;
+  address: string;
 
   /**
-   * Body param: The name of the device settings profile.
+   * A description of the split tunnel item, displayed in the client UI.
    */
-  name?: string;
+  description: string;
 
   /**
-   * Body param: The precedence of the policy. Lower values indicate higher
-   * precedence. Policies will be evaluated in ascending order of this field.
+   * The domain name to include in the tunnel. If host is present, address must not
+   * be present.
    */
-  precedence?: number;
+  host?: string;
+}
 
+export interface SplitTunnelIncludeParam {
   /**
-   * Body param:
+   * The address in CIDR format to include in the tunnel. If address is present, host
+   * must not be present.
    */
-  service_mode_v2?: PolicyEditParams.ServiceModeV2;
+  address: string;
 
   /**
-   * Body param: The URL to launch when the Send Feedback button is clicked.
+   * A description of the split tunnel item, displayed in the client UI.
    */
-  support_url?: string;
+  description: string;
 
   /**
-   * Body param: Whether to allow the user to turn off the WARP switch and disconnect
-   * the client.
+   * The domain name to include in the tunnel. If host is present, address must not
+   * be present.
    */
-  switch_locked?: boolean;
-}
-
-export namespace PolicyEditParams {
-  export interface ServiceModeV2 {
-    /**
-     * The mode to run the WARP client under.
-     */
-    mode?: string;
-
-    /**
-     * The port number when used with proxy mode.
-     */
-    port?: number;
-  }
-}
-
-export interface PolicyGetParams {
-  account_id: string;
+  host?: string;
 }
 
-export namespace Policies {
-  export import SettingsPolicy = PoliciesAPI.SettingsPolicy;
-  export import PolicyDeleteResponse = PoliciesAPI.PolicyDeleteResponse;
-  export import SettingsPoliciesSinglePage = PoliciesAPI.SettingsPoliciesSinglePage;
-  export import PolicyCreateParams = PoliciesAPI.PolicyCreateParams;
-  export import PolicyListParams = PoliciesAPI.PolicyListParams;
-  export import PolicyDeleteParams = PoliciesAPI.PolicyDeleteParams;
-  export import PolicyEditParams = PoliciesAPI.PolicyEditParams;
-  export import PolicyGetParams = PoliciesAPI.PolicyGetParams;
-  export import DefaultPolicy = DefaultPolicyAPI.DefaultPolicy;
-  export import DefaultPolicyGetResponse = DefaultPolicyAPI.DefaultPolicyGetResponse;
-  export import DefaultPolicyGetParams = DefaultPolicyAPI.DefaultPolicyGetParams;
-  export import Excludes = ExcludesAPI.Excludes;
-  export import SplitTunnelExclude = ExcludesAPI.SplitTunnelExclude;
-  export import ExcludeUpdateResponse = ExcludesAPI.ExcludeUpdateResponse;
-  export import ExcludeGetResponse = ExcludesAPI.ExcludeGetResponse;
-  export import SplitTunnelExcludesSinglePage = ExcludesAPI.SplitTunnelExcludesSinglePage;
-  export import ExcludeUpdateParams = ExcludesAPI.ExcludeUpdateParams;
-  export import ExcludeListParams = ExcludesAPI.ExcludeListParams;
-  export import ExcludeGetParams = ExcludesAPI.ExcludeGetParams;
-  export import FallbackDomains = FallbackDomainsAPI.FallbackDomains;
-  export import FallbackDomain = FallbackDomainsAPI.FallbackDomain;
-  export import FallbackDomainPolicy = FallbackDomainsAPI.FallbackDomainPolicy;
-  export import FallbackDomainUpdateResponse = FallbackDomainsAPI.FallbackDomainUpdateResponse;
-  export import FallbackDomainGetResponse = FallbackDomainsAPI.FallbackDomainGetResponse;
-  export import FallbackDomainsSinglePage = FallbackDomainsAPI.FallbackDomainsSinglePage;
-  export import FallbackDomainUpdateParams = FallbackDomainsAPI.FallbackDomainUpdateParams;
-  export import FallbackDomainListParams = FallbackDomainsAPI.FallbackDomainListParams;
-  export import FallbackDomainGetParams = FallbackDomainsAPI.FallbackDomainGetParams;
-  export import Includes = IncludesAPI.Includes;
-  export import SplitTunnelInclude = IncludesAPI.SplitTunnelInclude;
-  export import IncludeUpdateResponse = IncludesAPI.IncludeUpdateResponse;
-  export import IncludeGetResponse = IncludesAPI.IncludeGetResponse;
-  export import SplitTunnelIncludesSinglePage = IncludesAPI.SplitTunnelIncludesSinglePage;
-  export import IncludeUpdateParams = IncludesAPI.IncludeUpdateParams;
-  export import IncludeListParams = IncludesAPI.IncludeListParams;
-  export import IncludeGetParams = IncludesAPI.IncludeGetParams;
+Policies.Default = Default;
+Policies.Custom = Custom;
+
+export declare namespace Policies {
+  export {
+    type DevicePolicyCertificates as DevicePolicyCertificates,
+    type FallbackDomain as FallbackDomain,
+    type FallbackDomainPolicy as FallbackDomainPolicy,
+    type SettingsPolicy as SettingsPolicy,
+    type SplitTunnelExclude as SplitTunnelExclude,
+    type SplitTunnelInclude as SplitTunnelInclude,
+  };
+
+  export {
+    Default as Default,
+    type DefaultEditResponse as DefaultEditResponse,
+    type DefaultGetResponse as DefaultGetResponse,
+    type DefaultEditParams as DefaultEditParams,
+    type DefaultGetParams as DefaultGetParams,
+  };
+
+  export {
+    Custom as Custom,
+    type CustomDeleteResponse as CustomDeleteResponse,
+    type CustomCreateParams as CustomCreateParams,
+    type CustomListParams as CustomListParams,
+    type CustomDeleteParams as CustomDeleteParams,
+    type CustomEditParams as CustomEditParams,
+    type CustomGetParams as CustomGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/devices/posture/index.ts b/src/resources/zero-trust/devices/posture/index.ts
index 2b4ea057d4..c38227b48e 100644
--- a/src/resources/zero-trust/devices/posture/index.ts
+++ b/src/resources/zero-trust/devices/posture/index.ts
@@ -1,41 +1,41 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  CarbonblackInput,
-  ClientCertificateInput,
-  CrowdstrikeInput,
-  DeviceInput,
-  DeviceMatch,
-  DevicePostureRule,
-  DiskEncryptionInput,
-  DomainJoinedInput,
-  FileInput,
-  FirewallInput,
-  IntuneInput,
-  KolideInput,
-  OSVersionInput,
-  SentineloneInput,
-  SentineloneS2sInput,
-  TaniumInput,
-  UniqueClientIDInput,
-  WorkspaceOneInput,
-  PostureDeleteResponse,
-  PostureCreateParams,
-  PostureUpdateParams,
-  PostureListParams,
-  PostureDeleteParams,
-  PostureGetParams,
   DevicePostureRulesSinglePage,
   Posture,
+  type CarbonblackInput,
+  type ClientCertificateInput,
+  type CrowdstrikeInput,
+  type DeviceInput,
+  type DeviceMatch,
+  type DevicePostureRule,
+  type DiskEncryptionInput,
+  type DomainJoinedInput,
+  type FileInput,
+  type FirewallInput,
+  type IntuneInput,
+  type KolideInput,
+  type OSVersionInput,
+  type SentineloneInput,
+  type SentineloneS2sInput,
+  type TaniumInput,
+  type UniqueClientIDInput,
+  type WorkspaceOneInput,
+  type PostureDeleteResponse,
+  type PostureCreateParams,
+  type PostureUpdateParams,
+  type PostureListParams,
+  type PostureDeleteParams,
+  type PostureGetParams,
 } from './posture';
 export {
-  Integration,
-  IntegrationDeleteResponse,
-  IntegrationCreateParams,
-  IntegrationListParams,
-  IntegrationDeleteParams,
-  IntegrationEditParams,
-  IntegrationGetParams,
   IntegrationsSinglePage,
   Integrations,
+  type Integration,
+  type IntegrationDeleteResponse,
+  type IntegrationCreateParams,
+  type IntegrationListParams,
+  type IntegrationDeleteParams,
+  type IntegrationEditParams,
+  type IntegrationGetParams,
 } from './integrations';
diff --git a/src/resources/zero-trust/devices/posture/integrations.ts b/src/resources/zero-trust/devices/posture/integrations.ts
index 01a8edb487..39cb03713f 100644
--- a/src/resources/zero-trust/devices/posture/integrations.ts
+++ b/src/resources/zero-trust/devices/posture/integrations.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as IntegrationsAPI from './integrations';
 import { SinglePage } from '../../../../pagination';
 
 export class Integrations extends APIResource {
@@ -44,13 +43,13 @@ export class Integrations extends APIResource {
     integrationId: string,
     params: IntegrationDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<IntegrationDeleteResponse> {
+  ): Core.APIPromise<IntegrationDeleteResponse | null> {
     const { account_id } = params;
     return (
       this._client.delete(
         `/accounts/${account_id}/devices/posture/integration/${integrationId}`,
         options,
-      ) as Core.APIPromise<{ result: IntegrationDeleteResponse }>
+      ) as Core.APIPromise<{ result: IntegrationDeleteResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -98,7 +97,7 @@ export interface Integration {
   id?: string;
 
   /**
-   * The configuration object containing third-party integration information.
+   * The Workspace One Config Response.
    */
   config?: Integration.Config;
 
@@ -116,12 +115,20 @@ export interface Integration {
   /**
    * The type of device posture integration.
    */
-  type?: 'workspace_one' | 'crowdstrike_s2s' | 'uptycs' | 'intune' | 'kolide' | 'tanium' | 'sentinelone_s2s';
+  type?:
+    | 'workspace_one'
+    | 'crowdstrike_s2s'
+    | 'uptycs'
+    | 'intune'
+    | 'kolide'
+    | 'tanium'
+    | 'sentinelone_s2s'
+    | 'custom_s2s';
 }
 
 export namespace Integration {
   /**
-   * The configuration object containing third-party integration information.
+   * The Workspace One Config Response.
    */
   export interface Config {
     /**
@@ -141,7 +148,7 @@ export namespace Integration {
   }
 }
 
-export type IntegrationDeleteResponse = unknown | string | null;
+export type IntegrationDeleteResponse = unknown | string;
 
 export interface IntegrationCreateParams {
   /**
@@ -160,7 +167,8 @@ export interface IntegrationCreateParams {
     | IntegrationCreateParams.TeamsDevicesIntuneConfigRequest
     | IntegrationCreateParams.TeamsDevicesKolideConfigRequest
     | IntegrationCreateParams.TeamsDevicesTaniumConfigRequest
-    | IntegrationCreateParams.TeamsDevicesSentineloneS2sConfigRequest;
+    | IntegrationCreateParams.TeamsDevicesSentineloneS2sConfigRequest
+    | IntegrationCreateParams.TeamsDevicesCustomS2sConfigRequest;
 
   /**
    * Body param: The interval between each posture check with the third-party API.
@@ -176,7 +184,15 @@ export interface IntegrationCreateParams {
   /**
    * Body param: The type of device posture integration.
    */
-  type: 'workspace_one' | 'crowdstrike_s2s' | 'uptycs' | 'intune' | 'kolide' | 'tanium' | 'sentinelone_s2s';
+  type:
+    | 'workspace_one'
+    | 'crowdstrike_s2s'
+    | 'uptycs'
+    | 'intune'
+    | 'kolide'
+    | 'tanium'
+    | 'sentinelone_s2s'
+    | 'custom_s2s';
 }
 
 export namespace IntegrationCreateParams {
@@ -310,6 +326,25 @@ export namespace IntegrationCreateParams {
      */
     client_secret: string;
   }
+
+  export interface TeamsDevicesCustomS2sConfigRequest {
+    /**
+     * This id will be passed in the `CF-Access-Client-ID` header when hitting the
+     * `api_url`
+     */
+    access_client_id: string;
+
+    /**
+     * This secret will be passed in the `CF-Access-Client-Secret` header when hitting
+     * the `api_url`
+     */
+    access_client_secret: string;
+
+    /**
+     * The Custom Device Posture Integration API URL.
+     */
+    api_url: string;
+  }
 }
 
 export interface IntegrationListParams {
@@ -337,7 +372,8 @@ export interface IntegrationEditParams {
     | IntegrationEditParams.TeamsDevicesIntuneConfigRequest
     | IntegrationEditParams.TeamsDevicesKolideConfigRequest
     | IntegrationEditParams.TeamsDevicesTaniumConfigRequest
-    | IntegrationEditParams.TeamsDevicesSentineloneS2sConfigRequest;
+    | IntegrationEditParams.TeamsDevicesSentineloneS2sConfigRequest
+    | IntegrationEditParams.TeamsDevicesCustomS2sConfigRequest;
 
   /**
    * Body param: The interval between each posture check with the third-party API.
@@ -353,7 +389,15 @@ export interface IntegrationEditParams {
   /**
    * Body param: The type of device posture integration.
    */
-  type?: 'workspace_one' | 'crowdstrike_s2s' | 'uptycs' | 'intune' | 'kolide' | 'tanium' | 'sentinelone_s2s';
+  type?:
+    | 'workspace_one'
+    | 'crowdstrike_s2s'
+    | 'uptycs'
+    | 'intune'
+    | 'kolide'
+    | 'tanium'
+    | 'sentinelone_s2s'
+    | 'custom_s2s';
 }
 
 export namespace IntegrationEditParams {
@@ -487,19 +531,42 @@ export namespace IntegrationEditParams {
      */
     client_secret: string;
   }
+
+  export interface TeamsDevicesCustomS2sConfigRequest {
+    /**
+     * This id will be passed in the `CF-Access-Client-ID` header when hitting the
+     * `api_url`
+     */
+    access_client_id: string;
+
+    /**
+     * This secret will be passed in the `CF-Access-Client-Secret` header when hitting
+     * the `api_url`
+     */
+    access_client_secret: string;
+
+    /**
+     * The Custom Device Posture Integration API URL.
+     */
+    api_url: string;
+  }
 }
 
 export interface IntegrationGetParams {
   account_id: string;
 }
 
-export namespace Integrations {
-  export import Integration = IntegrationsAPI.Integration;
-  export import IntegrationDeleteResponse = IntegrationsAPI.IntegrationDeleteResponse;
-  export import IntegrationsSinglePage = IntegrationsAPI.IntegrationsSinglePage;
-  export import IntegrationCreateParams = IntegrationsAPI.IntegrationCreateParams;
-  export import IntegrationListParams = IntegrationsAPI.IntegrationListParams;
-  export import IntegrationDeleteParams = IntegrationsAPI.IntegrationDeleteParams;
-  export import IntegrationEditParams = IntegrationsAPI.IntegrationEditParams;
-  export import IntegrationGetParams = IntegrationsAPI.IntegrationGetParams;
+Integrations.IntegrationsSinglePage = IntegrationsSinglePage;
+
+export declare namespace Integrations {
+  export {
+    type Integration as Integration,
+    type IntegrationDeleteResponse as IntegrationDeleteResponse,
+    IntegrationsSinglePage as IntegrationsSinglePage,
+    type IntegrationCreateParams as IntegrationCreateParams,
+    type IntegrationListParams as IntegrationListParams,
+    type IntegrationDeleteParams as IntegrationDeleteParams,
+    type IntegrationEditParams as IntegrationEditParams,
+    type IntegrationGetParams as IntegrationGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/devices/posture/posture.ts b/src/resources/zero-trust/devices/posture/posture.ts
index 7a2cc59244..9804b10b05 100644
--- a/src/resources/zero-trust/devices/posture/posture.ts
+++ b/src/resources/zero-trust/devices/posture/posture.ts
@@ -2,8 +2,18 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as PostureAPI from './posture';
 import * as IntegrationsAPI from './integrations';
+import {
+  Integration,
+  IntegrationCreateParams,
+  IntegrationDeleteParams,
+  IntegrationDeleteResponse,
+  IntegrationEditParams,
+  IntegrationGetParams,
+  IntegrationListParams,
+  Integrations,
+  IntegrationsSinglePage,
+} from './integrations';
 import { SinglePage } from '../../../../pagination';
 
 export class Posture extends APIResource {
@@ -227,12 +237,14 @@ export type DeviceInput =
   | DiskEncryptionInput
   | DeviceInput.TeamsDevicesApplicationInputRequest
   | ClientCertificateInput
+  | DeviceInput.TeamsDevicesClientCertificateV2InputRequest
   | WorkspaceOneInput
   | CrowdstrikeInput
   | IntuneInput
   | KolideInput
   | TaniumInput
-  | SentineloneS2sInput;
+  | SentineloneS2sInput
+  | DeviceInput.TeamsDevicesCustomS2sInputRequest;
 
 export namespace DeviceInput {
   export interface TeamsDevicesCarbonblackInputRequest {
@@ -278,6 +290,70 @@ export namespace DeviceInput {
      */
     thumbprint?: string;
   }
+
+  export interface TeamsDevicesClientCertificateV2InputRequest {
+    /**
+     * UUID of Cloudflare managed certificate.
+     */
+    certificate_id: string;
+
+    /**
+     * Confirm the certificate was not imported from another device. We recommend
+     * keeping this enabled unless the certificate was deployed without a private key.
+     */
+    check_private_key: boolean;
+
+    /**
+     * Operating system
+     */
+    operating_system: 'windows' | 'linux' | 'mac';
+
+    /**
+     * Common Name that is protected by the client certificate. This may include one or
+     * more variables in the ${ } notation. Only ${serial_number} and ${hostname} are
+     * valid variables.
+     */
+    cn?: string;
+
+    /**
+     * List of values indicating purposes for which the certificate public key can be
+     * used
+     */
+    extended_key_usage?: Array<'clientAuth' | 'emailProtection'>;
+
+    locations?: TeamsDevicesClientCertificateV2InputRequest.Locations;
+  }
+
+  export namespace TeamsDevicesClientCertificateV2InputRequest {
+    export interface Locations {
+      /**
+       * List of paths to check for client certificate on linux.
+       */
+      paths?: Array<string>;
+
+      /**
+       * List of trust stores to check for client certificate.
+       */
+      trust_stores?: Array<'system' | 'user'>;
+    }
+  }
+
+  export interface TeamsDevicesCustomS2sInputRequest {
+    /**
+     * Posture Integration ID.
+     */
+    connection_id: string;
+
+    /**
+     * operator
+     */
+    operator: '<' | '<=' | '>' | '>=' | '==';
+
+    /**
+     * A value between 0-100 assigned to devices set by the 3rd party posture provider.
+     */
+    score: number;
+  }
 }
 
 /**
@@ -294,12 +370,14 @@ export type DeviceInputParam =
   | DiskEncryptionInputParam
   | DeviceInputParam.TeamsDevicesApplicationInputRequest
   | ClientCertificateInputParam
+  | DeviceInputParam.TeamsDevicesClientCertificateV2InputRequest
   | WorkspaceOneInputParam
   | CrowdstrikeInputParam
   | IntuneInputParam
   | KolideInputParam
   | TaniumInputParam
-  | SentineloneS2sInputParam;
+  | SentineloneS2sInputParam
+  | DeviceInputParam.TeamsDevicesCustomS2sInputRequest;
 
 export namespace DeviceInputParam {
   export interface TeamsDevicesCarbonblackInputRequest {
@@ -345,6 +423,70 @@ export namespace DeviceInputParam {
      */
     thumbprint?: string;
   }
+
+  export interface TeamsDevicesClientCertificateV2InputRequest {
+    /**
+     * UUID of Cloudflare managed certificate.
+     */
+    certificate_id: string;
+
+    /**
+     * Confirm the certificate was not imported from another device. We recommend
+     * keeping this enabled unless the certificate was deployed without a private key.
+     */
+    check_private_key: boolean;
+
+    /**
+     * Operating system
+     */
+    operating_system: 'windows' | 'linux' | 'mac';
+
+    /**
+     * Common Name that is protected by the client certificate. This may include one or
+     * more variables in the ${ } notation. Only ${serial_number} and ${hostname} are
+     * valid variables.
+     */
+    cn?: string;
+
+    /**
+     * List of values indicating purposes for which the certificate public key can be
+     * used
+     */
+    extended_key_usage?: Array<'clientAuth' | 'emailProtection'>;
+
+    locations?: TeamsDevicesClientCertificateV2InputRequest.Locations;
+  }
+
+  export namespace TeamsDevicesClientCertificateV2InputRequest {
+    export interface Locations {
+      /**
+       * List of paths to check for client certificate on linux.
+       */
+      paths?: Array<string>;
+
+      /**
+       * List of trust stores to check for client certificate.
+       */
+      trust_stores?: Array<'system' | 'user'>;
+    }
+  }
+
+  export interface TeamsDevicesCustomS2sInputRequest {
+    /**
+     * Posture Integration ID.
+     */
+    connection_id: string;
+
+    /**
+     * operator
+     */
+    operator: '<' | '<=' | '>' | '>=' | '==';
+
+    /**
+     * A value between 0-100 assigned to devices set by the 3rd party posture provider.
+     */
+    score: number;
+  }
 }
 
 export interface DeviceMatch {
@@ -409,13 +551,15 @@ export interface DevicePostureRule {
     | 'os_version'
     | 'domain_joined'
     | 'client_certificate'
+    | 'client_certificate_v2'
     | 'unique_client_id'
     | 'kolide'
     | 'tanium_s2s'
     | 'crowdstrike_s2s'
     | 'intune'
     | 'workspace_one'
-    | 'sentinelone_s2s';
+    | 'sentinelone_s2s'
+    | 'custom_s2s';
 }
 
 export interface DiskEncryptionInput {
@@ -629,7 +773,7 @@ export interface OSVersionInput {
   os_distro_revision?: string;
 
   /**
-   * Additional version data. For Mac or iOS, the Product Verison Extra. For Linux,
+   * Additional version data. For Mac or iOS, the Product Version Extra. For Linux,
    * the kernel release version. (Mac, iOS, and Linux only)
    */
   os_version_extra?: string;
@@ -662,7 +806,7 @@ export interface OSVersionInputParam {
   os_distro_revision?: string;
 
   /**
-   * Additional version data. For Mac or iOS, the Product Verison Extra. For Linux,
+   * Additional version data. For Mac or iOS, the Product Version Extra. For Linux,
    * the kernel release version. (Mac, iOS, and Linux only)
    */
   os_version_extra?: string;
@@ -738,6 +882,18 @@ export interface SentineloneS2sInput {
    */
   network_status?: 'connected' | 'disconnected' | 'disconnecting' | 'connecting';
 
+  /**
+   * Agent operational state.
+   */
+  operational_state?:
+    | 'na'
+    | 'partially_disabled'
+    | 'auto_fully_disabled'
+    | 'fully_disabled'
+    | 'auto_partially_disabled'
+    | 'disabled_error'
+    | 'db_corruption';
+
   /**
    * operator
    */
@@ -770,6 +926,18 @@ export interface SentineloneS2sInputParam {
    */
   network_status?: 'connected' | 'disconnected' | 'disconnecting' | 'connecting';
 
+  /**
+   * Agent operational state.
+   */
+  operational_state?:
+    | 'na'
+    | 'partially_disabled'
+    | 'auto_fully_disabled'
+    | 'fully_disabled'
+    | 'auto_partially_disabled'
+    | 'disabled_error'
+    | 'db_corruption';
+
   /**
    * operator
    */
@@ -922,13 +1090,15 @@ export interface PostureCreateParams {
     | 'os_version'
     | 'domain_joined'
     | 'client_certificate'
+    | 'client_certificate_v2'
     | 'unique_client_id'
     | 'kolide'
     | 'tanium_s2s'
     | 'crowdstrike_s2s'
     | 'intune'
     | 'workspace_one'
-    | 'sentinelone_s2s';
+    | 'sentinelone_s2s'
+    | 'custom_s2s';
 
   /**
    * Body param: The description of the device posture rule.
@@ -985,13 +1155,15 @@ export interface PostureUpdateParams {
     | 'os_version'
     | 'domain_joined'
     | 'client_certificate'
+    | 'client_certificate_v2'
     | 'unique_client_id'
     | 'kolide'
     | 'tanium_s2s'
     | 'crowdstrike_s2s'
     | 'intune'
     | 'workspace_one'
-    | 'sentinelone_s2s';
+    | 'sentinelone_s2s'
+    | 'custom_s2s';
 
   /**
    * Body param: The description of the device posture rule.
@@ -1033,39 +1205,48 @@ export interface PostureGetParams {
   account_id: string;
 }
 
-export namespace Posture {
-  export import CarbonblackInput = PostureAPI.CarbonblackInput;
-  export import ClientCertificateInput = PostureAPI.ClientCertificateInput;
-  export import CrowdstrikeInput = PostureAPI.CrowdstrikeInput;
-  export import DeviceInput = PostureAPI.DeviceInput;
-  export import DeviceMatch = PostureAPI.DeviceMatch;
-  export import DevicePostureRule = PostureAPI.DevicePostureRule;
-  export import DiskEncryptionInput = PostureAPI.DiskEncryptionInput;
-  export import DomainJoinedInput = PostureAPI.DomainJoinedInput;
-  export import FileInput = PostureAPI.FileInput;
-  export import FirewallInput = PostureAPI.FirewallInput;
-  export import IntuneInput = PostureAPI.IntuneInput;
-  export import KolideInput = PostureAPI.KolideInput;
-  export import OSVersionInput = PostureAPI.OSVersionInput;
-  export import SentineloneInput = PostureAPI.SentineloneInput;
-  export import SentineloneS2sInput = PostureAPI.SentineloneS2sInput;
-  export import TaniumInput = PostureAPI.TaniumInput;
-  export import UniqueClientIDInput = PostureAPI.UniqueClientIDInput;
-  export import WorkspaceOneInput = PostureAPI.WorkspaceOneInput;
-  export import PostureDeleteResponse = PostureAPI.PostureDeleteResponse;
-  export import DevicePostureRulesSinglePage = PostureAPI.DevicePostureRulesSinglePage;
-  export import PostureCreateParams = PostureAPI.PostureCreateParams;
-  export import PostureUpdateParams = PostureAPI.PostureUpdateParams;
-  export import PostureListParams = PostureAPI.PostureListParams;
-  export import PostureDeleteParams = PostureAPI.PostureDeleteParams;
-  export import PostureGetParams = PostureAPI.PostureGetParams;
-  export import Integrations = IntegrationsAPI.Integrations;
-  export import Integration = IntegrationsAPI.Integration;
-  export import IntegrationDeleteResponse = IntegrationsAPI.IntegrationDeleteResponse;
-  export import IntegrationsSinglePage = IntegrationsAPI.IntegrationsSinglePage;
-  export import IntegrationCreateParams = IntegrationsAPI.IntegrationCreateParams;
-  export import IntegrationListParams = IntegrationsAPI.IntegrationListParams;
-  export import IntegrationDeleteParams = IntegrationsAPI.IntegrationDeleteParams;
-  export import IntegrationEditParams = IntegrationsAPI.IntegrationEditParams;
-  export import IntegrationGetParams = IntegrationsAPI.IntegrationGetParams;
+Posture.DevicePostureRulesSinglePage = DevicePostureRulesSinglePage;
+Posture.Integrations = Integrations;
+Posture.IntegrationsSinglePage = IntegrationsSinglePage;
+
+export declare namespace Posture {
+  export {
+    type CarbonblackInput as CarbonblackInput,
+    type ClientCertificateInput as ClientCertificateInput,
+    type CrowdstrikeInput as CrowdstrikeInput,
+    type DeviceInput as DeviceInput,
+    type DeviceMatch as DeviceMatch,
+    type DevicePostureRule as DevicePostureRule,
+    type DiskEncryptionInput as DiskEncryptionInput,
+    type DomainJoinedInput as DomainJoinedInput,
+    type FileInput as FileInput,
+    type FirewallInput as FirewallInput,
+    type IntuneInput as IntuneInput,
+    type KolideInput as KolideInput,
+    type OSVersionInput as OSVersionInput,
+    type SentineloneInput as SentineloneInput,
+    type SentineloneS2sInput as SentineloneS2sInput,
+    type TaniumInput as TaniumInput,
+    type UniqueClientIDInput as UniqueClientIDInput,
+    type WorkspaceOneInput as WorkspaceOneInput,
+    type PostureDeleteResponse as PostureDeleteResponse,
+    DevicePostureRulesSinglePage as DevicePostureRulesSinglePage,
+    type PostureCreateParams as PostureCreateParams,
+    type PostureUpdateParams as PostureUpdateParams,
+    type PostureListParams as PostureListParams,
+    type PostureDeleteParams as PostureDeleteParams,
+    type PostureGetParams as PostureGetParams,
+  };
+
+  export {
+    Integrations as Integrations,
+    type Integration as Integration,
+    type IntegrationDeleteResponse as IntegrationDeleteResponse,
+    IntegrationsSinglePage as IntegrationsSinglePage,
+    type IntegrationCreateParams as IntegrationCreateParams,
+    type IntegrationListParams as IntegrationListParams,
+    type IntegrationDeleteParams as IntegrationDeleteParams,
+    type IntegrationEditParams as IntegrationEditParams,
+    type IntegrationGetParams as IntegrationGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/devices/revoke.ts b/src/resources/zero-trust/devices/revoke.ts
index 8d39bd7921..42fa6de18e 100644
--- a/src/resources/zero-trust/devices/revoke.ts
+++ b/src/resources/zero-trust/devices/revoke.ts
@@ -2,24 +2,26 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as RevokeAPI from './revoke';
 
 export class Revoke extends APIResource {
   /**
    * Revokes a list of devices.
    */
-  create(params: RevokeCreateParams, options?: Core.RequestOptions): Core.APIPromise<RevokeCreateResponse> {
+  create(
+    params: RevokeCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RevokeCreateResponse | null> {
     const { account_id, body } = params;
     return (
       this._client.post(`/accounts/${account_id}/devices/revoke`, {
         body: body,
         ...options,
-      }) as Core.APIPromise<{ result: RevokeCreateResponse }>
+      }) as Core.APIPromise<{ result: RevokeCreateResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export type RevokeCreateResponse = unknown | string | null;
+export type RevokeCreateResponse = unknown | string;
 
 export interface RevokeCreateParams {
   /**
@@ -33,7 +35,6 @@ export interface RevokeCreateParams {
   body: Array<string>;
 }
 
-export namespace Revoke {
-  export import RevokeCreateResponse = RevokeAPI.RevokeCreateResponse;
-  export import RevokeCreateParams = RevokeAPI.RevokeCreateParams;
+export declare namespace Revoke {
+  export { type RevokeCreateResponse as RevokeCreateResponse, type RevokeCreateParams as RevokeCreateParams };
 }
diff --git a/src/resources/zero-trust/devices/settings.ts b/src/resources/zero-trust/devices/settings.ts
index 93d9148beb..52374bfc6e 100644
--- a/src/resources/zero-trust/devices/settings.ts
+++ b/src/resources/zero-trust/devices/settings.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as SettingsAPI from './settings';
 
 export class Settings extends APIResource {
   /**
@@ -28,9 +27,28 @@ export class Settings extends APIResource {
       }>
     )._thenUnwrap((obj) => obj.result);
   }
+
+  /**
+   * Patches the current device settings for a Zero Trust account.
+   */
+  edit(params: SettingEditParams, options?: Core.RequestOptions): Core.APIPromise<DeviceSettings | null> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/devices/settings`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: DeviceSettings | null }>
+    )._thenUnwrap((obj) => obj.result);
+  }
 }
 
 export interface DeviceSettings {
+  /**
+   * Sets the time limit, in seconds, that a user can use an override code to bypass
+   * WARP.
+   */
+  disable_for_time?: number;
+
   /**
    * Enable gateway proxy filtering on TCP.
    */
@@ -58,6 +76,12 @@ export interface SettingUpdateParams {
    */
   account_id: string;
 
+  /**
+   * Body param: Sets the time limit, in seconds, that a user can use an override
+   * code to bypass WARP.
+   */
+  disable_for_time?: number;
+
   /**
    * Body param: Enable gateway proxy filtering on TCP.
    */
@@ -83,8 +107,44 @@ export interface SettingListParams {
   account_id: string;
 }
 
-export namespace Settings {
-  export import DeviceSettings = SettingsAPI.DeviceSettings;
-  export import SettingUpdateParams = SettingsAPI.SettingUpdateParams;
-  export import SettingListParams = SettingsAPI.SettingListParams;
+export interface SettingEditParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param: Sets the time limit, in seconds, that a user can use an override
+   * code to bypass WARP.
+   */
+  disable_for_time?: number;
+
+  /**
+   * Body param: Enable gateway proxy filtering on TCP.
+   */
+  gateway_proxy_enabled?: boolean;
+
+  /**
+   * Body param: Enable gateway proxy filtering on UDP.
+   */
+  gateway_udp_proxy_enabled?: boolean;
+
+  /**
+   * Body param: Enable installation of cloudflare managed root certificate.
+   */
+  root_certificate_installation_enabled?: boolean;
+
+  /**
+   * Body param: Enable using CGNAT virtual IPv4.
+   */
+  use_zt_virtual_ip?: boolean;
+}
+
+export declare namespace Settings {
+  export {
+    type DeviceSettings as DeviceSettings,
+    type SettingUpdateParams as SettingUpdateParams,
+    type SettingListParams as SettingListParams,
+    type SettingEditParams as SettingEditParams,
+  };
 }
diff --git a/src/resources/zero-trust/devices/unrevoke.ts b/src/resources/zero-trust/devices/unrevoke.ts
index dad9a15d9b..9bfa02a232 100644
--- a/src/resources/zero-trust/devices/unrevoke.ts
+++ b/src/resources/zero-trust/devices/unrevoke.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as UnrevokeAPI from './unrevoke';
 
 export class Unrevoke extends APIResource {
   /**
@@ -11,18 +10,18 @@ export class Unrevoke extends APIResource {
   create(
     params: UnrevokeCreateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<UnrevokeCreateResponse> {
+  ): Core.APIPromise<UnrevokeCreateResponse | null> {
     const { account_id, body } = params;
     return (
       this._client.post(`/accounts/${account_id}/devices/unrevoke`, {
         body: body,
         ...options,
-      }) as Core.APIPromise<{ result: UnrevokeCreateResponse }>
+      }) as Core.APIPromise<{ result: UnrevokeCreateResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
-export type UnrevokeCreateResponse = unknown | string | null;
+export type UnrevokeCreateResponse = unknown | string;
 
 export interface UnrevokeCreateParams {
   /**
@@ -36,7 +35,9 @@ export interface UnrevokeCreateParams {
   body: Array<string>;
 }
 
-export namespace Unrevoke {
-  export import UnrevokeCreateResponse = UnrevokeAPI.UnrevokeCreateResponse;
-  export import UnrevokeCreateParams = UnrevokeAPI.UnrevokeCreateParams;
+export declare namespace Unrevoke {
+  export {
+    type UnrevokeCreateResponse as UnrevokeCreateResponse,
+    type UnrevokeCreateParams as UnrevokeCreateParams,
+  };
 }
diff --git a/src/resources/zero-trust/dex/colos.ts b/src/resources/zero-trust/dex/colos.ts
index da6e42f065..2943014151 100644
--- a/src/resources/zero-trust/dex/colos.ts
+++ b/src/resources/zero-trust/dex/colos.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ColosAPI from './colos';
 import { SinglePage } from '../../../pagination';
 
 export class Colos extends APIResource {
@@ -34,12 +33,12 @@ export interface ColoListParams {
   account_id: string;
 
   /**
-   * Query param: Start time for connection period in RFC3339 (ISO 8601) format.
+   * Query param: Start time for connection period in ISO (RFC3339 - ISO 8601) format
    */
   from: string;
 
   /**
-   * Query param: End time for connection period in RFC3339 (ISO 8601) format.
+   * Query param: End time for connection period in ISO (RFC3339 - ISO 8601) format
    */
   to: string;
 
@@ -50,8 +49,12 @@ export interface ColoListParams {
   sortBy?: 'fleet-status-usage' | 'application-tests-usage';
 }
 
-export namespace Colos {
-  export import ColoListResponse = ColosAPI.ColoListResponse;
-  export import ColoListResponsesSinglePage = ColosAPI.ColoListResponsesSinglePage;
-  export import ColoListParams = ColosAPI.ColoListParams;
+Colos.ColoListResponsesSinglePage = ColoListResponsesSinglePage;
+
+export declare namespace Colos {
+  export {
+    type ColoListResponse as ColoListResponse,
+    ColoListResponsesSinglePage as ColoListResponsesSinglePage,
+    type ColoListParams as ColoListParams,
+  };
 }
diff --git a/src/resources/zero-trust/dex/commands/commands.ts b/src/resources/zero-trust/dex/commands/commands.ts
new file mode 100644
index 0000000000..8936e878d7
--- /dev/null
+++ b/src/resources/zero-trust/dex/commands/commands.ts
@@ -0,0 +1,249 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+import * as DevicesAPI from './devices';
+import {
+  DeviceListParams,
+  DeviceListResponse,
+  DeviceListResponsesV4PagePagination,
+  Devices,
+} from './devices';
+import * as DownloadsAPI from './downloads';
+import { DownloadGetParams, Downloads } from './downloads';
+import * as QuotaAPI from './quota';
+import { Quota, QuotaGetParams, QuotaGetResponse } from './quota';
+import * as UsersAPI from './users';
+import { UserListParams, UserListResponse, Users } from './users';
+import { V4PagePagination, type V4PagePaginationParams } from '../../../../pagination';
+
+export class Commands extends APIResource {
+  users: UsersAPI.Users = new UsersAPI.Users(this._client);
+  devices: DevicesAPI.Devices = new DevicesAPI.Devices(this._client);
+  downloads: DownloadsAPI.Downloads = new DownloadsAPI.Downloads(this._client);
+  quota: QuotaAPI.Quota = new QuotaAPI.Quota(this._client);
+
+  /**
+   * Initiate commands for up to 10 devices per account
+   */
+  create(params: CommandCreateParams, options?: Core.RequestOptions): Core.APIPromise<CommandCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/dex/commands`, { body, ...options }) as Core.APIPromise<{
+        result: CommandCreateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Retrieves a paginated list of commands issued to devices under the specified
+   * account, optionally filtered by time range, device, or other parameters
+   */
+  list(
+    params: CommandListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<CommandListResponsesV4PagePagination, CommandListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/dex/commands`,
+      CommandListResponsesV4PagePagination,
+      { query, ...options },
+    );
+  }
+}
+
+export class CommandListResponsesV4PagePagination extends V4PagePagination<CommandListResponse> {}
+
+export interface CommandCreateResponse {
+  /**
+   * List of created commands
+   */
+  commands?: Array<CommandCreateResponse.Command>;
+}
+
+export namespace CommandCreateResponse {
+  export interface Command {
+    /**
+     * Unique identifier for the command
+     */
+    id?: string;
+
+    /**
+     * Command arguments
+     */
+    args?: Record<string, string>;
+
+    /**
+     * Identifier for the device associated with the command
+     */
+    device_id?: string;
+
+    /**
+     * Current status of the command
+     */
+    status?: 'PENDING_EXEC' | 'PENDING_UPLOAD' | 'SUCCESS' | 'FAILED';
+
+    /**
+     * Type of the command (e.g., "pcap" or "warp-diag")
+     */
+    type?: string;
+  }
+}
+
+export interface CommandListResponse {
+  commands?: Array<CommandListResponse.Command>;
+}
+
+export namespace CommandListResponse {
+  export interface Command {
+    id?: string;
+
+    completed_date?: string | null;
+
+    created_date?: string;
+
+    device_id?: string;
+
+    filename?: string | null;
+
+    status?: string;
+
+    type?: string;
+
+    user_email?: string;
+  }
+}
+
+export interface CommandCreateParams {
+  /**
+   * Path param: unique identifier linked to an account in the API request path
+   */
+  account_id: string;
+
+  /**
+   * Body param: List of device-level commands to execute
+   */
+  commands: Array<CommandCreateParams.Command>;
+}
+
+export namespace CommandCreateParams {
+  export interface Command {
+    /**
+     * Type of command to execute on the device
+     */
+    command_type: 'pcap' | 'warp-diag';
+
+    /**
+     * Unique identifier for the device
+     */
+    device_id: string;
+
+    /**
+     * Email tied to the device
+     */
+    user_email: string;
+
+    command_args?: Command.CommandArgs;
+  }
+
+  export namespace Command {
+    export interface CommandArgs {
+      /**
+       * List of interfaces to capture packets on
+       */
+      interfaces?: Array<'default' | 'tunnel'>;
+
+      /**
+       * Maximum file size (in MB) for the capture file. Specifies the maximum file size
+       * of the warp-diag zip artifact that can be uploaded. If the zip artifact exceeds
+       * the specified max file size, it will NOT be uploaded
+       */
+      'max-file-size-mb'?: number;
+
+      /**
+       * Maximum number of bytes to save for each packet
+       */
+      'packet-size-bytes'?: number;
+
+      /**
+       * Test an IP address from all included or excluded ranges. Tests an IP address
+       * from all included or excluded ranges. Essentially the same as running 'route get
+       * <ip>'' and collecting the results. This option may increase the time taken to
+       * collect the warp-diag
+       */
+      'test-all-routes'?: boolean;
+
+      /**
+       * Limit on capture duration (in minutes)
+       */
+      'time-limit-min'?: number;
+    }
+  }
+}
+
+export interface CommandListParams extends V4PagePaginationParams {
+  /**
+   * Path param: unique identifier linked to an account in the API request path
+   */
+  account_id: string;
+
+  /**
+   * Query param: Optionally filter executed commands by command type
+   */
+  command_type?: string;
+
+  /**
+   * Query param: Unique identifier for a device
+   */
+  device_id?: string;
+
+  /**
+   * Query param: Start time for the query in ISO (RFC3339 - ISO 8601) format
+   */
+  from?: string;
+
+  /**
+   * Query param: Optionally filter executed commands by status
+   */
+  status?: 'PENDING_EXEC' | 'PENDING_UPLOAD' | 'SUCCESS' | 'FAILED';
+
+  /**
+   * Query param: End time for the query in ISO (RFC3339 - ISO 8601) format
+   */
+  to?: string;
+
+  /**
+   * Query param: Email tied to the device
+   */
+  user_email?: string;
+}
+
+Commands.CommandListResponsesV4PagePagination = CommandListResponsesV4PagePagination;
+Commands.Users = Users;
+Commands.Devices = Devices;
+Commands.DeviceListResponsesV4PagePagination = DeviceListResponsesV4PagePagination;
+Commands.Downloads = Downloads;
+Commands.Quota = Quota;
+
+export declare namespace Commands {
+  export {
+    type CommandCreateResponse as CommandCreateResponse,
+    type CommandListResponse as CommandListResponse,
+    CommandListResponsesV4PagePagination as CommandListResponsesV4PagePagination,
+    type CommandCreateParams as CommandCreateParams,
+    type CommandListParams as CommandListParams,
+  };
+
+  export { Users as Users, type UserListResponse as UserListResponse, type UserListParams as UserListParams };
+
+  export {
+    Devices as Devices,
+    type DeviceListResponse as DeviceListResponse,
+    DeviceListResponsesV4PagePagination as DeviceListResponsesV4PagePagination,
+    type DeviceListParams as DeviceListParams,
+  };
+
+  export { Downloads as Downloads, type DownloadGetParams as DownloadGetParams };
+
+  export { Quota as Quota, type QuotaGetResponse as QuotaGetResponse, type QuotaGetParams as QuotaGetParams };
+}
diff --git a/src/resources/zero-trust/dex/commands/devices.ts b/src/resources/zero-trust/dex/commands/devices.ts
new file mode 100644
index 0000000000..792c89812b
--- /dev/null
+++ b/src/resources/zero-trust/dex/commands/devices.ts
@@ -0,0 +1,93 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+import { V4PagePagination, type V4PagePaginationParams } from '../../../../pagination';
+
+export class Devices extends APIResource {
+  /**
+   * List devices with WARP client support for remote captures which have been
+   * connected in the last 1 hour.
+   */
+  list(
+    params: DeviceListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<DeviceListResponsesV4PagePagination, DeviceListResponse> {
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/dex/commands/devices`,
+      DeviceListResponsesV4PagePagination,
+      { query, ...options },
+    );
+  }
+}
+
+export class DeviceListResponsesV4PagePagination extends V4PagePagination<DeviceListResponse> {}
+
+export interface DeviceListResponse {
+  /**
+   * List of eligible devices
+   */
+  devices?: Array<DeviceListResponse.Device>;
+}
+
+export namespace DeviceListResponse {
+  export interface Device {
+    /**
+     * Device identifier (UUID v4)
+     */
+    deviceId?: string;
+
+    /**
+     * Device identifier (human readable)
+     */
+    deviceName?: string;
+
+    /**
+     * User contact email address
+     */
+    personEmail?: string;
+
+    /**
+     * Operating system
+     */
+    platform?: string;
+
+    /**
+     * Network status
+     */
+    status?: string;
+
+    /**
+     * Timestamp in ISO format
+     */
+    timestamp?: string;
+
+    /**
+     * WARP client version
+     */
+    version?: string;
+  }
+}
+
+export interface DeviceListParams extends V4PagePaginationParams {
+  /**
+   * Path param: unique identifier linked to an account in the API request path
+   */
+  account_id: string;
+
+  /**
+   * Query param: Filter devices by name or email
+   */
+  search?: string;
+}
+
+Devices.DeviceListResponsesV4PagePagination = DeviceListResponsesV4PagePagination;
+
+export declare namespace Devices {
+  export {
+    type DeviceListResponse as DeviceListResponse,
+    DeviceListResponsesV4PagePagination as DeviceListResponsesV4PagePagination,
+    type DeviceListParams as DeviceListParams,
+  };
+}
diff --git a/src/resources/zero-trust/dex/commands/downloads.ts b/src/resources/zero-trust/dex/commands/downloads.ts
new file mode 100644
index 0000000000..193fbb06d4
--- /dev/null
+++ b/src/resources/zero-trust/dex/commands/downloads.ts
@@ -0,0 +1,35 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+import { type Response } from '../../../../_shims/index';
+
+export class Downloads extends APIResource {
+  /**
+   * Downloads artifacts for an executed command. Bulk downloads are not supported
+   */
+  get(
+    commandId: string,
+    filename: string,
+    params: DownloadGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<Response> {
+    const { account_id } = params;
+    return this._client.get(`/accounts/${account_id}/dex/commands/${commandId}/downloads/${filename}`, {
+      ...options,
+      headers: { Accept: 'application/zip', ...options?.headers },
+      __binaryResponse: true,
+    });
+  }
+}
+
+export interface DownloadGetParams {
+  /**
+   * unique identifier linked to an account in the API request path
+   */
+  account_id: string;
+}
+
+export declare namespace Downloads {
+  export { type DownloadGetParams as DownloadGetParams };
+}
diff --git a/src/resources/zero-trust/dex/commands/index.ts b/src/resources/zero-trust/dex/commands/index.ts
new file mode 100644
index 0000000000..cfe4b86184
--- /dev/null
+++ b/src/resources/zero-trust/dex/commands/index.ts
@@ -0,0 +1,19 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  CommandListResponsesV4PagePagination,
+  Commands,
+  type CommandCreateResponse,
+  type CommandListResponse,
+  type CommandCreateParams,
+  type CommandListParams,
+} from './commands';
+export {
+  DeviceListResponsesV4PagePagination,
+  Devices,
+  type DeviceListResponse,
+  type DeviceListParams,
+} from './devices';
+export { Downloads, type DownloadGetParams } from './downloads';
+export { Quota, type QuotaGetResponse, type QuotaGetParams } from './quota';
+export { Users, type UserListResponse, type UserListParams } from './users';
diff --git a/src/resources/zero-trust/dex/commands/quota.ts b/src/resources/zero-trust/dex/commands/quota.ts
new file mode 100644
index 0000000000..f15496f3a8
--- /dev/null
+++ b/src/resources/zero-trust/dex/commands/quota.ts
@@ -0,0 +1,47 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+
+export class Quota extends APIResource {
+  /**
+   * Retrieves the current quota usage and limits for device commands within a
+   * specific account, including the time when the quota will reset
+   */
+  get(params: QuotaGetParams, options?: Core.RequestOptions): Core.APIPromise<QuotaGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/dex/commands/quota`, options) as Core.APIPromise<{
+        result: QuotaGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface QuotaGetResponse {
+  /**
+   * The remaining number of commands that can be initiated for an account
+   */
+  quota: number;
+
+  /**
+   * The number of commands that have been initiated for an account
+   */
+  quota_usage: number;
+
+  /**
+   * The time when the quota resets
+   */
+  reset_time: string;
+}
+
+export interface QuotaGetParams {
+  /**
+   * unique identifier linked to an account in the API request path
+   */
+  account_id: string;
+}
+
+export declare namespace Quota {
+  export { type QuotaGetResponse as QuotaGetResponse, type QuotaGetParams as QuotaGetParams };
+}
diff --git a/src/resources/zero-trust/dex/commands/users.ts b/src/resources/zero-trust/dex/commands/users.ts
new file mode 100644
index 0000000000..869d3e5c0f
--- /dev/null
+++ b/src/resources/zero-trust/dex/commands/users.ts
@@ -0,0 +1,43 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+
+export class Users extends APIResource {
+  /**
+   * List users emails associated with devices with WARP client support for remote
+   * captures which have been connected in the last 1 hour.
+   */
+  list(params: UserListParams, options?: Core.RequestOptions): Core.APIPromise<UserListResponse> {
+    const { account_id, ...query } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/dex/commands/users`, {
+        query,
+        ...options,
+      }) as Core.APIPromise<{ result: UserListResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface UserListResponse {
+  /**
+   * List of user emails
+   */
+  userEmails?: Array<string>;
+}
+
+export interface UserListParams {
+  /**
+   * Path param: unique identifier linked to an account in the API request path
+   */
+  account_id: string;
+
+  /**
+   * Query param: filter user emails by search
+   */
+  search?: string;
+}
+
+export declare namespace Users {
+  export { type UserListResponse as UserListResponse, type UserListParams as UserListParams };
+}
diff --git a/src/resources/zero-trust/dex/dex.ts b/src/resources/zero-trust/dex/dex.ts
index 24e7376e49..8daee8b7c5 100644
--- a/src/resources/zero-trust/dex/dex.ts
+++ b/src/resources/zero-trust/dex/dex.ts
@@ -1,15 +1,43 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../resource';
-import * as DEXAPI from './dex';
 import * as ColosAPI from './colos';
+import { ColoListParams, ColoListResponse, ColoListResponsesSinglePage, Colos } from './colos';
 import * as TracerouteTestsAPI from './traceroute-tests';
+import {
+  Traceroute,
+  TracerouteTestGetParams,
+  TracerouteTestNetworkPathParams,
+  TracerouteTestPercentilesParams,
+  TracerouteTestPercentilesResponse,
+  TracerouteTests,
+} from './traceroute-tests';
+import * as CommandsAPI from './commands/commands';
+import {
+  CommandCreateParams,
+  CommandCreateResponse,
+  CommandListParams,
+  CommandListResponse,
+  CommandListResponsesV4PagePagination,
+  Commands,
+} from './commands/commands';
 import * as FleetStatusAPI from './fleet-status/fleet-status';
+import {
+  FleetStatus,
+  FleetStatusLiveParams,
+  FleetStatusLiveResponse,
+  FleetStatusOverTimeParams,
+  LiveStat,
+} from './fleet-status/fleet-status';
 import * as HTTPTestsAPI from './http-tests/http-tests';
+import { HTTPDetails, HTTPTestGetParams, HTTPTests } from './http-tests/http-tests';
 import * as TestsAPI from './tests/tests';
+import { AggregateTimePeriod, TestListParams, Tests, TestsV4PagePagination } from './tests/tests';
 import * as TracerouteTestResultsAPI from './traceroute-test-results/traceroute-test-results';
+import { TracerouteTestResults } from './traceroute-test-results/traceroute-test-results';
 
 export class DEX extends APIResource {
+  commands: CommandsAPI.Commands = new CommandsAPI.Commands(this._client);
   colos: ColosAPI.Colos = new ColosAPI.Colos(this._client);
   fleetStatus: FleetStatusAPI.FleetStatus = new FleetStatusAPI.FleetStatus(this._client);
   httpTests: HTTPTestsAPI.HTTPTests = new HTTPTestsAPI.HTTPTests(this._client);
@@ -19,7 +47,7 @@ export class DEX extends APIResource {
   tracerouteTests: TracerouteTestsAPI.TracerouteTests = new TracerouteTestsAPI.TracerouteTests(this._client);
 }
 
-export interface DeviceExperienceMonitor {
+export interface DigitalExperienceMonitor {
   id: string;
 
   /**
@@ -130,33 +158,69 @@ export interface Percentiles {
   p99?: number | null;
 }
 
-export namespace DEX {
-  export import DeviceExperienceMonitor = DEXAPI.DeviceExperienceMonitor;
-  export import NetworkPath = DEXAPI.NetworkPath;
-  export import NetworkPathResponse = DEXAPI.NetworkPathResponse;
-  export import Percentiles = DEXAPI.Percentiles;
-  export import Colos = ColosAPI.Colos;
-  export import ColoListResponse = ColosAPI.ColoListResponse;
-  export import ColoListResponsesSinglePage = ColosAPI.ColoListResponsesSinglePage;
-  export import ColoListParams = ColosAPI.ColoListParams;
-  export import FleetStatus = FleetStatusAPI.FleetStatus;
-  export import LiveStat = FleetStatusAPI.LiveStat;
-  export import FleetStatusLiveResponse = FleetStatusAPI.FleetStatusLiveResponse;
-  export import FleetStatusLiveParams = FleetStatusAPI.FleetStatusLiveParams;
-  export import FleetStatusOverTimeParams = FleetStatusAPI.FleetStatusOverTimeParams;
-  export import HTTPTests = HTTPTestsAPI.HTTPTests;
-  export import HTTPDetails = HTTPTestsAPI.HTTPDetails;
-  export import HTTPTestGetParams = HTTPTestsAPI.HTTPTestGetParams;
-  export import Tests = TestsAPI.Tests;
-  export import AggregateTimePeriod = TestsAPI.AggregateTimePeriod;
-  export import TestListResponse = TestsAPI.TestListResponse;
-  export import TestListResponsesV4PagePagination = TestsAPI.TestListResponsesV4PagePagination;
-  export import TestListParams = TestsAPI.TestListParams;
-  export import TracerouteTestResults = TracerouteTestResultsAPI.TracerouteTestResults;
-  export import TracerouteTests = TracerouteTestsAPI.TracerouteTests;
-  export import Traceroute = TracerouteTestsAPI.Traceroute;
-  export import TracerouteTestPercentilesResponse = TracerouteTestsAPI.TracerouteTestPercentilesResponse;
-  export import TracerouteTestGetParams = TracerouteTestsAPI.TracerouteTestGetParams;
-  export import TracerouteTestNetworkPathParams = TracerouteTestsAPI.TracerouteTestNetworkPathParams;
-  export import TracerouteTestPercentilesParams = TracerouteTestsAPI.TracerouteTestPercentilesParams;
+DEX.Commands = Commands;
+DEX.CommandListResponsesV4PagePagination = CommandListResponsesV4PagePagination;
+DEX.Colos = Colos;
+DEX.ColoListResponsesSinglePage = ColoListResponsesSinglePage;
+DEX.FleetStatus = FleetStatus;
+DEX.HTTPTests = HTTPTests;
+DEX.TestsV4PagePagination = TestsV4PagePagination;
+DEX.TracerouteTestResults = TracerouteTestResults;
+DEX.TracerouteTests = TracerouteTests;
+
+export declare namespace DEX {
+  export {
+    type DigitalExperienceMonitor as DigitalExperienceMonitor,
+    type NetworkPath as NetworkPath,
+    type NetworkPathResponse as NetworkPathResponse,
+    type Percentiles as Percentiles,
+  };
+
+  export {
+    Commands as Commands,
+    type CommandCreateResponse as CommandCreateResponse,
+    type CommandListResponse as CommandListResponse,
+    CommandListResponsesV4PagePagination as CommandListResponsesV4PagePagination,
+    type CommandCreateParams as CommandCreateParams,
+    type CommandListParams as CommandListParams,
+  };
+
+  export {
+    Colos as Colos,
+    type ColoListResponse as ColoListResponse,
+    ColoListResponsesSinglePage as ColoListResponsesSinglePage,
+    type ColoListParams as ColoListParams,
+  };
+
+  export {
+    FleetStatus as FleetStatus,
+    type LiveStat as LiveStat,
+    type FleetStatusLiveResponse as FleetStatusLiveResponse,
+    type FleetStatusLiveParams as FleetStatusLiveParams,
+    type FleetStatusOverTimeParams as FleetStatusOverTimeParams,
+  };
+
+  export {
+    HTTPTests as HTTPTests,
+    type HTTPDetails as HTTPDetails,
+    type HTTPTestGetParams as HTTPTestGetParams,
+  };
+
+  export {
+    type Tests as Tests,
+    type AggregateTimePeriod as AggregateTimePeriod,
+    TestsV4PagePagination as TestsV4PagePagination,
+    type TestListParams as TestListParams,
+  };
+
+  export { TracerouteTestResults as TracerouteTestResults };
+
+  export {
+    TracerouteTests as TracerouteTests,
+    type Traceroute as Traceroute,
+    type TracerouteTestPercentilesResponse as TracerouteTestPercentilesResponse,
+    type TracerouteTestGetParams as TracerouteTestGetParams,
+    type TracerouteTestNetworkPathParams as TracerouteTestNetworkPathParams,
+    type TracerouteTestPercentilesParams as TracerouteTestPercentilesParams,
+  };
 }
diff --git a/src/resources/zero-trust/dex/fleet-status/devices.ts b/src/resources/zero-trust/dex/fleet-status/devices.ts
index 3385777908..65e6dbfce0 100644
--- a/src/resources/zero-trust/dex/fleet-status/devices.ts
+++ b/src/resources/zero-trust/dex/fleet-status/devices.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as DevicesAPI from './devices';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../../pagination';
 
 export class Devices extends APIResource {
@@ -35,6 +34,11 @@ export interface DeviceListResponse {
    */
   deviceId: string;
 
+  /**
+   * The mode under which the WARP client is run
+   */
+  mode: string;
+
   /**
    * Operating system
    */
@@ -45,44 +49,268 @@ export interface DeviceListResponse {
    */
   status: string;
 
+  /**
+   * Timestamp in ISO format
+   */
+  timestamp: string;
+
   /**
    * WARP client version
    */
   version: string;
 
+  alwaysOn?: boolean | null;
+
+  batteryCharging?: boolean | null;
+
+  batteryCycles?: number | null;
+
+  batteryPct?: number | null;
+
+  connectionType?: string | null;
+
+  cpuPct?: number | null;
+
+  cpuPctByApp?: Array<Array<DeviceListResponse.CPUPctByApp>> | null;
+
+  deviceIpv4?: DeviceListResponse.DeviceIPV4;
+
+  deviceIpv6?: DeviceListResponse.DeviceIPV6;
+
   /**
    * Device identifier (human readable)
    */
   deviceName?: string;
 
+  diskReadBps?: number | null;
+
+  diskUsagePct?: number | null;
+
+  diskWriteBps?: number | null;
+
+  dohSubdomain?: string | null;
+
+  estimatedLossPct?: number | null;
+
+  firewallEnabled?: boolean | null;
+
+  gatewayIpv4?: DeviceListResponse.GatewayIPV4;
+
+  gatewayIpv6?: DeviceListResponse.GatewayIPV6;
+
+  handshakeLatencyMs?: number | null;
+
+  ispIpv4?: DeviceListResponse.ISPIPV4;
+
+  ispIpv6?: DeviceListResponse.ISPIPV6;
+
+  metal?: string | null;
+
+  networkRcvdBps?: number | null;
+
+  networkSentBps?: number | null;
+
+  networkSsid?: string | null;
+
   /**
    * User contact email address
    */
   personEmail?: string;
+
+  ramAvailableKb?: number | null;
+
+  ramUsedPct?: number | null;
+
+  ramUsedPctByApp?: Array<Array<DeviceListResponse.RamUsedPctByApp>> | null;
+
+  switchLocked?: boolean | null;
+
+  wifiStrengthDbm?: number | null;
+}
+
+export namespace DeviceListResponse {
+  export interface CPUPctByApp {
+    cpu_pct?: number;
+
+    name?: string;
+  }
+
+  export interface DeviceIPV4 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: DeviceIPV4.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace DeviceIPV4 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface DeviceIPV6 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: DeviceIPV6.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace DeviceIPV6 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface GatewayIPV4 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: GatewayIPV4.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace GatewayIPV4 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface GatewayIPV6 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: GatewayIPV6.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace GatewayIPV6 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface ISPIPV4 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: ISPIPV4.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace ISPIPV4 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface ISPIPV6 {
+    address?: string | null;
+
+    asn?: number | null;
+
+    aso?: string | null;
+
+    location?: ISPIPV6.Location;
+
+    netmask?: string | null;
+
+    version?: string | null;
+  }
+
+  export namespace ISPIPV6 {
+    export interface Location {
+      city?: string | null;
+
+      country_iso?: string | null;
+
+      state_iso?: string | null;
+
+      zip?: string | null;
+    }
+  }
+
+  export interface RamUsedPctByApp {
+    name?: string;
+
+    ram_used_pct?: number;
+  }
 }
 
 export interface DeviceListParams extends V4PagePaginationArrayParams {
   /**
-   * Path param:
+   * Path param: Unique identifier for account
    */
   account_id: string;
 
   /**
-   * Query param: Timestamp in ISO format
+   * Query param: Time range beginning in ISO format
    */
   from: string;
 
   /**
-   * Query param: Source:
-   *
-   * - `hourly` - device details aggregated hourly, up to 7 days prior
-   * - `last_seen` - device details, up to 24 hours prior
-   * - `raw` - device details, up to 7 days prior
-   */
-  source: 'last_seen' | 'hourly' | 'raw';
-
-  /**
-   * Query param: Timestamp in ISO format
+   * Query param: Time range end in ISO format
    */
   to: string;
 
@@ -111,6 +339,15 @@ export interface DeviceListParams extends V4PagePaginationArrayParams {
    */
   sort_by?: 'colo' | 'device_id' | 'mode' | 'platform' | 'status' | 'timestamp' | 'version';
 
+  /**
+   * Query param: Source:
+   *
+   * - `hourly` - device details aggregated hourly, up to 7 days prior
+   * - `last_seen` - device details, up to 24 hours prior
+   * - `raw` - device details, up to 7 days prior
+   */
+  source?: 'last_seen' | 'hourly' | 'raw';
+
   /**
    * Query param: Network status
    */
@@ -122,8 +359,12 @@ export interface DeviceListParams extends V4PagePaginationArrayParams {
   version?: string;
 }
 
-export namespace Devices {
-  export import DeviceListResponse = DevicesAPI.DeviceListResponse;
-  export import DeviceListResponsesV4PagePaginationArray = DevicesAPI.DeviceListResponsesV4PagePaginationArray;
-  export import DeviceListParams = DevicesAPI.DeviceListParams;
+Devices.DeviceListResponsesV4PagePaginationArray = DeviceListResponsesV4PagePaginationArray;
+
+export declare namespace Devices {
+  export {
+    type DeviceListResponse as DeviceListResponse,
+    DeviceListResponsesV4PagePaginationArray as DeviceListResponsesV4PagePaginationArray,
+    type DeviceListParams as DeviceListParams,
+  };
 }
diff --git a/src/resources/zero-trust/dex/fleet-status/fleet-status.ts b/src/resources/zero-trust/dex/fleet-status/fleet-status.ts
index 657968a4ac..6a64f63bb8 100644
--- a/src/resources/zero-trust/dex/fleet-status/fleet-status.ts
+++ b/src/resources/zero-trust/dex/fleet-status/fleet-status.ts
@@ -4,6 +4,12 @@ import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
 import * as FleetStatusAPI from './fleet-status';
 import * as DevicesAPI from './devices';
+import {
+  DeviceListParams,
+  DeviceListResponse,
+  DeviceListResponsesV4PagePaginationArray,
+  Devices,
+} from './devices';
 
 export class FleetStatus extends APIResource {
   devices: DevicesAPI.Devices = new DevicesAPI.Devices(this._client);
@@ -71,7 +77,7 @@ export namespace FleetStatusLiveResponse {
 
 export interface FleetStatusLiveParams {
   /**
-   * Path param:
+   * Path param: Unique identifier for account
    */
   account_id: string;
 
@@ -83,17 +89,17 @@ export interface FleetStatusLiveParams {
 
 export interface FleetStatusOverTimeParams {
   /**
-   * Path param:
+   * Path param: Unique identifier for account
    */
   account_id: string;
 
   /**
-   * Query param: Timestamp in ISO format
+   * Query param: Time range beginning in ISO format
    */
   from: string;
 
   /**
-   * Query param: Timestamp in ISO format
+   * Query param: Time range end in ISO format
    */
   to: string;
 
@@ -108,13 +114,21 @@ export interface FleetStatusOverTimeParams {
   device_id?: string;
 }
 
-export namespace FleetStatus {
-  export import LiveStat = FleetStatusAPI.LiveStat;
-  export import FleetStatusLiveResponse = FleetStatusAPI.FleetStatusLiveResponse;
-  export import FleetStatusLiveParams = FleetStatusAPI.FleetStatusLiveParams;
-  export import FleetStatusOverTimeParams = FleetStatusAPI.FleetStatusOverTimeParams;
-  export import Devices = DevicesAPI.Devices;
-  export import DeviceListResponse = DevicesAPI.DeviceListResponse;
-  export import DeviceListResponsesV4PagePaginationArray = DevicesAPI.DeviceListResponsesV4PagePaginationArray;
-  export import DeviceListParams = DevicesAPI.DeviceListParams;
+FleetStatus.Devices = Devices;
+FleetStatus.DeviceListResponsesV4PagePaginationArray = DeviceListResponsesV4PagePaginationArray;
+
+export declare namespace FleetStatus {
+  export {
+    type LiveStat as LiveStat,
+    type FleetStatusLiveResponse as FleetStatusLiveResponse,
+    type FleetStatusLiveParams as FleetStatusLiveParams,
+    type FleetStatusOverTimeParams as FleetStatusOverTimeParams,
+  };
+
+  export {
+    Devices as Devices,
+    type DeviceListResponse as DeviceListResponse,
+    DeviceListResponsesV4PagePaginationArray as DeviceListResponsesV4PagePaginationArray,
+    type DeviceListParams as DeviceListParams,
+  };
 }
diff --git a/src/resources/zero-trust/dex/fleet-status/index.ts b/src/resources/zero-trust/dex/fleet-status/index.ts
index d370916380..31cdb34bb8 100644
--- a/src/resources/zero-trust/dex/fleet-status/index.ts
+++ b/src/resources/zero-trust/dex/fleet-status/index.ts
@@ -1,15 +1,15 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  DeviceListResponse,
-  DeviceListParams,
   DeviceListResponsesV4PagePaginationArray,
   Devices,
+  type DeviceListResponse,
+  type DeviceListParams,
 } from './devices';
 export {
-  LiveStat,
-  FleetStatusLiveResponse,
-  FleetStatusLiveParams,
-  FleetStatusOverTimeParams,
   FleetStatus,
+  type LiveStat,
+  type FleetStatusLiveResponse,
+  type FleetStatusLiveParams,
+  type FleetStatusOverTimeParams,
 } from './fleet-status';
diff --git a/src/resources/zero-trust/dex/http-tests/http-tests.ts b/src/resources/zero-trust/dex/http-tests/http-tests.ts
index 2c2dde9c70..966ddf097c 100644
--- a/src/resources/zero-trust/dex/http-tests/http-tests.ts
+++ b/src/resources/zero-trust/dex/http-tests/http-tests.ts
@@ -2,9 +2,9 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as HTTPTestsAPI from './http-tests';
 import * as DEXAPI from '../dex';
 import * as PercentilesAPI from './percentiles';
+import { HTTPDetailsPercentiles, PercentileGetParams, Percentiles, TestStatOverTime } from './percentiles';
 
 export class HTTPTests extends APIResource {
   percentiles: PercentilesAPI.Percentiles = new PercentilesAPI.Percentiles(this._client);
@@ -55,7 +55,7 @@ export interface HTTPDetails {
    */
   name?: string;
 
-  target_policies?: Array<DEXAPI.DeviceExperienceMonitor> | null;
+  target_policies?: Array<DEXAPI.DigitalExperienceMonitor> | null;
 
   targeted?: boolean;
 }
@@ -214,11 +214,15 @@ export interface HTTPTestGetParams {
   deviceId?: Array<string>;
 }
 
-export namespace HTTPTests {
-  export import HTTPDetails = HTTPTestsAPI.HTTPDetails;
-  export import HTTPTestGetParams = HTTPTestsAPI.HTTPTestGetParams;
-  export import Percentiles = PercentilesAPI.Percentiles;
-  export import HTTPDetailsPercentiles = PercentilesAPI.HTTPDetailsPercentiles;
-  export import TestStatOverTime = PercentilesAPI.TestStatOverTime;
-  export import PercentileGetParams = PercentilesAPI.PercentileGetParams;
+HTTPTests.Percentiles = Percentiles;
+
+export declare namespace HTTPTests {
+  export { type HTTPDetails as HTTPDetails, type HTTPTestGetParams as HTTPTestGetParams };
+
+  export {
+    Percentiles as Percentiles,
+    type HTTPDetailsPercentiles as HTTPDetailsPercentiles,
+    type TestStatOverTime as TestStatOverTime,
+    type PercentileGetParams as PercentileGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/dex/http-tests/index.ts b/src/resources/zero-trust/dex/http-tests/index.ts
index f27551daae..412e1bc76c 100644
--- a/src/resources/zero-trust/dex/http-tests/index.ts
+++ b/src/resources/zero-trust/dex/http-tests/index.ts
@@ -1,4 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { HTTPDetails, HTTPTestGetParams, HTTPTests } from './http-tests';
-export { HTTPDetailsPercentiles, TestStatOverTime, PercentileGetParams, Percentiles } from './percentiles';
+export { HTTPTests, type HTTPDetails, type HTTPTestGetParams } from './http-tests';
+export {
+  Percentiles,
+  type HTTPDetailsPercentiles,
+  type TestStatOverTime,
+  type PercentileGetParams,
+} from './percentiles';
diff --git a/src/resources/zero-trust/dex/http-tests/percentiles.ts b/src/resources/zero-trust/dex/http-tests/percentiles.ts
index 9a29ad683d..4f055b79d6 100644
--- a/src/resources/zero-trust/dex/http-tests/percentiles.ts
+++ b/src/resources/zero-trust/dex/http-tests/percentiles.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as PercentilesAPI from './percentiles';
 import * as DEXAPI from '../dex';
 
 export class Percentiles extends APIResource {
@@ -67,12 +66,12 @@ export interface PercentileGetParams {
   account_id: string;
 
   /**
-   * Query param: Start time for aggregate metrics in ISO format
+   * Query param: Start time for the query in ISO (RFC3339 - ISO 8601) format
    */
   from: string;
 
   /**
-   * Query param: End time for aggregate metrics in ISO format
+   * Query param: End time for the query in ISO (RFC3339 - ISO 8601) format
    */
   to: string;
 
@@ -89,8 +88,10 @@ export interface PercentileGetParams {
   deviceId?: Array<string>;
 }
 
-export namespace Percentiles {
-  export import HTTPDetailsPercentiles = PercentilesAPI.HTTPDetailsPercentiles;
-  export import TestStatOverTime = PercentilesAPI.TestStatOverTime;
-  export import PercentileGetParams = PercentilesAPI.PercentileGetParams;
+export declare namespace Percentiles {
+  export {
+    type HTTPDetailsPercentiles as HTTPDetailsPercentiles,
+    type TestStatOverTime as TestStatOverTime,
+    type PercentileGetParams as PercentileGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/dex/index.ts b/src/resources/zero-trust/dex/index.ts
index 9999c7627c..129d2d85f2 100644
--- a/src/resources/zero-trust/dex/index.ts
+++ b/src/resources/zero-trust/dex/index.ts
@@ -1,28 +1,36 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export { ColoListResponsesSinglePage, Colos, type ColoListResponse, type ColoListParams } from './colos';
 export {
-  AggregateTimePeriod,
-  Tests,
-  TestListResponse,
-  TestListParams,
-  TestListResponsesV4PagePagination,
-} from './tests/index';
-export { ColoListResponse, ColoListParams, ColoListResponsesSinglePage, Colos } from './colos';
-export { DeviceExperienceMonitor, NetworkPath, NetworkPathResponse, Percentiles, DEX } from './dex';
-export { HTTPDetails, HTTPTestGetParams, HTTPTests } from './http-tests/index';
+  CommandListResponsesV4PagePagination,
+  Commands,
+  type CommandCreateResponse,
+  type CommandListResponse,
+  type CommandCreateParams,
+  type CommandListParams,
+} from './commands/index';
+export {
+  DEX,
+  type DigitalExperienceMonitor,
+  type NetworkPath,
+  type NetworkPathResponse,
+  type Percentiles,
+} from './dex';
 export {
-  LiveStat,
-  FleetStatusLiveResponse,
-  FleetStatusLiveParams,
-  FleetStatusOverTimeParams,
   FleetStatus,
+  type LiveStat,
+  type FleetStatusLiveResponse,
+  type FleetStatusLiveParams,
+  type FleetStatusOverTimeParams,
 } from './fleet-status/index';
+export { HTTPTests, type HTTPDetails, type HTTPTestGetParams } from './http-tests/index';
+export { TestsV4PagePagination, Tests, type AggregateTimePeriod, type TestListParams } from './tests/index';
+export { TracerouteTestResults } from './traceroute-test-results/index';
 export {
-  Traceroute,
-  TracerouteTestPercentilesResponse,
-  TracerouteTestGetParams,
-  TracerouteTestNetworkPathParams,
-  TracerouteTestPercentilesParams,
   TracerouteTests,
+  type Traceroute,
+  type TracerouteTestPercentilesResponse,
+  type TracerouteTestGetParams,
+  type TracerouteTestNetworkPathParams,
+  type TracerouteTestPercentilesParams,
 } from './traceroute-tests';
-export { TracerouteTestResults } from './traceroute-test-results/index';
diff --git a/src/resources/zero-trust/dex/tests/index.ts b/src/resources/zero-trust/dex/tests/index.ts
index f211a5683b..6c0e6e4a2a 100644
--- a/src/resources/zero-trust/dex/tests/index.ts
+++ b/src/resources/zero-trust/dex/tests/index.ts
@@ -1,10 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export {
-  AggregateTimePeriod,
-  Tests,
-  TestListResponse,
-  TestListParams,
-  TestListResponsesV4PagePagination,
-} from './tests';
-export { UniqueDevices, UniqueDeviceListParams } from './unique-devices';
+export { TestsV4PagePagination, Tests, type AggregateTimePeriod, type TestListParams } from './tests';
+export { UniqueDevices, type UniqueDeviceListParams } from './unique-devices';
diff --git a/src/resources/zero-trust/dex/tests/tests.ts b/src/resources/zero-trust/dex/tests/tests.ts
index 3989878bd0..c269b87f60 100644
--- a/src/resources/zero-trust/dex/tests/tests.ts
+++ b/src/resources/zero-trust/dex/tests/tests.ts
@@ -3,30 +3,30 @@
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
 import * as TestsAPI from './tests';
-import * as Shared from '../../../shared';
 import * as DEXAPI from '../dex';
 import * as UniqueDevicesAPI from './unique-devices';
+import { UniqueDeviceListParams, UniqueDevices } from './unique-devices';
 import { V4PagePagination, type V4PagePaginationParams } from '../../../../pagination';
 
 export class Tests extends APIResource {
   uniqueDevices: UniqueDevicesAPI.UniqueDevices = new UniqueDevicesAPI.UniqueDevices(this._client);
 
   /**
-   * List DEX tests
+   * List DEX tests with overview metrics
    */
   list(
     params: TestListParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<TestListResponsesV4PagePagination, TestListResponse> {
+  ): Core.PagePromise<TestsV4PagePagination, Tests> {
     const { account_id, ...query } = params;
-    return this._client.getAPIList(`/accounts/${account_id}/dex/tests`, TestListResponsesV4PagePagination, {
+    return this._client.getAPIList(`/accounts/${account_id}/dex/tests/overview`, TestsV4PagePagination, {
       query,
       ...options,
     });
   }
 }
 
-export class TestListResponsesV4PagePagination extends V4PagePagination<TestListResponse> {}
+export class TestsV4PagePagination extends V4PagePagination<Tests> {}
 
 export interface AggregateTimePeriod {
   units: 'hours' | 'days' | 'testRuns';
@@ -111,7 +111,7 @@ export namespace Tests {
      */
     method?: string;
 
-    target_policies?: Array<DEXAPI.DeviceExperienceMonitor> | null;
+    target_policies?: Array<DEXAPI.DigitalExperienceMonitor> | null;
 
     targeted?: boolean;
 
@@ -285,45 +285,6 @@ export namespace Tests {
   }
 }
 
-export interface TestListResponse {
-  errors: Array<Shared.ResponseInfo>;
-
-  messages: Array<Shared.ResponseInfo>;
-
-  /**
-   * Whether the API call was successful
-   */
-  success: true;
-
-  result?: Tests;
-
-  result_info?: TestListResponse.ResultInfo;
-}
-
-export namespace TestListResponse {
-  export interface ResultInfo {
-    /**
-     * Total number of results for the requested service
-     */
-    count?: number;
-
-    /**
-     * Current page within paginated list of results
-     */
-    page?: number;
-
-    /**
-     * Number of results per page of results
-     */
-    per_page?: number;
-
-    /**
-     * Total results available without any search parameters
-     */
-    total_count?: number;
-  }
-}
-
 export interface TestListParams extends V4PagePaginationParams {
   /**
    * Path param: unique identifier linked to an account in the API request path.
@@ -348,12 +309,15 @@ export interface TestListParams extends V4PagePaginationParams {
   testName?: string;
 }
 
-export namespace Tests {
-  export import AggregateTimePeriod = TestsAPI.AggregateTimePeriod;
-  export import Tests = TestsAPI.Tests;
-  export import TestListResponse = TestsAPI.TestListResponse;
-  export import TestListResponsesV4PagePagination = TestsAPI.TestListResponsesV4PagePagination;
-  export import TestListParams = TestsAPI.TestListParams;
-  export import UniqueDevices = UniqueDevicesAPI.UniqueDevices;
-  export import UniqueDeviceListParams = UniqueDevicesAPI.UniqueDeviceListParams;
+Tests.TestsV4PagePagination = TestsV4PagePagination;
+
+export declare namespace Tests {
+  export {
+    type AggregateTimePeriod as AggregateTimePeriod,
+    type Tests as Tests,
+    TestsV4PagePagination as TestsV4PagePagination,
+    type TestListParams as TestListParams,
+  };
+
+  export { type UniqueDevices as UniqueDevices, type UniqueDeviceListParams as UniqueDeviceListParams };
 }
diff --git a/src/resources/zero-trust/dex/tests/unique-devices.ts b/src/resources/zero-trust/dex/tests/unique-devices.ts
index 6b7283e8aa..9899cbea6b 100644
--- a/src/resources/zero-trust/dex/tests/unique-devices.ts
+++ b/src/resources/zero-trust/dex/tests/unique-devices.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as UniqueDevicesAPI from './unique-devices';
 
 export class UniqueDevices extends APIResource {
   /**
@@ -45,7 +44,6 @@ export interface UniqueDeviceListParams {
   testName?: string;
 }
 
-export namespace UniqueDevices {
-  export import UniqueDevices = UniqueDevicesAPI.UniqueDevices;
-  export import UniqueDeviceListParams = UniqueDevicesAPI.UniqueDeviceListParams;
+export declare namespace UniqueDevices {
+  export { type UniqueDevices as UniqueDevices, type UniqueDeviceListParams as UniqueDeviceListParams };
 }
diff --git a/src/resources/zero-trust/dex/traceroute-test-results/index.ts b/src/resources/zero-trust/dex/traceroute-test-results/index.ts
index 34ddb15916..e0192aa20d 100644
--- a/src/resources/zero-trust/dex/traceroute-test-results/index.ts
+++ b/src/resources/zero-trust/dex/traceroute-test-results/index.ts
@@ -1,4 +1,4 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { NetworkPathGetResponse, NetworkPathGetParams, NetworkPath } from './network-path';
+export { NetworkPath, type NetworkPathGetResponse, type NetworkPathGetParams } from './network-path';
 export { TracerouteTestResults } from './traceroute-test-results';
diff --git a/src/resources/zero-trust/dex/traceroute-test-results/network-path.ts b/src/resources/zero-trust/dex/traceroute-test-results/network-path.ts
index 41310a9228..6b54a87fd3 100644
--- a/src/resources/zero-trust/dex/traceroute-test-results/network-path.ts
+++ b/src/resources/zero-trust/dex/traceroute-test-results/network-path.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as NetworkPathAPI from './network-path';
 
 export class NetworkPath extends APIResource {
   /**
@@ -90,7 +89,9 @@ export interface NetworkPathGetParams {
   account_id: string;
 }
 
-export namespace NetworkPath {
-  export import NetworkPathGetResponse = NetworkPathAPI.NetworkPathGetResponse;
-  export import NetworkPathGetParams = NetworkPathAPI.NetworkPathGetParams;
+export declare namespace NetworkPath {
+  export {
+    type NetworkPathGetResponse as NetworkPathGetResponse,
+    type NetworkPathGetParams as NetworkPathGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/dex/traceroute-test-results/traceroute-test-results.ts b/src/resources/zero-trust/dex/traceroute-test-results/traceroute-test-results.ts
index ea9068c067..30ea1fb8a5 100644
--- a/src/resources/zero-trust/dex/traceroute-test-results/traceroute-test-results.ts
+++ b/src/resources/zero-trust/dex/traceroute-test-results/traceroute-test-results.ts
@@ -2,13 +2,18 @@
 
 import { APIResource } from '../../../../resource';
 import * as NetworkPathAPI from './network-path';
+import { NetworkPath, NetworkPathGetParams, NetworkPathGetResponse } from './network-path';
 
 export class TracerouteTestResults extends APIResource {
   networkPath: NetworkPathAPI.NetworkPath = new NetworkPathAPI.NetworkPath(this._client);
 }
 
-export namespace TracerouteTestResults {
-  export import NetworkPath = NetworkPathAPI.NetworkPath;
-  export import NetworkPathGetResponse = NetworkPathAPI.NetworkPathGetResponse;
-  export import NetworkPathGetParams = NetworkPathAPI.NetworkPathGetParams;
+TracerouteTestResults.NetworkPath = NetworkPath;
+
+export declare namespace TracerouteTestResults {
+  export {
+    NetworkPath as NetworkPath,
+    type NetworkPathGetResponse as NetworkPathGetResponse,
+    type NetworkPathGetParams as NetworkPathGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/dex/traceroute-tests.ts b/src/resources/zero-trust/dex/traceroute-tests.ts
index d6c9520402..9ff5b13195 100644
--- a/src/resources/zero-trust/dex/traceroute-tests.ts
+++ b/src/resources/zero-trust/dex/traceroute-tests.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as TracerouteTestsAPI from './traceroute-tests';
 import * as DEXAPI from './dex';
 import * as PercentilesAPI from './http-tests/percentiles';
 
@@ -79,7 +78,7 @@ export interface Traceroute {
    */
   name: string;
 
-  target_policies?: Array<DEXAPI.DeviceExperienceMonitor> | null;
+  target_policies?: Array<DEXAPI.DigitalExperienceMonitor> | null;
 
   targeted?: boolean;
 
@@ -310,12 +309,12 @@ export interface TracerouteTestPercentilesParams {
   account_id: string;
 
   /**
-   * Query param: Start time for aggregate metrics in ISO format
+   * Query param: Start time for the query in ISO (RFC3339 - ISO 8601) format
    */
   from: string;
 
   /**
-   * Query param: End time for aggregate metrics in ISO format
+   * Query param: End time for the query in ISO (RFC3339 - ISO 8601) format
    */
   to: string;
 
@@ -332,10 +331,12 @@ export interface TracerouteTestPercentilesParams {
   deviceId?: Array<string>;
 }
 
-export namespace TracerouteTests {
-  export import Traceroute = TracerouteTestsAPI.Traceroute;
-  export import TracerouteTestPercentilesResponse = TracerouteTestsAPI.TracerouteTestPercentilesResponse;
-  export import TracerouteTestGetParams = TracerouteTestsAPI.TracerouteTestGetParams;
-  export import TracerouteTestNetworkPathParams = TracerouteTestsAPI.TracerouteTestNetworkPathParams;
-  export import TracerouteTestPercentilesParams = TracerouteTestsAPI.TracerouteTestPercentilesParams;
+export declare namespace TracerouteTests {
+  export {
+    type Traceroute as Traceroute,
+    type TracerouteTestPercentilesResponse as TracerouteTestPercentilesResponse,
+    type TracerouteTestGetParams as TracerouteTestGetParams,
+    type TracerouteTestNetworkPathParams as TracerouteTestNetworkPathParams,
+    type TracerouteTestPercentilesParams as TracerouteTestPercentilesParams,
+  };
 }
diff --git a/src/resources/zero-trust/dlp/datasets/datasets.ts b/src/resources/zero-trust/dlp/datasets/datasets.ts
index 65be8f1960..2734788163 100644
--- a/src/resources/zero-trust/dlp/datasets/datasets.ts
+++ b/src/resources/zero-trust/dlp/datasets/datasets.ts
@@ -2,15 +2,18 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as DatasetsAPI from './datasets';
 import * as UploadAPI from './upload';
+import { NewVersion, Upload as UploadAPIUpload, UploadCreateParams, UploadEditParams } from './upload';
+import * as VersionsAPI from './versions/versions';
+import { VersionCreateParams, VersionCreateResponse, Versions } from './versions/versions';
 import { SinglePage } from '../../../../pagination';
 
 export class Datasets extends APIResource {
   upload: UploadAPI.Upload = new UploadAPI.Upload(this._client);
+  versions: VersionsAPI.Versions = new VersionsAPI.Versions(this._client);
 
   /**
-   * Create a new dataset.
+   * Create a new dataset
    */
   create(params: DatasetCreateParams, options?: Core.RequestOptions): Core.APIPromise<DatasetCreation> {
     const { account_id, ...body } = params;
@@ -22,7 +25,7 @@ export class Datasets extends APIResource {
   }
 
   /**
-   * Update details about a dataset.
+   * Update details about a dataset
    */
   update(
     datasetId: string,
@@ -39,7 +42,7 @@ export class Datasets extends APIResource {
   }
 
   /**
-   * Fetch all datasets with information about available versions.
+   * Fetch all datasets
    */
   list(
     params: DatasetListParams,
@@ -50,8 +53,6 @@ export class Datasets extends APIResource {
   }
 
   /**
-   * Delete a dataset.
-   *
    * This deletes all versions of the dataset.
    */
   delete(
@@ -67,7 +68,7 @@ export class Datasets extends APIResource {
   }
 
   /**
-   * Fetch a specific dataset with information about available versions.
+   * Fetch a specific dataset
    */
   get(datasetId: string, params: DatasetGetParams, options?: Core.RequestOptions): Core.APIPromise<Dataset> {
     const { account_id } = params;
@@ -84,28 +85,50 @@ export class DatasetsSinglePage extends SinglePage<Dataset> {}
 export interface Dataset {
   id: string;
 
+  columns: Array<Dataset.Column>;
+
   created_at: string;
 
+  encoding_version: number;
+
   name: string;
 
   num_cells: number;
 
   secret: boolean;
 
-  status: 'empty' | 'uploading' | 'failed' | 'complete';
+  status: 'empty' | 'uploading' | 'processing' | 'failed' | 'complete';
 
+  /**
+   * When the dataset was last updated.
+   *
+   * This includes name or description changes as well as uploads.
+   */
   updated_at: string;
 
   uploads: Array<Dataset.Upload>;
 
+  /**
+   * The description of the dataset
+   */
   description?: string | null;
 }
 
 export namespace Dataset {
+  export interface Column {
+    entry_id: string;
+
+    header_name: string;
+
+    num_cells: number;
+
+    upload_status: 'empty' | 'uploading' | 'processing' | 'failed' | 'complete';
+  }
+
   export interface Upload {
     num_cells: number;
 
-    status: 'empty' | 'uploading' | 'failed' | 'complete';
+    status: 'empty' | 'uploading' | 'processing' | 'failed' | 'complete';
 
     version: number;
   }
@@ -116,6 +139,11 @@ export type DatasetArray = Array<Dataset>;
 export interface DatasetCreation {
   dataset: Dataset;
 
+  /**
+   * Encoding version to use for dataset
+   */
+  encoding_version: number;
+
   max_cells: number;
 
   /**
@@ -142,10 +170,20 @@ export interface DatasetCreateParams {
   name: string;
 
   /**
-   * Body param:
+   * Body param: The description of the dataset
    */
   description?: string | null;
 
+  /**
+   * Body param: Dataset encoding version
+   *
+   * Non-secret custom word lists with no header are always version 1. Secret EDM
+   * lists with no header are version 1. Multicolumn CSV with headers are version 2.
+   * Omitting this field provides the default value 0, which is interpreted the same
+   * as 1.
+   */
+  encoding_version?: number;
+
   /**
    * Body param: Generate a secret dataset.
    *
@@ -162,12 +200,12 @@ export interface DatasetUpdateParams {
   account_id: string;
 
   /**
-   * Body param:
+   * Body param: The description of the dataset
    */
   description?: string | null;
 
   /**
-   * Body param:
+   * Body param: The name of the dataset, must be unique
    */
   name?: string | null;
 }
@@ -184,18 +222,33 @@ export interface DatasetGetParams {
   account_id: string;
 }
 
-export namespace Datasets {
-  export import Dataset = DatasetsAPI.Dataset;
-  export import DatasetArray = DatasetsAPI.DatasetArray;
-  export import DatasetCreation = DatasetsAPI.DatasetCreation;
-  export import DatasetsSinglePage = DatasetsAPI.DatasetsSinglePage;
-  export import DatasetCreateParams = DatasetsAPI.DatasetCreateParams;
-  export import DatasetUpdateParams = DatasetsAPI.DatasetUpdateParams;
-  export import DatasetListParams = DatasetsAPI.DatasetListParams;
-  export import DatasetDeleteParams = DatasetsAPI.DatasetDeleteParams;
-  export import DatasetGetParams = DatasetsAPI.DatasetGetParams;
-  export import Upload = UploadAPI.Upload;
-  export import NewVersion = UploadAPI.NewVersion;
-  export import UploadCreateParams = UploadAPI.UploadCreateParams;
-  export import UploadEditParams = UploadAPI.UploadEditParams;
+Datasets.DatasetsSinglePage = DatasetsSinglePage;
+Datasets.Upload = UploadAPIUpload;
+Datasets.Versions = Versions;
+
+export declare namespace Datasets {
+  export {
+    type Dataset as Dataset,
+    type DatasetArray as DatasetArray,
+    type DatasetCreation as DatasetCreation,
+    DatasetsSinglePage as DatasetsSinglePage,
+    type DatasetCreateParams as DatasetCreateParams,
+    type DatasetUpdateParams as DatasetUpdateParams,
+    type DatasetListParams as DatasetListParams,
+    type DatasetDeleteParams as DatasetDeleteParams,
+    type DatasetGetParams as DatasetGetParams,
+  };
+
+  export {
+    UploadAPIUpload as Upload,
+    type NewVersion as NewVersion,
+    type UploadCreateParams as UploadCreateParams,
+    type UploadEditParams as UploadEditParams,
+  };
+
+  export {
+    Versions as Versions,
+    type VersionCreateResponse as VersionCreateResponse,
+    type VersionCreateParams as VersionCreateParams,
+  };
 }
diff --git a/src/resources/zero-trust/dlp/datasets/index.ts b/src/resources/zero-trust/dlp/datasets/index.ts
index f66437254a..2d1359fe37 100644
--- a/src/resources/zero-trust/dlp/datasets/index.ts
+++ b/src/resources/zero-trust/dlp/datasets/index.ts
@@ -1,15 +1,16 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Dataset,
-  DatasetArray,
-  DatasetCreation,
-  DatasetCreateParams,
-  DatasetUpdateParams,
-  DatasetListParams,
-  DatasetDeleteParams,
-  DatasetGetParams,
   DatasetsSinglePage,
   Datasets,
+  type Dataset,
+  type DatasetArray,
+  type DatasetCreation,
+  type DatasetCreateParams,
+  type DatasetUpdateParams,
+  type DatasetListParams,
+  type DatasetDeleteParams,
+  type DatasetGetParams,
 } from './datasets';
-export { NewVersion, UploadCreateParams, UploadEditParams, Upload } from './upload';
+export { Upload, type NewVersion, type UploadCreateParams, type UploadEditParams } from './upload';
+export { Versions, type VersionCreateResponse, type VersionCreateParams } from './versions/index';
diff --git a/src/resources/zero-trust/dlp/datasets/upload.ts b/src/resources/zero-trust/dlp/datasets/upload.ts
index 02b12369f8..df4af38415 100644
--- a/src/resources/zero-trust/dlp/datasets/upload.ts
+++ b/src/resources/zero-trust/dlp/datasets/upload.ts
@@ -2,12 +2,11 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as UploadAPI from './upload';
 import * as DatasetsAPI from './datasets';
 
 export class Upload extends APIResource {
   /**
-   * Prepare to upload a new version of a dataset.
+   * Prepare to upload a new version of a dataset
    */
   create(
     datasetId: string,
@@ -24,7 +23,10 @@ export class Upload extends APIResource {
   }
 
   /**
-   * Upload a new version of a dataset.
+   * This is used for single-column EDMv1 and Custom Word Lists. The EDM format can
+   * only be created in the Cloudflare dashboard. For other clients, this operation
+   * can only be used for non-secret Custom Word Lists. The body must be a UTF-8
+   * encoded, newline (NL or CRNL) separated list of words to be matched.
    */
   edit(
     datasetId: string,
@@ -45,13 +47,29 @@ export class Upload extends APIResource {
 }
 
 export interface NewVersion {
+  encoding_version: number;
+
   max_cells: number;
 
   version: number;
 
+  columns?: Array<NewVersion.Column>;
+
   secret?: string;
 }
 
+export namespace NewVersion {
+  export interface Column {
+    entry_id: string;
+
+    header_name: string;
+
+    num_cells: number;
+
+    upload_status: 'empty' | 'uploading' | 'processing' | 'failed' | 'complete';
+  }
+}
+
 export interface UploadCreateParams {
   account_id: string;
 }
@@ -68,8 +86,10 @@ export interface UploadEditParams {
   body: string;
 }
 
-export namespace Upload {
-  export import NewVersion = UploadAPI.NewVersion;
-  export import UploadCreateParams = UploadAPI.UploadCreateParams;
-  export import UploadEditParams = UploadAPI.UploadEditParams;
+export declare namespace Upload {
+  export {
+    type NewVersion as NewVersion,
+    type UploadCreateParams as UploadCreateParams,
+    type UploadEditParams as UploadEditParams,
+  };
 }
diff --git a/src/resources/zero-trust/dlp/datasets/versions/entries.ts b/src/resources/zero-trust/dlp/datasets/versions/entries.ts
new file mode 100755
index 0000000000..3ec121df1b
--- /dev/null
+++ b/src/resources/zero-trust/dlp/datasets/versions/entries.ts
@@ -0,0 +1,57 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+
+export class Entries extends APIResource {
+  /**
+   * This is used for multi-column EDMv2 datasets. The EDMv2 format can only be
+   * created in the Cloudflare dashboard.
+   */
+  create(
+    datasetId: string,
+    version: number,
+    entryId: string,
+    params: EntryCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<EntryCreateResponse> {
+    const { account_id, body } = params;
+    return (
+      this._client.post(
+        `/accounts/${account_id}/dlp/datasets/${datasetId}/versions/${version}/entries/${entryId}`,
+        {
+          body: body,
+          ...options,
+          headers: { 'Content-Type': 'application/octet-stream', ...options?.headers },
+          __binaryRequest: true,
+        },
+      ) as Core.APIPromise<{ result: EntryCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface EntryCreateResponse {
+  entry_id: string;
+
+  header_name: string;
+
+  num_cells: number;
+
+  upload_status: 'empty' | 'uploading' | 'processing' | 'failed' | 'complete';
+}
+
+export interface EntryCreateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: string;
+}
+
+export declare namespace Entries {
+  export { type EntryCreateResponse as EntryCreateResponse, type EntryCreateParams as EntryCreateParams };
+}
diff --git a/src/resources/zero-trust/dlp/datasets/versions/index.ts b/src/resources/zero-trust/dlp/datasets/versions/index.ts
new file mode 100755
index 0000000000..0e32e89eb8
--- /dev/null
+++ b/src/resources/zero-trust/dlp/datasets/versions/index.ts
@@ -0,0 +1,4 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export { Entries, type EntryCreateResponse, type EntryCreateParams } from './entries';
+export { Versions, type VersionCreateResponse, type VersionCreateParams } from './versions';
diff --git a/src/resources/zero-trust/dlp/datasets/versions/versions.ts b/src/resources/zero-trust/dlp/datasets/versions/versions.ts
new file mode 100755
index 0000000000..ac99e24889
--- /dev/null
+++ b/src/resources/zero-trust/dlp/datasets/versions/versions.ts
@@ -0,0 +1,89 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../../resource';
+import * as Core from '../../../../../core';
+import * as EntriesAPI from './entries';
+import { Entries, EntryCreateParams, EntryCreateResponse } from './entries';
+
+export class Versions extends APIResource {
+  entries: EntriesAPI.Entries = new EntriesAPI.Entries(this._client);
+
+  /**
+   * This is used for multi-column EDMv2 datasets. The EDMv2 format can only be
+   * created in the Cloudflare dashboard. The columns in the response appear in the
+   * same order as in the request.
+   */
+  create(
+    datasetId: string,
+    version: number,
+    params: VersionCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<VersionCreateResponse> {
+    const { account_id, body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/dlp/datasets/${datasetId}/versions/${version}`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: VersionCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type VersionCreateResponse = Array<VersionCreateResponse.VersionCreateResponseItem>;
+
+export namespace VersionCreateResponse {
+  export interface VersionCreateResponseItem {
+    entry_id: string;
+
+    header_name: string;
+
+    num_cells: number;
+
+    upload_status: 'empty' | 'uploading' | 'processing' | 'failed' | 'complete';
+  }
+}
+
+export interface VersionCreateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: Array<VersionCreateParams.ExistingColumn | VersionCreateParams.NewColumn>;
+}
+
+export namespace VersionCreateParams {
+  export interface ExistingColumn {
+    entry_id: string;
+
+    header_name?: string;
+
+    num_cells?: number;
+  }
+
+  export interface NewColumn {
+    entry_name: string;
+
+    header_name?: string;
+
+    num_cells?: number;
+  }
+}
+
+Versions.Entries = Entries;
+
+export declare namespace Versions {
+  export {
+    type VersionCreateResponse as VersionCreateResponse,
+    type VersionCreateParams as VersionCreateParams,
+  };
+
+  export {
+    Entries as Entries,
+    type EntryCreateResponse as EntryCreateResponse,
+    type EntryCreateParams as EntryCreateParams,
+  };
+}
diff --git a/src/resources/zero-trust/dlp/dlp.ts b/src/resources/zero-trust/dlp/dlp.ts
index 088b5ee2d2..292fccd178 100644
--- a/src/resources/zero-trust/dlp/dlp.ts
+++ b/src/resources/zero-trust/dlp/dlp.ts
@@ -1,42 +1,138 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../resource';
+import * as EntriesAPI from './entries';
+import {
+  Entries,
+  EntryCreateParams,
+  EntryCreateResponse,
+  EntryDeleteParams,
+  EntryDeleteResponse,
+  EntryGetParams,
+  EntryGetResponse,
+  EntryListParams,
+  EntryListResponse,
+  EntryListResponsesSinglePage,
+  EntryUpdateParams,
+  EntryUpdateResponse,
+} from './entries';
+import * as LimitsAPI from './limits';
+import { LimitListParams, LimitListResponse, Limits } from './limits';
 import * as PatternsAPI from './patterns';
+import { PatternValidateParams, PatternValidateResponse, Patterns } from './patterns';
 import * as PayloadLogsAPI from './payload-logs';
+import {
+  PayloadLogGetParams,
+  PayloadLogGetResponse,
+  PayloadLogUpdateParams,
+  PayloadLogUpdateResponse,
+  PayloadLogs,
+} from './payload-logs';
 import * as DatasetsAPI from './datasets/datasets';
+import {
+  Dataset,
+  DatasetArray,
+  DatasetCreateParams,
+  DatasetCreation,
+  DatasetDeleteParams,
+  DatasetGetParams,
+  DatasetListParams,
+  DatasetUpdateParams,
+  Datasets,
+  DatasetsSinglePage,
+} from './datasets/datasets';
+import * as EmailAPI from './email/email';
+import { Email } from './email/email';
 import * as ProfilesAPI from './profiles/profiles';
+import {
+  ContextAwareness,
+  Profile,
+  ProfileGetParams,
+  ProfileListParams,
+  Profiles,
+  ProfilesSinglePage,
+  SkipConfiguration,
+} from './profiles/profiles';
 
 export class DLP extends APIResource {
   datasets: DatasetsAPI.Datasets = new DatasetsAPI.Datasets(this._client);
   patterns: PatternsAPI.Patterns = new PatternsAPI.Patterns(this._client);
   payloadLogs: PayloadLogsAPI.PayloadLogs = new PayloadLogsAPI.PayloadLogs(this._client);
+  email: EmailAPI.Email = new EmailAPI.Email(this._client);
   profiles: ProfilesAPI.Profiles = new ProfilesAPI.Profiles(this._client);
+  limits: LimitsAPI.Limits = new LimitsAPI.Limits(this._client);
+  entries: EntriesAPI.Entries = new EntriesAPI.Entries(this._client);
 }
 
-export namespace DLP {
-  export import Datasets = DatasetsAPI.Datasets;
-  export import Dataset = DatasetsAPI.Dataset;
-  export import DatasetArray = DatasetsAPI.DatasetArray;
-  export import DatasetCreation = DatasetsAPI.DatasetCreation;
-  export import DatasetsSinglePage = DatasetsAPI.DatasetsSinglePage;
-  export import DatasetCreateParams = DatasetsAPI.DatasetCreateParams;
-  export import DatasetUpdateParams = DatasetsAPI.DatasetUpdateParams;
-  export import DatasetListParams = DatasetsAPI.DatasetListParams;
-  export import DatasetDeleteParams = DatasetsAPI.DatasetDeleteParams;
-  export import DatasetGetParams = DatasetsAPI.DatasetGetParams;
-  export import Patterns = PatternsAPI.Patterns;
-  export import PatternValidateParams = PatternsAPI.PatternValidateParams;
-  export import PayloadLogs = PayloadLogsAPI.PayloadLogs;
-  export import PayloadLogUpdateResponse = PayloadLogsAPI.PayloadLogUpdateResponse;
-  export import PayloadLogGetResponse = PayloadLogsAPI.PayloadLogGetResponse;
-  export import PayloadLogUpdateParams = PayloadLogsAPI.PayloadLogUpdateParams;
-  export import PayloadLogGetParams = PayloadLogsAPI.PayloadLogGetParams;
-  export import Profiles = ProfilesAPI.Profiles;
-  export import ContextAwareness = ProfilesAPI.ContextAwareness;
-  export import Profile = ProfilesAPI.Profile;
-  export import SkipConfiguration = ProfilesAPI.SkipConfiguration;
-  export import ProfileGetResponse = ProfilesAPI.ProfileGetResponse;
-  export import ProfilesSinglePage = ProfilesAPI.ProfilesSinglePage;
-  export import ProfileListParams = ProfilesAPI.ProfileListParams;
-  export import ProfileGetParams = ProfilesAPI.ProfileGetParams;
+DLP.Datasets = Datasets;
+DLP.DatasetsSinglePage = DatasetsSinglePage;
+DLP.Patterns = Patterns;
+DLP.PayloadLogs = PayloadLogs;
+DLP.Email = Email;
+DLP.Profiles = Profiles;
+DLP.ProfilesSinglePage = ProfilesSinglePage;
+DLP.Limits = Limits;
+DLP.Entries = Entries;
+DLP.EntryListResponsesSinglePage = EntryListResponsesSinglePage;
+
+export declare namespace DLP {
+  export {
+    Datasets as Datasets,
+    type Dataset as Dataset,
+    type DatasetArray as DatasetArray,
+    type DatasetCreation as DatasetCreation,
+    DatasetsSinglePage as DatasetsSinglePage,
+    type DatasetCreateParams as DatasetCreateParams,
+    type DatasetUpdateParams as DatasetUpdateParams,
+    type DatasetListParams as DatasetListParams,
+    type DatasetDeleteParams as DatasetDeleteParams,
+    type DatasetGetParams as DatasetGetParams,
+  };
+
+  export {
+    Patterns as Patterns,
+    type PatternValidateResponse as PatternValidateResponse,
+    type PatternValidateParams as PatternValidateParams,
+  };
+
+  export {
+    PayloadLogs as PayloadLogs,
+    type PayloadLogUpdateResponse as PayloadLogUpdateResponse,
+    type PayloadLogGetResponse as PayloadLogGetResponse,
+    type PayloadLogUpdateParams as PayloadLogUpdateParams,
+    type PayloadLogGetParams as PayloadLogGetParams,
+  };
+
+  export { Email as Email };
+
+  export {
+    Profiles as Profiles,
+    type ContextAwareness as ContextAwareness,
+    type Profile as Profile,
+    type SkipConfiguration as SkipConfiguration,
+    ProfilesSinglePage as ProfilesSinglePage,
+    type ProfileListParams as ProfileListParams,
+    type ProfileGetParams as ProfileGetParams,
+  };
+
+  export {
+    Limits as Limits,
+    type LimitListResponse as LimitListResponse,
+    type LimitListParams as LimitListParams,
+  };
+
+  export {
+    Entries as Entries,
+    type EntryCreateResponse as EntryCreateResponse,
+    type EntryUpdateResponse as EntryUpdateResponse,
+    type EntryListResponse as EntryListResponse,
+    type EntryDeleteResponse as EntryDeleteResponse,
+    type EntryGetResponse as EntryGetResponse,
+    EntryListResponsesSinglePage as EntryListResponsesSinglePage,
+    type EntryCreateParams as EntryCreateParams,
+    type EntryUpdateParams as EntryUpdateParams,
+    type EntryListParams as EntryListParams,
+    type EntryDeleteParams as EntryDeleteParams,
+    type EntryGetParams as EntryGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/dlp/email/account-mapping.ts b/src/resources/zero-trust/dlp/email/account-mapping.ts
new file mode 100644
index 0000000000..d4bf01189c
--- /dev/null
+++ b/src/resources/zero-trust/dlp/email/account-mapping.ts
@@ -0,0 +1,110 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+
+export class AccountMapping extends APIResource {
+  /**
+   * Create mapping
+   */
+  create(
+    params: AccountMappingCreateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AccountMappingCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/dlp/email/account_mapping`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: AccountMappingCreateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get mapping
+   */
+  get(
+    params: AccountMappingGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<AccountMappingGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/dlp/email/account_mapping`, options) as Core.APIPromise<{
+        result: AccountMappingGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface AccountMappingCreateResponse {
+  addin_identifier_token: string;
+
+  auth_requirements: AccountMappingCreateResponse.UnionMember0 | AccountMappingCreateResponse.Type;
+}
+
+export namespace AccountMappingCreateResponse {
+  export interface UnionMember0 {
+    allowed_microsoft_organizations: Array<string>;
+
+    type: 'Org';
+  }
+
+  export interface Type {
+    type: 'NoAuth';
+  }
+}
+
+export interface AccountMappingGetResponse {
+  addin_identifier_token: string;
+
+  auth_requirements: AccountMappingGetResponse.UnionMember0 | AccountMappingGetResponse.Type;
+}
+
+export namespace AccountMappingGetResponse {
+  export interface UnionMember0 {
+    allowed_microsoft_organizations: Array<string>;
+
+    type: 'Org';
+  }
+
+  export interface Type {
+    type: 'NoAuth';
+  }
+}
+
+export interface AccountMappingCreateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  auth_requirements: AccountMappingCreateParams.UnionMember0 | AccountMappingCreateParams.Type;
+}
+
+export namespace AccountMappingCreateParams {
+  export interface UnionMember0 {
+    allowed_microsoft_organizations: Array<string>;
+
+    type: 'Org';
+  }
+
+  export interface Type {
+    type: 'NoAuth';
+  }
+}
+
+export interface AccountMappingGetParams {
+  account_id: string;
+}
+
+export declare namespace AccountMapping {
+  export {
+    type AccountMappingCreateResponse as AccountMappingCreateResponse,
+    type AccountMappingGetResponse as AccountMappingGetResponse,
+    type AccountMappingCreateParams as AccountMappingCreateParams,
+    type AccountMappingGetParams as AccountMappingGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/dlp/email/email.ts b/src/resources/zero-trust/dlp/email/email.ts
new file mode 100644
index 0000000000..4c35a30cb0
--- /dev/null
+++ b/src/resources/zero-trust/dlp/email/email.ts
@@ -0,0 +1,64 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as AccountMappingAPI from './account-mapping';
+import {
+  AccountMapping,
+  AccountMappingCreateParams,
+  AccountMappingCreateResponse,
+  AccountMappingGetParams,
+  AccountMappingGetResponse,
+} from './account-mapping';
+import * as RulesAPI from './rules';
+import {
+  RuleBulkEditParams,
+  RuleBulkEditResponse,
+  RuleCreateParams,
+  RuleCreateResponse,
+  RuleDeleteParams,
+  RuleDeleteResponse,
+  RuleGetParams,
+  RuleGetResponse,
+  RuleListParams,
+  RuleListResponse,
+  RuleListResponsesSinglePage,
+  RuleUpdateParams,
+  RuleUpdateResponse,
+  Rules,
+} from './rules';
+
+export class Email extends APIResource {
+  accountMapping: AccountMappingAPI.AccountMapping = new AccountMappingAPI.AccountMapping(this._client);
+  rules: RulesAPI.Rules = new RulesAPI.Rules(this._client);
+}
+
+Email.AccountMapping = AccountMapping;
+Email.Rules = Rules;
+Email.RuleListResponsesSinglePage = RuleListResponsesSinglePage;
+
+export declare namespace Email {
+  export {
+    AccountMapping as AccountMapping,
+    type AccountMappingCreateResponse as AccountMappingCreateResponse,
+    type AccountMappingGetResponse as AccountMappingGetResponse,
+    type AccountMappingCreateParams as AccountMappingCreateParams,
+    type AccountMappingGetParams as AccountMappingGetParams,
+  };
+
+  export {
+    Rules as Rules,
+    type RuleCreateResponse as RuleCreateResponse,
+    type RuleUpdateResponse as RuleUpdateResponse,
+    type RuleListResponse as RuleListResponse,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    type RuleBulkEditResponse as RuleBulkEditResponse,
+    type RuleGetResponse as RuleGetResponse,
+    RuleListResponsesSinglePage as RuleListResponsesSinglePage,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleBulkEditParams as RuleBulkEditParams,
+    type RuleGetParams as RuleGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/dlp/email/index.ts b/src/resources/zero-trust/dlp/email/index.ts
new file mode 100644
index 0000000000..05646e74e0
--- /dev/null
+++ b/src/resources/zero-trust/dlp/email/index.ts
@@ -0,0 +1,26 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  AccountMapping,
+  type AccountMappingCreateResponse,
+  type AccountMappingGetResponse,
+  type AccountMappingCreateParams,
+  type AccountMappingGetParams,
+} from './account-mapping';
+export { Email } from './email';
+export {
+  RuleListResponsesSinglePage,
+  Rules,
+  type RuleCreateResponse,
+  type RuleUpdateResponse,
+  type RuleListResponse,
+  type RuleDeleteResponse,
+  type RuleBulkEditResponse,
+  type RuleGetResponse,
+  type RuleCreateParams,
+  type RuleUpdateParams,
+  type RuleListParams,
+  type RuleDeleteParams,
+  type RuleBulkEditParams,
+  type RuleGetParams,
+} from './rules';
diff --git a/src/resources/zero-trust/dlp/email/rules.ts b/src/resources/zero-trust/dlp/email/rules.ts
new file mode 100644
index 0000000000..68c95d6271
--- /dev/null
+++ b/src/resources/zero-trust/dlp/email/rules.ts
@@ -0,0 +1,471 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+import { SinglePage } from '../../../../pagination';
+
+export class Rules extends APIResource {
+  /**
+   * Create email scanner rule
+   */
+  create(params: RuleCreateParams, options?: Core.RequestOptions): Core.APIPromise<RuleCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/dlp/email/rules`, { body, ...options }) as Core.APIPromise<{
+        result: RuleCreateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update email scanner rule
+   */
+  update(
+    ruleId: string,
+    params: RuleUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RuleUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/dlp/email/rules/${ruleId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: RuleUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists all email scanner rules for an account.
+   */
+  list(
+    params: RuleListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<RuleListResponsesSinglePage, RuleListResponse> {
+    const { account_id } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/dlp/email/rules`,
+      RuleListResponsesSinglePage,
+      options,
+    );
+  }
+
+  /**
+   * Delete email scanner rule
+   */
+  delete(
+    ruleId: string,
+    params: RuleDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RuleDeleteResponse> {
+    const { account_id } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}/dlp/email/rules/${ruleId}`, options) as Core.APIPromise<{
+        result: RuleDeleteResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Update email scanner rule priorities
+   */
+  bulkEdit(params: RuleBulkEditParams, options?: Core.RequestOptions): Core.APIPromise<RuleBulkEditResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.patch(`/accounts/${account_id}/dlp/email/rules`, { body, ...options }) as Core.APIPromise<{
+        result: RuleBulkEditResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get an email scanner rule
+   */
+  get(
+    ruleId: string,
+    params: RuleGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<RuleGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/dlp/email/rules/${ruleId}`, options) as Core.APIPromise<{
+        result: RuleGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class RuleListResponsesSinglePage extends SinglePage<RuleListResponse> {}
+
+export interface RuleCreateResponse {
+  action: RuleCreateResponse.Action;
+
+  /**
+   * Rule is triggered if all conditions match
+   */
+  conditions: Array<RuleCreateResponse.Condition>;
+
+  created_at: string;
+
+  enabled: boolean;
+
+  name: string;
+
+  priority: number;
+
+  rule_id: string;
+
+  updated_at: string;
+
+  description?: string | null;
+}
+
+export namespace RuleCreateResponse {
+  export interface Action {
+    action: 'Block';
+
+    message?: string | null;
+  }
+
+  export interface Condition {
+    operator: 'InList' | 'NotInList' | 'MatchRegex' | 'NotMatchRegex';
+
+    selector: 'Recipients' | 'Sender' | 'DLPProfiles';
+
+    value: unknown;
+  }
+}
+
+export interface RuleUpdateResponse {
+  action: RuleUpdateResponse.Action;
+
+  /**
+   * Rule is triggered if all conditions match
+   */
+  conditions: Array<RuleUpdateResponse.Condition>;
+
+  created_at: string;
+
+  enabled: boolean;
+
+  name: string;
+
+  priority: number;
+
+  rule_id: string;
+
+  updated_at: string;
+
+  description?: string | null;
+}
+
+export namespace RuleUpdateResponse {
+  export interface Action {
+    action: 'Block';
+
+    message?: string | null;
+  }
+
+  export interface Condition {
+    operator: 'InList' | 'NotInList' | 'MatchRegex' | 'NotMatchRegex';
+
+    selector: 'Recipients' | 'Sender' | 'DLPProfiles';
+
+    value: unknown;
+  }
+}
+
+export interface RuleListResponse {
+  action: RuleListResponse.Action;
+
+  /**
+   * Rule is triggered if all conditions match
+   */
+  conditions: Array<RuleListResponse.Condition>;
+
+  created_at: string;
+
+  enabled: boolean;
+
+  name: string;
+
+  priority: number;
+
+  rule_id: string;
+
+  updated_at: string;
+
+  description?: string | null;
+}
+
+export namespace RuleListResponse {
+  export interface Action {
+    action: 'Block';
+
+    message?: string | null;
+  }
+
+  export interface Condition {
+    operator: 'InList' | 'NotInList' | 'MatchRegex' | 'NotMatchRegex';
+
+    selector: 'Recipients' | 'Sender' | 'DLPProfiles';
+
+    value: unknown;
+  }
+}
+
+export interface RuleDeleteResponse {
+  action: RuleDeleteResponse.Action;
+
+  /**
+   * Rule is triggered if all conditions match
+   */
+  conditions: Array<RuleDeleteResponse.Condition>;
+
+  created_at: string;
+
+  enabled: boolean;
+
+  name: string;
+
+  priority: number;
+
+  rule_id: string;
+
+  updated_at: string;
+
+  description?: string | null;
+}
+
+export namespace RuleDeleteResponse {
+  export interface Action {
+    action: 'Block';
+
+    message?: string | null;
+  }
+
+  export interface Condition {
+    operator: 'InList' | 'NotInList' | 'MatchRegex' | 'NotMatchRegex';
+
+    selector: 'Recipients' | 'Sender' | 'DLPProfiles';
+
+    value: unknown;
+  }
+}
+
+export interface RuleBulkEditResponse {
+  action: RuleBulkEditResponse.Action;
+
+  /**
+   * Rule is triggered if all conditions match
+   */
+  conditions: Array<RuleBulkEditResponse.Condition>;
+
+  created_at: string;
+
+  enabled: boolean;
+
+  name: string;
+
+  priority: number;
+
+  rule_id: string;
+
+  updated_at: string;
+
+  description?: string | null;
+}
+
+export namespace RuleBulkEditResponse {
+  export interface Action {
+    action: 'Block';
+
+    message?: string | null;
+  }
+
+  export interface Condition {
+    operator: 'InList' | 'NotInList' | 'MatchRegex' | 'NotMatchRegex';
+
+    selector: 'Recipients' | 'Sender' | 'DLPProfiles';
+
+    value: unknown;
+  }
+}
+
+export interface RuleGetResponse {
+  action: RuleGetResponse.Action;
+
+  /**
+   * Rule is triggered if all conditions match
+   */
+  conditions: Array<RuleGetResponse.Condition>;
+
+  created_at: string;
+
+  enabled: boolean;
+
+  name: string;
+
+  priority: number;
+
+  rule_id: string;
+
+  updated_at: string;
+
+  description?: string | null;
+}
+
+export namespace RuleGetResponse {
+  export interface Action {
+    action: 'Block';
+
+    message?: string | null;
+  }
+
+  export interface Condition {
+    operator: 'InList' | 'NotInList' | 'MatchRegex' | 'NotMatchRegex';
+
+    selector: 'Recipients' | 'Sender' | 'DLPProfiles';
+
+    value: unknown;
+  }
+}
+
+export interface RuleCreateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  action: RuleCreateParams.Action;
+
+  /**
+   * Body param: Rule is triggered if all conditions match
+   */
+  conditions: Array<RuleCreateParams.Condition>;
+
+  /**
+   * Body param:
+   */
+  enabled: boolean;
+
+  /**
+   * Body param:
+   */
+  name: string;
+
+  /**
+   * Body param:
+   */
+  description?: string | null;
+}
+
+export namespace RuleCreateParams {
+  export interface Action {
+    action: 'Block';
+
+    message?: string | null;
+  }
+
+  export interface Condition {
+    operator: 'InList' | 'NotInList' | 'MatchRegex' | 'NotMatchRegex';
+
+    selector: 'Recipients' | 'Sender' | 'DLPProfiles';
+
+    value: unknown;
+  }
+}
+
+export interface RuleUpdateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  action: RuleUpdateParams.Action;
+
+  /**
+   * Body param: Rule is triggered if all conditions match
+   */
+  conditions: Array<RuleUpdateParams.Condition>;
+
+  /**
+   * Body param:
+   */
+  enabled: boolean;
+
+  /**
+   * Body param:
+   */
+  name: string;
+
+  /**
+   * Body param:
+   */
+  description?: string | null;
+}
+
+export namespace RuleUpdateParams {
+  export interface Action {
+    action: 'Block';
+
+    message?: string | null;
+  }
+
+  export interface Condition {
+    operator: 'InList' | 'NotInList' | 'MatchRegex' | 'NotMatchRegex';
+
+    selector: 'Recipients' | 'Sender' | 'DLPProfiles';
+
+    value: unknown;
+  }
+}
+
+export interface RuleListParams {
+  account_id: string;
+}
+
+export interface RuleDeleteParams {
+  account_id: string;
+}
+
+export interface RuleBulkEditParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  new_priorities: Record<string, number>;
+}
+
+export interface RuleGetParams {
+  account_id: string;
+}
+
+Rules.RuleListResponsesSinglePage = RuleListResponsesSinglePage;
+
+export declare namespace Rules {
+  export {
+    type RuleCreateResponse as RuleCreateResponse,
+    type RuleUpdateResponse as RuleUpdateResponse,
+    type RuleListResponse as RuleListResponse,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    type RuleBulkEditResponse as RuleBulkEditResponse,
+    type RuleGetResponse as RuleGetResponse,
+    RuleListResponsesSinglePage as RuleListResponsesSinglePage,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleBulkEditParams as RuleBulkEditParams,
+    type RuleGetParams as RuleGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/dlp/entries.ts b/src/resources/zero-trust/dlp/entries.ts
new file mode 100644
index 0000000000..91a3f8176e
--- /dev/null
+++ b/src/resources/zero-trust/dlp/entries.ts
@@ -0,0 +1,535 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as CustomAPI from './profiles/custom';
+import { SinglePage } from '../../../pagination';
+
+export class Entries extends APIResource {
+  /**
+   * Creates a DLP custom entry.
+   */
+  create(params: EntryCreateParams, options?: Core.RequestOptions): Core.APIPromise<EntryCreateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/dlp/entries`, { body, ...options }) as Core.APIPromise<{
+        result: EntryCreateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Updates a DLP entry.
+   */
+  update(
+    entryId: string,
+    params: EntryUpdateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<EntryUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/dlp/entries/${entryId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: EntryUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Lists all DLP entries in an account.
+   */
+  list(
+    params: EntryListParams,
+    options?: Core.RequestOptions,
+  ): Core.PagePromise<EntryListResponsesSinglePage, EntryListResponse> {
+    const { account_id } = params;
+    return this._client.getAPIList(
+      `/accounts/${account_id}/dlp/entries`,
+      EntryListResponsesSinglePage,
+      options,
+    );
+  }
+
+  /**
+   * Deletes a DLP custom entry.
+   */
+  delete(
+    entryId: string,
+    params: EntryDeleteParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<EntryDeleteResponse | null> {
+    const { account_id } = params;
+    return (
+      this._client.delete(`/accounts/${account_id}/dlp/entries/${entryId}`, options) as Core.APIPromise<{
+        result: EntryDeleteResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Fetches a DLP entry by ID
+   */
+  get(
+    entryId: string,
+    params: EntryGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<EntryGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/dlp/entries/${entryId}`, options) as Core.APIPromise<{
+        result: EntryGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export class EntryListResponsesSinglePage extends SinglePage<EntryListResponse> {}
+
+export interface EntryCreateResponse {
+  id: string;
+
+  created_at: string;
+
+  enabled: boolean;
+
+  name: string;
+
+  pattern: CustomAPI.Pattern;
+
+  updated_at: string;
+
+  profile_id?: string | null;
+}
+
+export type EntryUpdateResponse =
+  | EntryUpdateResponse.CustomEntry
+  | EntryUpdateResponse.PredefinedEntry
+  | EntryUpdateResponse.IntegrationEntry
+  | EntryUpdateResponse.ExactDataEntry
+  | EntryUpdateResponse.WordListEntry;
+
+export namespace EntryUpdateResponse {
+  export interface CustomEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    pattern: CustomAPI.Pattern;
+
+    type: 'custom';
+
+    updated_at: string;
+
+    profile_id?: string | null;
+  }
+
+  export interface PredefinedEntry {
+    id: string;
+
+    confidence: PredefinedEntry.Confidence;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'predefined';
+
+    profile_id?: string | null;
+  }
+
+  export namespace PredefinedEntry {
+    export interface Confidence {
+      /**
+       * Indicates whether this entry can be made more or less sensitive by setting a
+       * confidence threshold. Profiles that use an entry with `available` set to true
+       * can use confidence thresholds
+       */
+      available: boolean;
+    }
+  }
+
+  export interface IntegrationEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'integration';
+
+    updated_at: string;
+
+    profile_id?: string | null;
+  }
+
+  export interface ExactDataEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    secret: boolean;
+
+    type: 'exact_data';
+
+    updated_at: string;
+  }
+
+  export interface WordListEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'word_list';
+
+    updated_at: string;
+
+    word_list: unknown;
+
+    profile_id?: string | null;
+  }
+}
+
+export type EntryListResponse =
+  | EntryListResponse.CustomEntry
+  | EntryListResponse.PredefinedEntry
+  | EntryListResponse.IntegrationEntry
+  | EntryListResponse.ExactDataEntry
+  | EntryListResponse.WordListEntry;
+
+export namespace EntryListResponse {
+  export interface CustomEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    pattern: CustomAPI.Pattern;
+
+    type: 'custom';
+
+    updated_at: string;
+
+    profile_id?: string | null;
+  }
+
+  export interface PredefinedEntry {
+    id: string;
+
+    confidence: PredefinedEntry.Confidence;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'predefined';
+
+    profile_id?: string | null;
+  }
+
+  export namespace PredefinedEntry {
+    export interface Confidence {
+      /**
+       * Indicates whether this entry can be made more or less sensitive by setting a
+       * confidence threshold. Profiles that use an entry with `available` set to true
+       * can use confidence thresholds
+       */
+      available: boolean;
+    }
+  }
+
+  export interface IntegrationEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'integration';
+
+    updated_at: string;
+
+    profile_id?: string | null;
+  }
+
+  export interface ExactDataEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    secret: boolean;
+
+    type: 'exact_data';
+
+    updated_at: string;
+  }
+
+  export interface WordListEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'word_list';
+
+    updated_at: string;
+
+    word_list: unknown;
+
+    profile_id?: string | null;
+  }
+}
+
+export type EntryDeleteResponse = unknown;
+
+export type EntryGetResponse =
+  | EntryGetResponse.CustomEntry
+  | EntryGetResponse.PredefinedEntry
+  | EntryGetResponse.IntegrationEntry
+  | EntryGetResponse.ExactDataEntry
+  | EntryGetResponse.WordListEntry;
+
+export namespace EntryGetResponse {
+  export interface CustomEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    pattern: CustomAPI.Pattern;
+
+    type: 'custom';
+
+    updated_at: string;
+
+    profile_id?: string | null;
+  }
+
+  export interface PredefinedEntry {
+    id: string;
+
+    confidence: PredefinedEntry.Confidence;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'predefined';
+
+    profile_id?: string | null;
+  }
+
+  export namespace PredefinedEntry {
+    export interface Confidence {
+      /**
+       * Indicates whether this entry can be made more or less sensitive by setting a
+       * confidence threshold. Profiles that use an entry with `available` set to true
+       * can use confidence thresholds
+       */
+      available: boolean;
+    }
+  }
+
+  export interface IntegrationEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'integration';
+
+    updated_at: string;
+
+    profile_id?: string | null;
+  }
+
+  export interface ExactDataEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    secret: boolean;
+
+    type: 'exact_data';
+
+    updated_at: string;
+  }
+
+  export interface WordListEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'word_list';
+
+    updated_at: string;
+
+    word_list: unknown;
+
+    profile_id?: string | null;
+  }
+}
+
+export interface EntryCreateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  enabled: boolean;
+
+  /**
+   * Body param:
+   */
+  name: string;
+
+  /**
+   * Body param:
+   */
+  pattern: CustomAPI.PatternParam;
+
+  /**
+   * Body param:
+   */
+  profile_id: string;
+}
+
+export type EntryUpdateParams =
+  | EntryUpdateParams.Variant0
+  | EntryUpdateParams.Variant1
+  | EntryUpdateParams.Variant2;
+
+export declare namespace EntryUpdateParams {
+  export interface Variant0 {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param:
+     */
+    name: string;
+
+    /**
+     * Body param:
+     */
+    pattern: CustomAPI.PatternParam;
+
+    /**
+     * Body param:
+     */
+    type: 'custom';
+
+    /**
+     * Body param:
+     */
+    enabled?: boolean;
+  }
+
+  export interface Variant1 {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param:
+     */
+    type: 'predefined';
+
+    /**
+     * Body param:
+     */
+    enabled?: boolean;
+  }
+
+  export interface Variant2 {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param:
+     */
+    type: 'integration';
+
+    /**
+     * Body param:
+     */
+    enabled?: boolean;
+  }
+}
+
+export interface EntryListParams {
+  account_id: string;
+}
+
+export interface EntryDeleteParams {
+  account_id: string;
+}
+
+export interface EntryGetParams {
+  account_id: string;
+}
+
+Entries.EntryListResponsesSinglePage = EntryListResponsesSinglePage;
+
+export declare namespace Entries {
+  export {
+    type EntryCreateResponse as EntryCreateResponse,
+    type EntryUpdateResponse as EntryUpdateResponse,
+    type EntryListResponse as EntryListResponse,
+    type EntryDeleteResponse as EntryDeleteResponse,
+    type EntryGetResponse as EntryGetResponse,
+    EntryListResponsesSinglePage as EntryListResponsesSinglePage,
+    type EntryCreateParams as EntryCreateParams,
+    type EntryUpdateParams as EntryUpdateParams,
+    type EntryListParams as EntryListParams,
+    type EntryDeleteParams as EntryDeleteParams,
+    type EntryGetParams as EntryGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/dlp/index.ts b/src/resources/zero-trust/dlp/index.ts
index 696fc008cd..15952685b1 100644
--- a/src/resources/zero-trust/dlp/index.ts
+++ b/src/resources/zero-trust/dlp/index.ts
@@ -1,33 +1,48 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export {
-  ContextAwareness,
-  Profile,
-  SkipConfiguration,
-  ProfileGetResponse,
-  ProfileListParams,
-  ProfileGetParams,
-  ProfilesSinglePage,
-  Profiles,
-} from './profiles/index';
 export { DLP } from './dlp';
 export {
-  Dataset,
-  DatasetArray,
-  DatasetCreation,
-  DatasetCreateParams,
-  DatasetUpdateParams,
-  DatasetListParams,
-  DatasetDeleteParams,
-  DatasetGetParams,
   DatasetsSinglePage,
   Datasets,
+  type Dataset,
+  type DatasetArray,
+  type DatasetCreation,
+  type DatasetCreateParams,
+  type DatasetUpdateParams,
+  type DatasetListParams,
+  type DatasetDeleteParams,
+  type DatasetGetParams,
 } from './datasets/index';
-export { PatternValidateParams, Patterns } from './patterns';
+export { Email } from './email/index';
+export {
+  EntryListResponsesSinglePage,
+  Entries,
+  type EntryCreateResponse,
+  type EntryUpdateResponse,
+  type EntryListResponse,
+  type EntryDeleteResponse,
+  type EntryGetResponse,
+  type EntryCreateParams,
+  type EntryUpdateParams,
+  type EntryListParams,
+  type EntryDeleteParams,
+  type EntryGetParams,
+} from './entries';
+export { Limits, type LimitListResponse, type LimitListParams } from './limits';
+export { Patterns, type PatternValidateResponse, type PatternValidateParams } from './patterns';
 export {
-  PayloadLogUpdateResponse,
-  PayloadLogGetResponse,
-  PayloadLogUpdateParams,
-  PayloadLogGetParams,
   PayloadLogs,
+  type PayloadLogUpdateResponse,
+  type PayloadLogGetResponse,
+  type PayloadLogUpdateParams,
+  type PayloadLogGetParams,
 } from './payload-logs';
+export {
+  ProfilesSinglePage,
+  Profiles,
+  type ContextAwareness,
+  type Profile,
+  type SkipConfiguration,
+  type ProfileListParams,
+  type ProfileGetParams,
+} from './profiles/index';
diff --git a/src/resources/zero-trust/dlp/limits.ts b/src/resources/zero-trust/dlp/limits.ts
new file mode 100755
index 0000000000..9feeb9f697
--- /dev/null
+++ b/src/resources/zero-trust/dlp/limits.ts
@@ -0,0 +1,30 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class Limits extends APIResource {
+  /**
+   * Fetch limits associated with DLP for account
+   */
+  list(params: LimitListParams, options?: Core.RequestOptions): Core.APIPromise<LimitListResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/dlp/limits`, options) as Core.APIPromise<{
+        result: LimitListResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface LimitListResponse {
+  max_dataset_cells: number;
+}
+
+export interface LimitListParams {
+  account_id: string;
+}
+
+export declare namespace Limits {
+  export { type LimitListResponse as LimitListResponse, type LimitListParams as LimitListParams };
+}
diff --git a/src/resources/zero-trust/dlp/patterns.ts b/src/resources/zero-trust/dlp/patterns.ts
index aef63e7bb5..e271f9c3e6 100644
--- a/src/resources/zero-trust/dlp/patterns.ts
+++ b/src/resources/zero-trust/dlp/patterns.ts
@@ -2,42 +2,60 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as PatternsAPI from './patterns';
-import * as OwnershipAPI from '../../logpush/ownership';
 
 export class Patterns extends APIResource {
   /**
    * Validates whether this pattern is a valid regular expression. Rejects it if the
-   * regular expression is too complex or can match an unbounded-length string. Your
-   * regex will be rejected if it uses the Kleene Star -- be sure to bound the
-   * maximum number of characters that can be matched.
+   * regular expression is too complex or can match an unbounded-length string. The
+   * regex will be rejected if it uses `*` or `+`. Bound the maximum number of
+   * characters that can be matched using a range, e.g. `{1,100}`.
    */
   validate(
     params: PatternValidateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<OwnershipAPI.OwnershipValidation | null> {
+  ): Core.APIPromise<PatternValidateResponse> {
     const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/dlp/patterns/validate`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: OwnershipAPI.OwnershipValidation | null }>
+      }) as Core.APIPromise<{ result: PatternValidateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
+export interface PatternValidateResponse {
+  valid: boolean;
+}
+
 export interface PatternValidateParams {
   /**
-   * Path param: Identifier
+   * Path param: Account ID
    */
   account_id: string;
 
   /**
-   * Body param: The regex pattern.
+   * Body param:
    */
   regex: string;
+
+  /**
+   * Body param: Maximum number of bytes that the regular expression can match.
+   *
+   * If this is `null` then there is no limit on the length. Patterns can use `*` and
+   * `+`. Otherwise repeats should use a range `{m,n}` to restrict patterns to the
+   * length. If this field is missing, then a default length limit is used.
+   *
+   * Note that the length is specified in bytes. Since regular expressions use UTF-8
+   * the pattern `.` can match up to 4 bytes. Hence `.{1,256}` has a maximum length
+   * of 1024 bytes.
+   */
+  max_match_bytes?: number | null;
 }
 
-export namespace Patterns {
-  export import PatternValidateParams = PatternsAPI.PatternValidateParams;
+export declare namespace Patterns {
+  export {
+    type PatternValidateResponse as PatternValidateResponse,
+    type PatternValidateParams as PatternValidateParams,
+  };
 }
diff --git a/src/resources/zero-trust/dlp/payload-logs.ts b/src/resources/zero-trust/dlp/payload-logs.ts
index c548701211..be9f5d7e42 100644
--- a/src/resources/zero-trust/dlp/payload-logs.ts
+++ b/src/resources/zero-trust/dlp/payload-logs.ts
@@ -2,11 +2,10 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as PayloadLogsAPI from './payload-logs';
 
 export class PayloadLogs extends APIResource {
   /**
-   * Updates the DLP payload log settings for this account.
+   * Set payload log settings
    */
   update(
     params: PayloadLogUpdateParams,
@@ -21,7 +20,7 @@ export class PayloadLogs extends APIResource {
   }
 
   /**
-   * Gets the current DLP payload log settings for this account.
+   * Get payload log settings
    */
   get(params: PayloadLogGetParams, options?: Core.RequestOptions): Core.APIPromise<PayloadLogGetResponse> {
     const { account_id } = params;
@@ -34,36 +33,38 @@ export class PayloadLogs extends APIResource {
 }
 
 export interface PayloadLogUpdateResponse {
-  public_key: string | null;
+  updated_at: string;
+
+  public_key?: string | null;
 }
 
 export interface PayloadLogGetResponse {
-  public_key: string | null;
+  updated_at: string;
+
+  public_key?: string | null;
 }
 
 export interface PayloadLogUpdateParams {
   /**
-   * Path param: Identifier
+   * Path param:
    */
   account_id: string;
 
   /**
-   * Body param: The public key to use when encrypting extracted payloads, as a
-   * base64 string
+   * Body param:
    */
-  public_key: string | null;
+  public_key?: string | null;
 }
 
 export interface PayloadLogGetParams {
-  /**
-   * Identifier
-   */
   account_id: string;
 }
 
-export namespace PayloadLogs {
-  export import PayloadLogUpdateResponse = PayloadLogsAPI.PayloadLogUpdateResponse;
-  export import PayloadLogGetResponse = PayloadLogsAPI.PayloadLogGetResponse;
-  export import PayloadLogUpdateParams = PayloadLogsAPI.PayloadLogUpdateParams;
-  export import PayloadLogGetParams = PayloadLogsAPI.PayloadLogGetParams;
+export declare namespace PayloadLogs {
+  export {
+    type PayloadLogUpdateResponse as PayloadLogUpdateResponse,
+    type PayloadLogGetResponse as PayloadLogGetResponse,
+    type PayloadLogUpdateParams as PayloadLogUpdateParams,
+    type PayloadLogGetParams as PayloadLogGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/dlp/profiles/custom.ts b/src/resources/zero-trust/dlp/profiles/custom.ts
index 8c92b8eac0..b6bc609b98 100644
--- a/src/resources/zero-trust/dlp/profiles/custom.ts
+++ b/src/resources/zero-trust/dlp/profiles/custom.ts
@@ -7,18 +7,15 @@ import * as ProfilesAPI from './profiles';
 
 export class Custom extends APIResource {
   /**
-   * Creates a set of DLP custom profiles.
+   * Creates a DLP custom profile.
    */
-  create(
-    params: CustomCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomCreateResponse | null> {
+  create(params: CustomCreateParams, options?: Core.RequestOptions): Core.APIPromise<CustomCreateResponse> {
     const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/dlp/profiles/custom`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: CustomCreateResponse | null }>
+      }) as Core.APIPromise<{ result: CustomCreateResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -29,9 +26,14 @@ export class Custom extends APIResource {
     profileId: string,
     params: CustomUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomProfile> {
+  ): Core.APIPromise<ProfilesAPI.Profile> {
     const { account_id, ...body } = params;
-    return this._client.put(`/accounts/${account_id}/dlp/profiles/custom/${profileId}`, { body, ...options });
+    return (
+      this._client.put(`/accounts/${account_id}/dlp/profiles/custom/${profileId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: ProfilesAPI.Profile }>
+    )._thenUnwrap((obj) => obj.result);
   }
 
   /**
@@ -41,340 +43,924 @@ export class Custom extends APIResource {
     profileId: string,
     params: CustomDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomDeleteResponse> {
+  ): Core.APIPromise<CustomDeleteResponse | null> {
     const { account_id } = params;
     return (
       this._client.delete(
         `/accounts/${account_id}/dlp/profiles/custom/${profileId}`,
         options,
-      ) as Core.APIPromise<{ result: CustomDeleteResponse }>
+      ) as Core.APIPromise<{ result: CustomDeleteResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Fetches a custom DLP profile.
+   * Fetches a custom DLP profile by id.
    */
   get(
     profileId: string,
     params: CustomGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomProfile> {
+  ): Core.APIPromise<ProfilesAPI.Profile> {
     const { account_id } = params;
     return (
       this._client.get(
         `/accounts/${account_id}/dlp/profiles/custom/${profileId}`,
         options,
-      ) as Core.APIPromise<{ result: CustomProfile }>
+      ) as Core.APIPromise<{ result: ProfilesAPI.Profile }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
 export interface CustomProfile {
   /**
-   * The ID for this profile
+   * The id of the profile (uuid)
    */
-  id?: string;
+  id: string;
 
   /**
    * Related DLP policies will trigger when the match count exceeds the number set.
    */
-  allowed_match_count?: number;
+  allowed_match_count: number;
 
   /**
    * Scan the context of predefined entries to only return matches surrounded by
    * keywords.
    */
-  context_awareness?: ProfilesAPI.ContextAwareness;
-
-  created_at?: string;
+  context_awareness: ProfilesAPI.ContextAwareness;
 
   /**
-   * The description of the profile.
+   * When the profile was created
    */
-  description?: string;
+  created_at: string;
 
-  /**
-   * The entries for this profile.
-   */
-  entries?: Array<CustomProfile.Entry>;
+  entries: Array<
+    | CustomProfile.CustomEntry
+    | CustomProfile.PredefinedEntry
+    | CustomProfile.IntegrationEntry
+    | CustomProfile.ExactDataEntry
+    | CustomProfile.WordListEntry
+  >;
 
   /**
-   * The name of the profile.
+   * The name of the profile
    */
-  name?: string;
+  name: string;
+
+  ocr_enabled: boolean;
 
   /**
-   * If true, scan images via OCR to determine if any text present matches filters.
+   * When the profile was lasted updated
    */
-  ocr_enabled?: boolean;
+  updated_at: string;
+
+  confidence_threshold?: 'low' | 'medium' | 'high' | 'very_high';
 
   /**
-   * The type of the profile.
+   * The description of the profile
    */
-  type?: 'custom';
-
-  updated_at?: string;
+  description?: string | null;
 }
 
 export namespace CustomProfile {
-  /**
-   * A custom entry that matches a profile
-   */
-  export interface Entry {
-    /**
-     * The ID for this entry
-     */
-    id?: string;
+  export interface CustomEntry {
+    id: string;
 
-    created_at?: string;
+    created_at: string;
 
-    /**
-     * Whether the entry is enabled or not.
-     */
-    enabled?: boolean;
+    enabled: boolean;
 
-    /**
-     * The name of the entry.
-     */
-    name?: string;
+    name: string;
 
-    /**
-     * A pattern that matches an entry
-     */
-    pattern?: CustomAPI.Pattern;
+    pattern: CustomAPI.Pattern;
 
-    /**
-     * ID of the parent profile
-     */
-    profile_id?: unknown;
+    type: 'custom';
+
+    updated_at: string;
+
+    profile_id?: string | null;
+  }
+
+  export interface PredefinedEntry {
+    id: string;
+
+    confidence: PredefinedEntry.Confidence;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'predefined';
+
+    profile_id?: string | null;
+  }
+
+  export namespace PredefinedEntry {
+    export interface Confidence {
+      /**
+       * Indicates whether this entry can be made more or less sensitive by setting a
+       * confidence threshold. Profiles that use an entry with `available` set to true
+       * can use confidence thresholds
+       */
+      available: boolean;
+    }
+  }
+
+  export interface IntegrationEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'integration';
+
+    updated_at: string;
+
+    profile_id?: string | null;
+  }
+
+  export interface ExactDataEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    secret: boolean;
+
+    type: 'exact_data';
 
-    updated_at?: string;
+    updated_at: string;
+  }
+
+  export interface WordListEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'word_list';
+
+    updated_at: string;
+
+    word_list: unknown;
+
+    profile_id?: string | null;
   }
 }
 
-/**
- * A pattern that matches an entry
- */
 export interface Pattern {
-  /**
-   * The regex pattern.
-   */
   regex: string;
 
-  /**
-   * Validation algorithm for the pattern. This algorithm will get run on potential
-   * matches, and if it returns false, the entry will not be matched.
-   */
   validation?: 'luhn';
 }
 
-/**
- * A pattern that matches an entry
- */
 export interface PatternParam {
-  /**
-   * The regex pattern.
-   */
   regex: string;
 
-  /**
-   * Validation algorithm for the pattern. This algorithm will get run on potential
-   * matches, and if it returns false, the entry will not be matched.
-   */
   validation?: 'luhn';
 }
 
-export type CustomCreateResponse = Array<CustomProfile>;
-
-export type CustomDeleteResponse = unknown | string | null;
+export type CustomCreateResponse =
+  | CustomCreateResponse.CustomProfile
+  | CustomCreateResponse.PredefinedProfile
+  | CustomCreateResponse.IntegrationProfile
+  | Array<ProfilesAPI.Profile>;
 
-export interface CustomCreateParams {
-  /**
-   * Path param: Identifier
-   */
-  account_id: string;
-
-  /**
-   * Body param:
-   */
-  profiles: Array<CustomCreateParams.Profile>;
-}
+export namespace CustomCreateResponse {
+  export interface CustomProfile {
+    /**
+     * The id of the profile (uuid)
+     */
+    id: string;
 
-export namespace CustomCreateParams {
-  export interface Profile {
     /**
      * Related DLP policies will trigger when the match count exceeds the number set.
      */
-    allowed_match_count?: number;
+    allowed_match_count: number;
 
     /**
      * Scan the context of predefined entries to only return matches surrounded by
      * keywords.
      */
-    context_awareness?: ProfilesAPI.ContextAwarenessParam;
+    context_awareness: ProfilesAPI.ContextAwareness;
+
+    /**
+     * When the profile was created
+     */
+    created_at: string;
+
+    entries: Array<
+      | CustomProfile.CustomEntry
+      | CustomProfile.PredefinedEntry
+      | CustomProfile.IntegrationEntry
+      | CustomProfile.ExactDataEntry
+      | CustomProfile.WordListEntry
+    >;
+
+    /**
+     * The name of the profile
+     */
+    name: string;
+
+    ocr_enabled: boolean;
+
+    type: 'custom';
+
+    /**
+     * When the profile was lasted updated
+     */
+    updated_at: string;
+
+    confidence_threshold?: 'low' | 'medium' | 'high' | 'very_high';
 
     /**
-     * The description of the profile.
+     * The description of the profile
      */
-    description?: string;
+    description?: string | null;
+  }
+
+  export namespace CustomProfile {
+    export interface CustomEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      pattern: CustomAPI.Pattern;
+
+      type: 'custom';
+
+      updated_at: string;
 
+      profile_id?: string | null;
+    }
+
+    export interface PredefinedEntry {
+      id: string;
+
+      confidence: PredefinedEntry.Confidence;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'predefined';
+
+      profile_id?: string | null;
+    }
+
+    export namespace PredefinedEntry {
+      export interface Confidence {
+        /**
+         * Indicates whether this entry can be made more or less sensitive by setting a
+         * confidence threshold. Profiles that use an entry with `available` set to true
+         * can use confidence thresholds
+         */
+        available: boolean;
+      }
+    }
+
+    export interface IntegrationEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'integration';
+
+      updated_at: string;
+
+      profile_id?: string | null;
+    }
+
+    export interface ExactDataEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      secret: boolean;
+
+      type: 'exact_data';
+
+      updated_at: string;
+    }
+
+    export interface WordListEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'word_list';
+
+      updated_at: string;
+
+      word_list: unknown;
+
+      profile_id?: string | null;
+    }
+  }
+
+  export interface PredefinedProfile {
     /**
-     * The entries for this profile.
+     * The id of the predefined profile (uuid)
      */
-    entries?: Array<Profile.Entry>;
+    id: string;
+
+    allowed_match_count: number;
+
+    entries: Array<
+      | PredefinedProfile.CustomEntry
+      | PredefinedProfile.PredefinedEntry
+      | PredefinedProfile.IntegrationEntry
+      | PredefinedProfile.ExactDataEntry
+      | PredefinedProfile.WordListEntry
+    >;
 
     /**
-     * The name of the profile.
+     * The name of the predefined profile
      */
-    name?: string;
+    name: string;
+
+    type: 'predefined';
+
+    confidence_threshold?: 'low' | 'medium' | 'high' | 'very_high';
 
     /**
-     * If true, scan images via OCR to determine if any text present matches filters.
+     * Scan the context of predefined entries to only return matches surrounded by
+     * keywords.
      */
+    context_awareness?: ProfilesAPI.ContextAwareness;
+
     ocr_enabled?: boolean;
+
+    /**
+     * Whether this profile can be accessed by anyone
+     */
+    open_access?: boolean;
+  }
+
+  export namespace PredefinedProfile {
+    export interface CustomEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      pattern: CustomAPI.Pattern;
+
+      type: 'custom';
+
+      updated_at: string;
+
+      profile_id?: string | null;
+    }
+
+    export interface PredefinedEntry {
+      id: string;
+
+      confidence: PredefinedEntry.Confidence;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'predefined';
+
+      profile_id?: string | null;
+    }
+
+    export namespace PredefinedEntry {
+      export interface Confidence {
+        /**
+         * Indicates whether this entry can be made more or less sensitive by setting a
+         * confidence threshold. Profiles that use an entry with `available` set to true
+         * can use confidence thresholds
+         */
+        available: boolean;
+      }
+    }
+
+    export interface IntegrationEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'integration';
+
+      updated_at: string;
+
+      profile_id?: string | null;
+    }
+
+    export interface ExactDataEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      secret: boolean;
+
+      type: 'exact_data';
+
+      updated_at: string;
+    }
+
+    export interface WordListEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'word_list';
+
+      updated_at: string;
+
+      word_list: unknown;
+
+      profile_id?: string | null;
+    }
   }
 
-  export namespace Profile {
+  export interface IntegrationProfile {
+    id: string;
+
+    created_at: string;
+
+    entries: Array<
+      | IntegrationProfile.CustomEntry
+      | IntegrationProfile.PredefinedEntry
+      | IntegrationProfile.IntegrationEntry
+      | IntegrationProfile.ExactDataEntry
+      | IntegrationProfile.WordListEntry
+    >;
+
+    name: string;
+
+    type: 'integration';
+
+    updated_at: string;
+
     /**
-     * A custom entry create payload
+     * The description of the profile
      */
-    export interface Entry {
+    description?: string | null;
+  }
+
+  export namespace IntegrationProfile {
+    export interface CustomEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      pattern: CustomAPI.Pattern;
+
+      type: 'custom';
+
+      updated_at: string;
+
+      profile_id?: string | null;
+    }
+
+    export interface PredefinedEntry {
+      id: string;
+
+      confidence: PredefinedEntry.Confidence;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'predefined';
+
+      profile_id?: string | null;
+    }
+
+    export namespace PredefinedEntry {
+      export interface Confidence {
+        /**
+         * Indicates whether this entry can be made more or less sensitive by setting a
+         * confidence threshold. Profiles that use an entry with `available` set to true
+         * can use confidence thresholds
+         */
+        available: boolean;
+      }
+    }
+
+    export interface IntegrationEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'integration';
+
+      updated_at: string;
+
+      profile_id?: string | null;
+    }
+
+    export interface ExactDataEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      secret: boolean;
+
+      type: 'exact_data';
+
+      updated_at: string;
+    }
+
+    export interface WordListEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'word_list';
+
+      updated_at: string;
+
+      word_list: unknown;
+
+      profile_id?: string | null;
+    }
+  }
+}
+
+export type CustomDeleteResponse = unknown;
+
+export type CustomCreateParams = CustomCreateParams.Variant0 | CustomCreateParams.DLPNewCustomProfile;
+
+export declare namespace CustomCreateParams {
+  export interface Variant0 {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param:
+     */
+    profiles: Array<CustomCreateParams.Variant0.Profile>;
+  }
+
+  export namespace Variant0 {
+    export interface Profile {
+      entries: Array<Profile.DLPNewCustomEntry | Profile.DLPNewWordListEntry>;
+
+      name: string;
+
       /**
-       * Whether the entry is enabled or not.
+       * Related DLP policies will trigger when the match count exceeds the number set.
        */
-      enabled: boolean;
+      allowed_match_count?: number;
+
+      confidence_threshold?: string | null;
 
       /**
-       * The name of the entry.
+       * Scan the context of predefined entries to only return matches surrounded by
+       * keywords.
        */
-      name: string;
+      context_awareness?: ProfilesAPI.ContextAwarenessParam;
 
       /**
-       * A pattern that matches an entry
+       * The description of the profile
        */
+      description?: string | null;
+
+      ocr_enabled?: boolean;
+
+      /**
+       * Entries from other profiles (e.g. pre-defined Cloudflare profiles, or your
+       * Microsoft Information Protection profiles).
+       */
+      shared_entries?: Array<
+        Profile.UnionMember0 | Profile.UnionMember1 | Profile.UnionMember2 | Profile.UnionMember3
+      >;
+    }
+
+    export namespace Profile {
+      export interface DLPNewCustomEntry {
+        enabled: boolean;
+
+        name: string;
+
+        pattern: CustomAPI.PatternParam;
+      }
+
+      export interface DLPNewWordListEntry {
+        enabled: boolean;
+
+        name: string;
+
+        words: Array<string>;
+      }
+
+      export interface UnionMember0 {
+        enabled: boolean;
+
+        entry_id: string;
+
+        entry_type: 'custom';
+      }
+
+      export interface UnionMember1 {
+        enabled: boolean;
+
+        entry_id: string;
+
+        entry_type: 'predefined';
+      }
+
+      export interface UnionMember2 {
+        enabled: boolean;
+
+        entry_id: string;
+
+        entry_type: 'integration';
+      }
+
+      export interface UnionMember3 {
+        enabled: boolean;
+
+        entry_id: string;
+
+        entry_type: 'exact_data';
+      }
+    }
+  }
+
+  export interface DLPNewCustomProfile {
+    /**
+     * Path param:
+     */
+    account_id: string;
+
+    /**
+     * Body param:
+     */
+    entries: Array<
+      | CustomCreateParams.DLPNewCustomProfile.DLPNewCustomEntry
+      | CustomCreateParams.DLPNewCustomProfile.DLPNewWordListEntry
+    >;
+
+    /**
+     * Body param:
+     */
+    name: string;
+
+    /**
+     * Body param: Related DLP policies will trigger when the match count exceeds the
+     * number set.
+     */
+    allowed_match_count?: number;
+
+    /**
+     * Body param:
+     */
+    confidence_threshold?: string | null;
+
+    /**
+     * Body param: Scan the context of predefined entries to only return matches
+     * surrounded by keywords.
+     */
+    context_awareness?: ProfilesAPI.ContextAwarenessParam;
+
+    /**
+     * Body param: The description of the profile
+     */
+    description?: string | null;
+
+    /**
+     * Body param:
+     */
+    ocr_enabled?: boolean;
+
+    /**
+     * Body param: Entries from other profiles (e.g. pre-defined Cloudflare profiles,
+     * or your Microsoft Information Protection profiles).
+     */
+    shared_entries?: Array<
+      | CustomCreateParams.DLPNewCustomProfile.UnionMember0
+      | CustomCreateParams.DLPNewCustomProfile.UnionMember1
+      | CustomCreateParams.DLPNewCustomProfile.UnionMember2
+      | CustomCreateParams.DLPNewCustomProfile.UnionMember3
+    >;
+  }
+
+  export namespace DLPNewCustomProfile {
+    export interface DLPNewCustomEntry {
+      enabled: boolean;
+
+      name: string;
+
       pattern: CustomAPI.PatternParam;
     }
+
+    export interface DLPNewWordListEntry {
+      enabled: boolean;
+
+      name: string;
+
+      words: Array<string>;
+    }
+
+    export interface UnionMember0 {
+      enabled: boolean;
+
+      entry_id: string;
+
+      entry_type: 'custom';
+    }
+
+    export interface UnionMember1 {
+      enabled: boolean;
+
+      entry_id: string;
+
+      entry_type: 'predefined';
+    }
+
+    export interface UnionMember2 {
+      enabled: boolean;
+
+      entry_id: string;
+
+      entry_type: 'integration';
+    }
+
+    export interface UnionMember3 {
+      enabled: boolean;
+
+      entry_id: string;
+
+      entry_type: 'exact_data';
+    }
   }
 }
 
 export interface CustomUpdateParams {
   /**
-   * Path param: Identifier
+   * Path param:
    */
   account_id: string;
 
   /**
-   * Body param: Related DLP policies will trigger when the match count exceeds the
-   * number set.
+   * Body param:
    */
-  allowed_match_count?: number;
+  name: string;
 
   /**
-   * Body param: Scan the context of predefined entries to only return matches
-   * surrounded by keywords.
+   * Body param:
    */
-  context_awareness?: ProfilesAPI.ContextAwarenessParam;
+  allowed_match_count?: number | null;
 
   /**
-   * Body param: The description of the profile.
+   * Body param:
    */
-  description?: string;
+  confidence_threshold?: string | null;
 
   /**
-   * Body param: The custom entries for this profile. Array elements with IDs are
-   * modifying the existing entry with that ID. Elements without ID will create new
-   * entries. Any entry not in the list will be deleted.
+   * Body param: Scan the context of predefined entries to only return matches
+   * surrounded by keywords.
    */
-  entries?: Array<CustomUpdateParams.Entry>;
+  context_awareness?: ProfilesAPI.ContextAwarenessParam;
 
   /**
-   * Body param: The name of the profile.
+   * Body param: The description of the profile
    */
-  name?: string;
+  description?: string | null;
 
   /**
-   * Body param: If true, scan images via OCR to determine if any text present
-   * matches filters.
+   * Body param: Custom entries from this profile. If this field is omitted, entries
+   * owned by this profile will not be changed.
+   */
+  entries?: Array<CustomUpdateParams.DLPNewCustomEntryWithID | CustomUpdateParams.DLPNewCustomEntry> | null;
+
+  /**
+   * Body param:
    */
   ocr_enabled?: boolean;
 
   /**
-   * Body param: Entries from other profiles (e.g. pre-defined Cloudflare profiles,
-   * or your Microsoft Information Protection profiles).
+   * Body param: Other entries, e.g. predefined or integration.
    */
   shared_entries?: Array<
-    CustomUpdateParams.DLPSharedEntryUpdatePredefined | CustomUpdateParams.DLPSharedEntryUpdateIntegration
+    CustomUpdateParams.UnionMember0 | CustomUpdateParams.UnionMember1 | CustomUpdateParams.UnionMember2
   >;
 }
 
 export namespace CustomUpdateParams {
-  /**
-   * A custom entry that matches a profile
-   */
-  export interface Entry {
-    /**
-     * Whether the entry is enabled or not.
-     */
-    enabled?: boolean;
+  export interface DLPNewCustomEntryWithID {
+    enabled: boolean;
 
-    /**
-     * The name of the entry.
-     */
-    name?: string;
+    entry_id: string;
 
-    /**
-     * A pattern that matches an entry
-     */
-    pattern?: CustomAPI.PatternParam;
+    name: string;
 
-    /**
-     * ID of the parent profile
-     */
-    profile_id?: unknown;
+    pattern: CustomAPI.PatternParam;
   }
 
-  /**
-   * Properties of a predefined entry in a custom profile
-   */
-  export interface DLPSharedEntryUpdatePredefined {
-    /**
-     * Whether the entry is enabled or not.
-     */
-    enabled?: boolean;
+  export interface DLPNewCustomEntry {
+    enabled: boolean;
+
+    name: string;
+
+    pattern: CustomAPI.PatternParam;
   }
 
-  /**
-   * Properties of an integration entry in a custom profile
-   */
-  export interface DLPSharedEntryUpdateIntegration {
-    /**
-     * Whether the entry is enabled or not.
-     */
-    enabled?: boolean;
+  export interface UnionMember0 {
+    enabled: boolean;
+
+    entry_id: string;
+
+    entry_type: 'predefined';
+  }
+
+  export interface UnionMember1 {
+    enabled: boolean;
+
+    entry_id: string;
+
+    entry_type: 'integration';
+  }
+
+  export interface UnionMember2 {
+    enabled: boolean;
+
+    entry_id: string;
+
+    entry_type: 'exact_data';
   }
 }
 
 export interface CustomDeleteParams {
-  /**
-   * Identifier
-   */
   account_id: string;
 }
 
 export interface CustomGetParams {
-  /**
-   * Identifier
-   */
   account_id: string;
 }
 
-export namespace Custom {
-  export import CustomProfile = CustomAPI.CustomProfile;
-  export import Pattern = CustomAPI.Pattern;
-  export import CustomCreateResponse = CustomAPI.CustomCreateResponse;
-  export import CustomDeleteResponse = CustomAPI.CustomDeleteResponse;
-  export import CustomCreateParams = CustomAPI.CustomCreateParams;
-  export import CustomUpdateParams = CustomAPI.CustomUpdateParams;
-  export import CustomDeleteParams = CustomAPI.CustomDeleteParams;
-  export import CustomGetParams = CustomAPI.CustomGetParams;
+export declare namespace Custom {
+  export {
+    type CustomProfile as CustomProfile,
+    type Pattern as Pattern,
+    type CustomCreateResponse as CustomCreateResponse,
+    type CustomDeleteResponse as CustomDeleteResponse,
+    type CustomCreateParams as CustomCreateParams,
+    type CustomUpdateParams as CustomUpdateParams,
+    type CustomDeleteParams as CustomDeleteParams,
+    type CustomGetParams as CustomGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/dlp/profiles/index.ts b/src/resources/zero-trust/dlp/profiles/index.ts
index a998d233f7..711fb9ee49 100644
--- a/src/resources/zero-trust/dlp/profiles/index.ts
+++ b/src/resources/zero-trust/dlp/profiles/index.ts
@@ -1,24 +1,28 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  ContextAwareness,
-  Profile,
-  SkipConfiguration,
-  ProfileGetResponse,
-  ProfileListParams,
-  ProfileGetParams,
+  Custom,
+  type CustomProfile,
+  type Pattern,
+  type CustomCreateResponse,
+  type CustomDeleteResponse,
+  type CustomCreateParams,
+  type CustomUpdateParams,
+  type CustomDeleteParams,
+  type CustomGetParams,
+} from './custom';
+export {
+  Predefined,
+  type PredefinedProfile,
+  type PredefinedUpdateParams,
+  type PredefinedGetParams,
+} from './predefined';
+export {
   ProfilesSinglePage,
   Profiles,
+  type ContextAwareness,
+  type Profile,
+  type SkipConfiguration,
+  type ProfileListParams,
+  type ProfileGetParams,
 } from './profiles';
-export {
-  CustomProfile,
-  Pattern,
-  CustomCreateResponse,
-  CustomDeleteResponse,
-  CustomCreateParams,
-  CustomUpdateParams,
-  CustomDeleteParams,
-  CustomGetParams,
-  Custom,
-} from './custom';
-export { PredefinedProfile, PredefinedUpdateParams, PredefinedGetParams, Predefined } from './predefined';
diff --git a/src/resources/zero-trust/dlp/profiles/predefined.ts b/src/resources/zero-trust/dlp/profiles/predefined.ts
index 99b68ab7ba..7d6e389238 100644
--- a/src/resources/zero-trust/dlp/profiles/predefined.ts
+++ b/src/resources/zero-trust/dlp/profiles/predefined.ts
@@ -2,7 +2,7 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as PredefinedAPI from './predefined';
+import * as CustomAPI from './custom';
 import * as ProfilesAPI from './profiles';
 
 export class Predefined extends APIResource {
@@ -13,42 +13,56 @@ export class Predefined extends APIResource {
     profileId: string,
     params: PredefinedUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<PredefinedProfile> {
+  ): Core.APIPromise<ProfilesAPI.Profile> {
     const { account_id, ...body } = params;
-    return this._client.put(`/accounts/${account_id}/dlp/profiles/predefined/${profileId}`, {
-      body,
-      ...options,
-    });
+    return (
+      this._client.put(`/accounts/${account_id}/dlp/profiles/predefined/${profileId}`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: ProfilesAPI.Profile }>
+    )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Fetches a predefined DLP profile.
+   * Fetches a predefined DLP profile by id.
    */
   get(
     profileId: string,
     params: PredefinedGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<PredefinedProfile> {
+  ): Core.APIPromise<ProfilesAPI.Profile> {
     const { account_id } = params;
     return (
       this._client.get(
         `/accounts/${account_id}/dlp/profiles/predefined/${profileId}`,
         options,
-      ) as Core.APIPromise<{ result: PredefinedProfile }>
+      ) as Core.APIPromise<{ result: ProfilesAPI.Profile }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
 export interface PredefinedProfile {
   /**
-   * The ID for this profile
+   * The id of the predefined profile (uuid)
    */
-  id?: string;
+  id: string;
+
+  allowed_match_count: number;
+
+  entries: Array<
+    | PredefinedProfile.CustomEntry
+    | PredefinedProfile.PredefinedEntry
+    | PredefinedProfile.IntegrationEntry
+    | PredefinedProfile.ExactDataEntry
+    | PredefinedProfile.WordListEntry
+  >;
 
   /**
-   * Related DLP policies will trigger when the match count exceeds the number set.
+   * The name of the predefined profile
    */
-  allowed_match_count?: number;
+  name: string;
+
+  confidence_threshold?: 'low' | 'medium' | 'high' | 'very_high';
 
   /**
    * Scan the context of predefined entries to only return matches surrounded by
@@ -56,102 +70,158 @@ export interface PredefinedProfile {
    */
   context_awareness?: ProfilesAPI.ContextAwareness;
 
-  /**
-   * The entries for this profile.
-   */
-  entries?: Array<PredefinedProfile.Entry>;
-
-  /**
-   * The name of the profile.
-   */
-  name?: string;
-
-  /**
-   * If true, scan images via OCR to determine if any text present matches filters.
-   */
   ocr_enabled?: boolean;
 
   /**
-   * The type of the profile.
+   * Whether this profile can be accessed by anyone
    */
-  type?: 'predefined';
+  open_access?: boolean;
 }
 
 export namespace PredefinedProfile {
-  /**
-   * A predefined entry that matches a profile
-   */
-  export interface Entry {
-    /**
-     * The ID for this entry
-     */
-    id?: string;
-
-    /**
-     * Whether the entry is enabled or not.
-     */
-    enabled?: boolean;
-
-    /**
-     * The name of the entry.
-     */
-    name?: string;
-
-    /**
-     * ID of the parent profile
-     */
-    profile_id?: unknown;
+  export interface CustomEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    pattern: CustomAPI.Pattern;
+
+    type: 'custom';
+
+    updated_at: string;
+
+    profile_id?: string | null;
+  }
+
+  export interface PredefinedEntry {
+    id: string;
+
+    confidence: PredefinedEntry.Confidence;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'predefined';
+
+    profile_id?: string | null;
+  }
+
+  export namespace PredefinedEntry {
+    export interface Confidence {
+      /**
+       * Indicates whether this entry can be made more or less sensitive by setting a
+       * confidence threshold. Profiles that use an entry with `available` set to true
+       * can use confidence thresholds
+       */
+      available: boolean;
+    }
+  }
+
+  export interface IntegrationEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'integration';
+
+    updated_at: string;
+
+    profile_id?: string | null;
+  }
+
+  export interface ExactDataEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    secret: boolean;
+
+    type: 'exact_data';
+
+    updated_at: string;
+  }
+
+  export interface WordListEntry {
+    id: string;
+
+    created_at: string;
+
+    enabled: boolean;
+
+    name: string;
+
+    type: 'word_list';
+
+    updated_at: string;
+
+    word_list: unknown;
+
+    profile_id?: string | null;
   }
 }
 
 export interface PredefinedUpdateParams {
   /**
-   * Path param: Identifier
+   * Path param:
    */
   account_id: string;
 
   /**
-   * Body param: Related DLP policies will trigger when the match count exceeds the
-   * number set.
+   * Body param:
    */
-  allowed_match_count?: number;
+  entries: Array<PredefinedUpdateParams.Entry>;
 
   /**
-   * Body param: Scan the context of predefined entries to only return matches
-   * surrounded by keywords.
+   * Body param:
    */
-  context_awareness?: ProfilesAPI.ContextAwarenessParam;
+  allowed_match_count?: number | null;
 
   /**
-   * Body param: The entries for this profile.
+   * Body param:
    */
-  entries?: Array<PredefinedUpdateParams.Entry>;
+  confidence_threshold?: string | null;
 
   /**
-   * Body param: If true, scan images via OCR to determine if any text present
-   * matches filters.
+   * Body param: Scan the context of predefined entries to only return matches
+   * surrounded by keywords.
+   */
+  context_awareness?: ProfilesAPI.ContextAwarenessParam;
+
+  /**
+   * Body param:
    */
   ocr_enabled?: boolean;
 }
 
 export namespace PredefinedUpdateParams {
   export interface Entry {
-    /**
-     * Whether the entry is enabled or not.
-     */
-    enabled?: boolean;
+    id: string;
+
+    enabled: boolean;
   }
 }
 
 export interface PredefinedGetParams {
-  /**
-   * Identifier
-   */
   account_id: string;
 }
 
-export namespace Predefined {
-  export import PredefinedProfile = PredefinedAPI.PredefinedProfile;
-  export import PredefinedUpdateParams = PredefinedAPI.PredefinedUpdateParams;
-  export import PredefinedGetParams = PredefinedAPI.PredefinedGetParams;
+export declare namespace Predefined {
+  export {
+    type PredefinedProfile as PredefinedProfile,
+    type PredefinedUpdateParams as PredefinedUpdateParams,
+    type PredefinedGetParams as PredefinedGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/dlp/profiles/profiles.ts b/src/resources/zero-trust/dlp/profiles/profiles.ts
index 91b8f54bc3..0ac721c321 100644
--- a/src/resources/zero-trust/dlp/profiles/profiles.ts
+++ b/src/resources/zero-trust/dlp/profiles/profiles.ts
@@ -4,7 +4,24 @@ import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
 import * as ProfilesAPI from './profiles';
 import * as CustomAPI from './custom';
+import {
+  Custom,
+  CustomCreateParams,
+  CustomCreateResponse,
+  CustomDeleteParams,
+  CustomDeleteResponse,
+  CustomGetParams,
+  CustomProfile as CustomAPICustomProfile,
+  CustomUpdateParams,
+  Pattern,
+} from './custom';
 import * as PredefinedAPI from './predefined';
+import {
+  Predefined,
+  PredefinedGetParams,
+  PredefinedProfile as PredefinedAPIPredefinedProfile,
+  PredefinedUpdateParams,
+} from './predefined';
 import { SinglePage } from '../../../../pagination';
 
 export class Profiles extends APIResource {
@@ -18,22 +35,21 @@ export class Profiles extends APIResource {
     params: ProfileListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<ProfilesSinglePage, Profile> {
-    const { account_id } = params;
-    return this._client.getAPIList(`/accounts/${account_id}/dlp/profiles`, ProfilesSinglePage, options);
+    const { account_id, ...query } = params;
+    return this._client.getAPIList(`/accounts/${account_id}/dlp/profiles`, ProfilesSinglePage, {
+      query,
+      ...options,
+    });
   }
 
   /**
-   * Fetches a DLP profile by ID. Supports both predefined and custom profiles
+   * Fetches a DLP profile by ID
    */
-  get(
-    profileId: string,
-    params: ProfileGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<ProfileGetResponse> {
+  get(profileId: string, params: ProfileGetParams, options?: Core.RequestOptions): Core.APIPromise<Profile> {
     const { account_id } = params;
     return (
       this._client.get(`/accounts/${account_id}/dlp/profiles/${profileId}`, options) as Core.APIPromise<{
-        result: ProfileGetResponse;
+        result: Profile;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
@@ -75,197 +91,478 @@ export interface ContextAwarenessParam {
   skip: SkipConfigurationParam;
 }
 
-export type Profile =
-  | PredefinedAPI.PredefinedProfile
-  | CustomAPI.CustomProfile
-  | Profile.DLPIntegrationProfile;
+export type Profile = Profile.CustomProfile | Profile.PredefinedProfile | Profile.IntegrationProfile;
 
 export namespace Profile {
-  export interface DLPIntegrationProfile {
+  export interface CustomProfile {
     /**
-     * The ID for this profile
+     * The id of the profile (uuid)
      */
-    id?: string;
+    id: string;
 
-    created_at?: string;
+    /**
+     * Related DLP policies will trigger when the match count exceeds the number set.
+     */
+    allowed_match_count: number;
 
     /**
-     * The description of the profile.
+     * Scan the context of predefined entries to only return matches surrounded by
+     * keywords.
      */
-    description?: string;
+    context_awareness: ProfilesAPI.ContextAwareness;
 
     /**
-     * The entries for this profile.
+     * When the profile was created
      */
-    entries?: Array<DLPIntegrationProfile.Entry>;
+    created_at: string;
+
+    entries: Array<
+      | CustomProfile.CustomEntry
+      | CustomProfile.PredefinedEntry
+      | CustomProfile.IntegrationEntry
+      | CustomProfile.ExactDataEntry
+      | CustomProfile.WordListEntry
+    >;
 
     /**
-     * The name of the profile.
+     * The name of the profile
      */
-    name?: string;
+    name: string;
+
+    ocr_enabled: boolean;
+
+    type: 'custom';
 
     /**
-     * The type of the profile.
+     * When the profile was lasted updated
      */
-    type?: 'integration';
+    updated_at: string;
 
-    updated_at?: string;
-  }
+    confidence_threshold?: 'low' | 'medium' | 'high' | 'very_high';
 
-  export namespace DLPIntegrationProfile {
     /**
-     * An entry derived from an integration
+     * The description of the profile
      */
-    export interface Entry {
-      /**
-       * The ID for this entry
-       */
-      id?: string;
-
-      created_at?: string;
-
-      /**
-       * Whether the entry is enabled or not.
-       */
-      enabled?: boolean;
-
-      /**
-       * The name of the entry.
-       */
-      name?: string;
-
-      /**
-       * ID of the parent profile
-       */
-      profile_id?: unknown;
-
-      updated_at?: string;
-    }
+    description?: string | null;
   }
-}
 
-/**
- * Content types to exclude from context analysis and return all matches.
- */
-export interface SkipConfiguration {
-  /**
-   * If the content type is a file, skip context analysis and return all matches.
-   */
-  files: boolean;
-}
+  export namespace CustomProfile {
+    export interface CustomEntry {
+      id: string;
 
-/**
- * Content types to exclude from context analysis and return all matches.
- */
-export interface SkipConfigurationParam {
-  /**
-   * If the content type is a file, skip context analysis and return all matches.
-   */
-  files: boolean;
-}
+      created_at: string;
 
-export type ProfileGetResponse =
-  | PredefinedAPI.PredefinedProfile
-  | CustomAPI.CustomProfile
-  | ProfileGetResponse.DLPIntegrationProfile;
+      enabled: boolean;
 
-export namespace ProfileGetResponse {
-  export interface DLPIntegrationProfile {
-    /**
-     * The ID for this profile
-     */
-    id?: string;
+      name: string;
+
+      pattern: CustomAPI.Pattern;
+
+      type: 'custom';
+
+      updated_at: string;
+
+      profile_id?: string | null;
+    }
+
+    export interface PredefinedEntry {
+      id: string;
+
+      confidence: PredefinedEntry.Confidence;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'predefined';
+
+      profile_id?: string | null;
+    }
+
+    export namespace PredefinedEntry {
+      export interface Confidence {
+        /**
+         * Indicates whether this entry can be made more or less sensitive by setting a
+         * confidence threshold. Profiles that use an entry with `available` set to true
+         * can use confidence thresholds
+         */
+        available: boolean;
+      }
+    }
+
+    export interface IntegrationEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
 
-    created_at?: string;
+      type: 'integration';
 
+      updated_at: string;
+
+      profile_id?: string | null;
+    }
+
+    export interface ExactDataEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      secret: boolean;
+
+      type: 'exact_data';
+
+      updated_at: string;
+    }
+
+    export interface WordListEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'word_list';
+
+      updated_at: string;
+
+      word_list: unknown;
+
+      profile_id?: string | null;
+    }
+  }
+
+  export interface PredefinedProfile {
     /**
-     * The description of the profile.
+     * The id of the predefined profile (uuid)
      */
-    description?: string;
+    id: string;
+
+    allowed_match_count: number;
+
+    entries: Array<
+      | PredefinedProfile.CustomEntry
+      | PredefinedProfile.PredefinedEntry
+      | PredefinedProfile.IntegrationEntry
+      | PredefinedProfile.ExactDataEntry
+      | PredefinedProfile.WordListEntry
+    >;
 
     /**
-     * The entries for this profile.
+     * The name of the predefined profile
      */
-    entries?: Array<DLPIntegrationProfile.Entry>;
+    name: string;
+
+    type: 'predefined';
+
+    confidence_threshold?: 'low' | 'medium' | 'high' | 'very_high';
 
     /**
-     * The name of the profile.
+     * Scan the context of predefined entries to only return matches surrounded by
+     * keywords.
      */
-    name?: string;
+    context_awareness?: ProfilesAPI.ContextAwareness;
+
+    ocr_enabled?: boolean;
 
     /**
-     * The type of the profile.
+     * Whether this profile can be accessed by anyone
      */
-    type?: 'integration';
+    open_access?: boolean;
+  }
+
+  export namespace PredefinedProfile {
+    export interface CustomEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      pattern: CustomAPI.Pattern;
+
+      type: 'custom';
+
+      updated_at: string;
+
+      profile_id?: string | null;
+    }
+
+    export interface PredefinedEntry {
+      id: string;
+
+      confidence: PredefinedEntry.Confidence;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'predefined';
+
+      profile_id?: string | null;
+    }
+
+    export namespace PredefinedEntry {
+      export interface Confidence {
+        /**
+         * Indicates whether this entry can be made more or less sensitive by setting a
+         * confidence threshold. Profiles that use an entry with `available` set to true
+         * can use confidence thresholds
+         */
+        available: boolean;
+      }
+    }
+
+    export interface IntegrationEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
 
-    updated_at?: string;
+      name: string;
+
+      type: 'integration';
+
+      updated_at: string;
+
+      profile_id?: string | null;
+    }
+
+    export interface ExactDataEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      secret: boolean;
+
+      type: 'exact_data';
+
+      updated_at: string;
+    }
+
+    export interface WordListEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'word_list';
+
+      updated_at: string;
+
+      word_list: unknown;
+
+      profile_id?: string | null;
+    }
   }
 
-  export namespace DLPIntegrationProfile {
+  export interface IntegrationProfile {
+    id: string;
+
+    created_at: string;
+
+    entries: Array<
+      | IntegrationProfile.CustomEntry
+      | IntegrationProfile.PredefinedEntry
+      | IntegrationProfile.IntegrationEntry
+      | IntegrationProfile.ExactDataEntry
+      | IntegrationProfile.WordListEntry
+    >;
+
+    name: string;
+
+    type: 'integration';
+
+    updated_at: string;
+
     /**
-     * An entry derived from an integration
+     * The description of the profile
      */
-    export interface Entry {
-      /**
-       * The ID for this entry
-       */
-      id?: string;
-
-      created_at?: string;
-
-      /**
-       * Whether the entry is enabled or not.
-       */
-      enabled?: boolean;
-
-      /**
-       * The name of the entry.
-       */
-      name?: string;
-
-      /**
-       * ID of the parent profile
-       */
-      profile_id?: unknown;
-
-      updated_at?: string;
+    description?: string | null;
+  }
+
+  export namespace IntegrationProfile {
+    export interface CustomEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      pattern: CustomAPI.Pattern;
+
+      type: 'custom';
+
+      updated_at: string;
+
+      profile_id?: string | null;
+    }
+
+    export interface PredefinedEntry {
+      id: string;
+
+      confidence: PredefinedEntry.Confidence;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'predefined';
+
+      profile_id?: string | null;
+    }
+
+    export namespace PredefinedEntry {
+      export interface Confidence {
+        /**
+         * Indicates whether this entry can be made more or less sensitive by setting a
+         * confidence threshold. Profiles that use an entry with `available` set to true
+         * can use confidence thresholds
+         */
+        available: boolean;
+      }
+    }
+
+    export interface IntegrationEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'integration';
+
+      updated_at: string;
+
+      profile_id?: string | null;
+    }
+
+    export interface ExactDataEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      secret: boolean;
+
+      type: 'exact_data';
+
+      updated_at: string;
+    }
+
+    export interface WordListEntry {
+      id: string;
+
+      created_at: string;
+
+      enabled: boolean;
+
+      name: string;
+
+      type: 'word_list';
+
+      updated_at: string;
+
+      word_list: unknown;
+
+      profile_id?: string | null;
     }
   }
 }
 
+/**
+ * Content types to exclude from context analysis and return all matches.
+ */
+export interface SkipConfiguration {
+  /**
+   * If the content type is a file, skip context analysis and return all matches.
+   */
+  files: boolean;
+}
+
+/**
+ * Content types to exclude from context analysis and return all matches.
+ */
+export interface SkipConfigurationParam {
+  /**
+   * If the content type is a file, skip context analysis and return all matches.
+   */
+  files: boolean;
+}
+
 export interface ProfileListParams {
   /**
-   * Identifier
+   * Path param:
    */
   account_id: string;
-}
 
-export interface ProfileGetParams {
   /**
-   * Identifier
+   * Query param: Return all profiles, including those that current account does not
+   * have access to.
    */
+  all?: boolean;
+}
+
+export interface ProfileGetParams {
   account_id: string;
 }
 
-export namespace Profiles {
-  export import ContextAwareness = ProfilesAPI.ContextAwareness;
-  export import Profile = ProfilesAPI.Profile;
-  export import SkipConfiguration = ProfilesAPI.SkipConfiguration;
-  export import ProfileGetResponse = ProfilesAPI.ProfileGetResponse;
-  export import ProfilesSinglePage = ProfilesAPI.ProfilesSinglePage;
-  export import ProfileListParams = ProfilesAPI.ProfileListParams;
-  export import ProfileGetParams = ProfilesAPI.ProfileGetParams;
-  export import Custom = CustomAPI.Custom;
-  export import CustomProfile = CustomAPI.CustomProfile;
-  export import Pattern = CustomAPI.Pattern;
-  export import CustomCreateResponse = CustomAPI.CustomCreateResponse;
-  export import CustomDeleteResponse = CustomAPI.CustomDeleteResponse;
-  export import CustomCreateParams = CustomAPI.CustomCreateParams;
-  export import CustomUpdateParams = CustomAPI.CustomUpdateParams;
-  export import CustomDeleteParams = CustomAPI.CustomDeleteParams;
-  export import CustomGetParams = CustomAPI.CustomGetParams;
-  export import Predefined = PredefinedAPI.Predefined;
-  export import PredefinedProfile = PredefinedAPI.PredefinedProfile;
-  export import PredefinedUpdateParams = PredefinedAPI.PredefinedUpdateParams;
-  export import PredefinedGetParams = PredefinedAPI.PredefinedGetParams;
+Profiles.ProfilesSinglePage = ProfilesSinglePage;
+Profiles.Custom = Custom;
+Profiles.Predefined = Predefined;
+
+export declare namespace Profiles {
+  export {
+    type ContextAwareness as ContextAwareness,
+    type Profile as Profile,
+    type SkipConfiguration as SkipConfiguration,
+    ProfilesSinglePage as ProfilesSinglePage,
+    type ProfileListParams as ProfileListParams,
+    type ProfileGetParams as ProfileGetParams,
+  };
+
+  export {
+    Custom as Custom,
+    type CustomAPICustomProfile as CustomProfile,
+    type Pattern as Pattern,
+    type CustomCreateResponse as CustomCreateResponse,
+    type CustomDeleteResponse as CustomDeleteResponse,
+    type CustomCreateParams as CustomCreateParams,
+    type CustomUpdateParams as CustomUpdateParams,
+    type CustomDeleteParams as CustomDeleteParams,
+    type CustomGetParams as CustomGetParams,
+  };
+
+  export {
+    Predefined as Predefined,
+    type PredefinedAPIPredefinedProfile as PredefinedProfile,
+    type PredefinedUpdateParams as PredefinedUpdateParams,
+    type PredefinedGetParams as PredefinedGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/app-types.ts b/src/resources/zero-trust/gateway/app-types.ts
index 377275677d..c8712a73fd 100644
--- a/src/resources/zero-trust/gateway/app-types.ts
+++ b/src/resources/zero-trust/gateway/app-types.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as AppTypesAPI from './app-types';
 import { SinglePage } from '../../../pagination';
 
 export class AppTypes extends APIResource {
@@ -71,8 +70,12 @@ export interface AppTypeListParams {
   account_id: string;
 }
 
-export namespace AppTypes {
-  export import AppType = AppTypesAPI.AppType;
-  export import AppTypesSinglePage = AppTypesAPI.AppTypesSinglePage;
-  export import AppTypeListParams = AppTypesAPI.AppTypeListParams;
+AppTypes.AppTypesSinglePage = AppTypesSinglePage;
+
+export declare namespace AppTypes {
+  export {
+    type AppType as AppType,
+    AppTypesSinglePage as AppTypesSinglePage,
+    type AppTypeListParams as AppTypeListParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/audit-ssh-settings.ts b/src/resources/zero-trust/gateway/audit-ssh-settings.ts
index 15a01ada19..cb70feb438 100644
--- a/src/resources/zero-trust/gateway/audit-ssh-settings.ts
+++ b/src/resources/zero-trust/gateway/audit-ssh-settings.ts
@@ -2,11 +2,11 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as AuditSSHSettingsAPI from './audit-ssh-settings';
 
 export class AuditSSHSettings extends APIResource {
   /**
-   * Updates Zero Trust Audit SSH settings.
+   * Updates Zero Trust Audit SSH and SSH with Access for Infrastructure settings for
+   * an account.
    */
   update(
     params: AuditSSHSettingUpdateParams,
@@ -22,7 +22,8 @@ export class AuditSSHSettings extends APIResource {
   }
 
   /**
-   * Get all Zero Trust Audit SSH settings for an account.
+   * Gets all Zero Trust Audit SSH and SSH with Access for Infrastructure settings
+   * for an account.
    */
   get(params: AuditSSHSettingGetParams, options?: Core.RequestOptions): Core.APIPromise<GatewaySettings> {
     const { account_id } = params;
@@ -32,13 +33,31 @@ export class AuditSSHSettings extends APIResource {
       }>
     )._thenUnwrap((obj) => obj.result);
   }
+
+  /**
+   * Rotates the SSH account seed that is used for generating the host key identity
+   * when connecting through the Cloudflare SSH Proxy.
+   */
+  rotateSeed(
+    params: AuditSSHSettingRotateSeedParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<GatewaySettings> {
+    const { account_id } = params;
+    return (
+      this._client.post(
+        `/accounts/${account_id}/gateway/audit_ssh_settings/rotate_seed`,
+        options,
+      ) as Core.APIPromise<{ result: GatewaySettings }>
+    )._thenUnwrap((obj) => obj.result);
+  }
 }
 
 export interface GatewaySettings {
   created_at?: string;
 
   /**
-   * SSH encryption public key
+   * Base64 encoded HPKE public key used to encrypt all your ssh session logs.
+   * https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/use-cases/ssh/ssh-infrastructure-access/#enable-ssh-command-logging
    */
   public_key?: string;
 
@@ -57,22 +76,26 @@ export interface AuditSSHSettingUpdateParams {
   account_id: string;
 
   /**
-   * Body param: SSH encryption public key
+   * Body param: Base64 encoded HPKE public key used to encrypt all your ssh session
+   * logs.
+   * https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/use-cases/ssh/ssh-infrastructure-access/#enable-ssh-command-logging
    */
   public_key: string;
-
-  /**
-   * Body param: Seed ID
-   */
-  seed_id?: string;
 }
 
 export interface AuditSSHSettingGetParams {
   account_id: string;
 }
 
-export namespace AuditSSHSettings {
-  export import GatewaySettings = AuditSSHSettingsAPI.GatewaySettings;
-  export import AuditSSHSettingUpdateParams = AuditSSHSettingsAPI.AuditSSHSettingUpdateParams;
-  export import AuditSSHSettingGetParams = AuditSSHSettingsAPI.AuditSSHSettingGetParams;
+export interface AuditSSHSettingRotateSeedParams {
+  account_id: string;
+}
+
+export declare namespace AuditSSHSettings {
+  export {
+    type GatewaySettings as GatewaySettings,
+    type AuditSSHSettingUpdateParams as AuditSSHSettingUpdateParams,
+    type AuditSSHSettingGetParams as AuditSSHSettingGetParams,
+    type AuditSSHSettingRotateSeedParams as AuditSSHSettingRotateSeedParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/categories.ts b/src/resources/zero-trust/gateway/categories.ts
index 661122eee3..ddc770461c 100644
--- a/src/resources/zero-trust/gateway/categories.ts
+++ b/src/resources/zero-trust/gateway/categories.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as CategoriesAPI from './categories';
 import { SinglePage } from '../../../pagination';
 
 export class Categories extends APIResource {
@@ -98,8 +97,12 @@ export interface CategoryListParams {
   account_id: string;
 }
 
-export namespace Categories {
-  export import Category = CategoriesAPI.Category;
-  export import CategoriesSinglePage = CategoriesAPI.CategoriesSinglePage;
-  export import CategoryListParams = CategoriesAPI.CategoryListParams;
+Categories.CategoriesSinglePage = CategoriesSinglePage;
+
+export declare namespace Categories {
+  export {
+    type Category as Category,
+    CategoriesSinglePage as CategoriesSinglePage,
+    type CategoryListParams as CategoryListParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/certificates.ts b/src/resources/zero-trust/gateway/certificates.ts
index e4bcde59f8..8772aeb601 100644
--- a/src/resources/zero-trust/gateway/certificates.ts
+++ b/src/resources/zero-trust/gateway/certificates.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as CertificatesAPI from './certificates';
 import { SinglePage } from '../../../pagination';
 
 export class Certificates extends APIResource {
@@ -38,7 +37,8 @@ export class Certificates extends APIResource {
   }
 
   /**
-   * Deletes a gateway-managed Zero Trust certificate.
+   * Deletes a gateway-managed Zero Trust certificate. A certificate must be
+   * deactivated from the edge (inactive) before it is deleted.
    */
   delete(
     certificateId: string,
@@ -54,6 +54,40 @@ export class Certificates extends APIResource {
     )._thenUnwrap((obj) => obj.result);
   }
 
+  /**
+   * Binds a single Zero Trust certificate to the edge.
+   */
+  activate(
+    certificateId: string,
+    params: CertificateActivateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CertificateActivateResponse> {
+    const { account_id, body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/gateway/certificates/${certificateId}/activate`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: CertificateActivateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Unbinds a single Zero Trust certificate from the edge
+   */
+  deactivate(
+    certificateId: string,
+    params: CertificateDeactivateParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<CertificateDeactivateResponse> {
+    const { account_id, body } = params;
+    return (
+      this._client.post(`/accounts/${account_id}/gateway/certificates/${certificateId}/deactivate`, {
+        body: body,
+        ...options,
+      }) as Core.APIPromise<{ result: CertificateDeactivateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Fetches a single Zero Trust certificate.
    */
@@ -81,18 +115,40 @@ export interface CertificateCreateResponse {
   id?: string;
 
   /**
-   * The deployment status of the certificate on Cloudflare's edge.
+   * The deployment status of the certificate on Cloudflare's edge. Certificates in
+   * the 'available' (previously called 'active') state may be used for Gateway TLS
+   * interception.
+   */
+  binding_status?: 'pending_deployment' | 'available' | 'pending_deletion' | 'inactive';
+
+  /**
+   * The CA certificate
    */
-  binding_status?: 'pending_deployment' | 'active' | 'pending_deletion' | 'inactive';
+  certificate?: string;
 
   created_at?: string;
 
+  expires_on?: string;
+
+  /**
+   * The SHA256 fingerprint of the certificate.
+   */
+  fingerprint?: string;
+
   /**
    * Use this certificate for Gateway TLS interception
    */
-  enabled?: boolean;
+  in_use?: boolean;
 
-  expires_on?: string;
+  /**
+   * The organization that issued the certificate.
+   */
+  issuer_org?: string;
+
+  /**
+   * The entire issuer field of the certificate.
+   */
+  issuer_raw?: string;
 
   /**
    * The type of certificate, either BYO-PKI (custom) or Gateway-managed.
@@ -111,18 +167,40 @@ export interface CertificateListResponse {
   id?: string;
 
   /**
-   * The deployment status of the certificate on Cloudflare's edge.
+   * The deployment status of the certificate on Cloudflare's edge. Certificates in
+   * the 'available' (previously called 'active') state may be used for Gateway TLS
+   * interception.
    */
-  binding_status?: 'pending_deployment' | 'active' | 'pending_deletion' | 'inactive';
+  binding_status?: 'pending_deployment' | 'available' | 'pending_deletion' | 'inactive';
+
+  /**
+   * The CA certificate
+   */
+  certificate?: string;
 
   created_at?: string;
 
+  expires_on?: string;
+
+  /**
+   * The SHA256 fingerprint of the certificate.
+   */
+  fingerprint?: string;
+
   /**
    * Use this certificate for Gateway TLS interception
    */
-  enabled?: boolean;
+  in_use?: boolean;
 
-  expires_on?: string;
+  /**
+   * The organization that issued the certificate.
+   */
+  issuer_org?: string;
+
+  /**
+   * The entire issuer field of the certificate.
+   */
+  issuer_raw?: string;
 
   /**
    * The type of certificate, either BYO-PKI (custom) or Gateway-managed.
@@ -141,19 +219,145 @@ export interface CertificateDeleteResponse {
   id?: string;
 
   /**
-   * The deployment status of the certificate on Cloudflare's edge.
+   * The deployment status of the certificate on Cloudflare's edge. Certificates in
+   * the 'available' (previously called 'active') state may be used for Gateway TLS
+   * interception.
+   */
+  binding_status?: 'pending_deployment' | 'available' | 'pending_deletion' | 'inactive';
+
+  /**
+   * The CA certificate
+   */
+  certificate?: string;
+
+  created_at?: string;
+
+  expires_on?: string;
+
+  /**
+   * The SHA256 fingerprint of the certificate.
+   */
+  fingerprint?: string;
+
+  /**
+   * Use this certificate for Gateway TLS interception
+   */
+  in_use?: boolean;
+
+  /**
+   * The organization that issued the certificate.
+   */
+  issuer_org?: string;
+
+  /**
+   * The entire issuer field of the certificate.
+   */
+  issuer_raw?: string;
+
+  /**
+   * The type of certificate, either BYO-PKI (custom) or Gateway-managed.
+   */
+  type?: 'custom' | 'gateway_managed';
+
+  updated_at?: string;
+
+  uploaded_on?: string;
+}
+
+export interface CertificateActivateResponse {
+  /**
+   * Certificate UUID tag.
+   */
+  id?: string;
+
+  /**
+   * The deployment status of the certificate on Cloudflare's edge. Certificates in
+   * the 'available' (previously called 'active') state may be used for Gateway TLS
+   * interception.
+   */
+  binding_status?: 'pending_deployment' | 'available' | 'pending_deletion' | 'inactive';
+
+  /**
+   * The CA certificate
    */
-  binding_status?: 'pending_deployment' | 'active' | 'pending_deletion' | 'inactive';
+  certificate?: string;
 
   created_at?: string;
 
+  expires_on?: string;
+
+  /**
+   * The SHA256 fingerprint of the certificate.
+   */
+  fingerprint?: string;
+
   /**
    * Use this certificate for Gateway TLS interception
    */
-  enabled?: boolean;
+  in_use?: boolean;
+
+  /**
+   * The organization that issued the certificate.
+   */
+  issuer_org?: string;
+
+  /**
+   * The entire issuer field of the certificate.
+   */
+  issuer_raw?: string;
+
+  /**
+   * The type of certificate, either BYO-PKI (custom) or Gateway-managed.
+   */
+  type?: 'custom' | 'gateway_managed';
+
+  updated_at?: string;
+
+  uploaded_on?: string;
+}
+
+export interface CertificateDeactivateResponse {
+  /**
+   * Certificate UUID tag.
+   */
+  id?: string;
+
+  /**
+   * The deployment status of the certificate on Cloudflare's edge. Certificates in
+   * the 'available' (previously called 'active') state may be used for Gateway TLS
+   * interception.
+   */
+  binding_status?: 'pending_deployment' | 'available' | 'pending_deletion' | 'inactive';
+
+  /**
+   * The CA certificate
+   */
+  certificate?: string;
+
+  created_at?: string;
 
   expires_on?: string;
 
+  /**
+   * The SHA256 fingerprint of the certificate.
+   */
+  fingerprint?: string;
+
+  /**
+   * Use this certificate for Gateway TLS interception
+   */
+  in_use?: boolean;
+
+  /**
+   * The organization that issued the certificate.
+   */
+  issuer_org?: string;
+
+  /**
+   * The entire issuer field of the certificate.
+   */
+  issuer_raw?: string;
+
   /**
    * The type of certificate, either BYO-PKI (custom) or Gateway-managed.
    */
@@ -171,18 +375,40 @@ export interface CertificateGetResponse {
   id?: string;
 
   /**
-   * The deployment status of the certificate on Cloudflare's edge.
+   * The deployment status of the certificate on Cloudflare's edge. Certificates in
+   * the 'available' (previously called 'active') state may be used for Gateway TLS
+   * interception.
    */
-  binding_status?: 'pending_deployment' | 'active' | 'pending_deletion' | 'inactive';
+  binding_status?: 'pending_deployment' | 'available' | 'pending_deletion' | 'inactive';
+
+  /**
+   * The CA certificate
+   */
+  certificate?: string;
 
   created_at?: string;
 
+  expires_on?: string;
+
+  /**
+   * The SHA256 fingerprint of the certificate.
+   */
+  fingerprint?: string;
+
   /**
    * Use this certificate for Gateway TLS interception
    */
-  enabled?: boolean;
+  in_use?: boolean;
 
-  expires_on?: string;
+  /**
+   * The organization that issued the certificate.
+   */
+  issuer_org?: string;
+
+  /**
+   * The entire issuer field of the certificate.
+   */
+  issuer_raw?: string;
 
   /**
    * The type of certificate, either BYO-PKI (custom) or Gateway-managed.
@@ -215,18 +441,50 @@ export interface CertificateDeleteParams {
   account_id: string;
 }
 
+export interface CertificateActivateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+}
+
+export interface CertificateDeactivateParams {
+  /**
+   * Path param:
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  body: unknown;
+}
+
 export interface CertificateGetParams {
   account_id: string;
 }
 
-export namespace Certificates {
-  export import CertificateCreateResponse = CertificatesAPI.CertificateCreateResponse;
-  export import CertificateListResponse = CertificatesAPI.CertificateListResponse;
-  export import CertificateDeleteResponse = CertificatesAPI.CertificateDeleteResponse;
-  export import CertificateGetResponse = CertificatesAPI.CertificateGetResponse;
-  export import CertificateListResponsesSinglePage = CertificatesAPI.CertificateListResponsesSinglePage;
-  export import CertificateCreateParams = CertificatesAPI.CertificateCreateParams;
-  export import CertificateListParams = CertificatesAPI.CertificateListParams;
-  export import CertificateDeleteParams = CertificatesAPI.CertificateDeleteParams;
-  export import CertificateGetParams = CertificatesAPI.CertificateGetParams;
+Certificates.CertificateListResponsesSinglePage = CertificateListResponsesSinglePage;
+
+export declare namespace Certificates {
+  export {
+    type CertificateCreateResponse as CertificateCreateResponse,
+    type CertificateListResponse as CertificateListResponse,
+    type CertificateDeleteResponse as CertificateDeleteResponse,
+    type CertificateActivateResponse as CertificateActivateResponse,
+    type CertificateDeactivateResponse as CertificateDeactivateResponse,
+    type CertificateGetResponse as CertificateGetResponse,
+    CertificateListResponsesSinglePage as CertificateListResponsesSinglePage,
+    type CertificateCreateParams as CertificateCreateParams,
+    type CertificateListParams as CertificateListParams,
+    type CertificateDeleteParams as CertificateDeleteParams,
+    type CertificateActivateParams as CertificateActivateParams,
+    type CertificateDeactivateParams as CertificateDeactivateParams,
+    type CertificateGetParams as CertificateGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/configurations.ts b/src/resources/zero-trust/gateway/configurations/configurations.ts
old mode 100644
new mode 100755
similarity index 81%
rename from src/resources/zero-trust/gateway/configurations.ts
rename to src/resources/zero-trust/gateway/configurations/configurations.ts
index a18c8dfc44..e12b658a82
--- a/src/resources/zero-trust/gateway/configurations.ts
+++ b/src/resources/zero-trust/gateway/configurations/configurations.ts
@@ -1,10 +1,15 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../../resource';
-import * as Core from '../../../core';
-import * as ConfigurationsAPI from './configurations';
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+import * as CustomCertificateAPI from './custom-certificate';
+import { CustomCertificate, CustomCertificateGetParams } from './custom-certificate';
 
 export class Configurations extends APIResource {
+  customCertificate: CustomCertificateAPI.CustomCertificate = new CustomCertificateAPI.CustomCertificate(
+    this._client,
+  );
+
   /**
    * Updates the current Zero Trust account configuration.
    */
@@ -361,7 +366,7 @@ export interface FipsSettingsParam {
 }
 
 /**
- * account settings.
+ * Account settings
  */
 export interface GatewayConfigurationSettings {
   /**
@@ -416,6 +421,11 @@ export interface GatewayConfigurationSettings {
    */
   protocol_detection?: ProtocolDetection;
 
+  /**
+   * Sandbox settings.
+   */
+  sandbox?: GatewayConfigurationSettings.Sandbox;
+
   /**
    * TLS interception settings.
    */
@@ -429,14 +439,31 @@ export namespace GatewayConfigurationSettings {
    */
   export interface Certificate {
     /**
-     * UUID of certificate to be used for interception.
+     * UUID of certificate to be used for interception. Certificate must be available
+     * (previously called 'active') on the edge. A nil UUID will indicate the
+     * Cloudflare Root CA should be used.
      */
     id: string;
   }
+
+  /**
+   * Sandbox settings.
+   */
+  export interface Sandbox {
+    /**
+     * Enable sandbox.
+     */
+    enabled?: boolean;
+
+    /**
+     * Action to take when the file cannot be scanned.
+     */
+    fallback_action?: 'allow' | 'block';
+  }
 }
 
 /**
- * account settings.
+ * Account settings
  */
 export interface GatewayConfigurationSettingsParam {
   /**
@@ -491,6 +518,11 @@ export interface GatewayConfigurationSettingsParam {
    */
   protocol_detection?: ProtocolDetectionParam;
 
+  /**
+   * Sandbox settings.
+   */
+  sandbox?: GatewayConfigurationSettingsParam.Sandbox;
+
   /**
    * TLS interception settings.
    */
@@ -504,10 +536,27 @@ export namespace GatewayConfigurationSettingsParam {
    */
   export interface Certificate {
     /**
-     * UUID of certificate to be used for interception.
+     * UUID of certificate to be used for interception. Certificate must be available
+     * (previously called 'active') on the edge. A nil UUID will indicate the
+     * Cloudflare Root CA should be used.
      */
     id: string;
   }
+
+  /**
+   * Sandbox settings.
+   */
+  export interface Sandbox {
+    /**
+     * Enable sandbox.
+     */
+    enabled?: boolean;
+
+    /**
+     * Action to take when the file cannot be scanned.
+     */
+    fallback_action?: 'allow' | 'block';
+  }
 }
 
 /**
@@ -595,13 +644,13 @@ export interface TLSSettingsParam {
 }
 
 /**
- * account settings.
+ * Account settings
  */
 export interface ConfigurationUpdateResponse {
   created_at?: string;
 
   /**
-   * account settings.
+   * Account settings
    */
   settings?: GatewayConfigurationSettings;
 
@@ -609,13 +658,13 @@ export interface ConfigurationUpdateResponse {
 }
 
 /**
- * account settings.
+ * Account settings
  */
 export interface ConfigurationEditResponse {
   created_at?: string;
 
   /**
-   * account settings.
+   * Account settings
    */
   settings?: GatewayConfigurationSettings;
 
@@ -623,13 +672,13 @@ export interface ConfigurationEditResponse {
 }
 
 /**
- * account settings.
+ * Account settings
  */
 export interface ConfigurationGetResponse {
   created_at?: string;
 
   /**
-   * account settings.
+   * Account settings
    */
   settings?: GatewayConfigurationSettings;
 
@@ -643,7 +692,7 @@ export interface ConfigurationUpdateParams {
   account_id: string;
 
   /**
-   * Body param: account settings.
+   * Body param: Account settings
    */
   settings?: GatewayConfigurationSettingsParam;
 }
@@ -655,7 +704,7 @@ export interface ConfigurationEditParams {
   account_id: string;
 
   /**
-   * Body param: account settings.
+   * Body param: Account settings
    */
   settings?: GatewayConfigurationSettingsParam;
 }
@@ -664,23 +713,32 @@ export interface ConfigurationGetParams {
   account_id: string;
 }
 
-export namespace Configurations {
-  export import ActivityLogSettings = ConfigurationsAPI.ActivityLogSettings;
-  export import AntiVirusSettings = ConfigurationsAPI.AntiVirusSettings;
-  export import BlockPageSettings = ConfigurationsAPI.BlockPageSettings;
-  export import BodyScanningSettings = ConfigurationsAPI.BodyScanningSettings;
-  export import BrowserIsolationSettings = ConfigurationsAPI.BrowserIsolationSettings;
-  export import CustomCertificateSettings = ConfigurationsAPI.CustomCertificateSettings;
-  export import ExtendedEmailMatching = ConfigurationsAPI.ExtendedEmailMatching;
-  export import FipsSettings = ConfigurationsAPI.FipsSettings;
-  export import GatewayConfigurationSettings = ConfigurationsAPI.GatewayConfigurationSettings;
-  export import NotificationSettings = ConfigurationsAPI.NotificationSettings;
-  export import ProtocolDetection = ConfigurationsAPI.ProtocolDetection;
-  export import TLSSettings = ConfigurationsAPI.TLSSettings;
-  export import ConfigurationUpdateResponse = ConfigurationsAPI.ConfigurationUpdateResponse;
-  export import ConfigurationEditResponse = ConfigurationsAPI.ConfigurationEditResponse;
-  export import ConfigurationGetResponse = ConfigurationsAPI.ConfigurationGetResponse;
-  export import ConfigurationUpdateParams = ConfigurationsAPI.ConfigurationUpdateParams;
-  export import ConfigurationEditParams = ConfigurationsAPI.ConfigurationEditParams;
-  export import ConfigurationGetParams = ConfigurationsAPI.ConfigurationGetParams;
+Configurations.CustomCertificate = CustomCertificate;
+
+export declare namespace Configurations {
+  export {
+    type ActivityLogSettings as ActivityLogSettings,
+    type AntiVirusSettings as AntiVirusSettings,
+    type BlockPageSettings as BlockPageSettings,
+    type BodyScanningSettings as BodyScanningSettings,
+    type BrowserIsolationSettings as BrowserIsolationSettings,
+    type CustomCertificateSettings as CustomCertificateSettings,
+    type ExtendedEmailMatching as ExtendedEmailMatching,
+    type FipsSettings as FipsSettings,
+    type GatewayConfigurationSettings as GatewayConfigurationSettings,
+    type NotificationSettings as NotificationSettings,
+    type ProtocolDetection as ProtocolDetection,
+    type TLSSettings as TLSSettings,
+    type ConfigurationUpdateResponse as ConfigurationUpdateResponse,
+    type ConfigurationEditResponse as ConfigurationEditResponse,
+    type ConfigurationGetResponse as ConfigurationGetResponse,
+    type ConfigurationUpdateParams as ConfigurationUpdateParams,
+    type ConfigurationEditParams as ConfigurationEditParams,
+    type ConfigurationGetParams as ConfigurationGetParams,
+  };
+
+  export {
+    CustomCertificate as CustomCertificate,
+    type CustomCertificateGetParams as CustomCertificateGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/configurations/custom-certificate.ts b/src/resources/zero-trust/gateway/configurations/custom-certificate.ts
new file mode 100755
index 0000000000..3c6b5c6e8e
--- /dev/null
+++ b/src/resources/zero-trust/gateway/configurations/custom-certificate.ts
@@ -0,0 +1,26 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../../resource';
+import * as Core from '../../../../core';
+import * as ConfigurationsAPI from './configurations';
+
+export class CustomCertificate extends APIResource {
+  /**
+   * Fetches the current Zero Trust certificate configuration.
+   */
+  get(
+    params: CustomCertificateGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<ConfigurationsAPI.CustomCertificateSettings> {
+    const { account_id } = params;
+    return this._client.get(`/accounts/${account_id}/gateway/configuration/custom_certificate`, options);
+  }
+}
+
+export interface CustomCertificateGetParams {
+  account_id: string;
+}
+
+export declare namespace CustomCertificate {
+  export { type CustomCertificateGetParams as CustomCertificateGetParams };
+}
diff --git a/src/resources/zero-trust/gateway/configurations/index.ts b/src/resources/zero-trust/gateway/configurations/index.ts
new file mode 100755
index 0000000000..afb424e940
--- /dev/null
+++ b/src/resources/zero-trust/gateway/configurations/index.ts
@@ -0,0 +1,24 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  Configurations,
+  type ActivityLogSettings,
+  type AntiVirusSettings,
+  type BlockPageSettings,
+  type BodyScanningSettings,
+  type BrowserIsolationSettings,
+  type CustomCertificateSettings,
+  type ExtendedEmailMatching,
+  type FipsSettings,
+  type GatewayConfigurationSettings,
+  type NotificationSettings,
+  type ProtocolDetection,
+  type TLSSettings,
+  type ConfigurationUpdateResponse,
+  type ConfigurationEditResponse,
+  type ConfigurationGetResponse,
+  type ConfigurationUpdateParams,
+  type ConfigurationEditParams,
+  type ConfigurationGetParams,
+} from './configurations';
+export { CustomCertificate, type CustomCertificateGetParams } from './custom-certificate';
diff --git a/src/resources/zero-trust/gateway/gateway.ts b/src/resources/zero-trust/gateway/gateway.ts
index a372161363..9f5183d3c7 100644
--- a/src/resources/zero-trust/gateway/gateway.ts
+++ b/src/resources/zero-trust/gateway/gateway.ts
@@ -2,17 +2,124 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as GatewayAPI from './gateway';
 import * as AppTypesAPI from './app-types';
+import { AppType, AppTypeListParams, AppTypes, AppTypesSinglePage } from './app-types';
 import * as AuditSSHSettingsAPI from './audit-ssh-settings';
+import {
+  AuditSSHSettingGetParams,
+  AuditSSHSettingRotateSeedParams,
+  AuditSSHSettingUpdateParams,
+  AuditSSHSettings,
+  GatewaySettings,
+} from './audit-ssh-settings';
 import * as CategoriesAPI from './categories';
+import { Categories, CategoriesSinglePage, Category, CategoryListParams } from './categories';
 import * as CertificatesAPI from './certificates';
-import * as ConfigurationsAPI from './configurations';
+import {
+  CertificateActivateParams,
+  CertificateActivateResponse,
+  CertificateCreateParams,
+  CertificateCreateResponse,
+  CertificateDeactivateParams,
+  CertificateDeactivateResponse,
+  CertificateDeleteParams,
+  CertificateDeleteResponse,
+  CertificateGetParams,
+  CertificateGetResponse,
+  CertificateListParams,
+  CertificateListResponse,
+  CertificateListResponsesSinglePage,
+  Certificates,
+} from './certificates';
 import * as LocationsAPI from './locations';
+import {
+  DOHEndpoint,
+  DOTEndpoint,
+  Endpoint,
+  IPNetwork,
+  IPV4Endpoint,
+  IPV6Endpoint,
+  IPV6Network,
+  Location,
+  LocationCreateParams,
+  LocationDeleteParams,
+  LocationDeleteResponse,
+  LocationGetParams,
+  LocationListParams,
+  LocationUpdateParams,
+  Locations,
+  LocationsSinglePage,
+} from './locations';
 import * as LoggingAPI from './logging';
+import { Logging, LoggingGetParams, LoggingSetting, LoggingUpdateParams } from './logging';
 import * as ProxyEndpointsAPI from './proxy-endpoints';
+import {
+  GatewayIPs,
+  ProxyEndpoint,
+  ProxyEndpointCreateParams,
+  ProxyEndpointDeleteParams,
+  ProxyEndpointDeleteResponse,
+  ProxyEndpointEditParams,
+  ProxyEndpointGetParams,
+  ProxyEndpointGetResponse,
+  ProxyEndpointListParams,
+  ProxyEndpoints,
+} from './proxy-endpoints';
 import * as RulesAPI from './rules';
+import {
+  DNSResolverSettingsV4,
+  DNSResolverSettingsV6,
+  GatewayFilter,
+  GatewayRule,
+  GatewayRulesSinglePage,
+  RuleCreateParams,
+  RuleDeleteParams,
+  RuleDeleteResponse,
+  RuleGetParams,
+  RuleListParams,
+  RuleResetExpirationParams,
+  RuleSetting,
+  RuleUpdateParams,
+  Rules,
+  Schedule,
+} from './rules';
+import * as ConfigurationsAPI from './configurations/configurations';
+import {
+  ActivityLogSettings,
+  AntiVirusSettings,
+  BlockPageSettings,
+  BodyScanningSettings,
+  BrowserIsolationSettings,
+  ConfigurationEditParams,
+  ConfigurationEditResponse,
+  ConfigurationGetParams,
+  ConfigurationGetResponse,
+  ConfigurationUpdateParams,
+  ConfigurationUpdateResponse,
+  Configurations,
+  CustomCertificateSettings,
+  ExtendedEmailMatching,
+  FipsSettings,
+  GatewayConfigurationSettings,
+  NotificationSettings,
+  ProtocolDetection,
+  TLSSettings,
+} from './configurations/configurations';
 import * as ListsAPI from './lists/lists';
+import {
+  GatewayItem,
+  GatewayList,
+  GatewayListsSinglePage,
+  ListCreateParams,
+  ListCreateResponse,
+  ListDeleteParams,
+  ListDeleteResponse,
+  ListEditParams,
+  ListGetParams,
+  ListListParams,
+  ListUpdateParams,
+  Lists,
+} from './lists/lists';
 
 export class Gateway extends APIResource {
   auditSSHSettings: AuditSSHSettingsAPI.AuditSSHSettings = new AuditSSHSettingsAPI.AuditSSHSettings(
@@ -95,99 +202,161 @@ export interface GatewayListParams {
   account_id: string;
 }
 
-export namespace Gateway {
-  export import GatewayCreateResponse = GatewayAPI.GatewayCreateResponse;
-  export import GatewayListResponse = GatewayAPI.GatewayListResponse;
-  export import GatewayCreateParams = GatewayAPI.GatewayCreateParams;
-  export import GatewayListParams = GatewayAPI.GatewayListParams;
-  export import AuditSSHSettings = AuditSSHSettingsAPI.AuditSSHSettings;
-  export import GatewaySettings = AuditSSHSettingsAPI.GatewaySettings;
-  export import AuditSSHSettingUpdateParams = AuditSSHSettingsAPI.AuditSSHSettingUpdateParams;
-  export import AuditSSHSettingGetParams = AuditSSHSettingsAPI.AuditSSHSettingGetParams;
-  export import Categories = CategoriesAPI.Categories;
-  export import Category = CategoriesAPI.Category;
-  export import CategoriesSinglePage = CategoriesAPI.CategoriesSinglePage;
-  export import CategoryListParams = CategoriesAPI.CategoryListParams;
-  export import AppTypes = AppTypesAPI.AppTypes;
-  export import AppType = AppTypesAPI.AppType;
-  export import AppTypesSinglePage = AppTypesAPI.AppTypesSinglePage;
-  export import AppTypeListParams = AppTypesAPI.AppTypeListParams;
-  export import Configurations = ConfigurationsAPI.Configurations;
-  export import ActivityLogSettings = ConfigurationsAPI.ActivityLogSettings;
-  export import AntiVirusSettings = ConfigurationsAPI.AntiVirusSettings;
-  export import BlockPageSettings = ConfigurationsAPI.BlockPageSettings;
-  export import BodyScanningSettings = ConfigurationsAPI.BodyScanningSettings;
-  export import BrowserIsolationSettings = ConfigurationsAPI.BrowserIsolationSettings;
-  export import CustomCertificateSettings = ConfigurationsAPI.CustomCertificateSettings;
-  export import ExtendedEmailMatching = ConfigurationsAPI.ExtendedEmailMatching;
-  export import FipsSettings = ConfigurationsAPI.FipsSettings;
-  export import GatewayConfigurationSettings = ConfigurationsAPI.GatewayConfigurationSettings;
-  export import NotificationSettings = ConfigurationsAPI.NotificationSettings;
-  export import ProtocolDetection = ConfigurationsAPI.ProtocolDetection;
-  export import TLSSettings = ConfigurationsAPI.TLSSettings;
-  export import ConfigurationUpdateResponse = ConfigurationsAPI.ConfigurationUpdateResponse;
-  export import ConfigurationEditResponse = ConfigurationsAPI.ConfigurationEditResponse;
-  export import ConfigurationGetResponse = ConfigurationsAPI.ConfigurationGetResponse;
-  export import ConfigurationUpdateParams = ConfigurationsAPI.ConfigurationUpdateParams;
-  export import ConfigurationEditParams = ConfigurationsAPI.ConfigurationEditParams;
-  export import ConfigurationGetParams = ConfigurationsAPI.ConfigurationGetParams;
-  export import Lists = ListsAPI.Lists;
-  export import GatewayItem = ListsAPI.GatewayItem;
-  export import GatewayList = ListsAPI.GatewayList;
-  export import ListCreateResponse = ListsAPI.ListCreateResponse;
-  export import ListDeleteResponse = ListsAPI.ListDeleteResponse;
-  export import GatewayListsSinglePage = ListsAPI.GatewayListsSinglePage;
-  export import ListCreateParams = ListsAPI.ListCreateParams;
-  export import ListUpdateParams = ListsAPI.ListUpdateParams;
-  export import ListListParams = ListsAPI.ListListParams;
-  export import ListDeleteParams = ListsAPI.ListDeleteParams;
-  export import ListEditParams = ListsAPI.ListEditParams;
-  export import ListGetParams = ListsAPI.ListGetParams;
-  export import Locations = LocationsAPI.Locations;
-  export import Location = LocationsAPI.Location;
-  export import LocationDeleteResponse = LocationsAPI.LocationDeleteResponse;
-  export import LocationsSinglePage = LocationsAPI.LocationsSinglePage;
-  export import LocationCreateParams = LocationsAPI.LocationCreateParams;
-  export import LocationUpdateParams = LocationsAPI.LocationUpdateParams;
-  export import LocationListParams = LocationsAPI.LocationListParams;
-  export import LocationDeleteParams = LocationsAPI.LocationDeleteParams;
-  export import LocationGetParams = LocationsAPI.LocationGetParams;
-  export import Logging = LoggingAPI.Logging;
-  export import LoggingSetting = LoggingAPI.LoggingSetting;
-  export import LoggingUpdateParams = LoggingAPI.LoggingUpdateParams;
-  export import LoggingGetParams = LoggingAPI.LoggingGetParams;
-  export import ProxyEndpoints = ProxyEndpointsAPI.ProxyEndpoints;
-  export import GatewayIPs = ProxyEndpointsAPI.GatewayIPs;
-  export import ProxyEndpoint = ProxyEndpointsAPI.ProxyEndpoint;
-  export import ProxyEndpointDeleteResponse = ProxyEndpointsAPI.ProxyEndpointDeleteResponse;
-  export import ProxyEndpointGetResponse = ProxyEndpointsAPI.ProxyEndpointGetResponse;
-  export import ProxyEndpointCreateParams = ProxyEndpointsAPI.ProxyEndpointCreateParams;
-  export import ProxyEndpointListParams = ProxyEndpointsAPI.ProxyEndpointListParams;
-  export import ProxyEndpointDeleteParams = ProxyEndpointsAPI.ProxyEndpointDeleteParams;
-  export import ProxyEndpointEditParams = ProxyEndpointsAPI.ProxyEndpointEditParams;
-  export import ProxyEndpointGetParams = ProxyEndpointsAPI.ProxyEndpointGetParams;
-  export import Rules = RulesAPI.Rules;
-  export import DNSResolverSettingsV4 = RulesAPI.DNSResolverSettingsV4;
-  export import DNSResolverSettingsV6 = RulesAPI.DNSResolverSettingsV6;
-  export import GatewayFilter = RulesAPI.GatewayFilter;
-  export import GatewayRule = RulesAPI.GatewayRule;
-  export import RuleSetting = RulesAPI.RuleSetting;
-  export import Schedule = RulesAPI.Schedule;
-  export import RuleDeleteResponse = RulesAPI.RuleDeleteResponse;
-  export import GatewayRulesSinglePage = RulesAPI.GatewayRulesSinglePage;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleDeleteParams = RulesAPI.RuleDeleteParams;
-  export import RuleGetParams = RulesAPI.RuleGetParams;
-  export import Certificates = CertificatesAPI.Certificates;
-  export import CertificateCreateResponse = CertificatesAPI.CertificateCreateResponse;
-  export import CertificateListResponse = CertificatesAPI.CertificateListResponse;
-  export import CertificateDeleteResponse = CertificatesAPI.CertificateDeleteResponse;
-  export import CertificateGetResponse = CertificatesAPI.CertificateGetResponse;
-  export import CertificateListResponsesSinglePage = CertificatesAPI.CertificateListResponsesSinglePage;
-  export import CertificateCreateParams = CertificatesAPI.CertificateCreateParams;
-  export import CertificateListParams = CertificatesAPI.CertificateListParams;
-  export import CertificateDeleteParams = CertificatesAPI.CertificateDeleteParams;
-  export import CertificateGetParams = CertificatesAPI.CertificateGetParams;
+Gateway.AuditSSHSettings = AuditSSHSettings;
+Gateway.Categories = Categories;
+Gateway.CategoriesSinglePage = CategoriesSinglePage;
+Gateway.AppTypes = AppTypes;
+Gateway.AppTypesSinglePage = AppTypesSinglePage;
+Gateway.Configurations = Configurations;
+Gateway.Lists = Lists;
+Gateway.GatewayListsSinglePage = GatewayListsSinglePage;
+Gateway.Locations = Locations;
+Gateway.LocationsSinglePage = LocationsSinglePage;
+Gateway.Logging = Logging;
+Gateway.ProxyEndpoints = ProxyEndpoints;
+Gateway.Rules = Rules;
+Gateway.GatewayRulesSinglePage = GatewayRulesSinglePage;
+Gateway.Certificates = Certificates;
+Gateway.CertificateListResponsesSinglePage = CertificateListResponsesSinglePage;
+
+export declare namespace Gateway {
+  export {
+    type GatewayCreateResponse as GatewayCreateResponse,
+    type GatewayListResponse as GatewayListResponse,
+    type GatewayCreateParams as GatewayCreateParams,
+    type GatewayListParams as GatewayListParams,
+  };
+
+  export {
+    AuditSSHSettings as AuditSSHSettings,
+    type GatewaySettings as GatewaySettings,
+    type AuditSSHSettingUpdateParams as AuditSSHSettingUpdateParams,
+    type AuditSSHSettingGetParams as AuditSSHSettingGetParams,
+    type AuditSSHSettingRotateSeedParams as AuditSSHSettingRotateSeedParams,
+  };
+
+  export {
+    Categories as Categories,
+    type Category as Category,
+    CategoriesSinglePage as CategoriesSinglePage,
+    type CategoryListParams as CategoryListParams,
+  };
+
+  export {
+    AppTypes as AppTypes,
+    type AppType as AppType,
+    AppTypesSinglePage as AppTypesSinglePage,
+    type AppTypeListParams as AppTypeListParams,
+  };
+
+  export {
+    Configurations as Configurations,
+    type ActivityLogSettings as ActivityLogSettings,
+    type AntiVirusSettings as AntiVirusSettings,
+    type BlockPageSettings as BlockPageSettings,
+    type BodyScanningSettings as BodyScanningSettings,
+    type BrowserIsolationSettings as BrowserIsolationSettings,
+    type CustomCertificateSettings as CustomCertificateSettings,
+    type ExtendedEmailMatching as ExtendedEmailMatching,
+    type FipsSettings as FipsSettings,
+    type GatewayConfigurationSettings as GatewayConfigurationSettings,
+    type NotificationSettings as NotificationSettings,
+    type ProtocolDetection as ProtocolDetection,
+    type TLSSettings as TLSSettings,
+    type ConfigurationUpdateResponse as ConfigurationUpdateResponse,
+    type ConfigurationEditResponse as ConfigurationEditResponse,
+    type ConfigurationGetResponse as ConfigurationGetResponse,
+    type ConfigurationUpdateParams as ConfigurationUpdateParams,
+    type ConfigurationEditParams as ConfigurationEditParams,
+    type ConfigurationGetParams as ConfigurationGetParams,
+  };
+
+  export {
+    Lists as Lists,
+    type GatewayItem as GatewayItem,
+    type GatewayList as GatewayList,
+    type ListCreateResponse as ListCreateResponse,
+    type ListDeleteResponse as ListDeleteResponse,
+    GatewayListsSinglePage as GatewayListsSinglePage,
+    type ListCreateParams as ListCreateParams,
+    type ListUpdateParams as ListUpdateParams,
+    type ListListParams as ListListParams,
+    type ListDeleteParams as ListDeleteParams,
+    type ListEditParams as ListEditParams,
+    type ListGetParams as ListGetParams,
+  };
+
+  export {
+    Locations as Locations,
+    type DOHEndpoint as DOHEndpoint,
+    type DOTEndpoint as DOTEndpoint,
+    type Endpoint as Endpoint,
+    type IPNetwork as IPNetwork,
+    type IPV4Endpoint as IPV4Endpoint,
+    type IPV6Endpoint as IPV6Endpoint,
+    type IPV6Network as IPV6Network,
+    type Location as Location,
+    type LocationDeleteResponse as LocationDeleteResponse,
+    LocationsSinglePage as LocationsSinglePage,
+    type LocationCreateParams as LocationCreateParams,
+    type LocationUpdateParams as LocationUpdateParams,
+    type LocationListParams as LocationListParams,
+    type LocationDeleteParams as LocationDeleteParams,
+    type LocationGetParams as LocationGetParams,
+  };
+
+  export {
+    Logging as Logging,
+    type LoggingSetting as LoggingSetting,
+    type LoggingUpdateParams as LoggingUpdateParams,
+    type LoggingGetParams as LoggingGetParams,
+  };
+
+  export {
+    ProxyEndpoints as ProxyEndpoints,
+    type GatewayIPs as GatewayIPs,
+    type ProxyEndpoint as ProxyEndpoint,
+    type ProxyEndpointDeleteResponse as ProxyEndpointDeleteResponse,
+    type ProxyEndpointGetResponse as ProxyEndpointGetResponse,
+    type ProxyEndpointCreateParams as ProxyEndpointCreateParams,
+    type ProxyEndpointListParams as ProxyEndpointListParams,
+    type ProxyEndpointDeleteParams as ProxyEndpointDeleteParams,
+    type ProxyEndpointEditParams as ProxyEndpointEditParams,
+    type ProxyEndpointGetParams as ProxyEndpointGetParams,
+  };
+
+  export {
+    Rules as Rules,
+    type DNSResolverSettingsV4 as DNSResolverSettingsV4,
+    type DNSResolverSettingsV6 as DNSResolverSettingsV6,
+    type GatewayFilter as GatewayFilter,
+    type GatewayRule as GatewayRule,
+    type RuleSetting as RuleSetting,
+    type Schedule as Schedule,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    GatewayRulesSinglePage as GatewayRulesSinglePage,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleGetParams as RuleGetParams,
+    type RuleResetExpirationParams as RuleResetExpirationParams,
+  };
+
+  export {
+    Certificates as Certificates,
+    type CertificateCreateResponse as CertificateCreateResponse,
+    type CertificateListResponse as CertificateListResponse,
+    type CertificateDeleteResponse as CertificateDeleteResponse,
+    type CertificateActivateResponse as CertificateActivateResponse,
+    type CertificateDeactivateResponse as CertificateDeactivateResponse,
+    type CertificateGetResponse as CertificateGetResponse,
+    CertificateListResponsesSinglePage as CertificateListResponsesSinglePage,
+    type CertificateCreateParams as CertificateCreateParams,
+    type CertificateListParams as CertificateListParams,
+    type CertificateDeleteParams as CertificateDeleteParams,
+    type CertificateActivateParams as CertificateActivateParams,
+    type CertificateDeactivateParams as CertificateDeactivateParams,
+    type CertificateGetParams as CertificateGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/index.ts b/src/resources/zero-trust/gateway/index.ts
index e03f690ae4..ae8fcd45a8 100644
--- a/src/resources/zero-trust/gateway/index.ts
+++ b/src/resources/zero-trust/gateway/index.ts
@@ -1,104 +1,117 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export { AppTypesSinglePage, AppTypes, type AppType, type AppTypeListParams } from './app-types';
 export {
-  ActivityLogSettings,
-  AntiVirusSettings,
-  BlockPageSettings,
-  BodyScanningSettings,
-  BrowserIsolationSettings,
-  CustomCertificateSettings,
-  ExtendedEmailMatching,
-  FipsSettings,
-  GatewayConfigurationSettings,
-  NotificationSettings,
-  ProtocolDetection,
-  TLSSettings,
-  ConfigurationUpdateResponse,
-  ConfigurationEditResponse,
-  ConfigurationGetResponse,
-  ConfigurationUpdateParams,
-  ConfigurationEditParams,
-  ConfigurationGetParams,
-  Configurations,
-} from './configurations';
-export { AppType, AppTypeListParams, AppTypesSinglePage, AppTypes } from './app-types';
-export { Category, CategoryListParams, CategoriesSinglePage, Categories } from './categories';
+  AuditSSHSettings,
+  type GatewaySettings,
+  type AuditSSHSettingUpdateParams,
+  type AuditSSHSettingGetParams,
+  type AuditSSHSettingRotateSeedParams,
+} from './audit-ssh-settings';
+export { CategoriesSinglePage, Categories, type Category, type CategoryListParams } from './categories';
 export {
-  CertificateCreateResponse,
-  CertificateListResponse,
-  CertificateDeleteResponse,
-  CertificateGetResponse,
-  CertificateCreateParams,
-  CertificateListParams,
-  CertificateDeleteParams,
-  CertificateGetParams,
   CertificateListResponsesSinglePage,
   Certificates,
+  type CertificateCreateResponse,
+  type CertificateListResponse,
+  type CertificateDeleteResponse,
+  type CertificateActivateResponse,
+  type CertificateDeactivateResponse,
+  type CertificateGetResponse,
+  type CertificateCreateParams,
+  type CertificateListParams,
+  type CertificateDeleteParams,
+  type CertificateActivateParams,
+  type CertificateDeactivateParams,
+  type CertificateGetParams,
 } from './certificates';
 export {
-  DNSResolverSettingsV4,
-  DNSResolverSettingsV6,
-  GatewayFilter,
-  GatewayRule,
-  RuleSetting,
-  Schedule,
-  RuleDeleteResponse,
-  RuleCreateParams,
-  RuleUpdateParams,
-  RuleListParams,
-  RuleDeleteParams,
-  RuleGetParams,
-  GatewayRulesSinglePage,
-  Rules,
-} from './rules';
+  Configurations,
+  type ActivityLogSettings,
+  type AntiVirusSettings,
+  type BlockPageSettings,
+  type BodyScanningSettings,
+  type BrowserIsolationSettings,
+  type CustomCertificateSettings,
+  type ExtendedEmailMatching,
+  type FipsSettings,
+  type GatewayConfigurationSettings,
+  type NotificationSettings,
+  type ProtocolDetection,
+  type TLSSettings,
+  type ConfigurationUpdateResponse,
+  type ConfigurationEditResponse,
+  type ConfigurationGetResponse,
+  type ConfigurationUpdateParams,
+  type ConfigurationEditParams,
+  type ConfigurationGetParams,
+} from './configurations/index';
 export {
-  GatewayCreateResponse,
-  GatewayListResponse,
-  GatewayCreateParams,
-  GatewayListParams,
   Gateway,
+  type GatewayCreateResponse,
+  type GatewayListResponse,
+  type GatewayCreateParams,
+  type GatewayListParams,
 } from './gateway';
 export {
-  GatewayIPs,
-  ProxyEndpoint,
-  ProxyEndpointDeleteResponse,
-  ProxyEndpointGetResponse,
-  ProxyEndpointCreateParams,
-  ProxyEndpointListParams,
-  ProxyEndpointDeleteParams,
-  ProxyEndpointEditParams,
-  ProxyEndpointGetParams,
-  ProxyEndpoints,
-} from './proxy-endpoints';
-export {
-  GatewayItem,
-  GatewayList,
-  ListCreateResponse,
-  ListDeleteResponse,
-  ListCreateParams,
-  ListUpdateParams,
-  ListListParams,
-  ListDeleteParams,
-  ListEditParams,
-  ListGetParams,
   GatewayListsSinglePage,
   Lists,
+  type GatewayItem,
+  type GatewayList,
+  type ListCreateResponse,
+  type ListDeleteResponse,
+  type ListCreateParams,
+  type ListUpdateParams,
+  type ListListParams,
+  type ListDeleteParams,
+  type ListEditParams,
+  type ListGetParams,
 } from './lists/index';
 export {
-  GatewaySettings,
-  AuditSSHSettingUpdateParams,
-  AuditSSHSettingGetParams,
-  AuditSSHSettings,
-} from './audit-ssh-settings';
+  GatewayRulesSinglePage,
+  Rules,
+  type DNSResolverSettingsV4,
+  type DNSResolverSettingsV6,
+  type GatewayFilter,
+  type GatewayRule,
+  type RuleSetting,
+  type Schedule,
+  type RuleDeleteResponse,
+  type RuleCreateParams,
+  type RuleUpdateParams,
+  type RuleListParams,
+  type RuleDeleteParams,
+  type RuleGetParams,
+  type RuleResetExpirationParams,
+} from './rules';
 export {
-  Location,
-  LocationDeleteResponse,
-  LocationCreateParams,
-  LocationUpdateParams,
-  LocationListParams,
-  LocationDeleteParams,
-  LocationGetParams,
   LocationsSinglePage,
   Locations,
+  type DOHEndpoint,
+  type DOTEndpoint,
+  type Endpoint,
+  type IPNetwork,
+  type IPV4Endpoint,
+  type IPV6Endpoint,
+  type IPV6Network,
+  type Location,
+  type LocationDeleteResponse,
+  type LocationCreateParams,
+  type LocationUpdateParams,
+  type LocationListParams,
+  type LocationDeleteParams,
+  type LocationGetParams,
 } from './locations';
-export { LoggingSetting, LoggingUpdateParams, LoggingGetParams, Logging } from './logging';
+export { Logging, type LoggingSetting, type LoggingUpdateParams, type LoggingGetParams } from './logging';
+export {
+  ProxyEndpoints,
+  type GatewayIPs,
+  type ProxyEndpoint,
+  type ProxyEndpointDeleteResponse,
+  type ProxyEndpointGetResponse,
+  type ProxyEndpointCreateParams,
+  type ProxyEndpointListParams,
+  type ProxyEndpointDeleteParams,
+  type ProxyEndpointEditParams,
+  type ProxyEndpointGetParams,
+} from './proxy-endpoints';
diff --git a/src/resources/zero-trust/gateway/lists/index.ts b/src/resources/zero-trust/gateway/lists/index.ts
index 30849583a1..8dd8e93750 100644
--- a/src/resources/zero-trust/gateway/lists/index.ts
+++ b/src/resources/zero-trust/gateway/lists/index.ts
@@ -1,17 +1,17 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  GatewayItem,
-  GatewayList,
-  ListCreateResponse,
-  ListDeleteResponse,
-  ListCreateParams,
-  ListUpdateParams,
-  ListListParams,
-  ListDeleteParams,
-  ListEditParams,
-  ListGetParams,
   GatewayListsSinglePage,
   Lists,
+  type GatewayItem,
+  type GatewayList,
+  type ListCreateResponse,
+  type ListDeleteResponse,
+  type ListCreateParams,
+  type ListUpdateParams,
+  type ListListParams,
+  type ListDeleteParams,
+  type ListEditParams,
+  type ListGetParams,
 } from './lists';
-export { ItemListResponse, ItemListParams, ItemListResponsesSinglePage, Items } from './items';
+export { ItemListResponsesSinglePage, Items, type ItemListResponse, type ItemListParams } from './items';
diff --git a/src/resources/zero-trust/gateway/lists/items.ts b/src/resources/zero-trust/gateway/lists/items.ts
index 19e62732b9..601ecae4f0 100644
--- a/src/resources/zero-trust/gateway/lists/items.ts
+++ b/src/resources/zero-trust/gateway/lists/items.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as ItemsAPI from './items';
 import * as ListsAPI from './lists';
 import { SinglePage } from '../../../../pagination';
 
@@ -35,8 +34,12 @@ export interface ItemListParams {
   account_id: string;
 }
 
-export namespace Items {
-  export import ItemListResponse = ItemsAPI.ItemListResponse;
-  export import ItemListResponsesSinglePage = ItemsAPI.ItemListResponsesSinglePage;
-  export import ItemListParams = ItemsAPI.ItemListParams;
+Items.ItemListResponsesSinglePage = ItemListResponsesSinglePage;
+
+export declare namespace Items {
+  export {
+    type ItemListResponse as ItemListResponse,
+    ItemListResponsesSinglePage as ItemListResponsesSinglePage,
+    type ItemListParams as ItemListParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/lists/lists.ts b/src/resources/zero-trust/gateway/lists/lists.ts
index 626ef8abe3..1bed8c36b5 100644
--- a/src/resources/zero-trust/gateway/lists/lists.ts
+++ b/src/resources/zero-trust/gateway/lists/lists.ts
@@ -2,8 +2,8 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as ListsAPI from './lists';
 import * as ItemsAPI from './items';
+import { ItemListParams, ItemListResponse, ItemListResponsesSinglePage, Items } from './items';
 import { SinglePage } from '../../../../pagination';
 
 export class Lists extends APIResource {
@@ -22,7 +22,8 @@ export class Lists extends APIResource {
   }
 
   /**
-   * Updates a configured Zero Trust list.
+   * Updates a configured Zero Trust list. Skips updating list items if not included
+   * in the payload.
    */
   update(
     listId: string,
@@ -111,8 +112,6 @@ export interface GatewayItem {
 }
 
 export interface GatewayItemParam {
-  created_at?: string;
-
   /**
    * The description of the list item, if present
    */
@@ -186,7 +185,7 @@ export interface ListCreateResponse {
   updated_at?: string;
 }
 
-export type ListDeleteResponse = unknown | string | null;
+export type ListDeleteResponse = unknown;
 
 export interface ListCreateParams {
   /**
@@ -230,6 +229,11 @@ export interface ListUpdateParams {
    * Body param: The description of the list.
    */
   description?: string;
+
+  /**
+   * Body param: The items in the list.
+   */
+  items?: Array<GatewayItemParam>;
 }
 
 export interface ListListParams {
@@ -269,20 +273,29 @@ export interface ListGetParams {
   account_id: string;
 }
 
-export namespace Lists {
-  export import GatewayItem = ListsAPI.GatewayItem;
-  export import GatewayList = ListsAPI.GatewayList;
-  export import ListCreateResponse = ListsAPI.ListCreateResponse;
-  export import ListDeleteResponse = ListsAPI.ListDeleteResponse;
-  export import GatewayListsSinglePage = ListsAPI.GatewayListsSinglePage;
-  export import ListCreateParams = ListsAPI.ListCreateParams;
-  export import ListUpdateParams = ListsAPI.ListUpdateParams;
-  export import ListListParams = ListsAPI.ListListParams;
-  export import ListDeleteParams = ListsAPI.ListDeleteParams;
-  export import ListEditParams = ListsAPI.ListEditParams;
-  export import ListGetParams = ListsAPI.ListGetParams;
-  export import Items = ItemsAPI.Items;
-  export import ItemListResponse = ItemsAPI.ItemListResponse;
-  export import ItemListResponsesSinglePage = ItemsAPI.ItemListResponsesSinglePage;
-  export import ItemListParams = ItemsAPI.ItemListParams;
+Lists.GatewayListsSinglePage = GatewayListsSinglePage;
+Lists.Items = Items;
+Lists.ItemListResponsesSinglePage = ItemListResponsesSinglePage;
+
+export declare namespace Lists {
+  export {
+    type GatewayItem as GatewayItem,
+    type GatewayList as GatewayList,
+    type ListCreateResponse as ListCreateResponse,
+    type ListDeleteResponse as ListDeleteResponse,
+    GatewayListsSinglePage as GatewayListsSinglePage,
+    type ListCreateParams as ListCreateParams,
+    type ListUpdateParams as ListUpdateParams,
+    type ListListParams as ListListParams,
+    type ListDeleteParams as ListDeleteParams,
+    type ListEditParams as ListEditParams,
+    type ListGetParams as ListGetParams,
+  };
+
+  export {
+    Items as Items,
+    type ItemListResponse as ItemListResponse,
+    ItemListResponsesSinglePage as ItemListResponsesSinglePage,
+    type ItemListParams as ItemListParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/locations.ts b/src/resources/zero-trust/gateway/locations.ts
index d2e3909ebe..7b33062676 100644
--- a/src/resources/zero-trust/gateway/locations.ts
+++ b/src/resources/zero-trust/gateway/locations.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as LocationsAPI from './locations';
 import { SinglePage } from '../../../pagination';
 
 export class Locations extends APIResource {
@@ -84,6 +83,176 @@ export class Locations extends APIResource {
 
 export class LocationsSinglePage extends SinglePage<Location> {}
 
+export interface DOHEndpoint {
+  /**
+   * True if the endpoint is enabled for this location.
+   */
+  enabled?: boolean;
+
+  /**
+   * A list of allowed source IP network ranges for this endpoint. When empty, all
+   * source IPs are allowed. A non-empty list is only effective if the endpoint is
+   * enabled for this location.
+   */
+  networks?: Array<IPNetwork>;
+
+  /**
+   * True if the endpoint requires
+   * [user identity](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/agentless/dns/dns-over-https/#filter-doh-requests-by-user)
+   * authentication.
+   */
+  require_token?: boolean;
+}
+
+export interface DOHEndpointParam {
+  /**
+   * True if the endpoint is enabled for this location.
+   */
+  enabled?: boolean;
+
+  /**
+   * A list of allowed source IP network ranges for this endpoint. When empty, all
+   * source IPs are allowed. A non-empty list is only effective if the endpoint is
+   * enabled for this location.
+   */
+  networks?: Array<IPNetworkParam>;
+
+  /**
+   * True if the endpoint requires
+   * [user identity](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/agentless/dns/dns-over-https/#filter-doh-requests-by-user)
+   * authentication.
+   */
+  require_token?: boolean;
+}
+
+export interface DOTEndpoint {
+  /**
+   * True if the endpoint is enabled for this location.
+   */
+  enabled?: boolean;
+
+  /**
+   * A list of allowed source IP network ranges for this endpoint. When empty, all
+   * source IPs are allowed. A non-empty list is only effective if the endpoint is
+   * enabled for this location.
+   */
+  networks?: Array<IPNetwork>;
+}
+
+export interface DOTEndpointParam {
+  /**
+   * True if the endpoint is enabled for this location.
+   */
+  enabled?: boolean;
+
+  /**
+   * A list of allowed source IP network ranges for this endpoint. When empty, all
+   * source IPs are allowed. A non-empty list is only effective if the endpoint is
+   * enabled for this location.
+   */
+  networks?: Array<IPNetworkParam>;
+}
+
+/**
+ * The destination endpoints configured for this location. When updating a
+ * location, if this field is absent or set with null, the endpoints configuration
+ * remains unchanged.
+ */
+export interface Endpoint {
+  doh?: DOHEndpoint;
+
+  dot?: DOTEndpoint;
+
+  ipv4?: IPV4Endpoint;
+
+  ipv6?: IPV6Endpoint;
+}
+
+/**
+ * The destination endpoints configured for this location. When updating a
+ * location, if this field is absent or set with null, the endpoints configuration
+ * remains unchanged.
+ */
+export interface EndpointParam {
+  doh?: DOHEndpointParam;
+
+  dot?: DOTEndpointParam;
+
+  ipv4?: IPV4EndpointParam;
+
+  ipv6?: IPV6EndpointParam;
+}
+
+export interface IPNetwork {
+  /**
+   * The IP address or IP CIDR.
+   */
+  network: string;
+}
+
+export interface IPNetworkParam {
+  /**
+   * The IP address or IP CIDR.
+   */
+  network: string;
+}
+
+export interface IPV4Endpoint {
+  /**
+   * True if the endpoint is enabled for this location.
+   */
+  enabled?: boolean;
+}
+
+export interface IPV4EndpointParam {
+  /**
+   * True if the endpoint is enabled for this location.
+   */
+  enabled?: boolean;
+}
+
+export interface IPV6Endpoint {
+  /**
+   * True if the endpoint is enabled for this location.
+   */
+  enabled?: boolean;
+
+  /**
+   * A list of allowed source IPv6 network ranges for this endpoint. When empty, all
+   * source IPs are allowed. A non-empty list is only effective if the endpoint is
+   * enabled for this location.
+   */
+  networks?: Array<IPV6Network>;
+}
+
+export interface IPV6EndpointParam {
+  /**
+   * True if the endpoint is enabled for this location.
+   */
+  enabled?: boolean;
+
+  /**
+   * A list of allowed source IPv6 network ranges for this endpoint. When empty, all
+   * source IPs are allowed. A non-empty list is only effective if the endpoint is
+   * enabled for this location.
+   */
+  networks?: Array<IPV6NetworkParam>;
+}
+
+export interface IPV6Network {
+  /**
+   * The IPv6 address or IPv6 CIDR.
+   */
+  network: string;
+}
+
+export interface IPV6NetworkParam {
+  /**
+   * The IPv6 address or IPv6 CIDR.
+   */
+  network: string;
+}
+
 export interface Location {
   id?: string;
 
@@ -99,6 +268,13 @@ export interface Location {
    */
   dns_destination_ips_id?: string;
 
+  /**
+   * The uuid identifier of the IPv6 block brought to the gateway, so that this
+   * location's IPv6 address is allocated from the Bring Your Own Ipv6(BYOIPv6) block
+   * and not from the standard CloudFlare IPv6 block.
+   */
+  dns_destination_ipv6_block_id?: string;
+
   /**
    * The DNS over HTTPS domain to send DNS requests to. This field is auto-generated
    * by Gateway.
@@ -115,7 +291,7 @@ export interface Location {
    * location, if this field is absent or set with null, the endpoints configuration
    * remains unchanged.
    */
-  endpoints?: Location.Endpoints;
+  endpoints?: Endpoint;
 
   /**
    * IPV6 destination ip assigned to this location. DNS requests sent to this IP will
@@ -152,106 +328,6 @@ export interface Location {
 }
 
 export namespace Location {
-  /**
-   * The destination endpoints configured for this location. When updating a
-   * location, if this field is absent or set with null, the endpoints configuration
-   * remains unchanged.
-   */
-  export interface Endpoints {
-    doh?: Endpoints.DOH;
-
-    dot?: Endpoints.DOT;
-
-    ipv4?: Endpoints.IPV4;
-
-    ipv6?: Endpoints.IPV6;
-  }
-
-  export namespace Endpoints {
-    export interface DOH {
-      /**
-       * True if the endpoint is enabled for this location.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of allowed source IP network ranges for this endpoint. When empty, all
-       * source IPs are allowed. A non-empty list is only effective if the endpoint is
-       * enabled for this location.
-       */
-      networks?: Array<DOH.Network>;
-
-      /**
-       * True if the endpoint requires
-       * [user identity](https://developers.cloudflare.com/cloudflare-one/connections/connect-devices/agentless/dns/dns-over-https/#filter-doh-requests-by-user)
-       * authentication.
-       */
-      require_token?: boolean;
-    }
-
-    export namespace DOH {
-      export interface Network {
-        /**
-         * The IP address or IP CIDR.
-         */
-        network: string;
-      }
-    }
-
-    export interface DOT {
-      /**
-       * True if the endpoint is enabled for this location.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of allowed source IP network ranges for this endpoint. When empty, all
-       * source IPs are allowed. A non-empty list is only effective if the endpoint is
-       * enabled for this location.
-       */
-      networks?: Array<DOT.Network>;
-    }
-
-    export namespace DOT {
-      export interface Network {
-        /**
-         * The IP address or IP CIDR.
-         */
-        network: string;
-      }
-    }
-
-    export interface IPV4 {
-      /**
-       * True if the endpoint is enabled for this location.
-       */
-      enabled?: boolean;
-    }
-
-    export interface IPV6 {
-      /**
-       * True if the endpoint is enabled for this location.
-       */
-      enabled?: boolean;
-
-      /**
-       * A list of allowed source IPv6 network ranges for this endpoint. When empty, all
-       * source IPs are allowed. A non-empty list is only effective if the endpoint is
-       * enabled for this location.
-       */
-      networks?: Array<IPV6.Network>;
-    }
-
-    export namespace IPV6 {
-      export interface Network {
-        /**
-         * The IPv6 address or IPv6 CIDR.
-         */
-        network: string;
-      }
-    }
-  }
-
   export interface Network {
     /**
      * The IPv4 address or IPv4 CIDR. IPv4 CIDRs are limited to a maximum of /24.
@@ -260,7 +336,7 @@ export namespace Location {
   }
 }
 
-export type LocationDeleteResponse = unknown | string | null;
+export type LocationDeleteResponse = unknown;
 
 export interface LocationCreateParams {
   /**
@@ -292,6 +368,13 @@ export interface LocationCreateParams {
    */
   ecs_support?: boolean;
 
+  /**
+   * Body param: The destination endpoints configured for this location. When
+   * updating a location, if this field is absent or set with null, the endpoints
+   * configuration remains unchanged.
+   */
+  endpoints?: EndpointParam;
+
   /**
    * Body param: A list of network ranges that requests from this location would
    * originate from. A non-empty list is only effective if the ipv4 endpoint is
@@ -339,6 +422,13 @@ export interface LocationUpdateParams {
    */
   ecs_support?: boolean;
 
+  /**
+   * Body param: The destination endpoints configured for this location. When
+   * updating a location, if this field is absent or set with null, the endpoints
+   * configuration remains unchanged.
+   */
+  endpoints?: EndpointParam;
+
   /**
    * Body param: A list of network ranges that requests from this location would
    * originate from. A non-empty list is only effective if the ipv4 endpoint is
@@ -368,13 +458,24 @@ export interface LocationGetParams {
   account_id: string;
 }
 
-export namespace Locations {
-  export import Location = LocationsAPI.Location;
-  export import LocationDeleteResponse = LocationsAPI.LocationDeleteResponse;
-  export import LocationsSinglePage = LocationsAPI.LocationsSinglePage;
-  export import LocationCreateParams = LocationsAPI.LocationCreateParams;
-  export import LocationUpdateParams = LocationsAPI.LocationUpdateParams;
-  export import LocationListParams = LocationsAPI.LocationListParams;
-  export import LocationDeleteParams = LocationsAPI.LocationDeleteParams;
-  export import LocationGetParams = LocationsAPI.LocationGetParams;
+Locations.LocationsSinglePage = LocationsSinglePage;
+
+export declare namespace Locations {
+  export {
+    type DOHEndpoint as DOHEndpoint,
+    type DOTEndpoint as DOTEndpoint,
+    type Endpoint as Endpoint,
+    type IPNetwork as IPNetwork,
+    type IPV4Endpoint as IPV4Endpoint,
+    type IPV6Endpoint as IPV6Endpoint,
+    type IPV6Network as IPV6Network,
+    type Location as Location,
+    type LocationDeleteResponse as LocationDeleteResponse,
+    LocationsSinglePage as LocationsSinglePage,
+    type LocationCreateParams as LocationCreateParams,
+    type LocationUpdateParams as LocationUpdateParams,
+    type LocationListParams as LocationListParams,
+    type LocationDeleteParams as LocationDeleteParams,
+    type LocationGetParams as LocationGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/logging.ts b/src/resources/zero-trust/gateway/logging.ts
index 1ce148cb6e..4ee1d1c029 100644
--- a/src/resources/zero-trust/gateway/logging.ts
+++ b/src/resources/zero-trust/gateway/logging.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as LoggingAPI from './logging';
 
 export class Logging extends APIResource {
   /**
@@ -110,8 +109,10 @@ export interface LoggingGetParams {
   account_id: string;
 }
 
-export namespace Logging {
-  export import LoggingSetting = LoggingAPI.LoggingSetting;
-  export import LoggingUpdateParams = LoggingAPI.LoggingUpdateParams;
-  export import LoggingGetParams = LoggingAPI.LoggingGetParams;
+export declare namespace Logging {
+  export {
+    type LoggingSetting as LoggingSetting,
+    type LoggingUpdateParams as LoggingUpdateParams,
+    type LoggingGetParams as LoggingGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/proxy-endpoints.ts b/src/resources/zero-trust/gateway/proxy-endpoints.ts
index 56d384962b..7315f9a89e 100644
--- a/src/resources/zero-trust/gateway/proxy-endpoints.ts
+++ b/src/resources/zero-trust/gateway/proxy-endpoints.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ProxyEndpointsAPI from './proxy-endpoints';
 
 export class ProxyEndpoints extends APIResource {
   /**
@@ -71,13 +70,13 @@ export class ProxyEndpoints extends APIResource {
     proxyEndpointId: string,
     params: ProxyEndpointGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ProxyEndpointGetResponse | null> {
+  ): Core.APIPromise<ProxyEndpointGetResponse> {
     const { account_id } = params;
     return (
       this._client.get(
         `/accounts/${account_id}/gateway/proxy_endpoints/${proxyEndpointId}`,
         options,
-      ) as Core.APIPromise<{ result: ProxyEndpointGetResponse | null }>
+      ) as Core.APIPromise<{ result: ProxyEndpointGetResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -117,7 +116,7 @@ export interface ProxyEndpoint {
   updated_at?: string;
 }
 
-export type ProxyEndpointDeleteResponse = unknown | string | null;
+export type ProxyEndpointDeleteResponse = unknown;
 
 export type ProxyEndpointGetResponse = Array<ProxyEndpoint>;
 
@@ -167,14 +166,16 @@ export interface ProxyEndpointGetParams {
   account_id: string;
 }
 
-export namespace ProxyEndpoints {
-  export import GatewayIPs = ProxyEndpointsAPI.GatewayIPs;
-  export import ProxyEndpoint = ProxyEndpointsAPI.ProxyEndpoint;
-  export import ProxyEndpointDeleteResponse = ProxyEndpointsAPI.ProxyEndpointDeleteResponse;
-  export import ProxyEndpointGetResponse = ProxyEndpointsAPI.ProxyEndpointGetResponse;
-  export import ProxyEndpointCreateParams = ProxyEndpointsAPI.ProxyEndpointCreateParams;
-  export import ProxyEndpointListParams = ProxyEndpointsAPI.ProxyEndpointListParams;
-  export import ProxyEndpointDeleteParams = ProxyEndpointsAPI.ProxyEndpointDeleteParams;
-  export import ProxyEndpointEditParams = ProxyEndpointsAPI.ProxyEndpointEditParams;
-  export import ProxyEndpointGetParams = ProxyEndpointsAPI.ProxyEndpointGetParams;
+export declare namespace ProxyEndpoints {
+  export {
+    type GatewayIPs as GatewayIPs,
+    type ProxyEndpoint as ProxyEndpoint,
+    type ProxyEndpointDeleteResponse as ProxyEndpointDeleteResponse,
+    type ProxyEndpointGetResponse as ProxyEndpointGetResponse,
+    type ProxyEndpointCreateParams as ProxyEndpointCreateParams,
+    type ProxyEndpointListParams as ProxyEndpointListParams,
+    type ProxyEndpointDeleteParams as ProxyEndpointDeleteParams,
+    type ProxyEndpointEditParams as ProxyEndpointEditParams,
+    type ProxyEndpointGetParams as ProxyEndpointGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/gateway/rules.ts b/src/resources/zero-trust/gateway/rules.ts
index 6da39c9303..a510672c7f 100644
--- a/src/resources/zero-trust/gateway/rules.ts
+++ b/src/resources/zero-trust/gateway/rules.ts
@@ -73,6 +73,27 @@ export class Rules extends APIResource {
       }>
     )._thenUnwrap((obj) => obj.result);
   }
+
+  /**
+   * Resets the expiration of a Zero Trust Gateway Rule if its duration has elapsed
+   * and it has a default duration.
+   *
+   * The Zero Trust Gateway Rule must have values for both `expiration.expires_at`
+   * and `expiration.duration`.
+   */
+  resetExpiration(
+    ruleId: string,
+    params: RuleResetExpirationParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<GatewayRule> {
+    const { account_id } = params;
+    return (
+      this._client.post(
+        `/accounts/${account_id}/gateway/rules/${ruleId}/reset_expiration`,
+        options,
+      ) as Core.APIPromise<{ result: GatewayRule }>
+    )._thenUnwrap((obj) => obj.result);
+  }
 }
 
 export class GatewayRulesSinglePage extends SinglePage<GatewayRule> {}
@@ -207,8 +228,8 @@ export interface GatewayRule {
     | 'override'
     | 'l4_override'
     | 'egress'
-    | 'audit_ssh'
-    | 'resolve';
+    | 'resolve'
+    | 'quarantine';
 
   created_at?: string;
 
@@ -232,6 +253,14 @@ export interface GatewayRule {
    */
   enabled?: boolean;
 
+  /**
+   * The expiration time stamp and default duration of a DNS policy. Takes precedence
+   * over the policy's `schedule` configuration, if any.
+   *
+   * This does not apply to HTTP or network policies.
+   */
+  expiration?: GatewayRule.Expiration;
+
   /**
    * The protocol or layer to evaluate the traffic, identity, and device posture
    * expressions.
@@ -272,6 +301,45 @@ export interface GatewayRule {
   traffic?: string;
 
   updated_at?: string;
+
+  /**
+   * version number of the rule
+   */
+  version?: number;
+}
+
+export namespace GatewayRule {
+  /**
+   * The expiration time stamp and default duration of a DNS policy. Takes precedence
+   * over the policy's `schedule` configuration, if any.
+   *
+   * This does not apply to HTTP or network policies.
+   */
+  export interface Expiration {
+    /**
+     * The time stamp at which the policy will expire and cease to be applied.
+     *
+     * Must adhere to RFC 3339 and include a UTC offset. Non-zero offsets are accepted
+     * but will be converted to the equivalent value with offset zero (UTC+00:00) and
+     * will be returned as time stamps with offset zero denoted by a trailing 'Z'.
+     *
+     * Policies with an expiration do not consider the timezone of clients they are
+     * applied to, and expire "globally" at the point given by their `expires_at`
+     * value.
+     */
+    expires_at: string;
+
+    /**
+     * The default duration a policy will be active in minutes. Must be set in order to
+     * use the `reset_expiration` endpoint on this rule.
+     */
+    duration?: number;
+
+    /**
+     * Whether the policy has expired.
+     */
+    expired?: boolean;
+  }
 }
 
 /**
@@ -282,7 +350,7 @@ export interface RuleSetting {
    * Add custom headers to allowed requests, in the form of key-value pairs. Keys are
    * header names, pointing to an array with its header value(s).
    */
-  add_headers?: unknown;
+  add_headers?: Record<string, string>;
 
   /**
    * Set by parent MSP accounts to enable their children to bypass this rule.
@@ -297,7 +365,7 @@ export interface RuleSetting {
   /**
    * Configure how browser isolation behaves.
    */
-  biso_admin_controls?: RuleSetting.BisoAdminControls;
+  biso_admin_controls?: RuleSetting.BISOAdminControls;
 
   /**
    * Enable the custom block page.
@@ -322,9 +390,9 @@ export interface RuleSetting {
 
   /**
    * Add your own custom resolvers to route queries that match the resolver policy.
-   * Cannot be used when resolve_dns_through_cloudflare is set. DNS queries will
-   * route to the address closest to their origin. Only valid when a rule's action is
-   * set to 'resolve'.
+   * Cannot be used when 'resolve_dns_through_cloudflare' or 'resolve_dns_internally'
+   * are set. DNS queries will route to the address closest to their origin. Only
+   * valid when a rule's action is set to 'resolve'.
    */
   dns_resolvers?: RuleSetting.DNSResolvers;
 
@@ -385,10 +453,24 @@ export interface RuleSetting {
    */
   payload_log?: RuleSetting.PayloadLog;
 
+  /**
+   * Settings that apply to quarantine rules
+   */
+  quarantine?: RuleSetting.Quarantine;
+
+  /**
+   * Configure to forward the query to the internal DNS service, passing the
+   * specified 'view_id' as input. Cannot be set when 'dns_resolvers' are specified
+   * or 'resolve_dns_through_cloudflare' is set. Only valid when a rule's action is
+   * set to 'resolve'.
+   */
+  resolve_dns_internally?: RuleSetting.ResolveDNSInternally;
+
   /**
    * Enable to send queries that match the policy to Cloudflare's default 1.1.1.1 DNS
-   * resolver. Cannot be set when dns_resolvers are specified. Only valid when a
-   * rule's action is set to 'resolve'.
+   * resolver. Cannot be set when 'dns_resolvers' are specified or
+   * 'resolve_dns_internally' is set. Only valid when a rule's action is set to
+   * 'resolve'.
    */
   resolve_dns_through_cloudflare?: boolean;
 
@@ -412,7 +494,7 @@ export namespace RuleSetting {
   /**
    * Configure how browser isolation behaves.
    */
-  export interface BisoAdminControls {
+  export interface BISOAdminControls {
     /**
      * Set to false to enable copy-pasting.
      */
@@ -456,9 +538,9 @@ export namespace RuleSetting {
 
   /**
    * Add your own custom resolvers to route queries that match the resolver policy.
-   * Cannot be used when resolve_dns_through_cloudflare is set. DNS queries will
-   * route to the address closest to their origin. Only valid when a rule's action is
-   * set to 'resolve'.
+   * Cannot be used when 'resolve_dns_through_cloudflare' or 'resolve_dns_internally'
+   * are set. DNS queries will route to the address closest to their origin. Only
+   * valid when a rule's action is set to 'resolve'.
    */
   export interface DNSResolvers {
     ipv4?: Array<RulesAPI.DNSResolverSettingsV4>;
@@ -537,6 +619,50 @@ export namespace RuleSetting {
     enabled?: boolean;
   }
 
+  /**
+   * Settings that apply to quarantine rules
+   */
+  export interface Quarantine {
+    /**
+     * Types of files to sandbox.
+     */
+    file_types?: Array<
+      | 'exe'
+      | 'pdf'
+      | 'doc'
+      | 'docm'
+      | 'docx'
+      | 'rtf'
+      | 'ppt'
+      | 'pptx'
+      | 'xls'
+      | 'xlsm'
+      | 'xlsx'
+      | 'zip'
+      | 'rar'
+    >;
+  }
+
+  /**
+   * Configure to forward the query to the internal DNS service, passing the
+   * specified 'view_id' as input. Cannot be set when 'dns_resolvers' are specified
+   * or 'resolve_dns_through_cloudflare' is set. Only valid when a rule's action is
+   * set to 'resolve'.
+   */
+  export interface ResolveDNSInternally {
+    /**
+     * The fallback behavior to apply when the internal DNS response code is different
+     * from 'NOERROR' or when the response data only contains CNAME records for 'A' or
+     * 'AAAA' queries.
+     */
+    fallback?: 'none' | 'public_dns';
+
+    /**
+     * The internal DNS view identifier that's passed to the internal DNS service.
+     */
+    view_id?: string;
+  }
+
   /**
    * Configure behavior when an upstream cert is invalid or an SSL error occurs.
    */
@@ -557,7 +683,7 @@ export interface RuleSettingParam {
    * Add custom headers to allowed requests, in the form of key-value pairs. Keys are
    * header names, pointing to an array with its header value(s).
    */
-  add_headers?: unknown;
+  add_headers?: Record<string, string>;
 
   /**
    * Set by parent MSP accounts to enable their children to bypass this rule.
@@ -572,7 +698,7 @@ export interface RuleSettingParam {
   /**
    * Configure how browser isolation behaves.
    */
-  biso_admin_controls?: RuleSettingParam.BisoAdminControls;
+  biso_admin_controls?: RuleSettingParam.BISOAdminControls;
 
   /**
    * Enable the custom block page.
@@ -597,9 +723,9 @@ export interface RuleSettingParam {
 
   /**
    * Add your own custom resolvers to route queries that match the resolver policy.
-   * Cannot be used when resolve_dns_through_cloudflare is set. DNS queries will
-   * route to the address closest to their origin. Only valid when a rule's action is
-   * set to 'resolve'.
+   * Cannot be used when 'resolve_dns_through_cloudflare' or 'resolve_dns_internally'
+   * are set. DNS queries will route to the address closest to their origin. Only
+   * valid when a rule's action is set to 'resolve'.
    */
   dns_resolvers?: RuleSettingParam.DNSResolvers;
 
@@ -660,10 +786,24 @@ export interface RuleSettingParam {
    */
   payload_log?: RuleSettingParam.PayloadLog;
 
+  /**
+   * Settings that apply to quarantine rules
+   */
+  quarantine?: RuleSettingParam.Quarantine;
+
+  /**
+   * Configure to forward the query to the internal DNS service, passing the
+   * specified 'view_id' as input. Cannot be set when 'dns_resolvers' are specified
+   * or 'resolve_dns_through_cloudflare' is set. Only valid when a rule's action is
+   * set to 'resolve'.
+   */
+  resolve_dns_internally?: RuleSettingParam.ResolveDNSInternally;
+
   /**
    * Enable to send queries that match the policy to Cloudflare's default 1.1.1.1 DNS
-   * resolver. Cannot be set when dns_resolvers are specified. Only valid when a
-   * rule's action is set to 'resolve'.
+   * resolver. Cannot be set when 'dns_resolvers' are specified or
+   * 'resolve_dns_internally' is set. Only valid when a rule's action is set to
+   * 'resolve'.
    */
   resolve_dns_through_cloudflare?: boolean;
 
@@ -687,7 +827,7 @@ export namespace RuleSettingParam {
   /**
    * Configure how browser isolation behaves.
    */
-  export interface BisoAdminControls {
+  export interface BISOAdminControls {
     /**
      * Set to false to enable copy-pasting.
      */
@@ -731,9 +871,9 @@ export namespace RuleSettingParam {
 
   /**
    * Add your own custom resolvers to route queries that match the resolver policy.
-   * Cannot be used when resolve_dns_through_cloudflare is set. DNS queries will
-   * route to the address closest to their origin. Only valid when a rule's action is
-   * set to 'resolve'.
+   * Cannot be used when 'resolve_dns_through_cloudflare' or 'resolve_dns_internally'
+   * are set. DNS queries will route to the address closest to their origin. Only
+   * valid when a rule's action is set to 'resolve'.
    */
   export interface DNSResolvers {
     ipv4?: Array<RulesAPI.DNSResolverSettingsV4Param>;
@@ -812,6 +952,50 @@ export namespace RuleSettingParam {
     enabled?: boolean;
   }
 
+  /**
+   * Settings that apply to quarantine rules
+   */
+  export interface Quarantine {
+    /**
+     * Types of files to sandbox.
+     */
+    file_types?: Array<
+      | 'exe'
+      | 'pdf'
+      | 'doc'
+      | 'docm'
+      | 'docx'
+      | 'rtf'
+      | 'ppt'
+      | 'pptx'
+      | 'xls'
+      | 'xlsm'
+      | 'xlsx'
+      | 'zip'
+      | 'rar'
+    >;
+  }
+
+  /**
+   * Configure to forward the query to the internal DNS service, passing the
+   * specified 'view_id' as input. Cannot be set when 'dns_resolvers' are specified
+   * or 'resolve_dns_through_cloudflare' is set. Only valid when a rule's action is
+   * set to 'resolve'.
+   */
+  export interface ResolveDNSInternally {
+    /**
+     * The fallback behavior to apply when the internal DNS response code is different
+     * from 'NOERROR' or when the response data only contains CNAME records for 'A' or
+     * 'AAAA' queries.
+     */
+    fallback?: 'none' | 'public_dns';
+
+    /**
+     * The internal DNS view identifier that's passed to the internal DNS service.
+     */
+    view_id?: string;
+  }
+
   /**
    * Configure behavior when an upstream cert is invalid or an SSL error occurs.
    */
@@ -956,7 +1140,7 @@ export interface ScheduleParam {
   wed?: string;
 }
 
-export type RuleDeleteResponse = unknown | string | null;
+export type RuleDeleteResponse = unknown;
 
 export interface RuleCreateParams {
   /**
@@ -982,8 +1166,8 @@ export interface RuleCreateParams {
     | 'override'
     | 'l4_override'
     | 'egress'
-    | 'audit_ssh'
-    | 'resolve';
+    | 'resolve'
+    | 'quarantine';
 
   /**
    * Body param: The name of the rule.
@@ -1005,6 +1189,14 @@ export interface RuleCreateParams {
    */
   enabled?: boolean;
 
+  /**
+   * Body param: The expiration time stamp and default duration of a DNS policy.
+   * Takes precedence over the policy's `schedule` configuration, if any.
+   *
+   * This does not apply to HTTP or network policies.
+   */
+  expiration?: RuleCreateParams.Expiration;
+
   /**
    * Body param: The protocol or layer to evaluate the traffic, identity, and device
    * posture expressions.
@@ -1040,6 +1232,40 @@ export interface RuleCreateParams {
   traffic?: string;
 }
 
+export namespace RuleCreateParams {
+  /**
+   * The expiration time stamp and default duration of a DNS policy. Takes precedence
+   * over the policy's `schedule` configuration, if any.
+   *
+   * This does not apply to HTTP or network policies.
+   */
+  export interface Expiration {
+    /**
+     * The time stamp at which the policy will expire and cease to be applied.
+     *
+     * Must adhere to RFC 3339 and include a UTC offset. Non-zero offsets are accepted
+     * but will be converted to the equivalent value with offset zero (UTC+00:00) and
+     * will be returned as time stamps with offset zero denoted by a trailing 'Z'.
+     *
+     * Policies with an expiration do not consider the timezone of clients they are
+     * applied to, and expire "globally" at the point given by their `expires_at`
+     * value.
+     */
+    expires_at: string;
+
+    /**
+     * The default duration a policy will be active in minutes. Must be set in order to
+     * use the `reset_expiration` endpoint on this rule.
+     */
+    duration?: number;
+
+    /**
+     * Whether the policy has expired.
+     */
+    expired?: boolean;
+  }
+}
+
 export interface RuleUpdateParams {
   /**
    * Path param:
@@ -1064,8 +1290,8 @@ export interface RuleUpdateParams {
     | 'override'
     | 'l4_override'
     | 'egress'
-    | 'audit_ssh'
-    | 'resolve';
+    | 'resolve'
+    | 'quarantine';
 
   /**
    * Body param: The name of the rule.
@@ -1087,6 +1313,14 @@ export interface RuleUpdateParams {
    */
   enabled?: boolean;
 
+  /**
+   * Body param: The expiration time stamp and default duration of a DNS policy.
+   * Takes precedence over the policy's `schedule` configuration, if any.
+   *
+   * This does not apply to HTTP or network policies.
+   */
+  expiration?: RuleUpdateParams.Expiration;
+
   /**
    * Body param: The protocol or layer to evaluate the traffic, identity, and device
    * posture expressions.
@@ -1122,6 +1356,40 @@ export interface RuleUpdateParams {
   traffic?: string;
 }
 
+export namespace RuleUpdateParams {
+  /**
+   * The expiration time stamp and default duration of a DNS policy. Takes precedence
+   * over the policy's `schedule` configuration, if any.
+   *
+   * This does not apply to HTTP or network policies.
+   */
+  export interface Expiration {
+    /**
+     * The time stamp at which the policy will expire and cease to be applied.
+     *
+     * Must adhere to RFC 3339 and include a UTC offset. Non-zero offsets are accepted
+     * but will be converted to the equivalent value with offset zero (UTC+00:00) and
+     * will be returned as time stamps with offset zero denoted by a trailing 'Z'.
+     *
+     * Policies with an expiration do not consider the timezone of clients they are
+     * applied to, and expire "globally" at the point given by their `expires_at`
+     * value.
+     */
+    expires_at: string;
+
+    /**
+     * The default duration a policy will be active in minutes. Must be set in order to
+     * use the `reset_expiration` endpoint on this rule.
+     */
+    duration?: number;
+
+    /**
+     * Whether the policy has expired.
+     */
+    expired?: boolean;
+  }
+}
+
 export interface RuleListParams {
   account_id: string;
 }
@@ -1134,18 +1402,27 @@ export interface RuleGetParams {
   account_id: string;
 }
 
-export namespace Rules {
-  export import DNSResolverSettingsV4 = RulesAPI.DNSResolverSettingsV4;
-  export import DNSResolverSettingsV6 = RulesAPI.DNSResolverSettingsV6;
-  export import GatewayFilter = RulesAPI.GatewayFilter;
-  export import GatewayRule = RulesAPI.GatewayRule;
-  export import RuleSetting = RulesAPI.RuleSetting;
-  export import Schedule = RulesAPI.Schedule;
-  export import RuleDeleteResponse = RulesAPI.RuleDeleteResponse;
-  export import GatewayRulesSinglePage = RulesAPI.GatewayRulesSinglePage;
-  export import RuleCreateParams = RulesAPI.RuleCreateParams;
-  export import RuleUpdateParams = RulesAPI.RuleUpdateParams;
-  export import RuleListParams = RulesAPI.RuleListParams;
-  export import RuleDeleteParams = RulesAPI.RuleDeleteParams;
-  export import RuleGetParams = RulesAPI.RuleGetParams;
+export interface RuleResetExpirationParams {
+  account_id: string;
+}
+
+Rules.GatewayRulesSinglePage = GatewayRulesSinglePage;
+
+export declare namespace Rules {
+  export {
+    type DNSResolverSettingsV4 as DNSResolverSettingsV4,
+    type DNSResolverSettingsV6 as DNSResolverSettingsV6,
+    type GatewayFilter as GatewayFilter,
+    type GatewayRule as GatewayRule,
+    type RuleSetting as RuleSetting,
+    type Schedule as Schedule,
+    type RuleDeleteResponse as RuleDeleteResponse,
+    GatewayRulesSinglePage as GatewayRulesSinglePage,
+    type RuleCreateParams as RuleCreateParams,
+    type RuleUpdateParams as RuleUpdateParams,
+    type RuleListParams as RuleListParams,
+    type RuleDeleteParams as RuleDeleteParams,
+    type RuleGetParams as RuleGetParams,
+    type RuleResetExpirationParams as RuleResetExpirationParams,
+  };
 }
diff --git a/src/resources/zero-trust/identity-providers.ts b/src/resources/zero-trust/identity-providers.ts
index 31b8a245dd..0868c1252f 100644
--- a/src/resources/zero-trust/identity-providers.ts
+++ b/src/resources/zero-trust/identity-providers.ts
@@ -3,7 +3,7 @@
 import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
-import { CloudflareError } from '../../error';
+import { CloudflareError } from 'cloudflare/error';
 import * as IdentityProvidersAPI from './identity-providers';
 import { SinglePage } from '../../pagination';
 
@@ -90,7 +90,7 @@ export class IdentityProviders extends APIResource {
     if (isRequestOptions(params)) {
       return this.list({}, params);
     }
-    const { account_id, zone_id } = params;
+    const { account_id, zone_id, ...query } = params;
     if (!account_id && !zone_id) {
       throw new CloudflareError('You must provide either account_id or zone_id.');
     }
@@ -110,7 +110,7 @@ export class IdentityProviders extends APIResource {
     return this._client.getAPIList(
       `/${accountOrZone}/${accountOrZoneId}/access/identity_providers`,
       IdentityProviderListResponsesSinglePage,
-      options,
+      { query, ...options },
     );
   }
 
@@ -233,7 +233,7 @@ export interface AzureAD {
    * The configuration settings for enabling a System for Cross-Domain Identity
    * Management (SCIM) with the identity provider.
    */
-  scim_config?: SCIMConfig;
+  scim_config?: IdentityProviderSCIMConfig;
 }
 
 export namespace AzureAD {
@@ -292,6 +292,89 @@ export namespace AzureAD {
   }
 }
 
+export interface AzureADParam {
+  /**
+   * The configuration parameters for the identity provider. To view the required
+   * parameters for a specific provider, refer to our
+   * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+   */
+  config: AzureADParam.Config;
+
+  /**
+   * The name of the identity provider, shown to users on the login page.
+   */
+  name: string;
+
+  /**
+   * The type of identity provider. To determine the value for a specific provider,
+   * refer to our
+   * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+   */
+  type: IdentityProviderTypeParam;
+
+  /**
+   * The configuration settings for enabling a System for Cross-Domain Identity
+   * Management (SCIM) with the identity provider.
+   */
+  scim_config?: IdentityProviderSCIMConfigParam;
+}
+
+export namespace AzureADParam {
+  /**
+   * The configuration parameters for the identity provider. To view the required
+   * parameters for a specific provider, refer to our
+   * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+   */
+  export interface Config {
+    /**
+     * Custom claims
+     */
+    claims?: Array<string>;
+
+    /**
+     * Your OAuth Client ID
+     */
+    client_id?: string;
+
+    /**
+     * Your OAuth Client Secret
+     */
+    client_secret?: string;
+
+    /**
+     * Should Cloudflare try to load authentication contexts from your account
+     */
+    conditional_access_enabled?: boolean;
+
+    /**
+     * Your Azure directory uuid
+     */
+    directory_id?: string;
+
+    /**
+     * The claim name for email in the id_token response.
+     */
+    email_claim_name?: string;
+
+    /**
+     * Indicates the type of user interaction that is required. prompt=login forces the
+     * user to enter their credentials on that request, negating single-sign on.
+     * prompt=none is the opposite. It ensures that the user isn't presented with any
+     * interactive prompt. If the request can't be completed silently by using
+     * single-sign on, the Microsoft identity platform returns an interaction_required
+     * error. prompt=select_account interrupts single sign-on providing account
+     * selection experience listing all the accounts either in session or any
+     * remembered account or an option to choose to use a different account altogether.
+     */
+    prompt?: 'login' | 'select_account' | 'none';
+
+    /**
+     * Should Cloudflare try to load groups from your account
+     */
+    support_groups?: boolean;
+  }
+}
+
 export interface GenericOAuthConfig {
   /**
    * Your OAuth Client ID
@@ -362,7 +445,7 @@ export namespace IdentityProvider {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessCentrify {
@@ -433,7 +516,7 @@ export namespace IdentityProvider {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export interface AccessGitHub {
@@ -465,7 +548,7 @@ export namespace IdentityProvider {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export interface AccessGoogle {
@@ -497,7 +580,7 @@ export namespace IdentityProvider {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessGoogle {
@@ -558,7 +641,7 @@ export namespace IdentityProvider {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessGoogleApps {
@@ -624,7 +707,7 @@ export namespace IdentityProvider {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export interface AccessOIDC {
@@ -656,7 +739,7 @@ export namespace IdentityProvider {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessOIDC {
@@ -696,6 +779,11 @@ export namespace IdentityProvider {
        */
       email_claim_name?: string;
 
+      /**
+       * Enable Proof Key for Code Exchange (PKCE)
+       */
+      pkce_enabled?: boolean;
+
       /**
        * OAuth scopes
        */
@@ -737,7 +825,7 @@ export namespace IdentityProvider {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessOkta {
@@ -808,7 +896,7 @@ export namespace IdentityProvider {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessOnelogin {
@@ -868,13 +956,732 @@ export namespace IdentityProvider {
     /**
      * UUID
      */
-    id?: string;
+    id?: string;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
+  }
+
+  export namespace AccessPingone {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    export interface Config {
+      /**
+       * Custom claims
+       */
+      claims?: Array<string>;
+
+      /**
+       * Your OAuth Client ID
+       */
+      client_id?: string;
+
+      /**
+       * Your OAuth Client Secret
+       */
+      client_secret?: string;
+
+      /**
+       * The claim name for email in the id_token response.
+       */
+      email_claim_name?: string;
+
+      /**
+       * Your PingOne environment identifier
+       */
+      ping_env_id?: string;
+    }
+  }
+
+  export interface AccessSAML {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: AccessSAML.Config;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderType;
+
+    /**
+     * UUID
+     */
+    id?: string;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
+  }
+
+  export namespace AccessSAML {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    export interface Config {
+      /**
+       * A list of SAML attribute names that will be added to your signed JWT token and
+       * can be used in SAML policy rules.
+       */
+      attributes?: Array<string>;
+
+      /**
+       * The attribute name for email in the SAML response.
+       */
+      email_attribute_name?: string;
+
+      /**
+       * Add a list of attribute names that will be returned in the response header from
+       * the Access callback.
+       */
+      header_attributes?: Array<Config.HeaderAttribute>;
+
+      /**
+       * X509 certificate to verify the signature in the SAML authentication response
+       */
+      idp_public_certs?: Array<string>;
+
+      /**
+       * IdP Entity ID or Issuer URL
+       */
+      issuer_url?: string;
+
+      /**
+       * Sign the SAML authentication request with Access credentials. To verify the
+       * signature, use the public key from the Access certs endpoints.
+       */
+      sign_request?: boolean;
+
+      /**
+       * URL to send the SAML authentication requests to
+       */
+      sso_target_url?: string;
+    }
+
+    export namespace Config {
+      export interface HeaderAttribute {
+        /**
+         * attribute name from the IDP
+         */
+        attribute_name?: string;
+
+        /**
+         * header that will be added on the request to the origin
+         */
+        header_name?: string;
+      }
+    }
+  }
+
+  export interface AccessYandex {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: IdentityProvidersAPI.GenericOAuthConfig;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderType;
+
+    /**
+     * UUID
+     */
+    id?: string;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
+  }
+
+  export interface AccessOnetimepin {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: AccessOnetimepin.Config;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderType;
+
+    /**
+     * UUID
+     */
+    id?: string;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
+  }
+
+  export namespace AccessOnetimepin {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    export interface Config {
+      redirect_url?: string;
+    }
+  }
+}
+
+export type IdentityProviderParam =
+  | AzureADParam
+  | IdentityProviderParam.AccessCentrify
+  | IdentityProviderParam.AccessFacebook
+  | IdentityProviderParam.AccessGitHub
+  | IdentityProviderParam.AccessGoogle
+  | IdentityProviderParam.AccessGoogleApps
+  | IdentityProviderParam.AccessLinkedin
+  | IdentityProviderParam.AccessOIDC
+  | IdentityProviderParam.AccessOkta
+  | IdentityProviderParam.AccessOnelogin
+  | IdentityProviderParam.AccessPingone
+  | IdentityProviderParam.AccessSAML
+  | IdentityProviderParam.AccessYandex
+  | IdentityProviderParam.AccessOnetimepin;
+
+export namespace IdentityProviderParam {
+  export interface AccessCentrify {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: AccessCentrify.Config;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
+  }
+
+  export namespace AccessCentrify {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    export interface Config {
+      /**
+       * Your centrify account url
+       */
+      centrify_account?: string;
+
+      /**
+       * Your centrify app id
+       */
+      centrify_app_id?: string;
+
+      /**
+       * Custom claims
+       */
+      claims?: Array<string>;
+
+      /**
+       * Your OAuth Client ID
+       */
+      client_id?: string;
+
+      /**
+       * Your OAuth Client Secret
+       */
+      client_secret?: string;
+
+      /**
+       * The claim name for email in the id_token response.
+       */
+      email_claim_name?: string;
+    }
+  }
+
+  export interface AccessFacebook {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: IdentityProvidersAPI.GenericOAuthConfigParam;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
+  }
+
+  export interface AccessGitHub {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: IdentityProvidersAPI.GenericOAuthConfigParam;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
+  }
+
+  export interface AccessGoogle {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: AccessGoogle.Config;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
+  }
+
+  export namespace AccessGoogle {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    export interface Config {
+      /**
+       * Custom claims
+       */
+      claims?: Array<string>;
+
+      /**
+       * Your OAuth Client ID
+       */
+      client_id?: string;
+
+      /**
+       * Your OAuth Client Secret
+       */
+      client_secret?: string;
+
+      /**
+       * The claim name for email in the id_token response.
+       */
+      email_claim_name?: string;
+    }
+  }
+
+  export interface AccessGoogleApps {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: AccessGoogleApps.Config;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
+  }
+
+  export namespace AccessGoogleApps {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    export interface Config {
+      /**
+       * Your companies TLD
+       */
+      apps_domain?: string;
+
+      /**
+       * Custom claims
+       */
+      claims?: Array<string>;
+
+      /**
+       * Your OAuth Client ID
+       */
+      client_id?: string;
+
+      /**
+       * Your OAuth Client Secret
+       */
+      client_secret?: string;
+
+      /**
+       * The claim name for email in the id_token response.
+       */
+      email_claim_name?: string;
+    }
+  }
+
+  export interface AccessLinkedin {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: IdentityProvidersAPI.GenericOAuthConfigParam;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
+  }
+
+  export interface AccessOIDC {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: AccessOIDC.Config;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
+  }
+
+  export namespace AccessOIDC {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    export interface Config {
+      /**
+       * The authorization_endpoint URL of your IdP
+       */
+      auth_url?: string;
+
+      /**
+       * The jwks_uri endpoint of your IdP to allow the IdP keys to sign the tokens
+       */
+      certs_url?: string;
+
+      /**
+       * Custom claims
+       */
+      claims?: Array<string>;
+
+      /**
+       * Your OAuth Client ID
+       */
+      client_id?: string;
+
+      /**
+       * Your OAuth Client Secret
+       */
+      client_secret?: string;
+
+      /**
+       * The claim name for email in the id_token response.
+       */
+      email_claim_name?: string;
+
+      /**
+       * Enable Proof Key for Code Exchange (PKCE)
+       */
+      pkce_enabled?: boolean;
+
+      /**
+       * OAuth scopes
+       */
+      scopes?: Array<string>;
+
+      /**
+       * The token_endpoint URL of your IdP
+       */
+      token_url?: string;
+    }
+  }
+
+  export interface AccessOkta {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: AccessOkta.Config;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
+  }
+
+  export namespace AccessOkta {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    export interface Config {
+      /**
+       * Your okta authorization server id
+       */
+      authorization_server_id?: string;
+
+      /**
+       * Custom claims
+       */
+      claims?: Array<string>;
+
+      /**
+       * Your OAuth Client ID
+       */
+      client_id?: string;
+
+      /**
+       * Your OAuth Client Secret
+       */
+      client_secret?: string;
+
+      /**
+       * The claim name for email in the id_token response.
+       */
+      email_claim_name?: string;
+
+      /**
+       * Your okta account url
+       */
+      okta_account?: string;
+    }
+  }
+
+  export interface AccessOnelogin {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: AccessOnelogin.Config;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
+
+    /**
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
+     */
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
+  }
+
+  export namespace AccessOnelogin {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    export interface Config {
+      /**
+       * Custom claims
+       */
+      claims?: Array<string>;
+
+      /**
+       * Your OAuth Client ID
+       */
+      client_id?: string;
+
+      /**
+       * Your OAuth Client Secret
+       */
+      client_secret?: string;
+
+      /**
+       * The claim name for email in the id_token response.
+       */
+      email_claim_name?: string;
+
+      /**
+       * Your OneLogin account url
+       */
+      onelogin_account?: string;
+    }
+  }
+
+  export interface AccessPingone {
+    /**
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    config: AccessPingone.Config;
+
+    /**
+     * The name of the identity provider, shown to users on the login page.
+     */
+    name: string;
+
+    /**
+     * The type of identity provider. To determine the value for a specific provider,
+     * refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+     */
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
 
     /**
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessPingone {
@@ -929,18 +1736,13 @@ export namespace IdentityProvider {
      * refer to our
      * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
      */
-    type: IdentityProvidersAPI.IdentityProviderType;
-
-    /**
-     * UUID
-     */
-    id?: string;
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
 
     /**
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessSAML {
@@ -1010,7 +1812,7 @@ export namespace IdentityProvider {
      * parameters for a specific provider, refer to our
      * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
      */
-    config: IdentityProvidersAPI.GenericOAuthConfig;
+    config: IdentityProvidersAPI.GenericOAuthConfigParam;
 
     /**
      * The name of the identity provider, shown to users on the login page.
@@ -1022,18 +1824,13 @@ export namespace IdentityProvider {
      * refer to our
      * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
      */
-    type: IdentityProvidersAPI.IdentityProviderType;
-
-    /**
-     * UUID
-     */
-    id?: string;
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
 
     /**
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
   }
 
   export interface AccessOnetimepin {
@@ -1042,7 +1839,7 @@ export namespace IdentityProvider {
      * parameters for a specific provider, refer to our
      * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
      */
-    config: unknown;
+    config: AccessOnetimepin.Config;
 
     /**
      * The name of the identity provider, shown to users on the login page.
@@ -1054,79 +1851,50 @@ export namespace IdentityProvider {
      * refer to our
      * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
      */
-    type: IdentityProvidersAPI.IdentityProviderType;
+    type: IdentityProvidersAPI.IdentityProviderTypeParam;
 
     /**
-     * UUID
+     * The configuration settings for enabling a System for Cross-Domain Identity
+     * Management (SCIM) with the identity provider.
      */
-    id?: string;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfigParam;
+  }
 
+  export namespace AccessOnetimepin {
     /**
-     * The configuration settings for enabling a System for Cross-Domain Identity
-     * Management (SCIM) with the identity provider.
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    export interface Config {}
   }
 }
 
-/**
- * The type of identity provider. To determine the value for a specific provider,
- * refer to our
- * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
- */
-export type IdentityProviderType =
-  | 'onetimepin'
-  | 'azureAD'
-  | 'saml'
-  | 'centrify'
-  | 'facebook'
-  | 'github'
-  | 'google-apps'
-  | 'google'
-  | 'linkedin'
-  | 'oidc'
-  | 'okta'
-  | 'onelogin'
-  | 'pingone'
-  | 'yandex';
-
-/**
- * The type of identity provider. To determine the value for a specific provider,
- * refer to our
- * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
- */
-export type IdentityProviderTypeParam =
-  | 'onetimepin'
-  | 'azureAD'
-  | 'saml'
-  | 'centrify'
-  | 'facebook'
-  | 'github'
-  | 'google-apps'
-  | 'google'
-  | 'linkedin'
-  | 'oidc'
-  | 'okta'
-  | 'onelogin'
-  | 'pingone'
-  | 'yandex';
-
 /**
  * The configuration settings for enabling a System for Cross-Domain Identity
  * Management (SCIM) with the identity provider.
  */
-export interface SCIMConfig {
+export interface IdentityProviderSCIMConfig {
   /**
    * A flag to enable or disable SCIM for the identity provider.
    */
   enabled?: boolean;
 
   /**
-   * A flag to revoke a user's session in Access and force a reauthentication on the
-   * user's Gateway session when they have been added or removed from a group in the
-   * Identity Provider.
+   * Indicates how a SCIM event updates a user identity used for policy evaluation.
+   * Use "automatic" to automatically update a user's identity and augment it with
+   * fields from the SCIM user resource. Use "reauth" to force re-authentication on
+   * group membership updates, user identity update will only occur after successful
+   * re-authentication. With "reauth" identities will not contain fields from the
+   * SCIM user resource. With "no_action" identities will not be changed by SCIM
+   * updates in any way and users will not be prompted to reauthenticate.
+   */
+  identity_update_behavior?: 'automatic' | 'reauth' | 'no_action';
+
+  /**
+   * The base URL of Cloudflare's SCIM V2.0 API endpoint.
    */
-  group_member_deprovision?: boolean;
+  scim_base_url?: string;
 
   /**
    * A flag to remove a user's seat in Zero Trust when they have been deprovisioned
@@ -1138,7 +1906,7 @@ export interface SCIMConfig {
   /**
    * A read-only token generated when the SCIM integration is enabled for the first
    * time. It is redacted on subsequent requests. If you lose this you will need to
-   * refresh it token at /access/identity_providers/:idpID/refresh_scim_secret.
+   * refresh it at /access/identity_providers/:idpID/refresh_scim_secret.
    */
   secret?: string;
 
@@ -1153,18 +1921,22 @@ export interface SCIMConfig {
  * The configuration settings for enabling a System for Cross-Domain Identity
  * Management (SCIM) with the identity provider.
  */
-export interface SCIMConfigParam {
+export interface IdentityProviderSCIMConfigParam {
   /**
    * A flag to enable or disable SCIM for the identity provider.
    */
   enabled?: boolean;
 
   /**
-   * A flag to revoke a user's session in Access and force a reauthentication on the
-   * user's Gateway session when they have been added or removed from a group in the
-   * Identity Provider.
+   * Indicates how a SCIM event updates a user identity used for policy evaluation.
+   * Use "automatic" to automatically update a user's identity and augment it with
+   * fields from the SCIM user resource. Use "reauth" to force re-authentication on
+   * group membership updates, user identity update will only occur after successful
+   * re-authentication. With "reauth" identities will not contain fields from the
+   * SCIM user resource. With "no_action" identities will not be changed by SCIM
+   * updates in any way and users will not be prompted to reauthenticate.
    */
-  group_member_deprovision?: boolean;
+  identity_update_behavior?: 'automatic' | 'reauth' | 'no_action';
 
   /**
    * A flag to remove a user's seat in Zero Trust when they have been deprovisioned
@@ -1173,13 +1945,6 @@ export interface SCIMConfigParam {
    */
   seat_deprovision?: boolean;
 
-  /**
-   * A read-only token generated when the SCIM integration is enabled for the first
-   * time. It is redacted on subsequent requests. If you lose this you will need to
-   * refresh it token at /access/identity_providers/:idpID/refresh_scim_secret.
-   */
-  secret?: string;
-
   /**
    * A flag to enable revoking a user's session in Access and Gateway when they have
    * been deprovisioned in the Identity Provider.
@@ -1187,6 +1952,48 @@ export interface SCIMConfigParam {
   user_deprovision?: boolean;
 }
 
+/**
+ * The type of identity provider. To determine the value for a specific provider,
+ * refer to our
+ * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+ */
+export type IdentityProviderType =
+  | 'onetimepin'
+  | 'azureAD'
+  | 'saml'
+  | 'centrify'
+  | 'facebook'
+  | 'github'
+  | 'google-apps'
+  | 'google'
+  | 'linkedin'
+  | 'oidc'
+  | 'okta'
+  | 'onelogin'
+  | 'pingone'
+  | 'yandex';
+
+/**
+ * The type of identity provider. To determine the value for a specific provider,
+ * refer to our
+ * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
+ */
+export type IdentityProviderTypeParam =
+  | 'onetimepin'
+  | 'azureAD'
+  | 'saml'
+  | 'centrify'
+  | 'facebook'
+  | 'github'
+  | 'google-apps'
+  | 'google'
+  | 'linkedin'
+  | 'oidc'
+  | 'okta'
+  | 'onelogin'
+  | 'pingone'
+  | 'yandex';
+
 export type IdentityProviderListResponse =
   | AzureAD
   | IdentityProviderListResponse.AccessCentrify
@@ -1232,7 +2039,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessCentrify {
@@ -1303,7 +2110,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export interface AccessGitHub {
@@ -1335,7 +2142,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export interface AccessGoogle {
@@ -1367,7 +2174,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessGoogle {
@@ -1428,7 +2235,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessGoogleApps {
@@ -1494,7 +2301,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export interface AccessOIDC {
@@ -1526,7 +2333,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessOIDC {
@@ -1566,6 +2373,11 @@ export namespace IdentityProviderListResponse {
        */
       email_claim_name?: string;
 
+      /**
+       * Enable Proof Key for Code Exchange (PKCE)
+       */
+      pkce_enabled?: boolean;
+
       /**
        * OAuth scopes
        */
@@ -1607,7 +2419,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessOkta {
@@ -1678,7 +2490,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessOnelogin {
@@ -1744,7 +2556,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessPingone {
@@ -1810,7 +2622,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 
   export namespace AccessSAML {
@@ -1903,7 +2715,7 @@ export namespace IdentityProviderListResponse {
      * The configuration settings for enabling a System for Cross-Domain Identity
      * Management (SCIM) with the identity provider.
      */
-    scim_config?: IdentityProvidersAPI.SCIMConfig;
+    scim_config?: IdentityProvidersAPI.IdentityProviderSCIMConfig;
   }
 }
 
@@ -1930,7 +2742,7 @@ export type IdentityProviderCreateParams =
   | IdentityProviderCreateParams.AccessYandex
   | IdentityProviderCreateParams.AccessOnetimepin;
 
-export namespace IdentityProviderCreateParams {
+export declare namespace IdentityProviderCreateParams {
   export interface AzureAD {
     /**
      * Body param: The configuration parameters for the identity provider. To view the
@@ -1963,16 +2775,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AzureAD {
@@ -2063,16 +2870,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessCentrify {
@@ -2146,16 +2948,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export interface AccessGitHub {
@@ -2190,16 +2987,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export interface AccessGoogle {
@@ -2234,16 +3026,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessGoogle {
@@ -2307,16 +3094,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessGoogleApps {
@@ -2385,16 +3167,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export interface AccessOIDC {
@@ -2429,16 +3206,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessOIDC {
@@ -2478,6 +3250,11 @@ export namespace IdentityProviderCreateParams {
        */
       email_claim_name?: string;
 
+      /**
+       * Enable Proof Key for Code Exchange (PKCE)
+       */
+      pkce_enabled?: boolean;
+
       /**
        * OAuth scopes
        */
@@ -2522,16 +3299,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessOkta {
@@ -2605,16 +3377,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessOnelogin {
@@ -2683,16 +3450,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessPingone {
@@ -2761,16 +3523,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessSAML {
@@ -2866,16 +3623,11 @@ export namespace IdentityProviderCreateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export interface AccessOnetimepin {
@@ -2884,7 +3636,7 @@ export namespace IdentityProviderCreateParams {
      * required parameters for a specific provider, refer to our
      * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
      */
-    config: unknown;
+    config: IdentityProviderCreateParams.AccessOnetimepin.Config;
 
     /**
      * Body param: The name of the identity provider, shown to users on the login page.
@@ -2911,15 +3663,19 @@ export namespace IdentityProviderCreateParams {
     zone_id?: string;
 
     /**
-     * Body param: UUID
+     * Body param: The configuration settings for enabling a System for Cross-Domain
+     * Identity Management (SCIM) with the identity provider.
      */
-    id?: string;
+    scim_config?: IdentityProviderSCIMConfigParam;
+  }
 
+  export namespace AccessOnetimepin {
     /**
-     * Body param: The configuration settings for enabling a System for Cross-Domain
-     * Identity Management (SCIM) with the identity provider.
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
      */
-    scim_config?: SCIMConfigParam;
+    export interface Config {}
   }
 }
 
@@ -2939,7 +3695,7 @@ export type IdentityProviderUpdateParams =
   | IdentityProviderUpdateParams.AccessYandex
   | IdentityProviderUpdateParams.AccessOnetimepin;
 
-export namespace IdentityProviderUpdateParams {
+export declare namespace IdentityProviderUpdateParams {
   export interface AzureAD {
     /**
      * Body param: The configuration parameters for the identity provider. To view the
@@ -2972,16 +3728,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AzureAD {
@@ -3072,16 +3823,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessCentrify {
@@ -3155,16 +3901,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export interface AccessGitHub {
@@ -3199,16 +3940,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export interface AccessGoogle {
@@ -3243,16 +3979,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessGoogle {
@@ -3316,16 +4047,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessGoogleApps {
@@ -3394,16 +4120,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export interface AccessOIDC {
@@ -3438,16 +4159,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessOIDC {
@@ -3487,6 +4203,11 @@ export namespace IdentityProviderUpdateParams {
        */
       email_claim_name?: string;
 
+      /**
+       * Enable Proof Key for Code Exchange (PKCE)
+       */
+      pkce_enabled?: boolean;
+
       /**
        * OAuth scopes
        */
@@ -3531,16 +4252,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessOkta {
@@ -3614,16 +4330,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessOnelogin {
@@ -3692,16 +4403,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessPingone {
@@ -3770,16 +4476,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export namespace AccessSAML {
@@ -3875,16 +4576,11 @@ export namespace IdentityProviderUpdateParams {
      */
     zone_id?: string;
 
-    /**
-     * Body param: UUID
-     */
-    id?: string;
-
     /**
      * Body param: The configuration settings for enabling a System for Cross-Domain
      * Identity Management (SCIM) with the identity provider.
      */
-    scim_config?: SCIMConfigParam;
+    scim_config?: IdentityProviderSCIMConfigParam;
   }
 
   export interface AccessOnetimepin {
@@ -3893,7 +4589,7 @@ export namespace IdentityProviderUpdateParams {
      * required parameters for a specific provider, refer to our
      * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
      */
-    config: unknown;
+    config: IdentityProviderUpdateParams.AccessOnetimepin.Config;
 
     /**
      * Body param: The name of the identity provider, shown to users on the login page.
@@ -3920,28 +4616,40 @@ export namespace IdentityProviderUpdateParams {
     zone_id?: string;
 
     /**
-     * Body param: UUID
+     * Body param: The configuration settings for enabling a System for Cross-Domain
+     * Identity Management (SCIM) with the identity provider.
      */
-    id?: string;
+    scim_config?: IdentityProviderSCIMConfigParam;
+  }
 
+  export namespace AccessOnetimepin {
     /**
-     * Body param: The configuration settings for enabling a System for Cross-Domain
-     * Identity Management (SCIM) with the identity provider.
+     * The configuration parameters for the identity provider. To view the required
+     * parameters for a specific provider, refer to our
+     * [developer documentation](https://developers.cloudflare.com/cloudflare-one/identity/idp-integration/).
      */
-    scim_config?: SCIMConfigParam;
+    export interface Config {}
   }
 }
 
 export interface IdentityProviderListParams {
   /**
-   * The Account ID to use for this endpoint. Mutually exclusive with the Zone ID.
+   * Path param: The Account ID to use for this endpoint. Mutually exclusive with the
+   * Zone ID.
    */
   account_id?: string;
 
   /**
-   * The Zone ID to use for this endpoint. Mutually exclusive with the Account ID.
+   * Path param: The Zone ID to use for this endpoint. Mutually exclusive with the
+   * Account ID.
    */
   zone_id?: string;
+
+  /**
+   * Query param: Indicates to Access to only retrieve identity providers that have
+   * the System for Cross-Domain Identity Management (SCIM) enabled.
+   */
+  scim_enabled?: string;
 }
 
 export interface IdentityProviderDeleteParams {
@@ -3968,18 +4676,22 @@ export interface IdentityProviderGetParams {
   zone_id?: string;
 }
 
-export namespace IdentityProviders {
-  export import AzureAD = IdentityProvidersAPI.AzureAD;
-  export import GenericOAuthConfig = IdentityProvidersAPI.GenericOAuthConfig;
-  export import IdentityProvider = IdentityProvidersAPI.IdentityProvider;
-  export import IdentityProviderType = IdentityProvidersAPI.IdentityProviderType;
-  export import SCIMConfig = IdentityProvidersAPI.SCIMConfig;
-  export import IdentityProviderListResponse = IdentityProvidersAPI.IdentityProviderListResponse;
-  export import IdentityProviderDeleteResponse = IdentityProvidersAPI.IdentityProviderDeleteResponse;
-  export import IdentityProviderListResponsesSinglePage = IdentityProvidersAPI.IdentityProviderListResponsesSinglePage;
-  export import IdentityProviderCreateParams = IdentityProvidersAPI.IdentityProviderCreateParams;
-  export import IdentityProviderUpdateParams = IdentityProvidersAPI.IdentityProviderUpdateParams;
-  export import IdentityProviderListParams = IdentityProvidersAPI.IdentityProviderListParams;
-  export import IdentityProviderDeleteParams = IdentityProvidersAPI.IdentityProviderDeleteParams;
-  export import IdentityProviderGetParams = IdentityProvidersAPI.IdentityProviderGetParams;
+IdentityProviders.IdentityProviderListResponsesSinglePage = IdentityProviderListResponsesSinglePage;
+
+export declare namespace IdentityProviders {
+  export {
+    type AzureAD as AzureAD,
+    type GenericOAuthConfig as GenericOAuthConfig,
+    type IdentityProvider as IdentityProvider,
+    type IdentityProviderSCIMConfig as IdentityProviderSCIMConfig,
+    type IdentityProviderType as IdentityProviderType,
+    type IdentityProviderListResponse as IdentityProviderListResponse,
+    type IdentityProviderDeleteResponse as IdentityProviderDeleteResponse,
+    IdentityProviderListResponsesSinglePage as IdentityProviderListResponsesSinglePage,
+    type IdentityProviderCreateParams as IdentityProviderCreateParams,
+    type IdentityProviderUpdateParams as IdentityProviderUpdateParams,
+    type IdentityProviderListParams as IdentityProviderListParams,
+    type IdentityProviderDeleteParams as IdentityProviderDeleteParams,
+    type IdentityProviderGetParams as IdentityProviderGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/index.ts b/src/resources/zero-trust/index.ts
index 59ac113a26..a674f1b156 100644
--- a/src/resources/zero-trust/index.ts
+++ b/src/resources/zero-trust/index.ts
@@ -1,99 +1,106 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  AccessDevicePostureRule,
-  AccessRule,
-  AnyValidServiceTokenRule,
-  AuthenticationMethodRule,
-  AzureGroupRule,
-  CertificateRule,
-  CountryRule,
-  DomainRule,
-  EmailListRule,
-  EmailRule,
-  EveryoneRule,
-  ExternalEvaluationRule,
-  GitHubOrganizationRule,
-  GroupRule,
-  GSuiteGroupRule,
-  IPListRule,
-  IPRule,
-  OktaGroupRule,
-  SAMLGroupRule,
-  ServiceTokenRule,
   Access,
+  type AccessDevicePostureRule,
+  type AccessRule,
+  type AnyValidServiceTokenRule,
+  type AuthenticationMethodRule,
+  type AzureGroupRule,
+  type CertificateRule,
+  type CountryRule,
+  type DomainRule,
+  type EmailListRule,
+  type EmailRule,
+  type EveryoneRule,
+  type ExternalEvaluationRule,
+  type GitHubOrganizationRule,
+  type GroupRule,
+  type GSuiteGroupRule,
+  type IPListRule,
+  type IPRule,
+  type OktaGroupRule,
+  type SAMLGroupRule,
+  type ServiceTokenRule,
 } from './access/index';
 export {
-  AzureAD,
-  GenericOAuthConfig,
-  IdentityProvider,
-  IdentityProviderType,
-  SCIMConfig,
-  IdentityProviderListResponse,
-  IdentityProviderDeleteResponse,
-  IdentityProviderCreateParams,
-  IdentityProviderUpdateParams,
-  IdentityProviderListParams,
-  IdentityProviderDeleteParams,
-  IdentityProviderGetParams,
-  IdentityProviderListResponsesSinglePage,
-  IdentityProviders,
-} from './identity-providers';
-export {
-  Connection,
-  TunnelCreateResponse,
-  TunnelListResponse,
-  TunnelDeleteResponse,
-  TunnelEditResponse,
-  TunnelGetResponse,
-  TunnelCreateParams,
-  TunnelListParams,
-  TunnelDeleteParams,
-  TunnelEditParams,
-  TunnelGetParams,
-  TunnelListResponsesV4PagePaginationArray,
-  Tunnels,
-} from './tunnels/index';
-export {
-  ConnectivitySettingEditResponse,
-  ConnectivitySettingGetResponse,
-  ConnectivitySettingEditParams,
-  ConnectivitySettingGetParams,
   ConnectivitySettings,
+  type ConnectivitySettingEditResponse,
+  type ConnectivitySettingGetResponse,
+  type ConnectivitySettingEditParams,
+  type ConnectivitySettingGetParams,
 } from './connectivity-settings';
+export {
+  DEX,
+  type DigitalExperienceMonitor,
+  type NetworkPath,
+  type NetworkPathResponse,
+  type Percentiles,
+} from './dex/index';
 export { DLP } from './dlp/index';
 export {
-  Device,
-  DeviceGetResponse,
-  DeviceListParams,
-  DeviceGetParams,
   DevicesSinglePage,
   Devices,
+  type Device,
+  type DeviceGetResponse,
+  type DeviceListParams,
+  type DeviceGetParams,
 } from './devices/index';
-export { DeviceExperienceMonitor, NetworkPath, NetworkPathResponse, Percentiles, DEX } from './dex/index';
 export {
-  GatewayCreateResponse,
-  GatewayListResponse,
-  GatewayCreateParams,
-  GatewayListParams,
   Gateway,
+  type GatewayCreateResponse,
+  type GatewayListResponse,
+  type GatewayCreateParams,
+  type GatewayListParams,
 } from './gateway/index';
 export {
-  LoginDesign,
-  Organization,
-  OrganizationRevokeUsersResponse,
-  OrganizationCreateParams,
-  OrganizationUpdateParams,
-  OrganizationListParams,
-  OrganizationRevokeUsersParams,
-  Organizations,
-} from './organizations';
+  IdentityProviderListResponsesSinglePage,
+  IdentityProviders,
+  type AzureAD,
+  type GenericOAuthConfig,
+  type IdentityProvider,
+  type IdentityProviderSCIMConfig,
+  type IdentityProviderType,
+  type IdentityProviderListResponse,
+  type IdentityProviderDeleteResponse,
+  type IdentityProviderCreateParams,
+  type IdentityProviderUpdateParams,
+  type IdentityProviderListParams,
+  type IdentityProviderDeleteParams,
+  type IdentityProviderGetParams,
+} from './identity-providers';
 export { Networks } from './networks/index';
 export {
-  RiskScoringGetResponse,
-  RiskScoringResetResponse,
-  RiskScoringGetParams,
+  Organizations,
+  type LoginDesign,
+  type Organization,
+  type OrganizationRevokeUsersResponse,
+  type OrganizationCreateParams,
+  type OrganizationUpdateParams,
+  type OrganizationListParams,
+  type OrganizationRevokeUsersParams,
+} from './organizations/index';
+export {
   RiskScoring,
+  type RiskScoringGetResponse,
+  type RiskScoringResetResponse,
+  type RiskScoringGetParams,
+  type RiskScoringResetParams,
 } from './risk-scoring/index';
-export { Seat, SeatEditResponse, SeatEditParams, Seats } from './seats';
+export { Seats, type Seat, type SeatEditResponse, type SeatEditParams } from './seats';
+export {
+  TunnelListResponsesV4PagePaginationArray,
+  Tunnels,
+  type Connection,
+  type TunnelCreateResponse,
+  type TunnelListResponse,
+  type TunnelDeleteResponse,
+  type TunnelEditResponse,
+  type TunnelGetResponse,
+  type TunnelCreateParams,
+  type TunnelListParams,
+  type TunnelDeleteParams,
+  type TunnelEditParams,
+  type TunnelGetParams,
+} from './tunnels/index';
 export { ZeroTrust } from './zero-trust';
diff --git a/src/resources/zero-trust/networks/index.ts b/src/resources/zero-trust/networks/index.ts
index af26d7c41a..0a2eae6776 100644
--- a/src/resources/zero-trust/networks/index.ts
+++ b/src/resources/zero-trust/networks/index.ts
@@ -1,26 +1,25 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
+export { Networks } from './networks';
 export {
-  NetworkRoute,
-  Route,
-  Teamnet,
-  RouteCreateParams,
-  RouteListParams,
-  RouteDeleteParams,
-  RouteEditParams,
   TeamnetsV4PagePaginationArray,
   Routes,
+  type NetworkRoute,
+  type Route,
+  type Teamnet,
+  type RouteCreateParams,
+  type RouteListParams,
+  type RouteDeleteParams,
+  type RouteEditParams,
+  type RouteGetParams,
 } from './routes/index';
-export { Networks } from './networks';
 export {
-  VirtualNetwork,
-  VirtualNetworkCreateResponse,
-  VirtualNetworkDeleteResponse,
-  VirtualNetworkEditResponse,
-  VirtualNetworkCreateParams,
-  VirtualNetworkListParams,
-  VirtualNetworkDeleteParams,
-  VirtualNetworkEditParams,
   VirtualNetworksSinglePage,
   VirtualNetworks,
+  type VirtualNetwork,
+  type VirtualNetworkCreateParams,
+  type VirtualNetworkListParams,
+  type VirtualNetworkDeleteParams,
+  type VirtualNetworkEditParams,
+  type VirtualNetworkGetParams,
 } from './virtual-networks';
diff --git a/src/resources/zero-trust/networks/networks.ts b/src/resources/zero-trust/networks/networks.ts
index fca2f3e36e..8ea4c820ad 100644
--- a/src/resources/zero-trust/networks/networks.ts
+++ b/src/resources/zero-trust/networks/networks.ts
@@ -2,31 +2,62 @@
 
 import { APIResource } from '../../../resource';
 import * as VirtualNetworksAPI from './virtual-networks';
+import {
+  VirtualNetwork,
+  VirtualNetworkCreateParams,
+  VirtualNetworkDeleteParams,
+  VirtualNetworkEditParams,
+  VirtualNetworkGetParams,
+  VirtualNetworkListParams,
+  VirtualNetworks,
+  VirtualNetworksSinglePage,
+} from './virtual-networks';
 import * as RoutesAPI from './routes/routes';
+import {
+  NetworkRoute,
+  Route,
+  RouteCreateParams,
+  RouteDeleteParams,
+  RouteEditParams,
+  RouteGetParams,
+  RouteListParams,
+  Routes,
+  Teamnet,
+  TeamnetsV4PagePaginationArray,
+} from './routes/routes';
 
 export class Networks extends APIResource {
   routes: RoutesAPI.Routes = new RoutesAPI.Routes(this._client);
   virtualNetworks: VirtualNetworksAPI.VirtualNetworks = new VirtualNetworksAPI.VirtualNetworks(this._client);
 }
 
-export namespace Networks {
-  export import Routes = RoutesAPI.Routes;
-  export import NetworkRoute = RoutesAPI.NetworkRoute;
-  export import Route = RoutesAPI.Route;
-  export import Teamnet = RoutesAPI.Teamnet;
-  export import TeamnetsV4PagePaginationArray = RoutesAPI.TeamnetsV4PagePaginationArray;
-  export import RouteCreateParams = RoutesAPI.RouteCreateParams;
-  export import RouteListParams = RoutesAPI.RouteListParams;
-  export import RouteDeleteParams = RoutesAPI.RouteDeleteParams;
-  export import RouteEditParams = RoutesAPI.RouteEditParams;
-  export import VirtualNetworks = VirtualNetworksAPI.VirtualNetworks;
-  export import VirtualNetwork = VirtualNetworksAPI.VirtualNetwork;
-  export import VirtualNetworkCreateResponse = VirtualNetworksAPI.VirtualNetworkCreateResponse;
-  export import VirtualNetworkDeleteResponse = VirtualNetworksAPI.VirtualNetworkDeleteResponse;
-  export import VirtualNetworkEditResponse = VirtualNetworksAPI.VirtualNetworkEditResponse;
-  export import VirtualNetworksSinglePage = VirtualNetworksAPI.VirtualNetworksSinglePage;
-  export import VirtualNetworkCreateParams = VirtualNetworksAPI.VirtualNetworkCreateParams;
-  export import VirtualNetworkListParams = VirtualNetworksAPI.VirtualNetworkListParams;
-  export import VirtualNetworkDeleteParams = VirtualNetworksAPI.VirtualNetworkDeleteParams;
-  export import VirtualNetworkEditParams = VirtualNetworksAPI.VirtualNetworkEditParams;
+Networks.Routes = Routes;
+Networks.TeamnetsV4PagePaginationArray = TeamnetsV4PagePaginationArray;
+Networks.VirtualNetworks = VirtualNetworks;
+Networks.VirtualNetworksSinglePage = VirtualNetworksSinglePage;
+
+export declare namespace Networks {
+  export {
+    Routes as Routes,
+    type NetworkRoute as NetworkRoute,
+    type Route as Route,
+    type Teamnet as Teamnet,
+    TeamnetsV4PagePaginationArray as TeamnetsV4PagePaginationArray,
+    type RouteCreateParams as RouteCreateParams,
+    type RouteListParams as RouteListParams,
+    type RouteDeleteParams as RouteDeleteParams,
+    type RouteEditParams as RouteEditParams,
+    type RouteGetParams as RouteGetParams,
+  };
+
+  export {
+    VirtualNetworks as VirtualNetworks,
+    type VirtualNetwork as VirtualNetwork,
+    VirtualNetworksSinglePage as VirtualNetworksSinglePage,
+    type VirtualNetworkCreateParams as VirtualNetworkCreateParams,
+    type VirtualNetworkListParams as VirtualNetworkListParams,
+    type VirtualNetworkDeleteParams as VirtualNetworkDeleteParams,
+    type VirtualNetworkEditParams as VirtualNetworkEditParams,
+    type VirtualNetworkGetParams as VirtualNetworkGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/networks/routes/index.ts b/src/resources/zero-trust/networks/routes/index.ts
index 8b38b59ed1..24de665925 100644
--- a/src/resources/zero-trust/networks/routes/index.ts
+++ b/src/resources/zero-trust/networks/routes/index.ts
@@ -1,15 +1,21 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-export { IPGetParams, IPs } from './ips';
-export { NetworkCreateParams, NetworkDeleteParams, NetworkEditParams, Networks } from './networks';
+export { IPs, type IPGetParams } from './ips';
+export {
+  Networks,
+  type NetworkCreateParams,
+  type NetworkDeleteParams,
+  type NetworkEditParams,
+} from './networks';
 export {
-  NetworkRoute,
-  Route,
-  Teamnet,
-  RouteCreateParams,
-  RouteListParams,
-  RouteDeleteParams,
-  RouteEditParams,
   TeamnetsV4PagePaginationArray,
   Routes,
+  type NetworkRoute,
+  type Route,
+  type Teamnet,
+  type RouteCreateParams,
+  type RouteListParams,
+  type RouteDeleteParams,
+  type RouteEditParams,
+  type RouteGetParams,
 } from './routes';
diff --git a/src/resources/zero-trust/networks/routes/ips.ts b/src/resources/zero-trust/networks/routes/ips.ts
index 0d5f9b0a1c..86b90b4a47 100644
--- a/src/resources/zero-trust/networks/routes/ips.ts
+++ b/src/resources/zero-trust/networks/routes/ips.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as IPsAPI from './ips';
 import * as RoutesAPI from './routes';
 
 export class IPs extends APIResource {
@@ -32,6 +31,6 @@ export interface IPGetParams {
   virtual_network_id?: string;
 }
 
-export namespace IPs {
-  export import IPGetParams = IPsAPI.IPGetParams;
+export declare namespace IPs {
+  export { type IPGetParams as IPGetParams };
 }
diff --git a/src/resources/zero-trust/networks/routes/networks.ts b/src/resources/zero-trust/networks/routes/networks.ts
index 193aeef981..057058a0ad 100644
--- a/src/resources/zero-trust/networks/routes/networks.ts
+++ b/src/resources/zero-trust/networks/routes/networks.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as NetworksAPI from './networks';
 import * as RoutesAPI from './routes';
 
 export class Networks extends APIResource {
@@ -117,8 +116,10 @@ export interface NetworkEditParams {
   account_id: string;
 }
 
-export namespace Networks {
-  export import NetworkCreateParams = NetworksAPI.NetworkCreateParams;
-  export import NetworkDeleteParams = NetworksAPI.NetworkDeleteParams;
-  export import NetworkEditParams = NetworksAPI.NetworkEditParams;
+export declare namespace Networks {
+  export {
+    type NetworkCreateParams as NetworkCreateParams,
+    type NetworkDeleteParams as NetworkDeleteParams,
+    type NetworkEditParams as NetworkEditParams,
+  };
 }
diff --git a/src/resources/zero-trust/networks/routes/routes.ts b/src/resources/zero-trust/networks/routes/routes.ts
index 9bba92e303..5c773eb114 100644
--- a/src/resources/zero-trust/networks/routes/routes.ts
+++ b/src/resources/zero-trust/networks/routes/routes.ts
@@ -2,9 +2,10 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as RoutesAPI from './routes';
 import * as IPsAPI from './ips';
+import { IPGetParams, IPs } from './ips';
 import * as NetworksAPI from './networks';
+import { NetworkCreateParams, NetworkDeleteParams, NetworkEditParams, Networks } from './networks';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../../pagination';
 
 export class Routes extends APIResource {
@@ -62,6 +63,18 @@ export class Routes extends APIResource {
       }) as Core.APIPromise<{ result: Route }>
     )._thenUnwrap((obj) => obj.result);
   }
+
+  /**
+   * Get a private network route in an account.
+   */
+  get(routeId: string, params: RouteGetParams, options?: Core.RequestOptions): Core.APIPromise<Route> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/teamnet/routes/${routeId}`, options) as Core.APIPromise<{
+        result: Route;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
 }
 
 export class TeamnetsV4PagePaginationArray extends V4PagePaginationArray<Teamnet> {}
@@ -312,19 +325,36 @@ export interface RouteEditParams {
   virtual_network_id?: string;
 }
 
-export namespace Routes {
-  export import NetworkRoute = RoutesAPI.NetworkRoute;
-  export import Route = RoutesAPI.Route;
-  export import Teamnet = RoutesAPI.Teamnet;
-  export import TeamnetsV4PagePaginationArray = RoutesAPI.TeamnetsV4PagePaginationArray;
-  export import RouteCreateParams = RoutesAPI.RouteCreateParams;
-  export import RouteListParams = RoutesAPI.RouteListParams;
-  export import RouteDeleteParams = RoutesAPI.RouteDeleteParams;
-  export import RouteEditParams = RoutesAPI.RouteEditParams;
-  export import IPs = IPsAPI.IPs;
-  export import IPGetParams = IPsAPI.IPGetParams;
-  export import Networks = NetworksAPI.Networks;
-  export import NetworkCreateParams = NetworksAPI.NetworkCreateParams;
-  export import NetworkDeleteParams = NetworksAPI.NetworkDeleteParams;
-  export import NetworkEditParams = NetworksAPI.NetworkEditParams;
+export interface RouteGetParams {
+  /**
+   * Cloudflare account ID
+   */
+  account_id: string;
+}
+
+Routes.TeamnetsV4PagePaginationArray = TeamnetsV4PagePaginationArray;
+Routes.IPs = IPs;
+Routes.Networks = Networks;
+
+export declare namespace Routes {
+  export {
+    type NetworkRoute as NetworkRoute,
+    type Route as Route,
+    type Teamnet as Teamnet,
+    TeamnetsV4PagePaginationArray as TeamnetsV4PagePaginationArray,
+    type RouteCreateParams as RouteCreateParams,
+    type RouteListParams as RouteListParams,
+    type RouteDeleteParams as RouteDeleteParams,
+    type RouteEditParams as RouteEditParams,
+    type RouteGetParams as RouteGetParams,
+  };
+
+  export { IPs as IPs, type IPGetParams as IPGetParams };
+
+  export {
+    Networks as Networks,
+    type NetworkCreateParams as NetworkCreateParams,
+    type NetworkDeleteParams as NetworkDeleteParams,
+    type NetworkEditParams as NetworkEditParams,
+  };
 }
diff --git a/src/resources/zero-trust/networks/virtual-networks.ts b/src/resources/zero-trust/networks/virtual-networks.ts
index 5a1057d19c..9f106f595f 100644
--- a/src/resources/zero-trust/networks/virtual-networks.ts
+++ b/src/resources/zero-trust/networks/virtual-networks.ts
@@ -2,23 +2,19 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as VirtualNetworksAPI from './virtual-networks';
 import { SinglePage } from '../../../pagination';
 
 export class VirtualNetworks extends APIResource {
   /**
    * Adds a new virtual network to an account.
    */
-  create(
-    params: VirtualNetworkCreateParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<VirtualNetworkCreateResponse> {
+  create(params: VirtualNetworkCreateParams, options?: Core.RequestOptions): Core.APIPromise<VirtualNetwork> {
     const { account_id, ...body } = params;
     return (
       this._client.post(`/accounts/${account_id}/teamnet/virtual_networks`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: VirtualNetworkCreateResponse }>
+      }) as Core.APIPromise<{ result: VirtualNetwork }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -44,13 +40,13 @@ export class VirtualNetworks extends APIResource {
     virtualNetworkId: string,
     params: VirtualNetworkDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<VirtualNetworkDeleteResponse> {
+  ): Core.APIPromise<VirtualNetwork> {
     const { account_id } = params;
     return (
       this._client.delete(
         `/accounts/${account_id}/teamnet/virtual_networks/${virtualNetworkId}`,
         options,
-      ) as Core.APIPromise<{ result: VirtualNetworkDeleteResponse }>
+      ) as Core.APIPromise<{ result: VirtualNetwork }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -61,13 +57,30 @@ export class VirtualNetworks extends APIResource {
     virtualNetworkId: string,
     params: VirtualNetworkEditParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<VirtualNetworkEditResponse> {
+  ): Core.APIPromise<VirtualNetwork> {
     const { account_id, ...body } = params;
     return (
       this._client.patch(`/accounts/${account_id}/teamnet/virtual_networks/${virtualNetworkId}`, {
         body,
         ...options,
-      }) as Core.APIPromise<{ result: VirtualNetworkEditResponse }>
+      }) as Core.APIPromise<{ result: VirtualNetwork }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Get a virtual network.
+   */
+  get(
+    virtualNetworkId: string,
+    params: VirtualNetworkGetParams,
+    options?: Core.RequestOptions,
+  ): Core.APIPromise<VirtualNetwork> {
+    const { account_id } = params;
+    return (
+      this._client.get(
+        `/accounts/${account_id}/teamnet/virtual_networks/${virtualNetworkId}`,
+        options,
+      ) as Core.APIPromise<{ result: VirtualNetwork }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -107,12 +120,6 @@ export interface VirtualNetwork {
   deleted_at?: string;
 }
 
-export type VirtualNetworkCreateResponse = unknown | Array<unknown> | string;
-
-export type VirtualNetworkDeleteResponse = unknown | Array<unknown> | string;
-
-export type VirtualNetworkEditResponse = unknown | Array<unknown> | string;
-
 export interface VirtualNetworkCreateParams {
   /**
    * Path param: Cloudflare account ID
@@ -195,14 +202,23 @@ export interface VirtualNetworkEditParams {
   name?: string;
 }
 
-export namespace VirtualNetworks {
-  export import VirtualNetwork = VirtualNetworksAPI.VirtualNetwork;
-  export import VirtualNetworkCreateResponse = VirtualNetworksAPI.VirtualNetworkCreateResponse;
-  export import VirtualNetworkDeleteResponse = VirtualNetworksAPI.VirtualNetworkDeleteResponse;
-  export import VirtualNetworkEditResponse = VirtualNetworksAPI.VirtualNetworkEditResponse;
-  export import VirtualNetworksSinglePage = VirtualNetworksAPI.VirtualNetworksSinglePage;
-  export import VirtualNetworkCreateParams = VirtualNetworksAPI.VirtualNetworkCreateParams;
-  export import VirtualNetworkListParams = VirtualNetworksAPI.VirtualNetworkListParams;
-  export import VirtualNetworkDeleteParams = VirtualNetworksAPI.VirtualNetworkDeleteParams;
-  export import VirtualNetworkEditParams = VirtualNetworksAPI.VirtualNetworkEditParams;
+export interface VirtualNetworkGetParams {
+  /**
+   * Cloudflare account ID
+   */
+  account_id: string;
+}
+
+VirtualNetworks.VirtualNetworksSinglePage = VirtualNetworksSinglePage;
+
+export declare namespace VirtualNetworks {
+  export {
+    type VirtualNetwork as VirtualNetwork,
+    VirtualNetworksSinglePage as VirtualNetworksSinglePage,
+    type VirtualNetworkCreateParams as VirtualNetworkCreateParams,
+    type VirtualNetworkListParams as VirtualNetworkListParams,
+    type VirtualNetworkDeleteParams as VirtualNetworkDeleteParams,
+    type VirtualNetworkEditParams as VirtualNetworkEditParams,
+    type VirtualNetworkGetParams as VirtualNetworkGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/organizations/doh.ts b/src/resources/zero-trust/organizations/doh.ts
new file mode 100644
index 0000000000..2e011a4c6a
--- /dev/null
+++ b/src/resources/zero-trust/organizations/doh.ts
@@ -0,0 +1,144 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+
+export class DOH extends APIResource {
+  /**
+   * Updates the DoH settings for your Zero Trust organization.
+   */
+  update(params: DOHUpdateParams, options?: Core.RequestOptions): Core.APIPromise<DOHUpdateResponse> {
+    const { account_id, ...body } = params;
+    return (
+      this._client.put(`/accounts/${account_id}/access/organizations/doh`, {
+        body,
+        ...options,
+      }) as Core.APIPromise<{ result: DOHUpdateResponse }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
+  /**
+   * Returns the DoH settings for your Zero Trust organization.
+   */
+  get(params: DOHGetParams, options?: Core.RequestOptions): Core.APIPromise<DOHGetResponse> {
+    const { account_id } = params;
+    return (
+      this._client.get(`/accounts/${account_id}/access/organizations/doh`, options) as Core.APIPromise<{
+        result: DOHGetResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export interface DOHUpdateResponse {
+  /**
+   * The ID of the service token.
+   */
+  id?: string;
+
+  /**
+   * The Client ID for the service token. Access will check for this value in the
+   * `CF-Access-Client-ID` request header.
+   */
+  client_id?: string;
+
+  created_at?: string;
+
+  /**
+   * The duration the DoH JWT is valid for. Must be in the format `300ms` or `2h45m`.
+   * Valid time units are: ns, us (or µs), ms, s, m, h. Note that the maximum
+   * duration for this setting is the same as the key rotation period on the account.
+   * Default expiration is 24h
+   */
+  doh_jwt_duration?: string;
+
+  /**
+   * The duration for how long the service token will be valid. Must be in the format
+   * `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h. The
+   * default is 1 year in hours (8760h).
+   */
+  duration?: string;
+
+  expires_at?: string;
+
+  /**
+   * The name of the service token.
+   */
+  name?: string;
+
+  updated_at?: string;
+}
+
+export interface DOHGetResponse {
+  /**
+   * The ID of the service token.
+   */
+  id?: string;
+
+  /**
+   * The Client ID for the service token. Access will check for this value in the
+   * `CF-Access-Client-ID` request header.
+   */
+  client_id?: string;
+
+  created_at?: string;
+
+  /**
+   * The duration the DoH JWT is valid for. Must be in the format `300ms` or `2h45m`.
+   * Valid time units are: ns, us (or µs), ms, s, m, h. Note that the maximum
+   * duration for this setting is the same as the key rotation period on the account.
+   */
+  doh_jwt_duration?: string;
+
+  /**
+   * The duration for how long the service token will be valid. Must be in the format
+   * `300ms` or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h. The
+   * default is 1 year in hours (8760h).
+   */
+  duration?: string;
+
+  expires_at?: string;
+
+  /**
+   * The name of the service token.
+   */
+  name?: string;
+
+  updated_at?: string;
+}
+
+export interface DOHUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: The duration the DoH JWT is valid for. Must be in the format `300ms`
+   * or `2h45m`. Valid time units are: ns, us (or µs), ms, s, m, h. Note that the
+   * maximum duration for this setting is the same as the key rotation period on the
+   * account. Default expiration is 24h
+   */
+  doh_jwt_duration?: string;
+
+  /**
+   * Body param: The uuid of the service token you want to use for DoH authentication
+   */
+  service_token_id?: string;
+}
+
+export interface DOHGetParams {
+  /**
+   * Identifier
+   */
+  account_id: string;
+}
+
+export declare namespace DOH {
+  export {
+    type DOHUpdateResponse as DOHUpdateResponse,
+    type DOHGetResponse as DOHGetResponse,
+    type DOHUpdateParams as DOHUpdateParams,
+    type DOHGetParams as DOHGetParams,
+  };
+}
diff --git a/src/resources/zero-trust/organizations/index.ts b/src/resources/zero-trust/organizations/index.ts
new file mode 100644
index 0000000000..8d414bbc94
--- /dev/null
+++ b/src/resources/zero-trust/organizations/index.ts
@@ -0,0 +1,19 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+export {
+  DOH,
+  type DOHUpdateResponse,
+  type DOHGetResponse,
+  type DOHUpdateParams,
+  type DOHGetParams,
+} from './doh';
+export {
+  Organizations,
+  type LoginDesign,
+  type Organization,
+  type OrganizationRevokeUsersResponse,
+  type OrganizationCreateParams,
+  type OrganizationUpdateParams,
+  type OrganizationListParams,
+  type OrganizationRevokeUsersParams,
+} from './organizations';
diff --git a/src/resources/zero-trust/organizations.ts b/src/resources/zero-trust/organizations/organizations.ts
similarity index 83%
rename from src/resources/zero-trust/organizations.ts
rename to src/resources/zero-trust/organizations/organizations.ts
index 40db9e25ab..8a662f672b 100644
--- a/src/resources/zero-trust/organizations.ts
+++ b/src/resources/zero-trust/organizations/organizations.ts
@@ -1,12 +1,15 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../../resource';
-import { isRequestOptions } from '../../core';
-import * as Core from '../../core';
-import { CloudflareError } from '../../error';
-import * as OrganizationsAPI from './organizations';
+import { APIResource } from '../../../resource';
+import { isRequestOptions } from '../../../core';
+import * as Core from '../../../core';
+import { CloudflareError } from 'cloudflare/error';
+import * as DOHAPI from './doh';
+import { DOH, DOHGetParams, DOHGetResponse, DOHUpdateParams, DOHUpdateResponse } from './doh';
 
 export class Organizations extends APIResource {
+  doh: DOHAPI.DOH = new DOHAPI.DOH(this._client);
+
   /**
    * Sets up a Zero Trust organization for your account or zone.
    */
@@ -109,7 +112,7 @@ export class Organizations extends APIResource {
     params: OrganizationRevokeUsersParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<OrganizationRevokeUsersResponse> {
-    const { account_id, zone_id, ...body } = params;
+    const { account_id, zone_id, query_devices, body_devices, ...body } = params;
     if (!account_id && !zone_id) {
       throw new CloudflareError('You must provide either account_id or zone_id.');
     }
@@ -128,7 +131,8 @@ export class Organizations extends APIResource {
         };
     return (
       this._client.post(`/${accountOrZone}/${accountOrZoneId}/access/organizations/revoke_user`, {
-        body,
+        query: { devices: query_devices },
+        body: { devices: body_devices, ...body },
         ...options,
       }) as Core.APIPromise<{ result: OrganizationRevokeUsersResponse }>
     )._thenUnwrap((obj) => obj.result);
@@ -241,8 +245,9 @@ export interface Organization {
   /**
    * The amount of time a user seat is inactive before it expires. When the user seat
    * exceeds the set time of inactivity, the user is removed as an active seat and no
-   * longer counts against your Teams seat count. Must be in the format `300ms` or
-   * `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
+   * longer counts against your Teams seat count. Minimum value for this setting is 1
+   * month (730h). Must be in the format `300ms` or `2h45m`. Valid time units are:
+   * `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
    */
   user_seat_expiration_inactive_time?: string;
 
@@ -334,9 +339,9 @@ export interface OrganizationCreateParams {
   /**
    * Body param: The amount of time a user seat is inactive before it expires. When
    * the user seat exceeds the set time of inactivity, the user is removed as an
-   * active seat and no longer counts against your Teams seat count. Must be in the
-   * format `300ms` or `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`,
-   * `s`, `m`, `h`.
+   * active seat and no longer counts against your Teams seat count. Minimum value
+   * for this setting is 1 month (730h). Must be in the format `300ms` or `2h45m`.
+   * Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
    */
   user_seat_expiration_inactive_time?: string;
 
@@ -416,9 +421,9 @@ export interface OrganizationUpdateParams {
   /**
    * Body param: The amount of time a user seat is inactive before it expires. When
    * the user seat exceeds the set time of inactivity, the user is removed as an
-   * active seat and no longer counts against your Teams seat count. Must be in the
-   * format `300ms` or `2h45m`. Valid time units are: `ns`, `us` (or `µs`), `ms`,
-   * `s`, `m`, `h`.
+   * active seat and no longer counts against your Teams seat count. Minimum value
+   * for this setting is 1 month (730h). Must be in the format `300ms` or `2h45m`.
+   * Valid time units are: `ns`, `us` (or `µs`), `ms`, `s`, `m`, `h`.
    */
   user_seat_expiration_inactive_time?: string;
 
@@ -473,14 +478,50 @@ export interface OrganizationRevokeUsersParams {
    * Account ID.
    */
   zone_id?: string;
+
+  /**
+   * Query param: When set to `true`, all devices associated with the user will be
+   * revoked.
+   */
+  query_devices?: boolean;
+
+  /**
+   * Body param: When set to `true`, all devices associated with the user will be
+   * revoked.
+   */
+  body_devices?: boolean;
+
+  /**
+   * Body param: The uuid of the user to revoke.
+   */
+  user_uid?: string;
+
+  /**
+   * Body param: When set to `true`, the user will be required to re-authenticate to
+   * WARP for all Gateway policies that enforce a WARP client session duration. When
+   * `false`, the user’s WARP session will remain active
+   */
+  warp_session_reauth?: boolean;
 }
 
-export namespace Organizations {
-  export import LoginDesign = OrganizationsAPI.LoginDesign;
-  export import Organization = OrganizationsAPI.Organization;
-  export import OrganizationRevokeUsersResponse = OrganizationsAPI.OrganizationRevokeUsersResponse;
-  export import OrganizationCreateParams = OrganizationsAPI.OrganizationCreateParams;
-  export import OrganizationUpdateParams = OrganizationsAPI.OrganizationUpdateParams;
-  export import OrganizationListParams = OrganizationsAPI.OrganizationListParams;
-  export import OrganizationRevokeUsersParams = OrganizationsAPI.OrganizationRevokeUsersParams;
+Organizations.DOH = DOH;
+
+export declare namespace Organizations {
+  export {
+    type LoginDesign as LoginDesign,
+    type Organization as Organization,
+    type OrganizationRevokeUsersResponse as OrganizationRevokeUsersResponse,
+    type OrganizationCreateParams as OrganizationCreateParams,
+    type OrganizationUpdateParams as OrganizationUpdateParams,
+    type OrganizationListParams as OrganizationListParams,
+    type OrganizationRevokeUsersParams as OrganizationRevokeUsersParams,
+  };
+
+  export {
+    DOH as DOH,
+    type DOHUpdateResponse as DOHUpdateResponse,
+    type DOHGetResponse as DOHGetResponse,
+    type DOHUpdateParams as DOHUpdateParams,
+    type DOHGetParams as DOHGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/risk-scoring/behaviours.ts b/src/resources/zero-trust/risk-scoring/behaviours.ts
index 72b83bbbc8..058eacc5bb 100644
--- a/src/resources/zero-trust/risk-scoring/behaviours.ts
+++ b/src/resources/zero-trust/risk-scoring/behaviours.ts
@@ -2,19 +2,18 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as BehavioursAPI from './behaviours';
 
 export class Behaviours extends APIResource {
   /**
    * Update configuration for risk behaviors
    */
   update(
-    accountIdentifier: string,
-    body: BehaviourUpdateParams,
+    params: BehaviourUpdateParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<BehaviourUpdateResponse> {
+    const { account_id, ...body } = params;
     return (
-      this._client.put(`/accounts/${accountIdentifier}/zt_risk_scoring/behaviors`, {
+      this._client.put(`/accounts/${account_id}/zt_risk_scoring/behaviors`, {
         body,
         ...options,
       }) as Core.APIPromise<{ result: BehaviourUpdateResponse }>
@@ -24,50 +23,54 @@ export class Behaviours extends APIResource {
   /**
    * Get all behaviors and associated configuration
    */
-  get(accountIdentifier: string, options?: Core.RequestOptions): Core.APIPromise<BehaviourGetResponse> {
+  get(params: BehaviourGetParams, options?: Core.RequestOptions): Core.APIPromise<BehaviourGetResponse> {
+    const { account_id } = params;
     return (
-      this._client.get(
-        `/accounts/${accountIdentifier}/zt_risk_scoring/behaviors`,
-        options,
-      ) as Core.APIPromise<{ result: BehaviourGetResponse }>
+      this._client.get(`/accounts/${account_id}/zt_risk_scoring/behaviors`, options) as Core.APIPromise<{
+        result: BehaviourGetResponse;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
 export interface BehaviourUpdateResponse {
-  behaviors?: Record<string, BehaviourUpdateResponse.Behaviors>;
+  behaviors: Record<string, BehaviourUpdateResponse.Behaviors>;
 }
 
 export namespace BehaviourUpdateResponse {
   export interface Behaviors {
-    description?: string;
-
-    enabled?: boolean;
-
-    name?: string;
+    enabled: boolean;
 
-    risk_level?: 'low' | 'medium' | 'high';
+    risk_level: 'low' | 'medium' | 'high';
   }
 }
 
 export interface BehaviourGetResponse {
-  behaviors?: Record<string, BehaviourGetResponse.Behaviors>;
+  behaviors: Record<string, BehaviourGetResponse.Behaviors>;
 }
 
 export namespace BehaviourGetResponse {
   export interface Behaviors {
-    description?: string;
+    description: string;
 
-    enabled?: boolean;
+    enabled: boolean;
 
-    name?: string;
+    name: string;
 
-    risk_level?: 'low' | 'medium' | 'high';
+    risk_level: 'low' | 'medium' | 'high';
   }
 }
 
 export interface BehaviourUpdateParams {
-  behaviors?: Record<string, BehaviourUpdateParams.Behaviors>;
+  /**
+   * Path param: Account ID
+   */
+  account_id: string;
+
+  /**
+   * Body param:
+   */
+  behaviors: Record<string, BehaviourUpdateParams.Behaviors>;
 }
 
 export namespace BehaviourUpdateParams {
@@ -78,8 +81,15 @@ export namespace BehaviourUpdateParams {
   }
 }
 
-export namespace Behaviours {
-  export import BehaviourUpdateResponse = BehavioursAPI.BehaviourUpdateResponse;
-  export import BehaviourGetResponse = BehavioursAPI.BehaviourGetResponse;
-  export import BehaviourUpdateParams = BehavioursAPI.BehaviourUpdateParams;
+export interface BehaviourGetParams {
+  account_id: string;
+}
+
+export declare namespace Behaviours {
+  export {
+    type BehaviourUpdateResponse as BehaviourUpdateResponse,
+    type BehaviourGetResponse as BehaviourGetResponse,
+    type BehaviourUpdateParams as BehaviourUpdateParams,
+    type BehaviourGetParams as BehaviourGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/risk-scoring/index.ts b/src/resources/zero-trust/risk-scoring/index.ts
index 97dfa937ea..60f0ee5ca8 100644
--- a/src/resources/zero-trust/risk-scoring/index.ts
+++ b/src/resources/zero-trust/risk-scoring/index.ts
@@ -1,29 +1,31 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  BehaviourUpdateResponse,
-  BehaviourGetResponse,
-  BehaviourUpdateParams,
   Behaviours,
+  type BehaviourUpdateResponse,
+  type BehaviourGetResponse,
+  type BehaviourUpdateParams,
+  type BehaviourGetParams,
 } from './behaviours';
 export {
-  IntegrationCreateResponse,
-  IntegrationUpdateResponse,
-  IntegrationListResponse,
-  IntegrationDeleteResponse,
-  IntegrationGetResponse,
-  IntegrationCreateParams,
-  IntegrationUpdateParams,
-  IntegrationListParams,
-  IntegrationDeleteParams,
-  IntegrationGetParams,
   IntegrationListResponsesSinglePage,
   Integrations,
+  type IntegrationCreateResponse,
+  type IntegrationUpdateResponse,
+  type IntegrationListResponse,
+  type IntegrationDeleteResponse,
+  type IntegrationGetResponse,
+  type IntegrationCreateParams,
+  type IntegrationUpdateParams,
+  type IntegrationListParams,
+  type IntegrationDeleteParams,
+  type IntegrationGetParams,
 } from './integrations/index';
 export {
-  RiskScoringGetResponse,
-  RiskScoringResetResponse,
-  RiskScoringGetParams,
   RiskScoring,
+  type RiskScoringGetResponse,
+  type RiskScoringResetResponse,
+  type RiskScoringGetParams,
+  type RiskScoringResetParams,
 } from './risk-scoring';
-export { SummaryGetResponse, SummaryGetParams, Summary } from './summary';
+export { Summary, type SummaryGetResponse, type SummaryGetParams } from './summary';
diff --git a/src/resources/zero-trust/risk-scoring/integrations/index.ts b/src/resources/zero-trust/risk-scoring/integrations/index.ts
index f2630784e4..0424843bd1 100644
--- a/src/resources/zero-trust/risk-scoring/integrations/index.ts
+++ b/src/resources/zero-trust/risk-scoring/integrations/index.ts
@@ -1,17 +1,17 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  IntegrationCreateResponse,
-  IntegrationUpdateResponse,
-  IntegrationListResponse,
-  IntegrationDeleteResponse,
-  IntegrationGetResponse,
-  IntegrationCreateParams,
-  IntegrationUpdateParams,
-  IntegrationListParams,
-  IntegrationDeleteParams,
-  IntegrationGetParams,
   IntegrationListResponsesSinglePage,
   Integrations,
+  type IntegrationCreateResponse,
+  type IntegrationUpdateResponse,
+  type IntegrationListResponse,
+  type IntegrationDeleteResponse,
+  type IntegrationGetResponse,
+  type IntegrationCreateParams,
+  type IntegrationUpdateParams,
+  type IntegrationListParams,
+  type IntegrationDeleteParams,
+  type IntegrationGetParams,
 } from './integrations';
-export { ReferenceGetResponse, ReferenceGetParams, References } from './references';
+export { References, type ReferenceGetResponse, type ReferenceGetParams } from './references';
diff --git a/src/resources/zero-trust/risk-scoring/integrations/integrations.ts b/src/resources/zero-trust/risk-scoring/integrations/integrations.ts
index 7c6c5dbaf8..78a900e0e2 100644
--- a/src/resources/zero-trust/risk-scoring/integrations/integrations.ts
+++ b/src/resources/zero-trust/risk-scoring/integrations/integrations.ts
@@ -2,8 +2,8 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as IntegrationsAPI from './integrations';
 import * as ReferencesAPI from './references';
+import { ReferenceGetParams, ReferenceGetResponse, References } from './references';
 import { SinglePage } from '../../../../pagination';
 
 export class Integrations extends APIResource {
@@ -26,8 +26,6 @@ export class Integrations extends APIResource {
   }
 
   /**
-   * Update a risk score integration.
-   *
    * Overwrite the reference_id, tenant_url, and active values with the ones provided
    */
   update(
@@ -66,13 +64,13 @@ export class Integrations extends APIResource {
     integrationId: string,
     params: IntegrationDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<IntegrationDeleteResponse> {
+  ): Core.APIPromise<IntegrationDeleteResponse | null> {
     const { account_id } = params;
     return (
       this._client.delete(
         `/accounts/${account_id}/zt_risk_scoring/integrations/${integrationId}`,
         options,
-      ) as Core.APIPromise<{ result: IntegrationDeleteResponse }>
+      ) as Core.APIPromise<{ result: IntegrationDeleteResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -331,19 +329,27 @@ export interface IntegrationGetParams {
   account_id: string;
 }
 
-export namespace Integrations {
-  export import IntegrationCreateResponse = IntegrationsAPI.IntegrationCreateResponse;
-  export import IntegrationUpdateResponse = IntegrationsAPI.IntegrationUpdateResponse;
-  export import IntegrationListResponse = IntegrationsAPI.IntegrationListResponse;
-  export import IntegrationDeleteResponse = IntegrationsAPI.IntegrationDeleteResponse;
-  export import IntegrationGetResponse = IntegrationsAPI.IntegrationGetResponse;
-  export import IntegrationListResponsesSinglePage = IntegrationsAPI.IntegrationListResponsesSinglePage;
-  export import IntegrationCreateParams = IntegrationsAPI.IntegrationCreateParams;
-  export import IntegrationUpdateParams = IntegrationsAPI.IntegrationUpdateParams;
-  export import IntegrationListParams = IntegrationsAPI.IntegrationListParams;
-  export import IntegrationDeleteParams = IntegrationsAPI.IntegrationDeleteParams;
-  export import IntegrationGetParams = IntegrationsAPI.IntegrationGetParams;
-  export import References = ReferencesAPI.References;
-  export import ReferenceGetResponse = ReferencesAPI.ReferenceGetResponse;
-  export import ReferenceGetParams = ReferencesAPI.ReferenceGetParams;
+Integrations.IntegrationListResponsesSinglePage = IntegrationListResponsesSinglePage;
+Integrations.References = References;
+
+export declare namespace Integrations {
+  export {
+    type IntegrationCreateResponse as IntegrationCreateResponse,
+    type IntegrationUpdateResponse as IntegrationUpdateResponse,
+    type IntegrationListResponse as IntegrationListResponse,
+    type IntegrationDeleteResponse as IntegrationDeleteResponse,
+    type IntegrationGetResponse as IntegrationGetResponse,
+    IntegrationListResponsesSinglePage as IntegrationListResponsesSinglePage,
+    type IntegrationCreateParams as IntegrationCreateParams,
+    type IntegrationUpdateParams as IntegrationUpdateParams,
+    type IntegrationListParams as IntegrationListParams,
+    type IntegrationDeleteParams as IntegrationDeleteParams,
+    type IntegrationGetParams as IntegrationGetParams,
+  };
+
+  export {
+    References as References,
+    type ReferenceGetResponse as ReferenceGetResponse,
+    type ReferenceGetParams as ReferenceGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/risk-scoring/integrations/references.ts b/src/resources/zero-trust/risk-scoring/integrations/references.ts
index 9b3c59ac76..9a2056a1e5 100644
--- a/src/resources/zero-trust/risk-scoring/integrations/references.ts
+++ b/src/resources/zero-trust/risk-scoring/integrations/references.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../../resource';
 import * as Core from '../../../../core';
-import * as ReferencesAPI from './references';
 
 export class References extends APIResource {
   /**
@@ -70,7 +69,6 @@ export interface ReferenceGetParams {
   account_id: string;
 }
 
-export namespace References {
-  export import ReferenceGetResponse = ReferencesAPI.ReferenceGetResponse;
-  export import ReferenceGetParams = ReferencesAPI.ReferenceGetParams;
+export declare namespace References {
+  export { type ReferenceGetResponse as ReferenceGetResponse, type ReferenceGetParams as ReferenceGetParams };
 }
diff --git a/src/resources/zero-trust/risk-scoring/risk-scoring.ts b/src/resources/zero-trust/risk-scoring/risk-scoring.ts
index 38eef107ac..e93fcc2744 100644
--- a/src/resources/zero-trust/risk-scoring/risk-scoring.ts
+++ b/src/resources/zero-trust/risk-scoring/risk-scoring.ts
@@ -1,12 +1,32 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../resource';
-import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as RiskScoringAPI from './risk-scoring';
 import * as BehavioursAPI from './behaviours';
+import {
+  BehaviourGetParams,
+  BehaviourGetResponse,
+  BehaviourUpdateParams,
+  BehaviourUpdateResponse,
+  Behaviours,
+} from './behaviours';
 import * as SummaryAPI from './summary';
+import { Summary, SummaryGetParams, SummaryGetResponse } from './summary';
 import * as IntegrationsAPI from './integrations/integrations';
+import {
+  IntegrationCreateParams,
+  IntegrationCreateResponse,
+  IntegrationDeleteParams,
+  IntegrationDeleteResponse,
+  IntegrationGetParams,
+  IntegrationGetResponse,
+  IntegrationListParams,
+  IntegrationListResponse,
+  IntegrationListResponsesSinglePage,
+  IntegrationUpdateParams,
+  IntegrationUpdateResponse,
+  Integrations,
+} from './integrations/integrations';
 
 export class RiskScoring extends APIResource {
   behaviours: BehavioursAPI.Behaviours = new BehavioursAPI.Behaviours(this._client);
@@ -17,30 +37,15 @@ export class RiskScoring extends APIResource {
    * Get risk event/score information for a specific user
    */
   get(
-    accountIdentifier: string,
     userId: string,
-    query?: RiskScoringGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<RiskScoringGetResponse>;
-  get(
-    accountIdentifier: string,
-    userId: string,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<RiskScoringGetResponse>;
-  get(
-    accountIdentifier: string,
-    userId: string,
-    query: RiskScoringGetParams | Core.RequestOptions = {},
+    params: RiskScoringGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<RiskScoringGetResponse> {
-    if (isRequestOptions(query)) {
-      return this.get(accountIdentifier, userId, {}, query);
-    }
+    const { account_id } = params;
     return (
-      this._client.get(`/accounts/${accountIdentifier}/zt_risk_scoring/${userId}`, {
-        query,
-        ...options,
-      }) as Core.APIPromise<{ result: RiskScoringGetResponse }>
+      this._client.get(`/accounts/${account_id}/zt_risk_scoring/${userId}`, options) as Core.APIPromise<{
+        result: RiskScoringGetResponse;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -48,29 +53,30 @@ export class RiskScoring extends APIResource {
    * Clear the risk score for a particular user
    */
   reset(
-    accountIdentifier: string,
     userId: string,
+    params: RiskScoringResetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<RiskScoringResetResponse> {
+  ): Core.APIPromise<RiskScoringResetResponse | null> {
+    const { account_id } = params;
     return (
       this._client.post(
-        `/accounts/${accountIdentifier}/zt_risk_scoring/${userId}/reset`,
+        `/accounts/${account_id}/zt_risk_scoring/${userId}/reset`,
         options,
-      ) as Core.APIPromise<{ result: RiskScoringResetResponse }>
+      ) as Core.APIPromise<{ result: RiskScoringResetResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
 export interface RiskScoringGetResponse {
-  email?: string;
+  email: string;
 
-  events?: Array<RiskScoringGetResponse.Event>;
+  events: Array<RiskScoringGetResponse.Event>;
 
-  last_reset_time?: string | null;
+  name: string;
 
-  name?: string;
+  last_reset_time?: string | null;
 
-  risk_level?: 'low' | 'medium' | 'high' | null;
+  risk_level?: 'low' | 'medium' | 'high';
 }
 
 export namespace RiskScoringGetResponse {
@@ -87,39 +93,55 @@ export namespace RiskScoringGetResponse {
   }
 }
 
-export type RiskScoringResetResponse = unknown | string | null;
+export type RiskScoringResetResponse = unknown;
 
 export interface RiskScoringGetParams {
-  direction?: 'desc' | 'asc';
-
-  order_by?: 'timestamp' | 'risk_level';
-
-  page?: number;
+  account_id: string;
+}
 
-  per_page?: number;
+export interface RiskScoringResetParams {
+  account_id: string;
 }
 
-export namespace RiskScoring {
-  export import RiskScoringGetResponse = RiskScoringAPI.RiskScoringGetResponse;
-  export import RiskScoringResetResponse = RiskScoringAPI.RiskScoringResetResponse;
-  export import RiskScoringGetParams = RiskScoringAPI.RiskScoringGetParams;
-  export import Behaviours = BehavioursAPI.Behaviours;
-  export import BehaviourUpdateResponse = BehavioursAPI.BehaviourUpdateResponse;
-  export import BehaviourGetResponse = BehavioursAPI.BehaviourGetResponse;
-  export import BehaviourUpdateParams = BehavioursAPI.BehaviourUpdateParams;
-  export import Summary = SummaryAPI.Summary;
-  export import SummaryGetResponse = SummaryAPI.SummaryGetResponse;
-  export import SummaryGetParams = SummaryAPI.SummaryGetParams;
-  export import Integrations = IntegrationsAPI.Integrations;
-  export import IntegrationCreateResponse = IntegrationsAPI.IntegrationCreateResponse;
-  export import IntegrationUpdateResponse = IntegrationsAPI.IntegrationUpdateResponse;
-  export import IntegrationListResponse = IntegrationsAPI.IntegrationListResponse;
-  export import IntegrationDeleteResponse = IntegrationsAPI.IntegrationDeleteResponse;
-  export import IntegrationGetResponse = IntegrationsAPI.IntegrationGetResponse;
-  export import IntegrationListResponsesSinglePage = IntegrationsAPI.IntegrationListResponsesSinglePage;
-  export import IntegrationCreateParams = IntegrationsAPI.IntegrationCreateParams;
-  export import IntegrationUpdateParams = IntegrationsAPI.IntegrationUpdateParams;
-  export import IntegrationListParams = IntegrationsAPI.IntegrationListParams;
-  export import IntegrationDeleteParams = IntegrationsAPI.IntegrationDeleteParams;
-  export import IntegrationGetParams = IntegrationsAPI.IntegrationGetParams;
+RiskScoring.Behaviours = Behaviours;
+RiskScoring.Summary = Summary;
+RiskScoring.Integrations = Integrations;
+RiskScoring.IntegrationListResponsesSinglePage = IntegrationListResponsesSinglePage;
+
+export declare namespace RiskScoring {
+  export {
+    type RiskScoringGetResponse as RiskScoringGetResponse,
+    type RiskScoringResetResponse as RiskScoringResetResponse,
+    type RiskScoringGetParams as RiskScoringGetParams,
+    type RiskScoringResetParams as RiskScoringResetParams,
+  };
+
+  export {
+    Behaviours as Behaviours,
+    type BehaviourUpdateResponse as BehaviourUpdateResponse,
+    type BehaviourGetResponse as BehaviourGetResponse,
+    type BehaviourUpdateParams as BehaviourUpdateParams,
+    type BehaviourGetParams as BehaviourGetParams,
+  };
+
+  export {
+    Summary as Summary,
+    type SummaryGetResponse as SummaryGetResponse,
+    type SummaryGetParams as SummaryGetParams,
+  };
+
+  export {
+    Integrations as Integrations,
+    type IntegrationCreateResponse as IntegrationCreateResponse,
+    type IntegrationUpdateResponse as IntegrationUpdateResponse,
+    type IntegrationListResponse as IntegrationListResponse,
+    type IntegrationDeleteResponse as IntegrationDeleteResponse,
+    type IntegrationGetResponse as IntegrationGetResponse,
+    IntegrationListResponsesSinglePage as IntegrationListResponsesSinglePage,
+    type IntegrationCreateParams as IntegrationCreateParams,
+    type IntegrationUpdateParams as IntegrationUpdateParams,
+    type IntegrationListParams as IntegrationListParams,
+    type IntegrationDeleteParams as IntegrationDeleteParams,
+    type IntegrationGetParams as IntegrationGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/risk-scoring/summary.ts b/src/resources/zero-trust/risk-scoring/summary.ts
index 5647f3fe3b..f1fd7c6f40 100644
--- a/src/resources/zero-trust/risk-scoring/summary.ts
+++ b/src/resources/zero-trust/risk-scoring/summary.ts
@@ -1,39 +1,24 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 import { APIResource } from '../../../resource';
-import { isRequestOptions } from '../../../core';
 import * as Core from '../../../core';
-import * as SummaryAPI from './summary';
 
 export class Summary extends APIResource {
   /**
    * Get risk score info for all users in the account
    */
-  get(
-    accountIdentifier: string,
-    query?: SummaryGetParams,
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SummaryGetResponse>;
-  get(accountIdentifier: string, options?: Core.RequestOptions): Core.APIPromise<SummaryGetResponse>;
-  get(
-    accountIdentifier: string,
-    query: SummaryGetParams | Core.RequestOptions = {},
-    options?: Core.RequestOptions,
-  ): Core.APIPromise<SummaryGetResponse> {
-    if (isRequestOptions(query)) {
-      return this.get(accountIdentifier, {}, query);
-    }
+  get(params: SummaryGetParams, options?: Core.RequestOptions): Core.APIPromise<SummaryGetResponse> {
+    const { account_id } = params;
     return (
-      this._client.get(`/accounts/${accountIdentifier}/zt_risk_scoring/summary`, {
-        query,
-        ...options,
-      }) as Core.APIPromise<{ result: SummaryGetResponse }>
+      this._client.get(`/accounts/${account_id}/zt_risk_scoring/summary`, options) as Core.APIPromise<{
+        result: SummaryGetResponse;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
 
 export interface SummaryGetResponse {
-  users?: Array<SummaryGetResponse.User>;
+  users: Array<SummaryGetResponse.User>;
 }
 
 export namespace SummaryGetResponse {
@@ -48,24 +33,14 @@ export namespace SummaryGetResponse {
 
     name: string;
 
-    /**
-     * The ID for a user
-     */
     user_id: string;
   }
 }
 
 export interface SummaryGetParams {
-  direction?: 'desc' | 'asc';
-
-  order_by?: 'timestamp' | 'event_count' | 'max_risk_level';
-
-  page?: number;
-
-  per_page?: number;
+  account_id: string;
 }
 
-export namespace Summary {
-  export import SummaryGetResponse = SummaryAPI.SummaryGetResponse;
-  export import SummaryGetParams = SummaryAPI.SummaryGetParams;
+export declare namespace Summary {
+  export { type SummaryGetResponse as SummaryGetResponse, type SummaryGetParams as SummaryGetParams };
 }
diff --git a/src/resources/zero-trust/seats.ts b/src/resources/zero-trust/seats.ts
index fbe05c3168..baace50a3a 100644
--- a/src/resources/zero-trust/seats.ts
+++ b/src/resources/zero-trust/seats.ts
@@ -2,20 +2,19 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as SeatsAPI from './seats';
 
 export class Seats extends APIResource {
   /**
    * Removes a user from a Zero Trust seat when both `access_seat` and `gateway_seat`
    * are set to false.
    */
-  edit(params: SeatEditParams, options?: Core.RequestOptions): Core.APIPromise<SeatEditResponse | null> {
+  edit(params: SeatEditParams, options?: Core.RequestOptions): Core.APIPromise<SeatEditResponse> {
     const { account_id, body } = params;
     return (
       this._client.patch(`/accounts/${account_id}/access/seats`, {
         body: body,
         ...options,
-      }) as Core.APIPromise<{ result: SeatEditResponse | null }>
+      }) as Core.APIPromise<{ result: SeatEditResponse }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -74,8 +73,10 @@ export namespace SeatEditParams {
   }
 }
 
-export namespace Seats {
-  export import Seat = SeatsAPI.Seat;
-  export import SeatEditResponse = SeatsAPI.SeatEditResponse;
-  export import SeatEditParams = SeatsAPI.SeatEditParams;
+export declare namespace Seats {
+  export {
+    type Seat as Seat,
+    type SeatEditResponse as SeatEditResponse,
+    type SeatEditParams as SeatEditParams,
+  };
 }
diff --git a/src/resources/zero-trust/tunnels/configurations.ts b/src/resources/zero-trust/tunnels/configurations.ts
index f8552b38aa..ec249678db 100644
--- a/src/resources/zero-trust/tunnels/configurations.ts
+++ b/src/resources/zero-trust/tunnels/configurations.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ConfigurationsAPI from './configurations';
 
 export class Configurations extends APIResource {
   /**
@@ -40,29 +39,48 @@ export class Configurations extends APIResource {
   }
 }
 
-export type ConfigurationUpdateResponse = unknown | Array<unknown> | string;
+/**
+ * Cloudflare Tunnel configuration
+ */
+export interface ConfigurationUpdateResponse {
+  /**
+   * Identifier
+   */
+  account_id?: string;
+
+  /**
+   * The tunnel configuration and ingress rules.
+   */
+  config?: ConfigurationUpdateResponse.Config;
 
-export type ConfigurationGetResponse = unknown | Array<unknown> | string;
+  created_at?: string;
 
-export interface ConfigurationUpdateParams {
   /**
-   * Path param: Cloudflare account ID
+   * Indicates if this is a locally or remotely configured tunnel. If `local`, manage
+   * the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the
+   * tunnel's configuration on the Zero Trust dashboard.
    */
-  account_id: string;
+  source?: 'local' | 'cloudflare';
 
   /**
-   * Body param: The tunnel configuration and ingress rules.
+   * UUID of the tunnel.
    */
-  config?: ConfigurationUpdateParams.Config;
+  tunnel_id?: string;
+
+  /**
+   * The version of the Tunnel Configuration.
+   */
+  version?: number;
 }
 
-export namespace ConfigurationUpdateParams {
+export namespace ConfigurationUpdateResponse {
   /**
    * The tunnel configuration and ingress rules.
    */
   export interface Config {
     /**
-     * List of public hostname definitions
+     * List of public hostname definitions. At least one ingress rule needs to be
+     * defined for the tunnel.
      */
     ingress?: Array<Config.Ingress>;
 
@@ -73,7 +91,8 @@ export namespace ConfigurationUpdateParams {
     originRequest?: Config.OriginRequest;
 
     /**
-     * Enable private network access from WARP users to private network routes
+     * Enable private network access from WARP users to private network routes. This is
+     * enabled if the tunnel has an assigned route.
      */
     'warp-routing'?: Config.WARPRouting;
   }
@@ -328,7 +347,8 @@ export namespace ConfigurationUpdateParams {
     }
 
     /**
-     * Enable private network access from WARP users to private network routes
+     * Enable private network access from WARP users to private network routes. This is
+     * enabled if the tunnel has an assigned route.
      */
     export interface WARPRouting {
       enabled?: boolean;
@@ -336,16 +356,616 @@ export namespace ConfigurationUpdateParams {
   }
 }
 
+/**
+ * Cloudflare Tunnel configuration
+ */
+export interface ConfigurationGetResponse {
+  /**
+   * Identifier
+   */
+  account_id?: string;
+
+  /**
+   * The tunnel configuration and ingress rules.
+   */
+  config?: ConfigurationGetResponse.Config;
+
+  created_at?: string;
+
+  /**
+   * Indicates if this is a locally or remotely configured tunnel. If `local`, manage
+   * the tunnel using a YAML file on the origin machine. If `cloudflare`, manage the
+   * tunnel's configuration on the Zero Trust dashboard.
+   */
+  source?: 'local' | 'cloudflare';
+
+  /**
+   * UUID of the tunnel.
+   */
+  tunnel_id?: string;
+
+  /**
+   * The version of the Tunnel Configuration.
+   */
+  version?: number;
+}
+
+export namespace ConfigurationGetResponse {
+  /**
+   * The tunnel configuration and ingress rules.
+   */
+  export interface Config {
+    /**
+     * List of public hostname definitions. At least one ingress rule needs to be
+     * defined for the tunnel.
+     */
+    ingress?: Array<Config.Ingress>;
+
+    /**
+     * Configuration parameters for the public hostname specific connection settings
+     * between cloudflared and origin server.
+     */
+    originRequest?: Config.OriginRequest;
+
+    /**
+     * Enable private network access from WARP users to private network routes. This is
+     * enabled if the tunnel has an assigned route.
+     */
+    'warp-routing'?: Config.WARPRouting;
+  }
+
+  export namespace Config {
+    /**
+     * Public hostname
+     */
+    export interface Ingress {
+      /**
+       * Public hostname for this service.
+       */
+      hostname: string;
+
+      /**
+       * Protocol and address of destination server. Supported protocols: http://,
+       * https://, unix://, tcp://, ssh://, rdp://, unix+tls://, smb://. Alternatively
+       * can return a HTTP status code http_status:[code] e.g. 'http_status:404'.
+       */
+      service: string;
+
+      /**
+       * Configuration parameters for the public hostname specific connection settings
+       * between cloudflared and origin server.
+       */
+      originRequest?: Ingress.OriginRequest;
+
+      /**
+       * Requests with this path route to this public hostname.
+       */
+      path?: string;
+    }
+
+    export namespace Ingress {
+      /**
+       * Configuration parameters for the public hostname specific connection settings
+       * between cloudflared and origin server.
+       */
+      export interface OriginRequest {
+        /**
+         * For all L7 requests to this hostname, cloudflared will validate each request's
+         * Cf-Access-Jwt-Assertion request header.
+         */
+        access?: OriginRequest.Access;
+
+        /**
+         * Path to the certificate authority (CA) for the certificate of your origin. This
+         * option should be used only if your certificate is not signed by Cloudflare.
+         */
+        caPool?: string;
+
+        /**
+         * Timeout for establishing a new TCP connection to your origin server. This
+         * excludes the time taken to establish TLS, which is controlled by tlsTimeout.
+         */
+        connectTimeout?: number;
+
+        /**
+         * Disables chunked transfer encoding. Useful if you are running a WSGI server.
+         */
+        disableChunkedEncoding?: boolean;
+
+        /**
+         * Attempt to connect to origin using HTTP2. Origin must be configured as https.
+         */
+        http2Origin?: boolean;
+
+        /**
+         * Sets the HTTP Host header on requests sent to the local service.
+         */
+        httpHostHeader?: string;
+
+        /**
+         * Maximum number of idle keepalive connections between Tunnel and your origin.
+         * This does not restrict the total number of concurrent connections.
+         */
+        keepAliveConnections?: number;
+
+        /**
+         * Timeout after which an idle keepalive connection can be discarded.
+         */
+        keepAliveTimeout?: number;
+
+        /**
+         * Disable the “happy eyeballs” algorithm for IPv4/IPv6 fallback if your local
+         * network has misconfigured one of the protocols.
+         */
+        noHappyEyeballs?: boolean;
+
+        /**
+         * Disables TLS verification of the certificate presented by your origin. Will
+         * allow any certificate from the origin to be accepted.
+         */
+        noTLSVerify?: boolean;
+
+        /**
+         * Hostname that cloudflared should expect from your origin server certificate.
+         */
+        originServerName?: string;
+
+        /**
+         * cloudflared starts a proxy server to translate HTTP traffic into TCP when
+         * proxying, for example, SSH or RDP. This configures what type of proxy will be
+         * started. Valid options are: "" for the regular proxy and "socks" for a SOCKS5
+         * proxy.
+         */
+        proxyType?: string;
+
+        /**
+         * The timeout after which a TCP keepalive packet is sent on a connection between
+         * Tunnel and the origin server.
+         */
+        tcpKeepAlive?: number;
+
+        /**
+         * Timeout for completing a TLS handshake to your origin server, if you have chosen
+         * to connect Tunnel to an HTTPS server.
+         */
+        tlsTimeout?: number;
+      }
+
+      export namespace OriginRequest {
+        /**
+         * For all L7 requests to this hostname, cloudflared will validate each request's
+         * Cf-Access-Jwt-Assertion request header.
+         */
+        export interface Access {
+          /**
+           * Access applications that are allowed to reach this hostname for this Tunnel.
+           * Audience tags can be identified in the dashboard or via the List Access policies
+           * API.
+           */
+          audTag: Array<string>;
+
+          teamName: string;
+
+          /**
+           * Deny traffic that has not fulfilled Access authorization.
+           */
+          required?: boolean;
+        }
+      }
+    }
+
+    /**
+     * Configuration parameters for the public hostname specific connection settings
+     * between cloudflared and origin server.
+     */
+    export interface OriginRequest {
+      /**
+       * For all L7 requests to this hostname, cloudflared will validate each request's
+       * Cf-Access-Jwt-Assertion request header.
+       */
+      access?: OriginRequest.Access;
+
+      /**
+       * Path to the certificate authority (CA) for the certificate of your origin. This
+       * option should be used only if your certificate is not signed by Cloudflare.
+       */
+      caPool?: string;
+
+      /**
+       * Timeout for establishing a new TCP connection to your origin server. This
+       * excludes the time taken to establish TLS, which is controlled by tlsTimeout.
+       */
+      connectTimeout?: number;
+
+      /**
+       * Disables chunked transfer encoding. Useful if you are running a WSGI server.
+       */
+      disableChunkedEncoding?: boolean;
+
+      /**
+       * Attempt to connect to origin using HTTP2. Origin must be configured as https.
+       */
+      http2Origin?: boolean;
+
+      /**
+       * Sets the HTTP Host header on requests sent to the local service.
+       */
+      httpHostHeader?: string;
+
+      /**
+       * Maximum number of idle keepalive connections between Tunnel and your origin.
+       * This does not restrict the total number of concurrent connections.
+       */
+      keepAliveConnections?: number;
+
+      /**
+       * Timeout after which an idle keepalive connection can be discarded.
+       */
+      keepAliveTimeout?: number;
+
+      /**
+       * Disable the “happy eyeballs” algorithm for IPv4/IPv6 fallback if your local
+       * network has misconfigured one of the protocols.
+       */
+      noHappyEyeballs?: boolean;
+
+      /**
+       * Disables TLS verification of the certificate presented by your origin. Will
+       * allow any certificate from the origin to be accepted.
+       */
+      noTLSVerify?: boolean;
+
+      /**
+       * Hostname that cloudflared should expect from your origin server certificate.
+       */
+      originServerName?: string;
+
+      /**
+       * cloudflared starts a proxy server to translate HTTP traffic into TCP when
+       * proxying, for example, SSH or RDP. This configures what type of proxy will be
+       * started. Valid options are: "" for the regular proxy and "socks" for a SOCKS5
+       * proxy.
+       */
+      proxyType?: string;
+
+      /**
+       * The timeout after which a TCP keepalive packet is sent on a connection between
+       * Tunnel and the origin server.
+       */
+      tcpKeepAlive?: number;
+
+      /**
+       * Timeout for completing a TLS handshake to your origin server, if you have chosen
+       * to connect Tunnel to an HTTPS server.
+       */
+      tlsTimeout?: number;
+    }
+
+    export namespace OriginRequest {
+      /**
+       * For all L7 requests to this hostname, cloudflared will validate each request's
+       * Cf-Access-Jwt-Assertion request header.
+       */
+      export interface Access {
+        /**
+         * Access applications that are allowed to reach this hostname for this Tunnel.
+         * Audience tags can be identified in the dashboard or via the List Access policies
+         * API.
+         */
+        audTag: Array<string>;
+
+        teamName: string;
+
+        /**
+         * Deny traffic that has not fulfilled Access authorization.
+         */
+        required?: boolean;
+      }
+    }
+
+    /**
+     * Enable private network access from WARP users to private network routes. This is
+     * enabled if the tunnel has an assigned route.
+     */
+    export interface WARPRouting {
+      enabled?: boolean;
+    }
+  }
+}
+
+export interface ConfigurationUpdateParams {
+  /**
+   * Path param: Identifier
+   */
+  account_id: string;
+
+  /**
+   * Body param: The tunnel configuration and ingress rules.
+   */
+  config?: ConfigurationUpdateParams.Config;
+}
+
+export namespace ConfigurationUpdateParams {
+  /**
+   * The tunnel configuration and ingress rules.
+   */
+  export interface Config {
+    /**
+     * List of public hostname definitions. At least one ingress rule needs to be
+     * defined for the tunnel.
+     */
+    ingress?: Array<Config.Ingress>;
+
+    /**
+     * Configuration parameters for the public hostname specific connection settings
+     * between cloudflared and origin server.
+     */
+    originRequest?: Config.OriginRequest;
+  }
+
+  export namespace Config {
+    /**
+     * Public hostname
+     */
+    export interface Ingress {
+      /**
+       * Public hostname for this service.
+       */
+      hostname: string;
+
+      /**
+       * Protocol and address of destination server. Supported protocols: http://,
+       * https://, unix://, tcp://, ssh://, rdp://, unix+tls://, smb://. Alternatively
+       * can return a HTTP status code http_status:[code] e.g. 'http_status:404'.
+       */
+      service: string;
+
+      /**
+       * Configuration parameters for the public hostname specific connection settings
+       * between cloudflared and origin server.
+       */
+      originRequest?: Ingress.OriginRequest;
+
+      /**
+       * Requests with this path route to this public hostname.
+       */
+      path?: string;
+    }
+
+    export namespace Ingress {
+      /**
+       * Configuration parameters for the public hostname specific connection settings
+       * between cloudflared and origin server.
+       */
+      export interface OriginRequest {
+        /**
+         * For all L7 requests to this hostname, cloudflared will validate each request's
+         * Cf-Access-Jwt-Assertion request header.
+         */
+        access?: OriginRequest.Access;
+
+        /**
+         * Path to the certificate authority (CA) for the certificate of your origin. This
+         * option should be used only if your certificate is not signed by Cloudflare.
+         */
+        caPool?: string;
+
+        /**
+         * Timeout for establishing a new TCP connection to your origin server. This
+         * excludes the time taken to establish TLS, which is controlled by tlsTimeout.
+         */
+        connectTimeout?: number;
+
+        /**
+         * Disables chunked transfer encoding. Useful if you are running a WSGI server.
+         */
+        disableChunkedEncoding?: boolean;
+
+        /**
+         * Attempt to connect to origin using HTTP2. Origin must be configured as https.
+         */
+        http2Origin?: boolean;
+
+        /**
+         * Sets the HTTP Host header on requests sent to the local service.
+         */
+        httpHostHeader?: string;
+
+        /**
+         * Maximum number of idle keepalive connections between Tunnel and your origin.
+         * This does not restrict the total number of concurrent connections.
+         */
+        keepAliveConnections?: number;
+
+        /**
+         * Timeout after which an idle keepalive connection can be discarded.
+         */
+        keepAliveTimeout?: number;
+
+        /**
+         * Disable the “happy eyeballs” algorithm for IPv4/IPv6 fallback if your local
+         * network has misconfigured one of the protocols.
+         */
+        noHappyEyeballs?: boolean;
+
+        /**
+         * Disables TLS verification of the certificate presented by your origin. Will
+         * allow any certificate from the origin to be accepted.
+         */
+        noTLSVerify?: boolean;
+
+        /**
+         * Hostname that cloudflared should expect from your origin server certificate.
+         */
+        originServerName?: string;
+
+        /**
+         * cloudflared starts a proxy server to translate HTTP traffic into TCP when
+         * proxying, for example, SSH or RDP. This configures what type of proxy will be
+         * started. Valid options are: "" for the regular proxy and "socks" for a SOCKS5
+         * proxy.
+         */
+        proxyType?: string;
+
+        /**
+         * The timeout after which a TCP keepalive packet is sent on a connection between
+         * Tunnel and the origin server.
+         */
+        tcpKeepAlive?: number;
+
+        /**
+         * Timeout for completing a TLS handshake to your origin server, if you have chosen
+         * to connect Tunnel to an HTTPS server.
+         */
+        tlsTimeout?: number;
+      }
+
+      export namespace OriginRequest {
+        /**
+         * For all L7 requests to this hostname, cloudflared will validate each request's
+         * Cf-Access-Jwt-Assertion request header.
+         */
+        export interface Access {
+          /**
+           * Access applications that are allowed to reach this hostname for this Tunnel.
+           * Audience tags can be identified in the dashboard or via the List Access policies
+           * API.
+           */
+          audTag: Array<string>;
+
+          teamName: string;
+
+          /**
+           * Deny traffic that has not fulfilled Access authorization.
+           */
+          required?: boolean;
+        }
+      }
+    }
+
+    /**
+     * Configuration parameters for the public hostname specific connection settings
+     * between cloudflared and origin server.
+     */
+    export interface OriginRequest {
+      /**
+       * For all L7 requests to this hostname, cloudflared will validate each request's
+       * Cf-Access-Jwt-Assertion request header.
+       */
+      access?: OriginRequest.Access;
+
+      /**
+       * Path to the certificate authority (CA) for the certificate of your origin. This
+       * option should be used only if your certificate is not signed by Cloudflare.
+       */
+      caPool?: string;
+
+      /**
+       * Timeout for establishing a new TCP connection to your origin server. This
+       * excludes the time taken to establish TLS, which is controlled by tlsTimeout.
+       */
+      connectTimeout?: number;
+
+      /**
+       * Disables chunked transfer encoding. Useful if you are running a WSGI server.
+       */
+      disableChunkedEncoding?: boolean;
+
+      /**
+       * Attempt to connect to origin using HTTP2. Origin must be configured as https.
+       */
+      http2Origin?: boolean;
+
+      /**
+       * Sets the HTTP Host header on requests sent to the local service.
+       */
+      httpHostHeader?: string;
+
+      /**
+       * Maximum number of idle keepalive connections between Tunnel and your origin.
+       * This does not restrict the total number of concurrent connections.
+       */
+      keepAliveConnections?: number;
+
+      /**
+       * Timeout after which an idle keepalive connection can be discarded.
+       */
+      keepAliveTimeout?: number;
+
+      /**
+       * Disable the “happy eyeballs” algorithm for IPv4/IPv6 fallback if your local
+       * network has misconfigured one of the protocols.
+       */
+      noHappyEyeballs?: boolean;
+
+      /**
+       * Disables TLS verification of the certificate presented by your origin. Will
+       * allow any certificate from the origin to be accepted.
+       */
+      noTLSVerify?: boolean;
+
+      /**
+       * Hostname that cloudflared should expect from your origin server certificate.
+       */
+      originServerName?: string;
+
+      /**
+       * cloudflared starts a proxy server to translate HTTP traffic into TCP when
+       * proxying, for example, SSH or RDP. This configures what type of proxy will be
+       * started. Valid options are: "" for the regular proxy and "socks" for a SOCKS5
+       * proxy.
+       */
+      proxyType?: string;
+
+      /**
+       * The timeout after which a TCP keepalive packet is sent on a connection between
+       * Tunnel and the origin server.
+       */
+      tcpKeepAlive?: number;
+
+      /**
+       * Timeout for completing a TLS handshake to your origin server, if you have chosen
+       * to connect Tunnel to an HTTPS server.
+       */
+      tlsTimeout?: number;
+    }
+
+    export namespace OriginRequest {
+      /**
+       * For all L7 requests to this hostname, cloudflared will validate each request's
+       * Cf-Access-Jwt-Assertion request header.
+       */
+      export interface Access {
+        /**
+         * Access applications that are allowed to reach this hostname for this Tunnel.
+         * Audience tags can be identified in the dashboard or via the List Access policies
+         * API.
+         */
+        audTag: Array<string>;
+
+        teamName: string;
+
+        /**
+         * Deny traffic that has not fulfilled Access authorization.
+         */
+        required?: boolean;
+      }
+    }
+  }
+}
+
 export interface ConfigurationGetParams {
   /**
-   * Cloudflare account ID
+   * Identifier
    */
   account_id: string;
 }
 
-export namespace Configurations {
-  export import ConfigurationUpdateResponse = ConfigurationsAPI.ConfigurationUpdateResponse;
-  export import ConfigurationGetResponse = ConfigurationsAPI.ConfigurationGetResponse;
-  export import ConfigurationUpdateParams = ConfigurationsAPI.ConfigurationUpdateParams;
-  export import ConfigurationGetParams = ConfigurationsAPI.ConfigurationGetParams;
+export declare namespace Configurations {
+  export {
+    type ConfigurationUpdateResponse as ConfigurationUpdateResponse,
+    type ConfigurationGetResponse as ConfigurationGetResponse,
+    type ConfigurationUpdateParams as ConfigurationUpdateParams,
+    type ConfigurationGetParams as ConfigurationGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/tunnels/connections.ts b/src/resources/zero-trust/tunnels/connections.ts
index 5157b433d9..fc7802191e 100644
--- a/src/resources/zero-trust/tunnels/connections.ts
+++ b/src/resources/zero-trust/tunnels/connections.ts
@@ -2,24 +2,25 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ConnectionsAPI from './connections';
 
 export class Connections extends APIResource {
   /**
-   * Removes connections that are in a disconnected or pending reconnect state. We
-   * recommend running this command after shutting down a tunnel.
+   * Removes a connection (aka Cloudflare Tunnel Connector) from a Cloudflare Tunnel
+   * independently of its current state. If no connector id (client_id) is provided
+   * all connectors will be removed. We recommend running this command after rotating
+   * tokens.
    */
   delete(
     tunnelId: string,
     params: ConnectionDeleteParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<ConnectionDeleteResponse> {
-    const { account_id } = params;
+  ): Core.APIPromise<ConnectionDeleteResponse | null> {
+    const { account_id, client_id } = params;
     return (
-      this._client.delete(
-        `/accounts/${account_id}/tunnels/${tunnelId}/connections`,
-        options,
-      ) as Core.APIPromise<{ result: ConnectionDeleteResponse }>
+      this._client.delete(`/accounts/${account_id}/cfd_tunnel/${tunnelId}/connections`, {
+        query: { client_id },
+        ...options,
+      }) as Core.APIPromise<{ result: ConnectionDeleteResponse | null }>
     )._thenUnwrap((obj) => obj.result);
   }
 
@@ -130,15 +131,20 @@ export namespace Client {
   }
 }
 
-export type ConnectionDeleteResponse = unknown | Array<unknown> | string;
+export type ConnectionDeleteResponse = unknown;
 
 export type ConnectionGetResponse = Array<Client>;
 
 export interface ConnectionDeleteParams {
   /**
-   * Cloudflare account ID
+   * Path param: Cloudflare account ID
    */
   account_id: string;
+
+  /**
+   * Query param: UUID of the Cloudflare Tunnel connector.
+   */
+  client_id?: string;
 }
 
 export interface ConnectionGetParams {
@@ -148,10 +154,12 @@ export interface ConnectionGetParams {
   account_id: string;
 }
 
-export namespace Connections {
-  export import Client = ConnectionsAPI.Client;
-  export import ConnectionDeleteResponse = ConnectionsAPI.ConnectionDeleteResponse;
-  export import ConnectionGetResponse = ConnectionsAPI.ConnectionGetResponse;
-  export import ConnectionDeleteParams = ConnectionsAPI.ConnectionDeleteParams;
-  export import ConnectionGetParams = ConnectionsAPI.ConnectionGetParams;
+export declare namespace Connections {
+  export {
+    type Client as Client,
+    type ConnectionDeleteResponse as ConnectionDeleteResponse,
+    type ConnectionGetResponse as ConnectionGetResponse,
+    type ConnectionDeleteParams as ConnectionDeleteParams,
+    type ConnectionGetParams as ConnectionGetParams,
+  };
 }
diff --git a/src/resources/zero-trust/tunnels/connectors.ts b/src/resources/zero-trust/tunnels/connectors.ts
index 0866ec005b..ec374c9809 100644
--- a/src/resources/zero-trust/tunnels/connectors.ts
+++ b/src/resources/zero-trust/tunnels/connectors.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ConnectorsAPI from './connectors';
 import * as ConnectionsAPI from './connections';
 
 export class Connectors extends APIResource {
@@ -32,6 +31,6 @@ export interface ConnectorGetParams {
   account_id: string;
 }
 
-export namespace Connectors {
-  export import ConnectorGetParams = ConnectorsAPI.ConnectorGetParams;
+export declare namespace Connectors {
+  export { type ConnectorGetParams as ConnectorGetParams };
 }
diff --git a/src/resources/zero-trust/tunnels/index.ts b/src/resources/zero-trust/tunnels/index.ts
index 0c990e7209..1e79c0aa47 100644
--- a/src/resources/zero-trust/tunnels/index.ts
+++ b/src/resources/zero-trust/tunnels/index.ts
@@ -1,35 +1,51 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  Client,
-  ConnectionDeleteResponse,
-  ConnectionGetResponse,
-  ConnectionDeleteParams,
-  ConnectionGetParams,
-  Connections,
-} from './connections';
-export {
-  ConfigurationUpdateResponse,
-  ConfigurationGetResponse,
-  ConfigurationUpdateParams,
-  ConfigurationGetParams,
   Configurations,
+  type ConfigurationUpdateResponse,
+  type ConfigurationGetResponse,
+  type ConfigurationUpdateParams,
+  type ConfigurationGetParams,
 } from './configurations';
 export {
-  Connection,
-  TunnelCreateResponse,
-  TunnelListResponse,
-  TunnelDeleteResponse,
-  TunnelEditResponse,
-  TunnelGetResponse,
-  TunnelCreateParams,
-  TunnelListParams,
-  TunnelDeleteParams,
-  TunnelEditParams,
-  TunnelGetParams,
+  Connections,
+  type Client,
+  type ConnectionDeleteResponse,
+  type ConnectionGetResponse,
+  type ConnectionDeleteParams,
+  type ConnectionGetParams,
+} from './connections';
+export { Connectors, type ConnectorGetParams } from './connectors';
+export { Management, type ManagementCreateResponse, type ManagementCreateParams } from './management';
+export { Token, type TokenGetResponse, type TokenGetParams } from './token';
+export {
   TunnelListResponsesV4PagePaginationArray,
   Tunnels,
+  type Connection,
+  type TunnelCreateResponse,
+  type TunnelListResponse,
+  type TunnelDeleteResponse,
+  type TunnelEditResponse,
+  type TunnelGetResponse,
+  type TunnelCreateParams,
+  type TunnelListParams,
+  type TunnelDeleteParams,
+  type TunnelEditParams,
+  type TunnelGetParams,
 } from './tunnels';
-export { ConnectorGetParams, Connectors } from './connectors';
-export { ManagementCreateResponse, ManagementCreateParams, Management } from './management';
-export { TokenGetResponse, TokenGetParams, Token } from './token';
+export {
+  WARPConnectorListResponsesV4PagePaginationArray,
+  WARPConnector,
+  type WARPConnectorCreateResponse,
+  type WARPConnectorListResponse,
+  type WARPConnectorDeleteResponse,
+  type WARPConnectorEditResponse,
+  type WARPConnectorGetResponse,
+  type WARPConnectorTokenResponse,
+  type WARPConnectorCreateParams,
+  type WARPConnectorListParams,
+  type WARPConnectorDeleteParams,
+  type WARPConnectorEditParams,
+  type WARPConnectorGetParams,
+  type WARPConnectorTokenParams,
+} from './warp-connector';
diff --git a/src/resources/zero-trust/tunnels/management.ts b/src/resources/zero-trust/tunnels/management.ts
index d6c4f14b44..6856ffd62e 100644
--- a/src/resources/zero-trust/tunnels/management.ts
+++ b/src/resources/zero-trust/tunnels/management.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as ManagementAPI from './management';
 
 export class Management extends APIResource {
   /**
@@ -24,7 +23,7 @@ export class Management extends APIResource {
   }
 }
 
-export type ManagementCreateResponse = unknown | Array<unknown> | string;
+export type ManagementCreateResponse = string;
 
 export interface ManagementCreateParams {
   /**
@@ -38,7 +37,9 @@ export interface ManagementCreateParams {
   resources: Array<'logs'>;
 }
 
-export namespace Management {
-  export import ManagementCreateResponse = ManagementAPI.ManagementCreateResponse;
-  export import ManagementCreateParams = ManagementAPI.ManagementCreateParams;
+export declare namespace Management {
+  export {
+    type ManagementCreateResponse as ManagementCreateResponse,
+    type ManagementCreateParams as ManagementCreateParams,
+  };
 }
diff --git a/src/resources/zero-trust/tunnels/token.ts b/src/resources/zero-trust/tunnels/token.ts
index 6249bf9e90..8905a208f5 100644
--- a/src/resources/zero-trust/tunnels/token.ts
+++ b/src/resources/zero-trust/tunnels/token.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as TokenAPI from './token';
 
 export class Token extends APIResource {
   /**
@@ -22,7 +21,7 @@ export class Token extends APIResource {
   }
 }
 
-export type TokenGetResponse = unknown | Array<unknown> | string;
+export type TokenGetResponse = string;
 
 export interface TokenGetParams {
   /**
@@ -31,7 +30,6 @@ export interface TokenGetParams {
   account_id: string;
 }
 
-export namespace Token {
-  export import TokenGetResponse = TokenAPI.TokenGetResponse;
-  export import TokenGetParams = TokenAPI.TokenGetParams;
+export declare namespace Token {
+  export { type TokenGetResponse as TokenGetResponse, type TokenGetParams as TokenGetParams };
 }
diff --git a/src/resources/zero-trust/tunnels/tunnels.ts b/src/resources/zero-trust/tunnels/tunnels.ts
index 5945bbec3e..dc5f0b0be5 100644
--- a/src/resources/zero-trust/tunnels/tunnels.ts
+++ b/src/resources/zero-trust/tunnels/tunnels.ts
@@ -2,16 +2,51 @@
 
 import { APIResource } from '../../../resource';
 import * as Core from '../../../core';
-import * as TunnelsAPI from './tunnels';
 import * as Shared from '../../shared';
 import * as ConfigurationsAPI from './configurations';
+import {
+  ConfigurationGetParams,
+  ConfigurationGetResponse,
+  ConfigurationUpdateParams,
+  ConfigurationUpdateResponse,
+  Configurations,
+} from './configurations';
 import * as ConnectionsAPI from './connections';
+import {
+  Client,
+  ConnectionDeleteParams,
+  ConnectionDeleteResponse,
+  ConnectionGetParams,
+  ConnectionGetResponse,
+  Connections,
+} from './connections';
 import * as ConnectorsAPI from './connectors';
+import { ConnectorGetParams, Connectors } from './connectors';
 import * as ManagementAPI from './management';
+import { Management, ManagementCreateParams, ManagementCreateResponse } from './management';
 import * as TokenAPI from './token';
+import { Token, TokenGetParams, TokenGetResponse } from './token';
+import * as WARPConnectorAPI from './warp-connector';
+import {
+  WARPConnector,
+  WARPConnectorCreateParams,
+  WARPConnectorCreateResponse,
+  WARPConnectorDeleteParams,
+  WARPConnectorDeleteResponse,
+  WARPConnectorEditParams,
+  WARPConnectorEditResponse,
+  WARPConnectorGetParams,
+  WARPConnectorGetResponse,
+  WARPConnectorListParams,
+  WARPConnectorListResponse,
+  WARPConnectorListResponsesV4PagePaginationArray,
+  WARPConnectorTokenParams,
+  WARPConnectorTokenResponse,
+} from './warp-connector';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class Tunnels extends APIResource {
+  warpConnector: WARPConnectorAPI.WARPConnector = new WARPConnectorAPI.WARPConnector(this._client);
   configurations: ConfigurationsAPI.Configurations = new ConfigurationsAPI.Configurations(this._client);
   connections: ConnectionsAPI.Connections = new ConnectionsAPI.Connections(this._client);
   token: TokenAPI.Token = new TokenAPI.Token(this._client);
@@ -19,19 +54,19 @@ export class Tunnels extends APIResource {
   management: ManagementAPI.Management = new ManagementAPI.Management(this._client);
 
   /**
-   * Creates a new Argo Tunnel in an account.
+   * Creates a new Cloudflare Tunnel in an account.
    */
   create(params: TunnelCreateParams, options?: Core.RequestOptions): Core.APIPromise<TunnelCreateResponse> {
     const { account_id, ...body } = params;
     return (
-      this._client.post(`/accounts/${account_id}/tunnels`, { body, ...options }) as Core.APIPromise<{
+      this._client.post(`/accounts/${account_id}/cfd_tunnel`, { body, ...options }) as Core.APIPromise<{
         result: TunnelCreateResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
-   * Lists and filters all types of Tunnels in an account.
+   * Lists and filters Cloudflare Tunnels in an account.
    */
   list(
     params: TunnelListParams,
@@ -39,14 +74,14 @@ export class Tunnels extends APIResource {
   ): Core.PagePromise<TunnelListResponsesV4PagePaginationArray, TunnelListResponse> {
     const { account_id, ...query } = params;
     return this._client.getAPIList(
-      `/accounts/${account_id}/tunnels`,
+      `/accounts/${account_id}/cfd_tunnel`,
       TunnelListResponsesV4PagePaginationArray,
       { query, ...options },
     );
   }
 
   /**
-   * Deletes an Argo Tunnel from an account.
+   * Deletes a Cloudflare Tunnel from an account.
    */
   delete(
     tunnelId: string,
@@ -55,7 +90,7 @@ export class Tunnels extends APIResource {
   ): Core.APIPromise<TunnelDeleteResponse> {
     const { account_id } = params;
     return (
-      this._client.delete(`/accounts/${account_id}/tunnels/${tunnelId}`, options) as Core.APIPromise<{
+      this._client.delete(`/accounts/${account_id}/cfd_tunnel/${tunnelId}`, options) as Core.APIPromise<{
         result: TunnelDeleteResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -79,7 +114,7 @@ export class Tunnels extends APIResource {
   }
 
   /**
-   * Fetches a single Argo Tunnel.
+   * Fetches a single Cloudflare Tunnel.
    */
   get(
     tunnelId: string,
@@ -88,7 +123,7 @@ export class Tunnels extends APIResource {
   ): Core.APIPromise<TunnelGetResponse> {
     const { account_id } = params;
     return (
-      this._client.get(`/accounts/${account_id}/tunnels/${tunnelId}`, options) as Core.APIPromise<{
+      this._client.get(`/accounts/${account_id}/cfd_tunnel/${tunnelId}`, options) as Core.APIPromise<{
         result: TunnelGetResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
@@ -117,32 +152,124 @@ export interface Connection {
   uuid?: string;
 }
 
-export interface TunnelCreateResponse {
-  /**
-   * UUID of the tunnel.
-   */
-  id: string;
+/**
+ * A Cloudflare Tunnel that connects your origin to Cloudflare's edge.
+ */
+export type TunnelCreateResponse = Shared.CloudflareTunnel | TunnelCreateResponse.TunnelWARPConnectorTunnel;
 
+export namespace TunnelCreateResponse {
   /**
-   * The tunnel connections between your origin and Cloudflare's edge.
+   * A Warp Connector Tunnel that connects your origin to Cloudflare's edge.
    */
-  connections: Array<Connection>;
+  export interface TunnelWARPConnectorTunnel {
+    /**
+     * UUID of the tunnel.
+     */
+    id?: string;
 
-  /**
-   * Timestamp of when the resource was created.
-   */
-  created_at: string;
+    /**
+     * Cloudflare account ID
+     */
+    account_tag?: string;
 
-  /**
-   * A user-friendly name for a tunnel.
-   */
-  name: string;
+    /**
+     * The Cloudflare Tunnel connections between your origin and Cloudflare's edge.
+     */
+    connections?: Array<TunnelWARPConnectorTunnel.Connection>;
 
-  /**
-   * Timestamp of when the resource was deleted. If `null`, the resource has not been
-   * deleted.
-   */
-  deleted_at?: string;
+    /**
+     * Timestamp of when the tunnel established at least one connection to Cloudflare's
+     * edge. If `null`, the tunnel is inactive.
+     */
+    conns_active_at?: string;
+
+    /**
+     * Timestamp of when the tunnel became inactive (no connections to Cloudflare's
+     * edge). If `null`, the tunnel is active.
+     */
+    conns_inactive_at?: string;
+
+    /**
+     * Timestamp of when the resource was created.
+     */
+    created_at?: string;
+
+    /**
+     * Timestamp of when the resource was deleted. If `null`, the resource has not been
+     * deleted.
+     */
+    deleted_at?: string;
+
+    /**
+     * Metadata associated with the tunnel.
+     */
+    metadata?: unknown;
+
+    /**
+     * A user-friendly name for a tunnel.
+     */
+    name?: string;
+
+    /**
+     * The status of the tunnel. Valid values are `inactive` (tunnel has never been
+     * run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy
+     * state), `healthy` (tunnel is active and able to serve traffic), or `down`
+     * (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
+     */
+    status?: 'inactive' | 'degraded' | 'healthy' | 'down';
+
+    /**
+     * The type of tunnel.
+     */
+    tun_type?: 'cfd_tunnel' | 'warp_connector' | 'ip_sec' | 'gre' | 'cni';
+  }
+
+  export namespace TunnelWARPConnectorTunnel {
+    export interface Connection {
+      /**
+       * UUID of the Cloudflare Tunnel connection.
+       */
+      id?: string;
+
+      /**
+       * UUID of the Cloudflare Tunnel connector.
+       */
+      client_id?: string;
+
+      /**
+       * The cloudflared version used to establish this connection.
+       */
+      client_version?: string;
+
+      /**
+       * The Cloudflare data center used for this connection.
+       */
+      colo_name?: string;
+
+      /**
+       * Cloudflare continues to track connections for several minutes after they
+       * disconnect. This is an optimization to improve latency and reliability of
+       * reconnecting. If `true`, the connection has disconnected but is still being
+       * tracked. If `false`, the connection is actively serving traffic.
+       */
+      is_pending_reconnect?: boolean;
+
+      /**
+       * Timestamp of when the connection was established.
+       */
+      opened_at?: string;
+
+      /**
+       * The public IP address of the host running cloudflared.
+       */
+      origin_ip?: string;
+
+      /**
+       * UUID of the Cloudflare Tunnel connection.
+       */
+      uuid?: string;
+    }
+  }
 }
 
 /**
@@ -265,32 +392,124 @@ export namespace TunnelListResponse {
   }
 }
 
-export interface TunnelDeleteResponse {
-  /**
-   * UUID of the tunnel.
-   */
-  id: string;
+/**
+ * A Cloudflare Tunnel that connects your origin to Cloudflare's edge.
+ */
+export type TunnelDeleteResponse = Shared.CloudflareTunnel | TunnelDeleteResponse.TunnelWARPConnectorTunnel;
 
+export namespace TunnelDeleteResponse {
   /**
-   * The tunnel connections between your origin and Cloudflare's edge.
+   * A Warp Connector Tunnel that connects your origin to Cloudflare's edge.
    */
-  connections: Array<Connection>;
+  export interface TunnelWARPConnectorTunnel {
+    /**
+     * UUID of the tunnel.
+     */
+    id?: string;
 
-  /**
-   * Timestamp of when the resource was created.
-   */
-  created_at: string;
+    /**
+     * Cloudflare account ID
+     */
+    account_tag?: string;
 
-  /**
-   * A user-friendly name for a tunnel.
-   */
-  name: string;
+    /**
+     * The Cloudflare Tunnel connections between your origin and Cloudflare's edge.
+     */
+    connections?: Array<TunnelWARPConnectorTunnel.Connection>;
 
-  /**
-   * Timestamp of when the resource was deleted. If `null`, the resource has not been
-   * deleted.
-   */
-  deleted_at?: string;
+    /**
+     * Timestamp of when the tunnel established at least one connection to Cloudflare's
+     * edge. If `null`, the tunnel is inactive.
+     */
+    conns_active_at?: string;
+
+    /**
+     * Timestamp of when the tunnel became inactive (no connections to Cloudflare's
+     * edge). If `null`, the tunnel is active.
+     */
+    conns_inactive_at?: string;
+
+    /**
+     * Timestamp of when the resource was created.
+     */
+    created_at?: string;
+
+    /**
+     * Timestamp of when the resource was deleted. If `null`, the resource has not been
+     * deleted.
+     */
+    deleted_at?: string;
+
+    /**
+     * Metadata associated with the tunnel.
+     */
+    metadata?: unknown;
+
+    /**
+     * A user-friendly name for a tunnel.
+     */
+    name?: string;
+
+    /**
+     * The status of the tunnel. Valid values are `inactive` (tunnel has never been
+     * run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy
+     * state), `healthy` (tunnel is active and able to serve traffic), or `down`
+     * (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
+     */
+    status?: 'inactive' | 'degraded' | 'healthy' | 'down';
+
+    /**
+     * The type of tunnel.
+     */
+    tun_type?: 'cfd_tunnel' | 'warp_connector' | 'ip_sec' | 'gre' | 'cni';
+  }
+
+  export namespace TunnelWARPConnectorTunnel {
+    export interface Connection {
+      /**
+       * UUID of the Cloudflare Tunnel connection.
+       */
+      id?: string;
+
+      /**
+       * UUID of the Cloudflare Tunnel connector.
+       */
+      client_id?: string;
+
+      /**
+       * The cloudflared version used to establish this connection.
+       */
+      client_version?: string;
+
+      /**
+       * The Cloudflare data center used for this connection.
+       */
+      colo_name?: string;
+
+      /**
+       * Cloudflare continues to track connections for several minutes after they
+       * disconnect. This is an optimization to improve latency and reliability of
+       * reconnecting. If `true`, the connection has disconnected but is still being
+       * tracked. If `false`, the connection is actively serving traffic.
+       */
+      is_pending_reconnect?: boolean;
+
+      /**
+       * Timestamp of when the connection was established.
+       */
+      opened_at?: string;
+
+      /**
+       * The public IP address of the host running cloudflared.
+       */
+      origin_ip?: string;
+
+      /**
+       * UUID of the Cloudflare Tunnel connection.
+       */
+      uuid?: string;
+    }
+  }
 }
 
 /**
@@ -413,32 +632,124 @@ export namespace TunnelEditResponse {
   }
 }
 
-export interface TunnelGetResponse {
-  /**
-   * UUID of the tunnel.
-   */
-  id: string;
+/**
+ * A Cloudflare Tunnel that connects your origin to Cloudflare's edge.
+ */
+export type TunnelGetResponse = Shared.CloudflareTunnel | TunnelGetResponse.TunnelWARPConnectorTunnel;
 
+export namespace TunnelGetResponse {
   /**
-   * The tunnel connections between your origin and Cloudflare's edge.
+   * A Warp Connector Tunnel that connects your origin to Cloudflare's edge.
    */
-  connections: Array<Connection>;
+  export interface TunnelWARPConnectorTunnel {
+    /**
+     * UUID of the tunnel.
+     */
+    id?: string;
 
-  /**
-   * Timestamp of when the resource was created.
-   */
-  created_at: string;
+    /**
+     * Cloudflare account ID
+     */
+    account_tag?: string;
 
-  /**
-   * A user-friendly name for a tunnel.
-   */
-  name: string;
+    /**
+     * The Cloudflare Tunnel connections between your origin and Cloudflare's edge.
+     */
+    connections?: Array<TunnelWARPConnectorTunnel.Connection>;
 
-  /**
-   * Timestamp of when the resource was deleted. If `null`, the resource has not been
-   * deleted.
-   */
-  deleted_at?: string;
+    /**
+     * Timestamp of when the tunnel established at least one connection to Cloudflare's
+     * edge. If `null`, the tunnel is inactive.
+     */
+    conns_active_at?: string;
+
+    /**
+     * Timestamp of when the tunnel became inactive (no connections to Cloudflare's
+     * edge). If `null`, the tunnel is active.
+     */
+    conns_inactive_at?: string;
+
+    /**
+     * Timestamp of when the resource was created.
+     */
+    created_at?: string;
+
+    /**
+     * Timestamp of when the resource was deleted. If `null`, the resource has not been
+     * deleted.
+     */
+    deleted_at?: string;
+
+    /**
+     * Metadata associated with the tunnel.
+     */
+    metadata?: unknown;
+
+    /**
+     * A user-friendly name for a tunnel.
+     */
+    name?: string;
+
+    /**
+     * The status of the tunnel. Valid values are `inactive` (tunnel has never been
+     * run), `degraded` (tunnel is active and able to serve traffic but in an unhealthy
+     * state), `healthy` (tunnel is active and able to serve traffic), or `down`
+     * (tunnel can not serve traffic as it has no connections to the Cloudflare Edge).
+     */
+    status?: 'inactive' | 'degraded' | 'healthy' | 'down';
+
+    /**
+     * The type of tunnel.
+     */
+    tun_type?: 'cfd_tunnel' | 'warp_connector' | 'ip_sec' | 'gre' | 'cni';
+  }
+
+  export namespace TunnelWARPConnectorTunnel {
+    export interface Connection {
+      /**
+       * UUID of the Cloudflare Tunnel connection.
+       */
+      id?: string;
+
+      /**
+       * UUID of the Cloudflare Tunnel connector.
+       */
+      client_id?: string;
+
+      /**
+       * The cloudflared version used to establish this connection.
+       */
+      client_version?: string;
+
+      /**
+       * The Cloudflare data center used for this connection.
+       */
+      colo_name?: string;
+
+      /**
+       * Cloudflare continues to track connections for several minutes after they
+       * disconnect. This is an optimization to improve latency and reliability of
+       * reconnecting. If `true`, the connection has disconnected but is still being
+       * tracked. If `false`, the connection is actively serving traffic.
+       */
+      is_pending_reconnect?: boolean;
+
+      /**
+       * Timestamp of when the connection was established.
+       */
+      opened_at?: string;
+
+      /**
+       * The public IP address of the host running cloudflared.
+       */
+      origin_ip?: string;
+
+      /**
+       * UUID of the Cloudflare Tunnel connection.
+       */
+      uuid?: string;
+    }
+  }
 }
 
 export interface TunnelCreateParams {
@@ -452,11 +763,18 @@ export interface TunnelCreateParams {
    */
   name: string;
 
+  /**
+   * Body param: Indicates if this is a locally or remotely configured tunnel. If
+   * `local`, manage the tunnel using a YAML file on the origin machine. If
+   * `cloudflare`, manage the tunnel on the Zero Trust dashboard.
+   */
+  config_src?: 'local' | 'cloudflare';
+
   /**
    * Body param: Sets the password required to run a locally-managed tunnel. Must be
    * at least 32 bytes and encoded as a base64 string.
    */
-  tunnel_secret: string;
+  tunnel_secret?: string;
 }
 
 export interface TunnelListParams extends V4PagePaginationArrayParams {
@@ -488,7 +806,7 @@ export interface TunnelListParams extends V4PagePaginationArrayParams {
   is_deleted?: boolean;
 
   /**
-   * Query param: A user-friendly name for the tunnel.
+   * Query param: A user-friendly name for a tunnel.
    */
   name?: string;
 
@@ -501,11 +819,6 @@ export interface TunnelListParams extends V4PagePaginationArrayParams {
    */
   status?: 'inactive' | 'degraded' | 'healthy' | 'down';
 
-  /**
-   * Query param: The types of tunnels to filter separated by a comma.
-   */
-  tun_types?: string;
-
   /**
    * Query param: UUID of the tunnel.
    */
@@ -554,36 +867,72 @@ export interface TunnelGetParams {
   account_id: string;
 }
 
-export namespace Tunnels {
-  export import Connection = TunnelsAPI.Connection;
-  export import TunnelCreateResponse = TunnelsAPI.TunnelCreateResponse;
-  export import TunnelListResponse = TunnelsAPI.TunnelListResponse;
-  export import TunnelDeleteResponse = TunnelsAPI.TunnelDeleteResponse;
-  export import TunnelEditResponse = TunnelsAPI.TunnelEditResponse;
-  export import TunnelGetResponse = TunnelsAPI.TunnelGetResponse;
-  export import TunnelListResponsesV4PagePaginationArray = TunnelsAPI.TunnelListResponsesV4PagePaginationArray;
-  export import TunnelCreateParams = TunnelsAPI.TunnelCreateParams;
-  export import TunnelListParams = TunnelsAPI.TunnelListParams;
-  export import TunnelDeleteParams = TunnelsAPI.TunnelDeleteParams;
-  export import TunnelEditParams = TunnelsAPI.TunnelEditParams;
-  export import TunnelGetParams = TunnelsAPI.TunnelGetParams;
-  export import Configurations = ConfigurationsAPI.Configurations;
-  export import ConfigurationUpdateResponse = ConfigurationsAPI.ConfigurationUpdateResponse;
-  export import ConfigurationGetResponse = ConfigurationsAPI.ConfigurationGetResponse;
-  export import ConfigurationUpdateParams = ConfigurationsAPI.ConfigurationUpdateParams;
-  export import ConfigurationGetParams = ConfigurationsAPI.ConfigurationGetParams;
-  export import Connections = ConnectionsAPI.Connections;
-  export import Client = ConnectionsAPI.Client;
-  export import ConnectionDeleteResponse = ConnectionsAPI.ConnectionDeleteResponse;
-  export import ConnectionGetResponse = ConnectionsAPI.ConnectionGetResponse;
-  export import ConnectionDeleteParams = ConnectionsAPI.ConnectionDeleteParams;
-  export import ConnectionGetParams = ConnectionsAPI.ConnectionGetParams;
-  export import Token = TokenAPI.Token;
-  export import TokenGetResponse = TokenAPI.TokenGetResponse;
-  export import TokenGetParams = TokenAPI.TokenGetParams;
-  export import Connectors = ConnectorsAPI.Connectors;
-  export import ConnectorGetParams = ConnectorsAPI.ConnectorGetParams;
-  export import Management = ManagementAPI.Management;
-  export import ManagementCreateResponse = ManagementAPI.ManagementCreateResponse;
-  export import ManagementCreateParams = ManagementAPI.ManagementCreateParams;
+Tunnels.TunnelListResponsesV4PagePaginationArray = TunnelListResponsesV4PagePaginationArray;
+Tunnels.WARPConnector = WARPConnector;
+Tunnels.WARPConnectorListResponsesV4PagePaginationArray = WARPConnectorListResponsesV4PagePaginationArray;
+Tunnels.Configurations = Configurations;
+Tunnels.Connections = Connections;
+Tunnels.Token = Token;
+Tunnels.Connectors = Connectors;
+Tunnels.Management = Management;
+
+export declare namespace Tunnels {
+  export {
+    type Connection as Connection,
+    type TunnelCreateResponse as TunnelCreateResponse,
+    type TunnelListResponse as TunnelListResponse,
+    type TunnelDeleteResponse as TunnelDeleteResponse,
+    type TunnelEditResponse as TunnelEditResponse,
+    type TunnelGetResponse as TunnelGetResponse,
+    TunnelListResponsesV4PagePaginationArray as TunnelListResponsesV4PagePaginationArray,
+    type TunnelCreateParams as TunnelCreateParams,
+    type TunnelListParams as TunnelListParams,
+    type TunnelDeleteParams as TunnelDeleteParams,
+    type TunnelEditParams as TunnelEditParams,
+    type TunnelGetParams as TunnelGetParams,
+  };
+
+  export {
+    WARPConnector as WARPConnector,
+    type WARPConnectorCreateResponse as WARPConnectorCreateResponse,
+    type WARPConnectorListResponse as WARPConnectorListResponse,
+    type WARPConnectorDeleteResponse as WARPConnectorDeleteResponse,
+    type WARPConnectorEditResponse as WARPConnectorEditResponse,
+    type WARPConnectorGetResponse as WARPConnectorGetResponse,
+    type WARPConnectorTokenResponse as WARPConnectorTokenResponse,
+    WARPConnectorListResponsesV4PagePaginationArray as WARPConnectorListResponsesV4PagePaginationArray,
+    type WARPConnectorCreateParams as WARPConnectorCreateParams,
+    type WARPConnectorListParams as WARPConnectorListParams,
+    type WARPConnectorDeleteParams as WARPConnectorDeleteParams,
+    type WARPConnectorEditParams as WARPConnectorEditParams,
+    type WARPConnectorGetParams as WARPConnectorGetParams,
+    type WARPConnectorTokenParams as WARPConnectorTokenParams,
+  };
+
+  export {
+    Configurations as Configurations,
+    type ConfigurationUpdateResponse as ConfigurationUpdateResponse,
+    type ConfigurationGetResponse as ConfigurationGetResponse,
+    type ConfigurationUpdateParams as ConfigurationUpdateParams,
+    type ConfigurationGetParams as ConfigurationGetParams,
+  };
+
+  export {
+    Connections as Connections,
+    type Client as Client,
+    type ConnectionDeleteResponse as ConnectionDeleteResponse,
+    type ConnectionGetResponse as ConnectionGetResponse,
+    type ConnectionDeleteParams as ConnectionDeleteParams,
+    type ConnectionGetParams as ConnectionGetParams,
+  };
+
+  export { Token as Token, type TokenGetResponse as TokenGetResponse, type TokenGetParams as TokenGetParams };
+
+  export { Connectors as Connectors, type ConnectorGetParams as ConnectorGetParams };
+
+  export {
+    Management as Management,
+    type ManagementCreateResponse as ManagementCreateResponse,
+    type ManagementCreateParams as ManagementCreateParams,
+  };
 }
diff --git a/src/resources/warp-connector.ts b/src/resources/zero-trust/tunnels/warp-connector.ts
similarity index 94%
rename from src/resources/warp-connector.ts
rename to src/resources/zero-trust/tunnels/warp-connector.ts
index e86ae80e28..14e1ea256e 100644
--- a/src/resources/warp-connector.ts
+++ b/src/resources/zero-trust/tunnels/warp-connector.ts
@@ -1,9 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../resource';
-import * as Core from '../core';
-import * as Shared from './shared';
-import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../pagination';
+import { APIResource } from '../../../resource';
+import * as Core from '../../../core';
+import * as Shared from '../../shared';
+import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../../pagination';
 
 export class WARPConnector extends APIResource {
   /**
@@ -716,7 +716,7 @@ export namespace WARPConnectorGetResponse {
   }
 }
 
-export type WARPConnectorTokenResponse = unknown | Array<unknown> | string;
+export type WARPConnectorTokenResponse = string;
 
 export interface WARPConnectorCreateParams {
   /**
@@ -826,3 +826,24 @@ export interface WARPConnectorTokenParams {
    */
   account_id: string;
 }
+
+WARPConnector.WARPConnectorListResponsesV4PagePaginationArray =
+  WARPConnectorListResponsesV4PagePaginationArray;
+
+export declare namespace WARPConnector {
+  export {
+    type WARPConnectorCreateResponse as WARPConnectorCreateResponse,
+    type WARPConnectorListResponse as WARPConnectorListResponse,
+    type WARPConnectorDeleteResponse as WARPConnectorDeleteResponse,
+    type WARPConnectorEditResponse as WARPConnectorEditResponse,
+    type WARPConnectorGetResponse as WARPConnectorGetResponse,
+    type WARPConnectorTokenResponse as WARPConnectorTokenResponse,
+    WARPConnectorListResponsesV4PagePaginationArray as WARPConnectorListResponsesV4PagePaginationArray,
+    type WARPConnectorCreateParams as WARPConnectorCreateParams,
+    type WARPConnectorListParams as WARPConnectorListParams,
+    type WARPConnectorDeleteParams as WARPConnectorDeleteParams,
+    type WARPConnectorEditParams as WARPConnectorEditParams,
+    type WARPConnectorGetParams as WARPConnectorGetParams,
+    type WARPConnectorTokenParams as WARPConnectorTokenParams,
+  };
+}
diff --git a/src/resources/zero-trust/zero-trust.ts b/src/resources/zero-trust/zero-trust.ts
index 229a763e98..13e096c825 100644
--- a/src/resources/zero-trust/zero-trust.ts
+++ b/src/resources/zero-trust/zero-trust.ts
@@ -2,17 +2,114 @@
 
 import { APIResource } from '../../resource';
 import * as ConnectivitySettingsAPI from './connectivity-settings';
+import {
+  ConnectivitySettingEditParams,
+  ConnectivitySettingEditResponse,
+  ConnectivitySettingGetParams,
+  ConnectivitySettingGetResponse,
+  ConnectivitySettings,
+} from './connectivity-settings';
 import * as IdentityProvidersAPI from './identity-providers';
-import * as OrganizationsAPI from './organizations';
+import {
+  AzureAD,
+  GenericOAuthConfig,
+  IdentityProvider,
+  IdentityProviderCreateParams,
+  IdentityProviderDeleteParams,
+  IdentityProviderDeleteResponse,
+  IdentityProviderGetParams,
+  IdentityProviderListParams,
+  IdentityProviderListResponse,
+  IdentityProviderListResponsesSinglePage,
+  IdentityProviderSCIMConfig,
+  IdentityProviderType,
+  IdentityProviderUpdateParams,
+  IdentityProviders,
+} from './identity-providers';
 import * as SeatsAPI from './seats';
+import { Seat, SeatEditParams, SeatEditResponse, Seats } from './seats';
 import * as AccessAPI from './access/access';
+import {
+  Access,
+  AccessDevicePostureRule,
+  AccessRule,
+  AnyValidServiceTokenRule,
+  AuthenticationMethodRule,
+  AzureGroupRule,
+  CertificateRule,
+  CountryRule,
+  DomainRule,
+  EmailListRule,
+  EmailRule,
+  EveryoneRule,
+  ExternalEvaluationRule,
+  GSuiteGroupRule,
+  GitHubOrganizationRule,
+  GroupRule,
+  IPListRule,
+  IPRule,
+  OktaGroupRule,
+  SAMLGroupRule,
+  ServiceTokenRule,
+} from './access/access';
 import * as DevicesAPI from './devices/devices';
+import {
+  Device,
+  DeviceGetParams,
+  DeviceGetResponse,
+  DeviceListParams,
+  Devices,
+  DevicesSinglePage,
+} from './devices/devices';
 import * as DEXAPI from './dex/dex';
+import { DEX, DigitalExperienceMonitor, NetworkPath, NetworkPathResponse, Percentiles } from './dex/dex';
 import * as DLPAPI from './dlp/dlp';
+import { DLP } from './dlp/dlp';
 import * as GatewayAPI from './gateway/gateway';
+import {
+  Gateway,
+  GatewayCreateParams,
+  GatewayCreateResponse,
+  GatewayListParams,
+  GatewayListResponse,
+} from './gateway/gateway';
 import * as NetworksAPI from './networks/networks';
+import { Networks } from './networks/networks';
+import * as OrganizationsAPI from './organizations/organizations';
+import {
+  LoginDesign,
+  Organization,
+  OrganizationCreateParams,
+  OrganizationListParams,
+  OrganizationRevokeUsersParams,
+  OrganizationRevokeUsersResponse,
+  OrganizationUpdateParams,
+  Organizations,
+} from './organizations/organizations';
 import * as RiskScoringAPI from './risk-scoring/risk-scoring';
+import {
+  RiskScoring,
+  RiskScoringGetParams,
+  RiskScoringGetResponse,
+  RiskScoringResetParams,
+  RiskScoringResetResponse,
+} from './risk-scoring/risk-scoring';
 import * as TunnelsAPI from './tunnels/tunnels';
+import {
+  Connection,
+  TunnelCreateParams,
+  TunnelCreateResponse,
+  TunnelDeleteParams,
+  TunnelDeleteResponse,
+  TunnelEditParams,
+  TunnelEditResponse,
+  TunnelGetParams,
+  TunnelGetResponse,
+  TunnelListParams,
+  TunnelListResponse,
+  TunnelListResponsesV4PagePaginationArray,
+  Tunnels,
+} from './tunnels/tunnels';
 
 export class ZeroTrust extends APIResource {
   devices: DevicesAPI.Devices = new DevicesAPI.Devices(this._client);
@@ -32,92 +129,140 @@ export class ZeroTrust extends APIResource {
   riskScoring: RiskScoringAPI.RiskScoring = new RiskScoringAPI.RiskScoring(this._client);
 }
 
-export namespace ZeroTrust {
-  export import Devices = DevicesAPI.Devices;
-  export import Device = DevicesAPI.Device;
-  export import DeviceGetResponse = DevicesAPI.DeviceGetResponse;
-  export import DevicesSinglePage = DevicesAPI.DevicesSinglePage;
-  export import DeviceListParams = DevicesAPI.DeviceListParams;
-  export import DeviceGetParams = DevicesAPI.DeviceGetParams;
-  export import IdentityProviders = IdentityProvidersAPI.IdentityProviders;
-  export import AzureAD = IdentityProvidersAPI.AzureAD;
-  export import GenericOAuthConfig = IdentityProvidersAPI.GenericOAuthConfig;
-  export import IdentityProvider = IdentityProvidersAPI.IdentityProvider;
-  export import IdentityProviderType = IdentityProvidersAPI.IdentityProviderType;
-  export import SCIMConfig = IdentityProvidersAPI.SCIMConfig;
-  export import IdentityProviderListResponse = IdentityProvidersAPI.IdentityProviderListResponse;
-  export import IdentityProviderDeleteResponse = IdentityProvidersAPI.IdentityProviderDeleteResponse;
-  export import IdentityProviderListResponsesSinglePage = IdentityProvidersAPI.IdentityProviderListResponsesSinglePage;
-  export import IdentityProviderCreateParams = IdentityProvidersAPI.IdentityProviderCreateParams;
-  export import IdentityProviderUpdateParams = IdentityProvidersAPI.IdentityProviderUpdateParams;
-  export import IdentityProviderListParams = IdentityProvidersAPI.IdentityProviderListParams;
-  export import IdentityProviderDeleteParams = IdentityProvidersAPI.IdentityProviderDeleteParams;
-  export import IdentityProviderGetParams = IdentityProvidersAPI.IdentityProviderGetParams;
-  export import Organizations = OrganizationsAPI.Organizations;
-  export import LoginDesign = OrganizationsAPI.LoginDesign;
-  export import Organization = OrganizationsAPI.Organization;
-  export import OrganizationRevokeUsersResponse = OrganizationsAPI.OrganizationRevokeUsersResponse;
-  export import OrganizationCreateParams = OrganizationsAPI.OrganizationCreateParams;
-  export import OrganizationUpdateParams = OrganizationsAPI.OrganizationUpdateParams;
-  export import OrganizationListParams = OrganizationsAPI.OrganizationListParams;
-  export import OrganizationRevokeUsersParams = OrganizationsAPI.OrganizationRevokeUsersParams;
-  export import Seats = SeatsAPI.Seats;
-  export import Seat = SeatsAPI.Seat;
-  export import SeatEditResponse = SeatsAPI.SeatEditResponse;
-  export import SeatEditParams = SeatsAPI.SeatEditParams;
-  export import Access = AccessAPI.Access;
-  export import AccessDevicePostureRule = AccessAPI.AccessDevicePostureRule;
-  export import AccessRule = AccessAPI.AccessRule;
-  export import AnyValidServiceTokenRule = AccessAPI.AnyValidServiceTokenRule;
-  export import AuthenticationMethodRule = AccessAPI.AuthenticationMethodRule;
-  export import AzureGroupRule = AccessAPI.AzureGroupRule;
-  export import CertificateRule = AccessAPI.CertificateRule;
-  export import CountryRule = AccessAPI.CountryRule;
-  export import DomainRule = AccessAPI.DomainRule;
-  export import EmailListRule = AccessAPI.EmailListRule;
-  export import EmailRule = AccessAPI.EmailRule;
-  export import EveryoneRule = AccessAPI.EveryoneRule;
-  export import ExternalEvaluationRule = AccessAPI.ExternalEvaluationRule;
-  export import GitHubOrganizationRule = AccessAPI.GitHubOrganizationRule;
-  export import GroupRule = AccessAPI.GroupRule;
-  export import GSuiteGroupRule = AccessAPI.GSuiteGroupRule;
-  export import IPListRule = AccessAPI.IPListRule;
-  export import IPRule = AccessAPI.IPRule;
-  export import OktaGroupRule = AccessAPI.OktaGroupRule;
-  export import SAMLGroupRule = AccessAPI.SAMLGroupRule;
-  export import ServiceTokenRule = AccessAPI.ServiceTokenRule;
-  export import DEX = DEXAPI.DEX;
-  export import DeviceExperienceMonitor = DEXAPI.DeviceExperienceMonitor;
-  export import NetworkPath = DEXAPI.NetworkPath;
-  export import NetworkPathResponse = DEXAPI.NetworkPathResponse;
-  export import Percentiles = DEXAPI.Percentiles;
-  export import Tunnels = TunnelsAPI.Tunnels;
-  export import Connection = TunnelsAPI.Connection;
-  export import TunnelCreateResponse = TunnelsAPI.TunnelCreateResponse;
-  export import TunnelListResponse = TunnelsAPI.TunnelListResponse;
-  export import TunnelDeleteResponse = TunnelsAPI.TunnelDeleteResponse;
-  export import TunnelEditResponse = TunnelsAPI.TunnelEditResponse;
-  export import TunnelGetResponse = TunnelsAPI.TunnelGetResponse;
-  export import TunnelListResponsesV4PagePaginationArray = TunnelsAPI.TunnelListResponsesV4PagePaginationArray;
-  export import TunnelCreateParams = TunnelsAPI.TunnelCreateParams;
-  export import TunnelListParams = TunnelsAPI.TunnelListParams;
-  export import TunnelDeleteParams = TunnelsAPI.TunnelDeleteParams;
-  export import TunnelEditParams = TunnelsAPI.TunnelEditParams;
-  export import TunnelGetParams = TunnelsAPI.TunnelGetParams;
-  export import ConnectivitySettings = ConnectivitySettingsAPI.ConnectivitySettings;
-  export import ConnectivitySettingEditResponse = ConnectivitySettingsAPI.ConnectivitySettingEditResponse;
-  export import ConnectivitySettingGetResponse = ConnectivitySettingsAPI.ConnectivitySettingGetResponse;
-  export import ConnectivitySettingEditParams = ConnectivitySettingsAPI.ConnectivitySettingEditParams;
-  export import ConnectivitySettingGetParams = ConnectivitySettingsAPI.ConnectivitySettingGetParams;
-  export import DLP = DLPAPI.DLP;
-  export import Gateway = GatewayAPI.Gateway;
-  export import GatewayCreateResponse = GatewayAPI.GatewayCreateResponse;
-  export import GatewayListResponse = GatewayAPI.GatewayListResponse;
-  export import GatewayCreateParams = GatewayAPI.GatewayCreateParams;
-  export import GatewayListParams = GatewayAPI.GatewayListParams;
-  export import Networks = NetworksAPI.Networks;
-  export import RiskScoring = RiskScoringAPI.RiskScoring;
-  export import RiskScoringGetResponse = RiskScoringAPI.RiskScoringGetResponse;
-  export import RiskScoringResetResponse = RiskScoringAPI.RiskScoringResetResponse;
-  export import RiskScoringGetParams = RiskScoringAPI.RiskScoringGetParams;
+ZeroTrust.Devices = Devices;
+ZeroTrust.DevicesSinglePage = DevicesSinglePage;
+ZeroTrust.IdentityProviders = IdentityProviders;
+ZeroTrust.IdentityProviderListResponsesSinglePage = IdentityProviderListResponsesSinglePage;
+ZeroTrust.Organizations = Organizations;
+ZeroTrust.Seats = Seats;
+ZeroTrust.Access = Access;
+ZeroTrust.DEX = DEX;
+ZeroTrust.Tunnels = Tunnels;
+ZeroTrust.TunnelListResponsesV4PagePaginationArray = TunnelListResponsesV4PagePaginationArray;
+ZeroTrust.ConnectivitySettings = ConnectivitySettings;
+ZeroTrust.DLP = DLP;
+ZeroTrust.Gateway = Gateway;
+ZeroTrust.Networks = Networks;
+ZeroTrust.RiskScoring = RiskScoring;
+
+export declare namespace ZeroTrust {
+  export {
+    Devices as Devices,
+    type Device as Device,
+    type DeviceGetResponse as DeviceGetResponse,
+    DevicesSinglePage as DevicesSinglePage,
+    type DeviceListParams as DeviceListParams,
+    type DeviceGetParams as DeviceGetParams,
+  };
+
+  export {
+    IdentityProviders as IdentityProviders,
+    type AzureAD as AzureAD,
+    type GenericOAuthConfig as GenericOAuthConfig,
+    type IdentityProvider as IdentityProvider,
+    type IdentityProviderSCIMConfig as IdentityProviderSCIMConfig,
+    type IdentityProviderType as IdentityProviderType,
+    type IdentityProviderListResponse as IdentityProviderListResponse,
+    type IdentityProviderDeleteResponse as IdentityProviderDeleteResponse,
+    IdentityProviderListResponsesSinglePage as IdentityProviderListResponsesSinglePage,
+    type IdentityProviderCreateParams as IdentityProviderCreateParams,
+    type IdentityProviderUpdateParams as IdentityProviderUpdateParams,
+    type IdentityProviderListParams as IdentityProviderListParams,
+    type IdentityProviderDeleteParams as IdentityProviderDeleteParams,
+    type IdentityProviderGetParams as IdentityProviderGetParams,
+  };
+
+  export {
+    Organizations as Organizations,
+    type LoginDesign as LoginDesign,
+    type Organization as Organization,
+    type OrganizationRevokeUsersResponse as OrganizationRevokeUsersResponse,
+    type OrganizationCreateParams as OrganizationCreateParams,
+    type OrganizationUpdateParams as OrganizationUpdateParams,
+    type OrganizationListParams as OrganizationListParams,
+    type OrganizationRevokeUsersParams as OrganizationRevokeUsersParams,
+  };
+
+  export {
+    Seats as Seats,
+    type Seat as Seat,
+    type SeatEditResponse as SeatEditResponse,
+    type SeatEditParams as SeatEditParams,
+  };
+
+  export {
+    Access as Access,
+    type AccessDevicePostureRule as AccessDevicePostureRule,
+    type AccessRule as AccessRule,
+    type AnyValidServiceTokenRule as AnyValidServiceTokenRule,
+    type AuthenticationMethodRule as AuthenticationMethodRule,
+    type AzureGroupRule as AzureGroupRule,
+    type CertificateRule as CertificateRule,
+    type CountryRule as CountryRule,
+    type DomainRule as DomainRule,
+    type EmailListRule as EmailListRule,
+    type EmailRule as EmailRule,
+    type EveryoneRule as EveryoneRule,
+    type ExternalEvaluationRule as ExternalEvaluationRule,
+    type GitHubOrganizationRule as GitHubOrganizationRule,
+    type GroupRule as GroupRule,
+    type GSuiteGroupRule as GSuiteGroupRule,
+    type IPListRule as IPListRule,
+    type IPRule as IPRule,
+    type OktaGroupRule as OktaGroupRule,
+    type SAMLGroupRule as SAMLGroupRule,
+    type ServiceTokenRule as ServiceTokenRule,
+  };
+
+  export {
+    DEX as DEX,
+    type DigitalExperienceMonitor as DigitalExperienceMonitor,
+    type NetworkPath as NetworkPath,
+    type NetworkPathResponse as NetworkPathResponse,
+    type Percentiles as Percentiles,
+  };
+
+  export {
+    Tunnels as Tunnels,
+    type Connection as Connection,
+    type TunnelCreateResponse as TunnelCreateResponse,
+    type TunnelListResponse as TunnelListResponse,
+    type TunnelDeleteResponse as TunnelDeleteResponse,
+    type TunnelEditResponse as TunnelEditResponse,
+    type TunnelGetResponse as TunnelGetResponse,
+    TunnelListResponsesV4PagePaginationArray as TunnelListResponsesV4PagePaginationArray,
+    type TunnelCreateParams as TunnelCreateParams,
+    type TunnelListParams as TunnelListParams,
+    type TunnelDeleteParams as TunnelDeleteParams,
+    type TunnelEditParams as TunnelEditParams,
+    type TunnelGetParams as TunnelGetParams,
+  };
+
+  export {
+    ConnectivitySettings as ConnectivitySettings,
+    type ConnectivitySettingEditResponse as ConnectivitySettingEditResponse,
+    type ConnectivitySettingGetResponse as ConnectivitySettingGetResponse,
+    type ConnectivitySettingEditParams as ConnectivitySettingEditParams,
+    type ConnectivitySettingGetParams as ConnectivitySettingGetParams,
+  };
+
+  export { DLP as DLP };
+
+  export {
+    Gateway as Gateway,
+    type GatewayCreateResponse as GatewayCreateResponse,
+    type GatewayListResponse as GatewayListResponse,
+    type GatewayCreateParams as GatewayCreateParams,
+    type GatewayListParams as GatewayListParams,
+  };
+
+  export { Networks as Networks };
+
+  export {
+    RiskScoring as RiskScoring,
+    type RiskScoringGetResponse as RiskScoringGetResponse,
+    type RiskScoringResetResponse as RiskScoringResetResponse,
+    type RiskScoringGetParams as RiskScoringGetParams,
+    type RiskScoringResetParams as RiskScoringResetParams,
+  };
 }
diff --git a/src/resources/zones/activation-check.ts b/src/resources/zones/activation-check.ts
index 2837d58300..fb43ae8a06 100644
--- a/src/resources/zones/activation-check.ts
+++ b/src/resources/zones/activation-check.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ActivationCheckAPI from './activation-check';
 
 export class ActivationCheck extends APIResource {
   /**
@@ -36,7 +35,9 @@ export interface ActivationCheckTriggerParams {
   zone_id: string;
 }
 
-export namespace ActivationCheck {
-  export import ActivationCheckTriggerResponse = ActivationCheckAPI.ActivationCheckTriggerResponse;
-  export import ActivationCheckTriggerParams = ActivationCheckAPI.ActivationCheckTriggerParams;
+export declare namespace ActivationCheck {
+  export {
+    type ActivationCheckTriggerResponse as ActivationCheckTriggerResponse,
+    type ActivationCheckTriggerParams as ActivationCheckTriggerParams,
+  };
 }
diff --git a/src/resources/zones/custom-nameservers.ts b/src/resources/zones/custom-nameservers.ts
index 79f090d1ee..662fb35079 100644
--- a/src/resources/zones/custom-nameservers.ts
+++ b/src/resources/zones/custom-nameservers.ts
@@ -2,7 +2,7 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as CustomNameserversAPI from './custom-nameservers';
+import * as Shared from '../shared';
 
 export class CustomNameservers extends APIResource {
   /**
@@ -11,38 +11,85 @@ export class CustomNameservers extends APIResource {
    * If you would like new zones in the account to use account custom nameservers by
    * default, use PUT /accounts/:identifier to set the account setting
    * use_account_custom_ns_by_default to true.
+   *
+   * Deprecated in favor of
+   * [Update DNS Settings](https://developers.cloudflare.com/api/operations/dns-settings-for-a-zone-update-dns-settings).
    */
   update(
     params: CustomNameserverUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomNameserverUpdateResponse | null> {
+  ): Core.APIPromise<CustomNameserverUpdateResponse> {
     const { zone_id, ...body } = params;
     return (
       this._client.put(`/zones/${zone_id}/custom_ns`, { body, ...options }) as Core.APIPromise<{
-        result: CustomNameserverUpdateResponse | null;
+        result: CustomNameserverUpdateResponse;
       }>
     )._thenUnwrap((obj) => obj.result);
   }
 
   /**
    * Get metadata for account-level custom nameservers on a zone.
+   *
+   * Deprecated in favor of
+   * [Show DNS Settings](https://developers.cloudflare.com/api/operations/dns-settings-for-a-zone-list-dns-settings).
    */
   get(
     params: CustomNameserverGetParams,
     options?: Core.RequestOptions,
-  ): Core.APIPromise<CustomNameserverGetResponse | null> {
+  ): Core.APIPromise<CustomNameserverGetResponse> {
     const { zone_id } = params;
-    return (
-      this._client.get(`/zones/${zone_id}/custom_ns`, options) as Core.APIPromise<{
-        result: CustomNameserverGetResponse | null;
-      }>
-    )._thenUnwrap((obj) => obj.result);
+    return this._client.get(`/zones/${zone_id}/custom_ns`, options);
   }
 }
 
-export type CustomNameserverUpdateResponse = Array<unknown>;
+export type CustomNameserverUpdateResponse = Array<string>;
+
+export interface CustomNameserverGetResponse {
+  errors: Array<Shared.ResponseInfo>;
+
+  messages: Array<Shared.ResponseInfo>;
 
-export type CustomNameserverGetResponse = Array<unknown>;
+  /**
+   * Whether the API call was successful
+   */
+  success: true;
+
+  /**
+   * Whether zone uses account-level custom nameservers.
+   */
+  enabled?: boolean;
+
+  /**
+   * The number of the name server set to assign to the zone.
+   */
+  ns_set?: number;
+
+  result_info?: CustomNameserverGetResponse.ResultInfo;
+}
+
+export namespace CustomNameserverGetResponse {
+  export interface ResultInfo {
+    /**
+     * Total number of results for the requested service
+     */
+    count?: number;
+
+    /**
+     * Current page within paginated list of results
+     */
+    page?: number;
+
+    /**
+     * Number of results per page of results
+     */
+    per_page?: number;
+
+    /**
+     * Total results available without any search parameters
+     */
+    total_count?: number;
+  }
+}
 
 export interface CustomNameserverUpdateParams {
   /**
@@ -68,9 +115,11 @@ export interface CustomNameserverGetParams {
   zone_id: string;
 }
 
-export namespace CustomNameservers {
-  export import CustomNameserverUpdateResponse = CustomNameserversAPI.CustomNameserverUpdateResponse;
-  export import CustomNameserverGetResponse = CustomNameserversAPI.CustomNameserverGetResponse;
-  export import CustomNameserverUpdateParams = CustomNameserversAPI.CustomNameserverUpdateParams;
-  export import CustomNameserverGetParams = CustomNameserversAPI.CustomNameserverGetParams;
+export declare namespace CustomNameservers {
+  export {
+    type CustomNameserverUpdateResponse as CustomNameserverUpdateResponse,
+    type CustomNameserverGetResponse as CustomNameserverGetResponse,
+    type CustomNameserverUpdateParams as CustomNameserverUpdateParams,
+    type CustomNameserverGetParams as CustomNameserverGetParams,
+  };
 }
diff --git a/src/resources/zones/holds.ts b/src/resources/zones/holds.ts
index 002bce1cad..04a1529000 100644
--- a/src/resources/zones/holds.ts
+++ b/src/resources/zones/holds.ts
@@ -2,7 +2,6 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as HoldsAPI from './holds';
 
 export class Holds extends APIResource {
   /**
@@ -33,6 +32,19 @@ export class Holds extends APIResource {
     )._thenUnwrap((obj) => obj.result);
   }
 
+  /**
+   * Update the `hold_after` and/or `include_subdomains` values on an existing zone
+   * hold. The hold is enabled if the `hold_after` date-time value is in the past.
+   */
+  edit(params: HoldEditParams, options?: Core.RequestOptions): Core.APIPromise<ZoneHold> {
+    const { zone_id, ...body } = params;
+    return (
+      this._client.patch(`/zones/${zone_id}/hold`, { body, ...options }) as Core.APIPromise<{
+        result: ZoneHold;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+
   /**
    * Retrieve whether the zone is subject to a zone hold, and metadata about the
    * hold.
@@ -82,6 +94,30 @@ export interface HoldDeleteParams {
   hold_after?: string;
 }
 
+export interface HoldEditParams {
+  /**
+   * Path param: Identifier
+   */
+  zone_id: string;
+
+  /**
+   * Body param: If `hold_after` is provided and future-dated, the hold will be
+   * temporarily disabled, then automatically re-enabled by the system at the time
+   * specified in this RFC3339-formatted timestamp. A past-dated `hold_after` value
+   * will have no effect on an existing, enabled hold. Providing an empty string will
+   * set its value to the current time.
+   */
+  hold_after?: string;
+
+  /**
+   * Body param: If `true`, the zone hold will extend to block any subdomain of the
+   * given zone, as well as SSL4SaaS Custom Hostnames. For example, a zone hold on a
+   * zone with the hostname 'example.com' and include_subdomains=true will block
+   * 'example.com', 'staging.example.com', 'api.staging.example.com', etc.
+   */
+  include_subdomains?: boolean;
+}
+
 export interface HoldGetParams {
   /**
    * Identifier
@@ -89,9 +125,12 @@ export interface HoldGetParams {
   zone_id: string;
 }
 
-export namespace Holds {
-  export import ZoneHold = HoldsAPI.ZoneHold;
-  export import HoldCreateParams = HoldsAPI.HoldCreateParams;
-  export import HoldDeleteParams = HoldsAPI.HoldDeleteParams;
-  export import HoldGetParams = HoldsAPI.HoldGetParams;
+export declare namespace Holds {
+  export {
+    type ZoneHold as ZoneHold,
+    type HoldCreateParams as HoldCreateParams,
+    type HoldDeleteParams as HoldDeleteParams,
+    type HoldEditParams as HoldEditParams,
+    type HoldGetParams as HoldGetParams,
+  };
 }
diff --git a/src/resources/zones/index.ts b/src/resources/zones/index.ts
index ad23faf4e1..f9a8e23fbd 100644
--- a/src/resources/zones/index.ts
+++ b/src/resources/zones/index.ts
@@ -1,80 +1,96 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
 export {
-  ActivationCheckTriggerResponse,
-  ActivationCheckTriggerParams,
   ActivationCheck,
+  type ActivationCheckTriggerResponse,
+  type ActivationCheckTriggerParams,
 } from './activation-check';
 export {
-  AdvancedDDoS,
-  AlwaysOnline,
-  AlwaysUseHTTPS,
-  AutomaticHTTPSRewrites,
-  AutomaticPlatformOptimization,
-  Brotli,
-  BrowserCacheTTL,
-  BrowserCheck,
-  CacheLevel,
-  ChallengeTTL,
-  Ciphers,
-  DevelopmentMode,
-  EarlyHints,
-  EmailObfuscation,
-  FontSettings,
-  H2Prioritization,
-  HotlinkProtection,
-  HTTP2,
-  HTTP3,
-  ImageResizing,
-  IPGeolocation,
-  IPV6,
-  MinTLSVersion,
-  Minify,
-  Mirage,
-  MobileRedirect,
-  NEL,
-  OpportunisticEncryption,
-  OpportunisticOnion,
-  OrangeToOrange,
-  OriginErrorPagePassThru,
-  OriginMaxHTTPVersion,
-  Polish,
-  PrefetchPreload,
-  ProxyReadTimeout,
-  PseudoIPV4,
-  ResponseBuffering,
-  RocketLoader,
-  SecurityHeaders,
-  SecurityLevel,
-  ServerSideExcludes,
-  SortQueryStringForCache,
-  SSL,
-  SSLRecommender,
-  TLS1_3,
-  TLSClientAuth,
-  TrueClientIPHeader,
-  WAF,
-  WebP,
-  Websocket,
-  ZeroRTT,
-  SettingEditResponse,
-  SettingGetResponse,
-  SettingEditParams,
-  SettingGetParams,
-  Settings,
-} from './settings';
+  AvailableRatePlansSinglePage,
+  Plans,
+  type AvailableRatePlan,
+  type PlanListParams,
+  type PlanGetParams,
+} from './plans';
 export {
-  CustomNameserverUpdateResponse,
-  CustomNameserverGetResponse,
-  CustomNameserverUpdateParams,
-  CustomNameserverGetParams,
   CustomNameservers,
+  type CustomNameserverUpdateResponse,
+  type CustomNameserverGetResponse,
+  type CustomNameserverUpdateParams,
+  type CustomNameserverGetParams,
 } from './custom-nameservers';
 export {
-  SubscriptionCreateResponse,
-  SubscriptionGetResponse,
-  SubscriptionCreateParams,
+  Holds,
+  type ZoneHold,
+  type HoldCreateParams,
+  type HoldDeleteParams,
+  type HoldEditParams,
+  type HoldGetParams,
+} from './holds';
+export { RatePlans, type RatePlanGetResponse, type RatePlanGetParams } from './rate-plans';
+export {
+  Settings,
+  type AdvancedDDoS,
+  type Aegis,
+  type AlwaysOnline,
+  type AlwaysUseHTTPS,
+  type AutomaticHTTPSRewrites,
+  type AutomaticPlatformOptimization,
+  type Brotli,
+  type BrowserCacheTTL,
+  type BrowserCheck,
+  type CacheLevel,
+  type ChallengeTTL,
+  type Ciphers,
+  type DevelopmentMode,
+  type EarlyHints,
+  type EmailObfuscation,
+  type FontSettings,
+  type H2Prioritization,
+  type HotlinkProtection,
+  type HTTP2,
+  type HTTP3,
+  type ImageResizing,
+  type IPGeolocation,
+  type IPV6,
+  type MinTLSVersion,
+  type Mirage,
+  type NEL,
+  type OpportunisticEncryption,
+  type OpportunisticOnion,
+  type OrangeToOrange,
+  type OriginErrorPagePassThru,
+  type OriginMaxHTTPVersion,
+  type Polish,
+  type PrefetchPreload,
+  type ProxyReadTimeout,
+  type PseudoIPV4,
+  type ResponseBuffering,
+  type RocketLoader,
+  type SecurityHeaders,
+  type SecurityLevel,
+  type ServerSideExcludes,
+  type SortQueryStringForCache,
+  type SSL,
+  type SSLRecommender,
+  type TLS1_3,
+  type TLSClientAuth,
+  type TrueClientIPHeader,
+  type WAF,
+  type WebP,
+  type Websocket,
+  type ZeroRTT,
+  type SettingEditResponse,
+  type SettingGetResponse,
+  type SettingEditParams,
+  type SettingGetParams,
+} from './settings';
+export {
   Subscriptions,
+  type SubscriptionCreateResponse,
+  type SubscriptionUpdateResponse,
+  type SubscriptionGetResponse,
+  type SubscriptionCreateParams,
+  type SubscriptionUpdateParams,
 } from './subscriptions';
-export { ZoneHold, HoldCreateParams, HoldDeleteParams, HoldGetParams, Holds } from './holds';
 export { Zones } from './zones';
diff --git a/src/resources/plans.ts b/src/resources/zones/plans.ts
similarity index 64%
rename from src/resources/plans.ts
rename to src/resources/zones/plans.ts
index e904804bf7..c536e16f2a 100644
--- a/src/resources/plans.ts
+++ b/src/resources/zones/plans.ts
@@ -1,19 +1,20 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import { APIResource } from '../resource';
-import * as Core from '../core';
-import { SinglePage } from '../pagination';
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+import { SinglePage } from '../../pagination';
 
 export class Plans extends APIResource {
   /**
    * Lists available plans the zone can subscribe to.
    */
   list(
-    zoneIdentifier: string,
+    params: PlanListParams,
     options?: Core.RequestOptions,
   ): Core.PagePromise<AvailableRatePlansSinglePage, AvailableRatePlan> {
+    const { zone_id } = params;
     return this._client.getAPIList(
-      `/zones/${zoneIdentifier}/available_plans`,
+      `/zones/${zone_id}/available_plans`,
       AvailableRatePlansSinglePage,
       options,
     );
@@ -23,15 +24,15 @@ export class Plans extends APIResource {
    * Details of the available plan that the zone can subscribe to.
    */
   get(
-    zoneIdentifier: string,
     planIdentifier: string,
+    params: PlanGetParams,
     options?: Core.RequestOptions,
   ): Core.APIPromise<AvailableRatePlan> {
+    const { zone_id } = params;
     return (
-      this._client.get(
-        `/zones/${zoneIdentifier}/available_plans/${planIdentifier}`,
-        options,
-      ) as Core.APIPromise<{ result: AvailableRatePlan }>
+      this._client.get(`/zones/${zone_id}/available_plans/${planIdentifier}`, options) as Core.APIPromise<{
+        result: AvailableRatePlan;
+      }>
     )._thenUnwrap((obj) => obj.result);
   }
 }
@@ -89,3 +90,28 @@ export interface AvailableRatePlan {
    */
   price?: number;
 }
+
+export interface PlanListParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export interface PlanGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+Plans.AvailableRatePlansSinglePage = AvailableRatePlansSinglePage;
+
+export declare namespace Plans {
+  export {
+    type AvailableRatePlan as AvailableRatePlan,
+    AvailableRatePlansSinglePage as AvailableRatePlansSinglePage,
+    type PlanListParams as PlanListParams,
+    type PlanGetParams as PlanGetParams,
+  };
+}
diff --git a/src/resources/zones/rate-plans.ts b/src/resources/zones/rate-plans.ts
new file mode 100644
index 0000000000..7b84b51b77
--- /dev/null
+++ b/src/resources/zones/rate-plans.ts
@@ -0,0 +1,84 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import { APIResource } from '../../resource';
+import * as Core from '../../core';
+
+export class RatePlans extends APIResource {
+  /**
+   * Lists all rate plans the zone can subscribe to.
+   */
+  get(params: RatePlanGetParams, options?: Core.RequestOptions): Core.APIPromise<RatePlanGetResponse | null> {
+    const { zone_id } = params;
+    return (
+      this._client.get(`/zones/${zone_id}/available_rate_plans`, options) as Core.APIPromise<{
+        result: RatePlanGetResponse | null;
+      }>
+    )._thenUnwrap((obj) => obj.result);
+  }
+}
+
+export type RatePlanGetResponse = Array<RatePlanGetResponse.RatePlanGetResponseItem>;
+
+export namespace RatePlanGetResponse {
+  export interface RatePlanGetResponseItem {
+    /**
+     * Plan identifier tag.
+     */
+    id?: string;
+
+    /**
+     * Array of available components values for the plan.
+     */
+    components?: Array<RatePlanGetResponseItem.Component>;
+
+    /**
+     * The monetary unit in which pricing information is displayed.
+     */
+    currency?: string;
+
+    /**
+     * The duration of the plan subscription.
+     */
+    duration?: number;
+
+    /**
+     * The frequency at which you will be billed for this plan.
+     */
+    frequency?: 'weekly' | 'monthly' | 'quarterly' | 'yearly';
+
+    /**
+     * The plan name.
+     */
+    name?: string;
+  }
+
+  export namespace RatePlanGetResponseItem {
+    export interface Component {
+      /**
+       * The default amount allocated.
+       */
+      default?: number;
+
+      /**
+       * The unique component.
+       */
+      name?: 'zones' | 'page_rules' | 'dedicated_certificates' | 'dedicated_certificates_custom';
+
+      /**
+       * The unit price of the addon.
+       */
+      unit_price?: number;
+    }
+  }
+}
+
+export interface RatePlanGetParams {
+  /**
+   * Identifier
+   */
+  zone_id: string;
+}
+
+export declare namespace RatePlans {
+  export { type RatePlanGetResponse as RatePlanGetResponse, type RatePlanGetParams as RatePlanGetParams };
+}
diff --git a/src/resources/zones/settings.ts b/src/resources/zones/settings.ts
index 6478cd787a..ebd5c97fc9 100644
--- a/src/resources/zones/settings.ts
+++ b/src/resources/zones/settings.ts
@@ -66,6 +66,64 @@ export interface AdvancedDDoS {
   modified_on?: string | null;
 }
 
+/**
+ * Advanced protection from Distributed Denial of Service (DDoS) attacks on your
+ * website. This is an uneditable value that is 'on' in the case of Business and
+ * Enterprise zones.
+ */
+export interface AdvancedDDoSParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'advanced_ddos';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'on' | 'off';
+}
+
+/**
+ * Aegis provides dedicated egress IPs (from Cloudflare to your origin) for your
+ * layer 7 WAF and CDN services. The egress IPs are reserved exclusively for your
+ * account so that you can increase your origin security by only allowing traffic
+ * from a small list of IP addresses.
+ */
+export interface Aegis {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'aegis';
+
+  /**
+   * Last time this setting was modified.
+   */
+  modified_on?: string | null;
+
+  /**
+   * Value of the zone setting.
+   */
+  value?: Aegis.Value;
+}
+
+export namespace Aegis {
+  /**
+   * Value of the zone setting.
+   */
+  export interface Value {
+    /**
+     * Whether the feature is enabled or not.
+     */
+    enabled?: boolean;
+
+    /**
+     * Egress pool id which refers to a grouping of dedicated egress IPs through which
+     * Cloudflare will connect to origin.
+     */
+    pool_id?: string;
+  }
+}
+
 /**
  * When enabled, Cloudflare serves limited copies of web pages available from the
  * [Internet Archive's Wayback Machine](https://archive.org/web/) if your server is
@@ -97,57 +155,62 @@ export interface AlwaysOnline {
 }
 
 /**
- * Reply to all requests for URLs that use "http" with a 301 redirect to the
- * equivalent "https" URL. If you only want to redirect for a subset of requests,
- * consider creating an "Always use HTTPS" page rule.
+ * When enabled, Cloudflare serves limited copies of web pages available from the
+ * [Internet Archive's Wayback Machine](https://archive.org/web/) if your server is
+ * offline. Refer to
+ * [Always Online](https://developers.cloudflare.com/cache/about/always-online) for
+ * more information.
  */
-export interface AlwaysUseHTTPS {
+export interface AlwaysOnlineParam {
   /**
    * ID of the zone setting.
    */
-  id: 'always_use_https';
+  id: 'always_online';
 
   /**
    * Current value of the zone setting.
    */
   value: 'on' | 'off';
+}
 
+export interface AlwaysUseHTTPS {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * If enabled, any ` http://`` URL is converted to  `https://` through a 301
+   * redirect.
    */
-  editable?: true | false;
+  id?: 'always_use_https';
+}
 
+export interface AlwaysUseHTTPSParam {
   /**
-   * last time this setting was modified.
+   * If enabled, any ` http://`` URL is converted to  `https://` through a 301
+   * redirect.
    */
-  modified_on?: string | null;
+  id?: 'always_use_https';
 }
 
-/**
- * Enable the Automatic HTTPS Rewrites feature for this zone.
- */
 export interface AutomaticHTTPSRewrites {
   /**
-   * ID of the zone setting.
+   * Turn on or off Automatic HTTPS Rewrites.
    */
-  id: 'automatic_https_rewrites';
+  id?: 'automatic_https_rewrites';
 
   /**
-   * Current value of the zone setting.
+   * The status of Automatic HTTPS Rewrites.
    */
-  value: 'on' | 'off';
+  value?: 'on' | 'off';
+}
 
+export interface AutomaticHTTPSRewritesParam {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Turn on or off Automatic HTTPS Rewrites.
    */
-  editable?: true | false;
+  id?: 'automatic_https_rewrites';
 
   /**
-   * last time this setting was modified.
+   * The status of Automatic HTTPS Rewrites.
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
 }
 
 export interface AutomaticPlatformOptimization {
@@ -252,120 +315,109 @@ export interface Brotli {
 }
 
 /**
- * Browser Cache TTL (in seconds) specifies how long Cloudflare-cached resources
- * will remain on your visitors' computers. Cloudflare will honor any larger times
- * specified by your server.
- * (https://support.cloudflare.com/hc/en-us/articles/200168276).
+ * When the client requesting an asset supports the Brotli compression algorithm,
+ * Cloudflare will serve a Brotli compressed version of the asset.
  */
-export interface BrowserCacheTTL {
+export interface BrotliParam {
   /**
    * ID of the zone setting.
    */
-  id: 'browser_cache_ttl';
+  id: 'brotli';
 
   /**
    * Current value of the zone setting.
    */
-  value:
-    | 0
-    | 30
-    | 60
-    | 120
-    | 300
-    | 1200
-    | 1800
-    | 3600
-    | 7200
-    | 10800
-    | 14400
-    | 18000
-    | 28800
-    | 43200
-    | 57600
-    | 72000
-    | 86400
-    | 172800
-    | 259200
-    | 345600
-    | 432000
-    | 691200
-    | 1382400
-    | 2073600
-    | 2678400
-    | 5356800
-    | 16070400
-    | 31536000;
+  value: 'off' | 'on';
+}
 
+export interface BrowserCacheTTL {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Control how long resources cached by client browsers remain valid.
    */
-  editable?: true | false;
+  id?: 'browser_cache_ttl';
 
   /**
-   * last time this setting was modified.
+   * The number of seconds to cache resources for. The API prohibits setting this to
+   * 0 for non-Enterprise domains.
    */
-  modified_on?: string | null;
+  value?: number;
+}
+
+export interface BrowserCacheTTLParam {
+  /**
+   * Control how long resources cached by client browsers remain valid.
+   */
+  id?: 'browser_cache_ttl';
+
+  /**
+   * The number of seconds to cache resources for. The API prohibits setting this to
+   * 0 for non-Enterprise domains.
+   */
+  value?: number;
 }
 
-/**
- * Browser Integrity Check is similar to Bad Behavior and looks for common HTTP
- * headers abused most commonly by spammers and denies access to your page. It will
- * also challenge visitors that do not have a user agent or a non standard user
- * agent (also commonly used by abuse bots, crawlers or visitors).
- * (https://support.cloudflare.com/hc/en-us/articles/200170086).
- */
 export interface BrowserCheck {
   /**
-   * ID of the zone setting.
+   * Inspect the visitor's browser for headers commonly associated with spammers and
+   * certain bots.
    */
-  id: 'browser_check';
+  id?: 'browser_check';
 
   /**
-   * Current value of the zone setting.
+   * The status of Browser Integrity Check.
    */
-  value: 'on' | 'off';
+  value?: 'on' | 'off';
+}
 
+export interface BrowserCheckParam {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Inspect the visitor's browser for headers commonly associated with spammers and
+   * certain bots.
    */
-  editable?: true | false;
+  id?: 'browser_check';
 
   /**
-   * last time this setting was modified.
+   * The status of Browser Integrity Check.
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
 }
 
-/**
- * Cache Level functions based off the setting level. The basic setting will cache
- * most static resources (i.e., css, images, and JavaScript). The simplified
- * setting will ignore the query string when delivering a cached resource. The
- * aggressive setting will cache all static resources, including ones with a query
- * string. (https://support.cloudflare.com/hc/en-us/articles/200168256).
- */
 export interface CacheLevel {
   /**
-   * ID of the zone setting.
+   * Apply custom caching based on the option selected.
    */
-  id: 'cache_level';
+  id?: 'cache_level';
 
   /**
-   * Current value of the zone setting.
+   * - `bypass`: Cloudflare does not cache.
+   * - `basic`: Delivers resources from cache when there is no query string.
+   * - `simplified`: Delivers the same resource to everyone independent of the query
+   *   string.
+   * - `aggressive`: Caches all static content that has a query string.
+   * - `cache_everything`: Treats all content as static and caches all file types
+   *   beyond the
+   *   [Cloudflare default cached content](https://developers.cloudflare.com/cache/concepts/default-cache-behavior/#default-cached-file-extensions).
    */
-  value: 'aggressive' | 'basic' | 'simplified';
+  value?: 'bypass' | 'basic' | 'simplified' | 'aggressive' | 'cache_everything';
+}
 
+export interface CacheLevelParam {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Apply custom caching based on the option selected.
    */
-  editable?: true | false;
+  id?: 'cache_level';
 
   /**
-   * last time this setting was modified.
+   * - `bypass`: Cloudflare does not cache.
+   * - `basic`: Delivers resources from cache when there is no query string.
+   * - `simplified`: Delivers the same resource to everyone independent of the query
+   *   string.
+   * - `aggressive`: Caches all static content that has a query string.
+   * - `cache_everything`: Treats all content as static and caches all file types
+   *   beyond the
+   *   [Cloudflare default cached content](https://developers.cloudflare.com/cache/concepts/default-cache-behavior/#default-cached-file-extensions).
    */
-  modified_on?: string | null;
+  value?: 'bypass' | 'basic' | 'simplified' | 'aggressive' | 'cache_everything';
 }
 
 /**
@@ -412,6 +464,39 @@ export interface ChallengeTTL {
   modified_on?: string | null;
 }
 
+/**
+ * Specify how long a visitor is allowed access to your site after successfully
+ * completing a challenge (such as a CAPTCHA). After the TTL has expired the
+ * visitor will have to complete a new challenge. We recommend a 15 - 45 minute
+ * setting and will attempt to honor any setting above 45 minutes.
+ * (https://support.cloudflare.com/hc/en-us/articles/200170136).
+ */
+export interface ChallengeTTLParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'challenge_ttl';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value:
+    | 300
+    | 900
+    | 1800
+    | 2700
+    | 3600
+    | 7200
+    | 10800
+    | 14400
+    | 28800
+    | 57600
+    | 86400
+    | 604800
+    | 2592000
+    | 31536000;
+}
+
 /**
  * An allowlist of ciphers for TLS termination. These ciphers must be in the
  * BoringSSL format.
@@ -439,6 +524,22 @@ export interface Ciphers {
   modified_on?: string | null;
 }
 
+/**
+ * An allowlist of ciphers for TLS termination. These ciphers must be in the
+ * BoringSSL format.
+ */
+export interface CiphersParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'ciphers';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: Array<string>;
+}
+
 /**
  * Development Mode temporarily allows you to enter development mode for your
  * websites if you need to make changes to your site. This will bypass Cloudflare's
@@ -477,6 +578,26 @@ export interface DevelopmentMode {
   time_remaining?: number;
 }
 
+/**
+ * Development Mode temporarily allows you to enter development mode for your
+ * websites if you need to make changes to your site. This will bypass Cloudflare's
+ * accelerated cache and slow down your site, but is useful if you are making
+ * changes to cacheable content (like images, css, or JavaScript) and would like to
+ * see those changes right away. Once entered, development mode will last for 3
+ * hours and then automatically toggle off.
+ */
+export interface DevelopmentModeParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'development_mode';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'on' | 'off';
+}
+
 /**
  * When enabled, Cloudflare will attempt to speed up overall page loads by serving
  * `103` responses with `Link` headers from the final response. Refer to
@@ -507,30 +628,45 @@ export interface EarlyHints {
 }
 
 /**
- * Encrypt email adresses on your web page from bots, while keeping them visible to
- * humans. (https://support.cloudflare.com/hc/en-us/articles/200170016).
+ * When enabled, Cloudflare will attempt to speed up overall page loads by serving
+ * `103` responses with `Link` headers from the final response. Refer to
+ * [Early Hints](https://developers.cloudflare.com/cache/about/early-hints) for
+ * more information.
  */
-export interface EmailObfuscation {
+export interface EarlyHintsParam {
   /**
    * ID of the zone setting.
    */
-  id: 'email_obfuscation';
+  id: 'early_hints';
 
   /**
    * Current value of the zone setting.
    */
   value: 'on' | 'off';
+}
 
+export interface EmailObfuscation {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Turn on or off **Email Obfuscation**.
    */
-  editable?: true | false;
+  id?: 'email_obfuscation';
 
   /**
-   * last time this setting was modified.
+   * The status of Email Obfuscation.
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
+}
+
+export interface EmailObfuscationParam {
+  /**
+   * Turn on or off **Email Obfuscation**.
+   */
+  id?: 'email_obfuscation';
+
+  /**
+   * The status of Email Obfuscation.
+   */
+  value?: 'on' | 'off';
 }
 
 /**
@@ -542,12 +678,7 @@ export interface FontSettings {
   /**
    * ID of the zone setting.
    */
-  id: 'fonts';
-
-  /**
-   * Current value of the zone setting.
-   */
-  value: 'on' | 'off';
+  id?: 'fonts';
 
   /**
    * Whether or not this setting can be modified for this zone (based on your
@@ -559,6 +690,11 @@ export interface FontSettings {
    * last time this setting was modified.
    */
   modified_on?: string | null;
+
+  /**
+   * Current value of the zone setting.
+   */
+  value?: 'on' | 'off';
 }
 
 /**
@@ -589,6 +725,23 @@ export interface H2Prioritization {
   modified_on?: string | null;
 }
 
+/**
+ * HTTP/2 Edge Prioritization optimises the delivery of resources served through
+ * HTTP/2 to improve page load performance. It also supports fine control of
+ * content delivery when used in conjunction with Workers.
+ */
+export interface H2PrioritizationParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'h2_prioritization';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'on' | 'off' | 'custom';
+}
+
 /**
  * When enabled, the Hotlink Protection option ensures that other sites cannot suck
  * up your bandwidth by building pages that use images hosted on your site. Anytime
@@ -621,6 +774,27 @@ export interface HotlinkProtection {
   modified_on?: string | null;
 }
 
+/**
+ * When enabled, the Hotlink Protection option ensures that other sites cannot suck
+ * up your bandwidth by building pages that use images hosted on your site. Anytime
+ * a request for an image on your site hits Cloudflare, we check to ensure that
+ * it's not another site requesting them. People will still be able to download and
+ * view images from your page, but other sites won't be able to steal them for use
+ * on their own pages.
+ * (https://support.cloudflare.com/hc/en-us/articles/200170026).
+ */
+export interface HotlinkProtectionParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'hotlink_protection';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'on' | 'off';
+}
+
 /**
  * HTTP2 enabled for this zone.
  */
@@ -648,13 +822,28 @@ export interface HTTP2 {
 }
 
 /**
- * HTTP3 enabled for this zone.
+ * HTTP2 enabled for this zone.
  */
-export interface HTTP3 {
+export interface HTTP2Param {
   /**
    * ID of the zone setting.
    */
-  id: 'http3';
+  id: 'http2';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'on' | 'off';
+}
+
+/**
+ * HTTP3 enabled for this zone.
+ */
+export interface HTTP3 {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'http3';
 
   /**
    * Current value of the zone setting.
@@ -673,6 +862,21 @@ export interface HTTP3 {
   modified_on?: string | null;
 }
 
+/**
+ * HTTP3 enabled for this zone.
+ */
+export interface HTTP3Param {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'http3';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'on' | 'off';
+}
+
 /**
  * Image Resizing provides on-demand resizing, conversion and optimisation for
  * images served through Cloudflare's network. Refer to the
@@ -703,31 +907,47 @@ export interface ImageResizing {
 }
 
 /**
- * Enable IP Geolocation to have Cloudflare geolocate visitors to your website and
- * pass the country code to you.
- * (https://support.cloudflare.com/hc/en-us/articles/200168236).
+ * Image Resizing provides on-demand resizing, conversion and optimisation for
+ * images served through Cloudflare's network. Refer to the
+ * [Image Resizing documentation](https://developers.cloudflare.com/images/) for
+ * more information.
  */
-export interface IPGeolocation {
+export interface ImageResizingParam {
   /**
    * ID of the zone setting.
    */
-  id: 'ip_geolocation';
+  id: 'image_resizing';
 
   /**
    * Current value of the zone setting.
    */
-  value: 'on' | 'off';
+  value: 'on' | 'off' | 'open';
+}
 
+export interface IPGeolocation {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Cloudflare adds a CF-IPCountry HTTP header containing the country code that
+   * corresponds to the visitor.
    */
-  editable?: true | false;
+  id?: 'ip_geolocation';
 
   /**
-   * last time this setting was modified.
+   * The status of adding the IP Geolocation Header.
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
+}
+
+export interface IPGeolocationParam {
+  /**
+   * Cloudflare adds a CF-IPCountry HTTP header containing the country code that
+   * corresponds to the visitor.
+   */
+  id?: 'ip_geolocation';
+
+  /**
+   * The status of adding the IP Geolocation Header.
+   */
+  value?: 'on' | 'off';
 }
 
 /**
@@ -757,6 +977,22 @@ export interface IPV6 {
   modified_on?: string | null;
 }
 
+/**
+ * Enable IPv6 on all subdomains that are Cloudflare enabled.
+ * (https://support.cloudflare.com/hc/en-us/articles/200168586).
+ */
+export interface IPV6Param {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'ipv6';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'off' | 'on';
+}
+
 /**
  * Only accepts HTTPS requests that use at least the TLS protocol version
  * specified. For example, if TLS 1.1 is selected, TLS 1.0 connections will be
@@ -786,100 +1022,63 @@ export interface MinTLSVersion {
 }
 
 /**
- * Automatically minify certain assets for your website. Refer to
- * [Using Cloudflare Auto Minify](https://support.cloudflare.com/hc/en-us/articles/200168196)
- * for more information.
+ * Only accepts HTTPS requests that use at least the TLS protocol version
+ * specified. For example, if TLS 1.1 is selected, TLS 1.0 connections will be
+ * rejected, while 1.1, 1.2, and 1.3 (if enabled) will be permitted.
  */
-export interface Minify {
-  /**
-   * Zone setting identifier.
-   */
-  id: 'minify';
-
-  /**
-   * Current value of the zone setting.
-   */
-  value: Minify.Value;
-
-  /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
-   */
-  editable?: true | false;
-
+export interface MinTLSVersionParam {
   /**
-   * last time this setting was modified.
+   * ID of the zone setting.
    */
-  modified_on?: string | null;
-}
+  id: 'min_tls_version';
 
-export namespace Minify {
   /**
    * Current value of the zone setting.
    */
-  export interface Value {
-    /**
-     * Automatically minify all CSS files for your website.
-     */
-    css?: 'on' | 'off';
-
-    /**
-     * Automatically minify all HTML files for your website.
-     */
-    html?: 'on' | 'off';
-
-    /**
-     * Automatically minify all JavaScript files for your website.
-     */
-    js?: 'on' | 'off';
-  }
+  value: '1.0' | '1.1' | '1.2' | '1.3';
 }
 
-/**
- * Automatically optimize image loading for website visitors on mobile devices.
- * Refer to
- * [our blog post](http://blog.cloudflare.com/mirage2-solving-mobile-speed) for
- * more information.
- */
 export interface Mirage {
   /**
-   * ID of the zone setting.
+   * Cloudflare Mirage reduces bandwidth used by images in mobile browsers. It can
+   * accelerate loading of image-heavy websites on very slow mobile connections and
+   * HTTP/1.
    */
-  id: 'mirage';
+  id?: 'mirage';
 
   /**
-   * Current value of the zone setting.
+   * The status of Mirage.
    */
-  value: 'on' | 'off';
+  value?: 'on' | 'off';
+}
 
+export interface MirageParam {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Cloudflare Mirage reduces bandwidth used by images in mobile browsers. It can
+   * accelerate loading of image-heavy websites on very slow mobile connections and
+   * HTTP/1.
    */
-  editable?: true | false;
+  id?: 'mirage';
 
   /**
-   * last time this setting was modified.
+   * The status of Mirage.
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
 }
 
 /**
- * @deprecated: Deprecated: Use Single Redirects instead
- * https://developers.cloudflare.com/rules/url-forwarding/single-redirects/examples/#perform-mobile-redirects.
- * Automatically redirect visitors on mobile devices to a mobile-optimized
- * subdomain.
+ * Enable Network Error Logging reporting on your zone. (Beta)
  */
-export interface MobileRedirect {
+export interface NEL {
   /**
-   * Identifier of the zone setting.
+   * Zone setting identifier.
    */
-  id: 'mobile_redirect';
+  id: 'nel';
 
   /**
-   * @deprecated: Current value of the zone setting.
+   * Current value of the zone setting.
    */
-  value: MobileRedirect.Value;
+  value: NEL.Value;
 
   /**
    * Whether or not this setting can be modified for this zone (based on your
@@ -893,36 +1092,19 @@ export interface MobileRedirect {
   modified_on?: string | null;
 }
 
-export namespace MobileRedirect {
+export namespace NEL {
   /**
-   * @deprecated: Current value of the zone setting.
+   * Current value of the zone setting.
    */
   export interface Value {
-    /**
-     * Which subdomain prefix you wish to redirect visitors on mobile devices to
-     * (subdomain must already exist).
-     */
-    mobile_subdomain?: string | null;
-
-    /**
-     * Deprecated: Use Single Redirects instead
-     * https://developers.cloudflare.com/rules/url-forwarding/single-redirects/examples/#perform-mobile-redirects.
-     * Whether or not mobile redirect is enabled.
-     */
-    status?: 'on' | 'off';
-
-    /**
-     * Whether to drop the current page path and redirect to the mobile subdomain URL
-     * root, or keep the path and redirect to the same page on the mobile subdomain.
-     */
-    strip_uri?: boolean;
+    enabled?: boolean;
   }
 }
 
 /**
  * Enable Network Error Logging reporting on your zone. (Beta)
  */
-export interface NEL {
+export interface NELParam {
   /**
    * Zone setting identifier.
    */
@@ -931,21 +1113,10 @@ export interface NEL {
   /**
    * Current value of the zone setting.
    */
-  value: NEL.Value;
-
-  /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
-   */
-  editable?: true | false;
-
-  /**
-   * last time this setting was modified.
-   */
-  modified_on?: string | null;
+  value: NELParam.Value;
 }
 
-export namespace NEL {
+export namespace NELParam {
   /**
    * Current value of the zone setting.
    */
@@ -954,30 +1125,32 @@ export namespace NEL {
   }
 }
 
-/**
- * Enables the Opportunistic Encryption feature for a zone.
- */
 export interface OpportunisticEncryption {
   /**
-   * ID of the zone setting.
+   * Opportunistic Encryption allows browsers to access HTTP URIs over an encrypted
+   * TLS channel. It's not a substitute for HTTPS, but provides additional security
+   * for otherwise vulnerable requests.
    */
-  id: 'opportunistic_encryption';
+  id?: 'opportunistic_encryption';
 
   /**
-   * Current value of the zone setting.
+   * The status of Opportunistic Encryption.
    */
-  value: 'on' | 'off';
+  value?: 'on' | 'off';
+}
 
+export interface OpportunisticEncryptionParam {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Opportunistic Encryption allows browsers to access HTTP URIs over an encrypted
+   * TLS channel. It's not a substitute for HTTPS, but provides additional security
+   * for otherwise vulnerable requests.
    */
-  editable?: true | false;
+  id?: 'opportunistic_encryption';
 
   /**
-   * last time this setting was modified.
+   * The status of Opportunistic Encryption.
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
 }
 
 /**
@@ -1007,6 +1180,22 @@ export interface OpportunisticOnion {
   modified_on?: string | null;
 }
 
+/**
+ * Add an Alt-Svc header to all legitimate requests from Tor, allowing the
+ * connection to use our onion services instead of exit nodes.
+ */
+export interface OpportunisticOnionParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'opportunistic_onion';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'on' | 'off';
+}
+
 /**
  * Orange to Orange (O2O) allows zones on Cloudflare to CNAME to other zones also
  * on Cloudflare.
@@ -1035,69 +1224,93 @@ export interface OrangeToOrange {
 }
 
 /**
- * Cloudflare will proxy customer error pages on any 502,504 errors on origin
- * server instead of showing a default Cloudflare error page. This does not apply
- * to 522 errors and is limited to Enterprise Zones.
+ * Orange to Orange (O2O) allows zones on Cloudflare to CNAME to other zones also
+ * on Cloudflare.
  */
-export interface OriginErrorPagePassThru {
+export interface OrangeToOrangeParam {
   /**
    * ID of the zone setting.
    */
-  id: 'origin_error_page_pass_thru';
+  id: 'orange_to_orange';
 
   /**
    * Current value of the zone setting.
    */
   value: 'on' | 'off';
+}
 
+export interface OriginErrorPagePassThru {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Turn on or off Cloudflare error pages generated from issues sent from the origin
+   * server. If enabled, this setting triggers error pages issued by the origin.
    */
-  editable?: true | false;
+  id?: 'origin_error_page_pass_thru';
 
   /**
-   * last time this setting was modified.
+   * The status of Origin Error Page Passthru.
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
 }
 
-/**
- * Value of the zone setting.
- */
-export type OriginMaxHTTPVersion = 'origin_max_http_version';
+export interface OriginErrorPagePassThruParam {
+  /**
+   * Turn on or off Cloudflare error pages generated from issues sent from the origin
+   * server. If enabled, this setting triggers error pages issued by the origin.
+   */
+  id?: 'origin_error_page_pass_thru';
 
-/**
- * Removes metadata and compresses your images for faster page load times. Basic
- * (Lossless): Reduce the size of PNG, JPEG, and GIF files - no impact on visual
- * quality. Basic + JPEG (Lossy): Further reduce the size of JPEG files for faster
- * image loading. Larger JPEGs are converted to progressive images, loading a
- * lower-resolution image first and ending in a higher-resolution version. Not
- * recommended for hi-res photography sites.
- */
-export interface Polish {
   /**
-   * ID of the zone setting.
+   * The status of Origin Error Page Passthru.
    */
-  id: 'polish';
+  value?: 'on' | 'off';
+}
 
+export interface OriginMaxHTTPVersion {
   /**
-   * Current value of the zone setting.
+   * Value of the zone setting.
    */
-  value: 'off' | 'lossless' | 'lossy';
+  id: 'origin_max_http_version';
 
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Whether the setting is editable
    */
-  editable?: true | false;
+  editable: boolean;
 
   /**
-   * last time this setting was modified.
+   * The value of the feature
+   */
+  value: '2' | '1';
+
+  /**
+   * Last time this setting was modified.
    */
   modified_on?: string | null;
 }
 
+export interface Polish {
+  /**
+   * Apply options from the Polish feature of the Cloudflare Speed app.
+   */
+  id?: 'polish';
+
+  /**
+   * The level of Polish you want applied to your origin.
+   */
+  value?: 'off' | 'lossless' | 'lossy';
+}
+
+export interface PolishParam {
+  /**
+   * Apply options from the Polish feature of the Cloudflare Speed app.
+   */
+  id?: 'polish';
+
+  /**
+   * The level of Polish you want applied to your origin.
+   */
+  value?: 'off' | 'lossless' | 'lossy';
+}
+
 /**
  * Cloudflare will prefetch any URLs that are included in the response headers.
  * This is limited to Enterprise Zones.
@@ -1125,6 +1338,22 @@ export interface PrefetchPreload {
   modified_on?: string | null;
 }
 
+/**
+ * Cloudflare will prefetch any URLs that are included in the response headers.
+ * This is limited to Enterprise Zones.
+ */
+export interface PrefetchPreloadParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'prefetch_preload';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'on' | 'off';
+}
+
 /**
  * Maximum time between two read operations from origin.
  */
@@ -1151,6 +1380,21 @@ export interface ProxyReadTimeout {
   modified_on?: string | null;
 }
 
+/**
+ * Maximum time between two read operations from origin.
+ */
+export interface ProxyReadTimeoutParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'proxy_read_timeout';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: number;
+}
+
 /**
  * The value set for the Pseudo IPv4 setting.
  */
@@ -1178,67 +1422,70 @@ export interface PseudoIPV4 {
 }
 
 /**
- * Enables or disables buffering of responses from the proxied server. Cloudflare
- * may buffer the whole payload to deliver it at once to the client versus allowing
- * it to be delivered in chunks. By default, the proxied server streams directly
- * and is not buffered by Cloudflare. This is limited to Enterprise Zones.
+ * The value set for the Pseudo IPv4 setting.
  */
-export interface ResponseBuffering {
+export interface PseudoIPV4Param {
   /**
-   * ID of the zone setting.
+   * Value of the Pseudo IPv4 setting.
    */
-  id: 'response_buffering';
+  id: 'pseudo_ipv4';
 
   /**
    * Current value of the zone setting.
    */
-  value: 'on' | 'off';
+  value: 'off' | 'add_header' | 'overwrite_header';
+}
 
+export interface ResponseBuffering {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Turn on or off whether Cloudflare should wait for an entire file from the origin
+   * server before forwarding it to the site visitor. By default, Cloudflare sends
+   * packets to the client as they arrive from the origin server.
    */
-  editable?: true | false;
+  id?: 'response_buffering';
 
   /**
-   * last time this setting was modified.
+   * The status of Response Buffering
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
 }
 
-/**
- * Rocket Loader is a general-purpose asynchronous JavaScript optimisation that
- * prioritises rendering your content while loading your site's Javascript
- * asynchronously. Turning on Rocket Loader will immediately improve a web page's
- * rendering time sometimes measured as Time to First Paint (TTFP), and also the
- * `window.onload` time (assuming there is JavaScript on the page). This can have a
- * positive impact on your Google search ranking. When turned on, Rocket Loader
- * will automatically defer the loading of all Javascript referenced in your HTML,
- * with no configuration required. Refer to
- * [Understanding Rocket Loader](https://support.cloudflare.com/hc/articles/200168056)
- * for more information.
- */
-export interface RocketLoader {
+export interface ResponseBufferingParam {
   /**
-   * ID of the zone setting.
+   * Turn on or off whether Cloudflare should wait for an entire file from the origin
+   * server before forwarding it to the site visitor. By default, Cloudflare sends
+   * packets to the client as they arrive from the origin server.
    */
-  id: 'rocket_loader';
+  id?: 'response_buffering';
 
   /**
-   * Current value of the zone setting.
+   * The status of Response Buffering
    */
-  value: 'on' | 'off';
+  value?: 'on' | 'off';
+}
 
+export interface RocketLoader {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Turn on or off Rocket Loader in the Cloudflare Speed app.
    */
-  editable?: true | false;
+  id?: 'rocket_loader';
 
   /**
-   * last time this setting was modified.
+   * The status of Rocket Loader
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
+}
+
+export interface RocketLoaderParam {
+  /**
+   * Turn on or off Rocket Loader in the Cloudflare Speed app.
+   */
+  id?: 'rocket_loader';
+
+  /**
+   * The status of Rocket Loader
+   */
+  value?: 'on' | 'off';
 }
 
 /**
@@ -1312,32 +1559,80 @@ export namespace SecurityHeaders {
 }
 
 /**
- * Choose the appropriate security profile for your website, which will
- * automatically adjust each of the security settings. If you choose to customize
- * an individual security setting, the profile will become Custom.
- * (https://support.cloudflare.com/hc/en-us/articles/200170056).
+ * Cloudflare security header for a zone.
  */
-export interface SecurityLevel {
+export interface SecurityHeadersParam {
   /**
-   * ID of the zone setting.
+   * ID of the zone's security header.
    */
-  id: 'security_level';
+  id: 'security_header';
 
   /**
    * Current value of the zone setting.
    */
-  value: 'off' | 'essentially_off' | 'low' | 'medium' | 'high' | 'under_attack';
+  value: SecurityHeadersParam.Value;
+}
 
+export namespace SecurityHeadersParam {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Current value of the zone setting.
    */
-  editable?: true | false;
+  export interface Value {
+    /**
+     * Strict Transport Security.
+     */
+    strict_transport_security?: Value.StrictTransportSecurity;
+  }
+
+  export namespace Value {
+    /**
+     * Strict Transport Security.
+     */
+    export interface StrictTransportSecurity {
+      /**
+       * Whether or not strict transport security is enabled.
+       */
+      enabled?: boolean;
+
+      /**
+       * Include all subdomains for strict transport security.
+       */
+      include_subdomains?: boolean;
+
+      /**
+       * Max age in seconds of the strict transport security.
+       */
+      max_age?: number;
+
+      /**
+       * Whether or not to include 'X-Content-Type-Options: nosniff' header.
+       */
+      nosniff?: boolean;
+
+      /**
+       * Enable automatic preload of the HSTS configuration.
+       */
+      preload?: boolean;
+    }
+  }
+}
 
+export interface SecurityLevel {
   /**
-   * last time this setting was modified.
+   * Control options for the **Security Level** feature from the **Security** app.
    */
-  modified_on?: string | null;
+  id?: 'security_level';
+
+  value?: 'off' | 'essentially_off' | 'low' | 'medium' | 'high' | 'under_attack';
+}
+
+export interface SecurityLevelParam {
+  /**
+   * Control options for the **Security Level** feature from the **Security** app.
+   */
+  id?: 'security_level';
+
+  value?: 'off' | 'essentially_off' | 'low' | 'medium' | 'high' | 'under_attack';
 }
 
 /**
@@ -1377,72 +1672,80 @@ export interface ServerSideExcludes {
 }
 
 /**
- * Cloudflare will treat files with the same query strings as the same file in
- * cache, regardless of the order of the query strings. This is limited to
- * Enterprise Zones.
+ * If there is sensitive content on your website that you want visible to real
+ * visitors, but that you want to hide from suspicious visitors, all you have to do
+ * is wrap the content with Cloudflare SSE tags. Wrap any content that you want to
+ * be excluded from suspicious visitors in the following SSE tags:
+ * <!--sse--><!--/sse-->. For example: <!--sse--> Bad visitors won't see my phone
+ * number, 555-555-5555 <!--/sse-->. Note: SSE only will work with HTML. If you
+ * have HTML minification enabled, you won't see the SSE tags in your HTML source
+ * when it's served through Cloudflare. SSE will still function in this case, as
+ * Cloudflare's HTML minification and SSE functionality occur on-the-fly as the
+ * resource moves through our network to the visitor's computer.
+ * (https://support.cloudflare.com/hc/en-us/articles/200170036).
  */
-export interface SortQueryStringForCache {
+export interface ServerSideExcludesParam {
   /**
    * ID of the zone setting.
    */
-  id: 'sort_query_string_for_cache';
+  id: 'server_side_exclude';
 
   /**
    * Current value of the zone setting.
    */
   value: 'on' | 'off';
+}
 
+export interface SortQueryStringForCache {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Turn on or off the reordering of query strings. When query strings have the same
+   * structure, caching improves.
    */
-  editable?: true | false;
+  id?: 'sort_query_string_for_cache';
 
   /**
-   * last time this setting was modified.
+   * The status of Query String Sort
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
+}
+
+export interface SortQueryStringForCacheParam {
+  /**
+   * Turn on or off the reordering of query strings. When query strings have the same
+   * structure, caching improves.
+   */
+  id?: 'sort_query_string_for_cache';
+
+  /**
+   * The status of Query String Sort
+   */
+  value?: 'on' | 'off';
 }
 
-/**
- * SSL encrypts your visitor's connection and safeguards credit card numbers and
- * other personal data to and from your website. SSL can take up to 5 minutes to
- * fully activate. Requires Cloudflare active on your root domain or www domain.
- * Off: no SSL between the visitor and Cloudflare, and no SSL between Cloudflare
- * and your web server (all HTTP traffic). Flexible: SSL between the visitor and
- * Cloudflare -- visitor sees HTTPS on your site, but no SSL between Cloudflare and
- * your web server. You don't need to have an SSL cert on your web server, but your
- * vistors will still see the site as being HTTPS enabled. Full: SSL between the
- * visitor and Cloudflare -- visitor sees HTTPS on your site, and SSL between
- * Cloudflare and your web server. You'll need to have your own SSL cert or
- * self-signed cert at the very least. Full (Strict): SSL between the visitor and
- * Cloudflare -- visitor sees HTTPS on your site, and SSL between Cloudflare and
- * your web server. You'll need to have a valid SSL certificate installed on your
- * web server. This certificate must be signed by a certificate authority, have an
- * expiration date in the future, and respond for the request domain name
- * (hostname). (https://support.cloudflare.com/hc/en-us/articles/200170416).
- */
 export interface SSL {
   /**
-   * ID of the zone setting.
+   * Control options for the SSL feature of the Edge Certificates tab in the
+   * Cloudflare SSL/TLS app.
    */
-  id: 'ssl';
+  id?: 'ssl';
 
   /**
-   * Current value of the zone setting.
+   * The encryption mode that Cloudflare uses to connect to your origin server.
    */
-  value: 'off' | 'flexible' | 'full' | 'strict';
+  value?: 'off' | 'flexible' | 'full' | 'strict' | 'origin_pull';
+}
 
+export interface SSLParam {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Control options for the SSL feature of the Edge Certificates tab in the
+   * Cloudflare SSL/TLS app.
    */
-  editable?: true | false;
+  id?: 'ssl';
 
   /**
-   * last time this setting was modified.
+   * The encryption mode that Cloudflare uses to connect to your origin server.
    */
-  modified_on?: string | null;
+  value?: 'off' | 'flexible' | 'full' | 'strict' | 'origin_pull';
 }
 
 /**
@@ -1462,6 +1765,23 @@ export interface SSLRecommender {
   enabled?: boolean;
 }
 
+/**
+ * Enrollment in the SSL/TLS Recommender service which tries to detect and
+ * recommend (by sending periodic emails) the most secure SSL/TLS setting your
+ * origin servers support.
+ */
+export interface SSLRecommenderParam {
+  /**
+   * Enrollment value for SSL/TLS Recommender.
+   */
+  id?: 'ssl_recommender';
+
+  /**
+   * ssl-recommender enrollment setting.
+   */
+  enabled?: boolean;
+}
+
 /**
  * Enables Crypto TLS 1.3 feature for a zone.
  */
@@ -1488,6 +1808,21 @@ export interface TLS1_3 {
   modified_on?: string | null;
 }
 
+/**
+ * Enables Crypto TLS 1.3 feature for a zone.
+ */
+export interface TLS1_3Param {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'tls_1_3';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'on' | 'off' | 'zrt';
+}
+
 /**
  * TLS Client Auth requires Cloudflare to connect to your origin server using a
  * client certificate (Enterprise Only).
@@ -1516,65 +1851,71 @@ export interface TLSClientAuth {
 }
 
 /**
- * Allows customer to continue to use True Client IP (Akamai feature) in the
- * headers we send to the origin. This is limited to Enterprise Zones.
+ * TLS Client Auth requires Cloudflare to connect to your origin server using a
+ * client certificate (Enterprise Only).
  */
-export interface TrueClientIPHeader {
+export interface TLSClientAuthParam {
   /**
    * ID of the zone setting.
    */
-  id: 'true_client_ip_header';
+  id: 'tls_client_auth';
 
   /**
    * Current value of the zone setting.
    */
   value: 'on' | 'off';
+}
 
+export interface TrueClientIPHeader {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Turn on or off the True-Client-IP Header feature of the Cloudflare Network app.
    */
-  editable?: true | false;
+  id?: 'true_client_ip_header';
 
   /**
-   * last time this setting was modified.
+   * The status of True Client IP Header.
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
+}
+
+export interface TrueClientIPHeaderParam {
+  /**
+   * Turn on or off the True-Client-IP Header feature of the Cloudflare Network app.
+   */
+  id?: 'true_client_ip_header';
+
+  /**
+   * The status of True Client IP Header.
+   */
+  value?: 'on' | 'off';
 }
 
-/**
- * The WAF examines HTTP requests to your website. It inspects both GET and POST
- * requests and applies rules to help filter out illegitimate traffic from
- * legitimate website visitors. The Cloudflare WAF inspects website addresses or
- * URLs to detect anything out of the ordinary. If the Cloudflare WAF determines
- * suspicious user behavior, then the WAF will 'challenge' the web visitor with a
- * page that asks them to submit a CAPTCHA successfully to continue their action.
- * If the challenge is failed, the action will be stopped. What this means is that
- * Cloudflare's WAF will block any traffic identified as illegitimate before it
- * reaches your origin web server.
- * (https://support.cloudflare.com/hc/en-us/articles/200172016).
- */
 export interface WAF {
   /**
-   * ID of the zone setting.
+   * Turn on or off
+   * [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+   * You cannot enable or disable individual WAF managed rules via Page Rules.
    */
-  id: 'waf';
+  id?: 'waf';
 
   /**
-   * Current value of the zone setting.
+   * The status of WAF managed rules (previous version).
    */
-  value: 'on' | 'off';
+  value?: 'on' | 'off';
+}
 
+export interface WAFParam {
   /**
-   * Whether or not this setting can be modified for this zone (based on your
-   * Cloudflare plan level).
+   * Turn on or off
+   * [WAF managed rules (previous version, deprecated)](https://developers.cloudflare.com/waf/reference/legacy/old-waf-managed-rules/).
+   * You cannot enable or disable individual WAF managed rules via Page Rules.
    */
-  editable?: true | false;
+  id?: 'waf';
 
   /**
-   * last time this setting was modified.
+   * The status of WAF managed rules (previous version).
    */
-  modified_on?: string | null;
+  value?: 'on' | 'off';
 }
 
 /**
@@ -1605,6 +1946,23 @@ export interface WebP {
   modified_on?: string | null;
 }
 
+/**
+ * When the client requesting the image supports the WebP image codec, and WebP
+ * offers a performance advantage over the original image format, Cloudflare will
+ * serve a WebP version of the original image.
+ */
+export interface WebPParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'webp';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'off' | 'on';
+}
+
 /**
  * WebSockets are open connections sustained between the client and the origin
  * server. Inside a WebSockets connection, the client and the origin can pass data
@@ -1637,6 +1995,27 @@ export interface Websocket {
   modified_on?: string | null;
 }
 
+/**
+ * WebSockets are open connections sustained between the client and the origin
+ * server. Inside a WebSockets connection, the client and the origin can pass data
+ * back and forth without having to reestablish sessions. This makes exchanging
+ * data within a WebSockets connection fast. WebSockets are often used for
+ * real-time applications such as live chat and gaming. For more information refer
+ * to
+ * [Can I use Cloudflare with Websockets](https://support.cloudflare.com/hc/en-us/articles/200169466-Can-I-use-Cloudflare-with-WebSockets-).
+ */
+export interface WebsocketParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: 'websockets';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'off' | 'on';
+}
+
 /**
  * 0-RTT session resumption enabled for this zone.
  */
@@ -1663,6 +2042,21 @@ export interface ZeroRTT {
   modified_on?: string | null;
 }
 
+/**
+ * 0-RTT session resumption enabled for this zone.
+ */
+export interface ZeroRTTParam {
+  /**
+   * ID of the zone setting.
+   */
+  id: '0rtt';
+
+  /**
+   * Current value of the zone setting.
+   */
+  value: 'on' | 'off';
+}
+
 /**
  * 0-RTT session resumption enabled for this zone.
  */
@@ -1670,73 +2064,1258 @@ export type SettingEditResponse =
   | ZeroRTT
   | AdvancedDDoS
   | AlwaysOnline
-  | AlwaysUseHTTPS
-  | AutomaticHTTPSRewrites
+  | SettingEditResponse.ZonesSchemasAlwaysUseHTTPS
+  | SettingEditResponse.ZonesSchemasAutomaticHTTPSRewrites
   | Brotli
-  | BrowserCacheTTL
-  | BrowserCheck
-  | CacheLevel
+  | SettingEditResponse.ZonesSchemasBrowserCacheTTL
+  | SettingEditResponse.ZonesSchemasBrowserCheck
+  | SettingEditResponse.ZonesSchemasCacheLevel
   | ChallengeTTL
   | Ciphers
   | SettingEditResponse.ZonesCNAMEFlattening
   | DevelopmentMode
   | EarlyHints
-  | SettingEditResponse.ZonesEdgeCacheTTL
-  | EmailObfuscation
+  | SettingEditResponse.ZonesSchemasEdgeCacheTTL
+  | SettingEditResponse.ZonesSchemasEmailObfuscation
   | H2Prioritization
   | HotlinkProtection
   | HTTP2
   | HTTP3
   | ImageResizing
-  | IPGeolocation
+  | SettingEditResponse.ZonesSchemasIPGeolocation
   | IPV6
   | SettingEditResponse.ZonesMaxUpload
   | MinTLSVersion
-  | Minify
-  | Mirage
-  | MobileRedirect
+  | SettingEditResponse.ZonesSchemasMirage
   | NEL
-  | OpportunisticEncryption
+  | SettingEditResponse.ZonesSchemasOpportunisticEncryption
   | OpportunisticOnion
   | OrangeToOrange
-  | OriginErrorPagePassThru
-  | Polish
+  | SettingEditResponse.ZonesSchemasOriginErrorPagePassThru
+  | SettingEditResponse.ZonesSchemasPolish
   | PrefetchPreload
   | ProxyReadTimeout
   | PseudoIPV4
   | SettingEditResponse.ZonesReplaceInsecureJS
-  | ResponseBuffering
-  | RocketLoader
+  | SettingEditResponse.ZonesSchemasResponseBuffering
+  | SettingEditResponse.ZonesSchemasRocketLoader
   | SettingEditResponse.ZonesSchemasAutomaticPlatformOptimization
   | SecurityHeaders
-  | SecurityLevel
+  | SettingEditResponse.ZonesSchemasSecurityLevel
   | ServerSideExcludes
   | SettingEditResponse.ZonesSha1Support
-  | SortQueryStringForCache
-  | SSL
+  | SettingEditResponse.ZonesSchemasSortQueryStringForCache
+  | SettingEditResponse.ZonesSchemasSSL
   | SSLRecommender
   | SettingEditResponse.ZonesTLS1_2Only
   | TLS1_3
   | TLSClientAuth
-  | TrueClientIPHeader
-  | WAF
+  | SettingEditResponse.ZonesSchemasTrueClientIPHeader
+  | SettingEditResponse.ZonesSchemasWAF
   | WebP
   | Websocket;
 
-export namespace SettingEditResponse {
+export namespace SettingEditResponse {
+  /**
+   * Reply to all requests for URLs that use "http" with a 301 redirect to the
+   * equivalent "https" URL. If you only want to redirect for a subset of requests,
+   * consider creating an "Always use HTTPS" page rule.
+   */
+  export interface ZonesSchemasAlwaysUseHTTPS {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'always_use_https';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Enable the Automatic HTTPS Rewrites feature for this zone.
+   */
+  export interface ZonesSchemasAutomaticHTTPSRewrites {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'automatic_https_rewrites';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Browser Cache TTL (in seconds) specifies how long Cloudflare-cached resources
+   * will remain on your visitors' computers. Cloudflare will honor any larger times
+   * specified by your server.
+   * (https://support.cloudflare.com/hc/en-us/articles/200168276).
+   */
+  export interface ZonesSchemasBrowserCacheTTL {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'browser_cache_ttl';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value:
+      | 0
+      | 30
+      | 60
+      | 120
+      | 300
+      | 1200
+      | 1800
+      | 3600
+      | 7200
+      | 10800
+      | 14400
+      | 18000
+      | 28800
+      | 43200
+      | 57600
+      | 72000
+      | 86400
+      | 172800
+      | 259200
+      | 345600
+      | 432000
+      | 691200
+      | 1382400
+      | 2073600
+      | 2678400
+      | 5356800
+      | 16070400
+      | 31536000;
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Browser Integrity Check is similar to Bad Behavior and looks for common HTTP
+   * headers abused most commonly by spammers and denies access to your page. It will
+   * also challenge visitors that do not have a user agent or a non standard user
+   * agent (also commonly used by abuse bots, crawlers or visitors).
+   * (https://support.cloudflare.com/hc/en-us/articles/200170086).
+   */
+  export interface ZonesSchemasBrowserCheck {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'browser_check';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Cache Level functions based off the setting level. The basic setting will cache
+   * most static resources (i.e., css, images, and JavaScript). The simplified
+   * setting will ignore the query string when delivering a cached resource. The
+   * aggressive setting will cache all static resources, including ones with a query
+   * string. (https://support.cloudflare.com/hc/en-us/articles/200168256).
+   */
+  export interface ZonesSchemasCacheLevel {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'cache_level';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'aggressive' | 'basic' | 'simplified';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Whether or not cname flattening is on.
+   */
+  export interface ZonesCNAMEFlattening {
+    /**
+     * How to flatten the cname destination.
+     */
+    id: 'cname_flattening';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'flatten_at_root' | 'flatten_all';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Time (in seconds) that a resource will be ensured to remain on Cloudflare's
+   * cache servers.
+   */
+  export interface ZonesSchemasEdgeCacheTTL {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'edge_cache_ttl';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value:
+      | 30
+      | 60
+      | 300
+      | 1200
+      | 1800
+      | 3600
+      | 7200
+      | 10800
+      | 14400
+      | 18000
+      | 28800
+      | 43200
+      | 57600
+      | 72000
+      | 86400
+      | 172800
+      | 259200
+      | 345600
+      | 432000
+      | 518400
+      | 604800;
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Encrypt email adresses on your web page from bots, while keeping them visible to
+   * humans. (https://support.cloudflare.com/hc/en-us/articles/200170016).
+   */
+  export interface ZonesSchemasEmailObfuscation {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'email_obfuscation';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Enable IP Geolocation to have Cloudflare geolocate visitors to your website and
+   * pass the country code to you.
+   * (https://support.cloudflare.com/hc/en-us/articles/200168236).
+   */
+  export interface ZonesSchemasIPGeolocation {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'ip_geolocation';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Maximum size of an allowable upload.
+   */
+  export interface ZonesMaxUpload {
+    /**
+     * identifier of the zone setting.
+     */
+    id: 'max_upload';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 100 | 200 | 500;
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Automatically optimize image loading for website visitors on mobile devices.
+   * Refer to
+   * [our blog post](http://blog.cloudflare.com/mirage2-solving-mobile-speed) for
+   * more information.
+   */
+  export interface ZonesSchemasMirage {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'mirage';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Enables the Opportunistic Encryption feature for a zone.
+   */
+  export interface ZonesSchemasOpportunisticEncryption {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'opportunistic_encryption';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Cloudflare will proxy customer error pages on any 502,504 errors on origin
+   * server instead of showing a default Cloudflare error page. This does not apply
+   * to 522 errors and is limited to Enterprise Zones.
+   */
+  export interface ZonesSchemasOriginErrorPagePassThru {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'origin_error_page_pass_thru';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Removes metadata and compresses your images for faster page load times. Basic
+   * (Lossless): Reduce the size of PNG, JPEG, and GIF files - no impact on visual
+   * quality. Basic + JPEG (Lossy): Further reduce the size of JPEG files for faster
+   * image loading. Larger JPEGs are converted to progressive images, loading a
+   * lower-resolution image first and ending in a higher-resolution version. Not
+   * recommended for hi-res photography sites.
+   */
+  export interface ZonesSchemasPolish {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'polish';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'off' | 'lossless' | 'lossy';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Automatically replace insecure JavaScript libraries with safer and faster
+   * alternatives provided under cdnjs and powered by Cloudflare. Currently supports
+   * the following libraries: Polyfill under polyfill.io.
+   */
+  export interface ZonesReplaceInsecureJS {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'replace_insecure_js';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Enables or disables buffering of responses from the proxied server. Cloudflare
+   * may buffer the whole payload to deliver it at once to the client versus allowing
+   * it to be delivered in chunks. By default, the proxied server streams directly
+   * and is not buffered by Cloudflare. This is limited to Enterprise Zones.
+   */
+  export interface ZonesSchemasResponseBuffering {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'response_buffering';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Rocket Loader is a general-purpose asynchronous JavaScript optimisation that
+   * prioritises rendering your content while loading your site's Javascript
+   * asynchronously. Turning on Rocket Loader will immediately improve a web page's
+   * rendering time sometimes measured as Time to First Paint (TTFP), and also the
+   * `window.onload` time (assuming there is JavaScript on the page). This can have a
+   * positive impact on your Google search ranking. When turned on, Rocket Loader
+   * will automatically defer the loading of all Javascript referenced in your HTML,
+   * with no configuration required. Refer to
+   * [Understanding Rocket Loader](https://support.cloudflare.com/hc/articles/200168056)
+   * for more information.
+   */
+  export interface ZonesSchemasRocketLoader {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'rocket_loader';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * [Automatic Platform Optimization for WordPress](https://developers.cloudflare.com/automatic-platform-optimization/)
+   * serves your WordPress site from Cloudflare's edge network and caches third-party
+   * fonts.
+   */
+  export interface ZonesSchemasAutomaticPlatformOptimization {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'automatic_platform_optimization';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: SettingsAPI.AutomaticPlatformOptimization;
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Choose the appropriate security profile for your website, which will
+   * automatically adjust each of the security settings. If you choose to customize
+   * an individual security setting, the profile will become Custom.
+   * (https://support.cloudflare.com/hc/en-us/articles/200170056).
+   */
+  export interface ZonesSchemasSecurityLevel {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'security_level';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'off' | 'essentially_off' | 'low' | 'medium' | 'high' | 'under_attack';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Allow SHA1 support.
+   */
+  export interface ZonesSha1Support {
+    /**
+     * Zone setting identifier.
+     */
+    id: 'sha1_support';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'off' | 'on';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Cloudflare will treat files with the same query strings as the same file in
+   * cache, regardless of the order of the query strings. This is limited to
+   * Enterprise Zones.
+   */
+  export interface ZonesSchemasSortQueryStringForCache {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'sort_query_string_for_cache';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * SSL encrypts your visitor's connection and safeguards credit card numbers and
+   * other personal data to and from your website. SSL can take up to 5 minutes to
+   * fully activate. Requires Cloudflare active on your root domain or www domain.
+   * Off: no SSL between the visitor and Cloudflare, and no SSL between Cloudflare
+   * and your web server (all HTTP traffic). Flexible: SSL between the visitor and
+   * Cloudflare -- visitor sees HTTPS on your site, but no SSL between Cloudflare and
+   * your web server. You don't need to have an SSL cert on your web server, but your
+   * vistors will still see the site as being HTTPS enabled. Full: SSL between the
+   * visitor and Cloudflare -- visitor sees HTTPS on your site, and SSL between
+   * Cloudflare and your web server. You'll need to have your own SSL cert or
+   * self-signed cert at the very least. Full (Strict): SSL between the visitor and
+   * Cloudflare -- visitor sees HTTPS on your site, and SSL between Cloudflare and
+   * your web server. You'll need to have a valid SSL certificate installed on your
+   * web server. This certificate must be signed by a certificate authority, have an
+   * expiration date in the future, and respond for the request domain name
+   * (hostname). (https://support.cloudflare.com/hc/en-us/articles/200170416).
+   */
+  export interface ZonesSchemasSSL {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'ssl';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'off' | 'flexible' | 'full' | 'strict';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Only allows TLS1.2.
+   */
+  export interface ZonesTLS1_2Only {
+    /**
+     * Zone setting identifier.
+     */
+    id: 'tls_1_2_only';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'off' | 'on';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Allows customer to continue to use True Client IP (Akamai feature) in the
+   * headers we send to the origin. This is limited to Enterprise Zones.
+   */
+  export interface ZonesSchemasTrueClientIPHeader {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'true_client_ip_header';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * The WAF examines HTTP requests to your website. It inspects both GET and POST
+   * requests and applies rules to help filter out illegitimate traffic from
+   * legitimate website visitors. The Cloudflare WAF inspects website addresses or
+   * URLs to detect anything out of the ordinary. If the Cloudflare WAF determines
+   * suspicious user behavior, then the WAF will 'challenge' the web visitor with a
+   * page that asks them to submit a CAPTCHA successfully to continue their action.
+   * If the challenge is failed, the action will be stopped. What this means is that
+   * Cloudflare's WAF will block any traffic identified as illegitimate before it
+   * reaches your origin web server.
+   * (https://support.cloudflare.com/hc/en-us/articles/200172016).
+   */
+  export interface ZonesSchemasWAF {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'waf';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+}
+
+/**
+ * 0-RTT session resumption enabled for this zone.
+ */
+export type SettingGetResponse =
+  | ZeroRTT
+  | AdvancedDDoS
+  | AlwaysOnline
+  | SettingGetResponse.ZonesSchemasAlwaysUseHTTPS
+  | SettingGetResponse.ZonesSchemasAutomaticHTTPSRewrites
+  | Brotli
+  | SettingGetResponse.ZonesSchemasBrowserCacheTTL
+  | SettingGetResponse.ZonesSchemasBrowserCheck
+  | SettingGetResponse.ZonesSchemasCacheLevel
+  | ChallengeTTL
+  | Ciphers
+  | SettingGetResponse.ZonesCNAMEFlattening
+  | DevelopmentMode
+  | EarlyHints
+  | SettingGetResponse.ZonesSchemasEdgeCacheTTL
+  | SettingGetResponse.ZonesSchemasEmailObfuscation
+  | H2Prioritization
+  | HotlinkProtection
+  | HTTP2
+  | HTTP3
+  | ImageResizing
+  | SettingGetResponse.ZonesSchemasIPGeolocation
+  | IPV6
+  | SettingGetResponse.ZonesMaxUpload
+  | MinTLSVersion
+  | SettingGetResponse.ZonesSchemasMirage
+  | NEL
+  | SettingGetResponse.ZonesSchemasOpportunisticEncryption
+  | OpportunisticOnion
+  | OrangeToOrange
+  | SettingGetResponse.ZonesSchemasOriginErrorPagePassThru
+  | SettingGetResponse.ZonesSchemasPolish
+  | PrefetchPreload
+  | ProxyReadTimeout
+  | PseudoIPV4
+  | SettingGetResponse.ZonesReplaceInsecureJS
+  | SettingGetResponse.ZonesSchemasResponseBuffering
+  | SettingGetResponse.ZonesSchemasRocketLoader
+  | SettingGetResponse.ZonesSchemasAutomaticPlatformOptimization
+  | SecurityHeaders
+  | SettingGetResponse.ZonesSchemasSecurityLevel
+  | ServerSideExcludes
+  | SettingGetResponse.ZonesSha1Support
+  | SettingGetResponse.ZonesSchemasSortQueryStringForCache
+  | SettingGetResponse.ZonesSchemasSSL
+  | SSLRecommender
+  | SettingGetResponse.ZonesTLS1_2Only
+  | TLS1_3
+  | TLSClientAuth
+  | SettingGetResponse.ZonesSchemasTrueClientIPHeader
+  | SettingGetResponse.ZonesSchemasWAF
+  | WebP
+  | Websocket;
+
+export namespace SettingGetResponse {
+  /**
+   * Reply to all requests for URLs that use "http" with a 301 redirect to the
+   * equivalent "https" URL. If you only want to redirect for a subset of requests,
+   * consider creating an "Always use HTTPS" page rule.
+   */
+  export interface ZonesSchemasAlwaysUseHTTPS {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'always_use_https';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Enable the Automatic HTTPS Rewrites feature for this zone.
+   */
+  export interface ZonesSchemasAutomaticHTTPSRewrites {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'automatic_https_rewrites';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Browser Cache TTL (in seconds) specifies how long Cloudflare-cached resources
+   * will remain on your visitors' computers. Cloudflare will honor any larger times
+   * specified by your server.
+   * (https://support.cloudflare.com/hc/en-us/articles/200168276).
+   */
+  export interface ZonesSchemasBrowserCacheTTL {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'browser_cache_ttl';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value:
+      | 0
+      | 30
+      | 60
+      | 120
+      | 300
+      | 1200
+      | 1800
+      | 3600
+      | 7200
+      | 10800
+      | 14400
+      | 18000
+      | 28800
+      | 43200
+      | 57600
+      | 72000
+      | 86400
+      | 172800
+      | 259200
+      | 345600
+      | 432000
+      | 691200
+      | 1382400
+      | 2073600
+      | 2678400
+      | 5356800
+      | 16070400
+      | 31536000;
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Browser Integrity Check is similar to Bad Behavior and looks for common HTTP
+   * headers abused most commonly by spammers and denies access to your page. It will
+   * also challenge visitors that do not have a user agent or a non standard user
+   * agent (also commonly used by abuse bots, crawlers or visitors).
+   * (https://support.cloudflare.com/hc/en-us/articles/200170086).
+   */
+  export interface ZonesSchemasBrowserCheck {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'browser_check';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Cache Level functions based off the setting level. The basic setting will cache
+   * most static resources (i.e., css, images, and JavaScript). The simplified
+   * setting will ignore the query string when delivering a cached resource. The
+   * aggressive setting will cache all static resources, including ones with a query
+   * string. (https://support.cloudflare.com/hc/en-us/articles/200168256).
+   */
+  export interface ZonesSchemasCacheLevel {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'cache_level';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'aggressive' | 'basic' | 'simplified';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Whether or not cname flattening is on.
+   */
+  export interface ZonesCNAMEFlattening {
+    /**
+     * How to flatten the cname destination.
+     */
+    id: 'cname_flattening';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'flatten_at_root' | 'flatten_all';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Time (in seconds) that a resource will be ensured to remain on Cloudflare's
+   * cache servers.
+   */
+  export interface ZonesSchemasEdgeCacheTTL {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'edge_cache_ttl';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value:
+      | 30
+      | 60
+      | 300
+      | 1200
+      | 1800
+      | 3600
+      | 7200
+      | 10800
+      | 14400
+      | 18000
+      | 28800
+      | 43200
+      | 57600
+      | 72000
+      | 86400
+      | 172800
+      | 259200
+      | 345600
+      | 432000
+      | 518400
+      | 604800;
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Encrypt email adresses on your web page from bots, while keeping them visible to
+   * humans. (https://support.cloudflare.com/hc/en-us/articles/200170016).
+   */
+  export interface ZonesSchemasEmailObfuscation {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'email_obfuscation';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Enable IP Geolocation to have Cloudflare geolocate visitors to your website and
+   * pass the country code to you.
+   * (https://support.cloudflare.com/hc/en-us/articles/200168236).
+   */
+  export interface ZonesSchemasIPGeolocation {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'ip_geolocation';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Maximum size of an allowable upload.
+   */
+  export interface ZonesMaxUpload {
+    /**
+     * identifier of the zone setting.
+     */
+    id: 'max_upload';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 100 | 200 | 500;
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
+  /**
+   * Automatically optimize image loading for website visitors on mobile devices.
+   * Refer to
+   * [our blog post](http://blog.cloudflare.com/mirage2-solving-mobile-speed) for
+   * more information.
+   */
+  export interface ZonesSchemasMirage {
+    /**
+     * ID of the zone setting.
+     */
+    id: 'mirage';
+
+    /**
+     * Current value of the zone setting.
+     */
+    value: 'on' | 'off';
+
+    /**
+     * Whether or not this setting can be modified for this zone (based on your
+     * Cloudflare plan level).
+     */
+    editable?: true | false;
+
+    /**
+     * last time this setting was modified.
+     */
+    modified_on?: string | null;
+  }
+
   /**
-   * Whether or not cname flattening is on.
+   * Enables the Opportunistic Encryption feature for a zone.
    */
-  export interface ZonesCNAMEFlattening {
+  export interface ZonesSchemasOpportunisticEncryption {
     /**
-     * How to flatten the cname destination.
+     * ID of the zone setting.
      */
-    id: 'cname_flattening';
+    id: 'opportunistic_encryption';
 
     /**
      * Current value of the zone setting.
      */
-    value: 'flatten_at_root' | 'flatten_all';
+    value: 'on' | 'off';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -1751,40 +3330,20 @@ export namespace SettingEditResponse {
   }
 
   /**
-   * Time (in seconds) that a resource will be ensured to remain on Cloudflare's
-   * cache servers.
+   * Cloudflare will proxy customer error pages on any 502,504 errors on origin
+   * server instead of showing a default Cloudflare error page. This does not apply
+   * to 522 errors and is limited to Enterprise Zones.
    */
-  export interface ZonesEdgeCacheTTL {
+  export interface ZonesSchemasOriginErrorPagePassThru {
     /**
      * ID of the zone setting.
      */
-    id: 'edge_cache_ttl';
+    id: 'origin_error_page_pass_thru';
 
     /**
      * Current value of the zone setting.
      */
-    value:
-      | 30
-      | 60
-      | 300
-      | 1200
-      | 1800
-      | 3600
-      | 7200
-      | 10800
-      | 14400
-      | 18000
-      | 28800
-      | 43200
-      | 57600
-      | 72000
-      | 86400
-      | 172800
-      | 259200
-      | 345600
-      | 432000
-      | 518400
-      | 604800;
+    value: 'on' | 'off';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -1799,18 +3358,23 @@ export namespace SettingEditResponse {
   }
 
   /**
-   * Maximum size of an allowable upload.
+   * Removes metadata and compresses your images for faster page load times. Basic
+   * (Lossless): Reduce the size of PNG, JPEG, and GIF files - no impact on visual
+   * quality. Basic + JPEG (Lossy): Further reduce the size of JPEG files for faster
+   * image loading. Larger JPEGs are converted to progressive images, loading a
+   * lower-resolution image first and ending in a higher-resolution version. Not
+   * recommended for hi-res photography sites.
    */
-  export interface ZonesMaxUpload {
+  export interface ZonesSchemasPolish {
     /**
-     * identifier of the zone setting.
+     * ID of the zone setting.
      */
-    id: 'max_upload';
+    id: 'polish';
 
     /**
      * Current value of the zone setting.
      */
-    value: 100 | 200 | 500;
+    value: 'off' | 'lossless' | 'lossy';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -1853,20 +3417,21 @@ export namespace SettingEditResponse {
   }
 
   /**
-   * [Automatic Platform Optimization for WordPress](https://developers.cloudflare.com/automatic-platform-optimization/)
-   * serves your WordPress site from Cloudflare's edge network and caches third-party
-   * fonts.
+   * Enables or disables buffering of responses from the proxied server. Cloudflare
+   * may buffer the whole payload to deliver it at once to the client versus allowing
+   * it to be delivered in chunks. By default, the proxied server streams directly
+   * and is not buffered by Cloudflare. This is limited to Enterprise Zones.
    */
-  export interface ZonesSchemasAutomaticPlatformOptimization {
+  export interface ZonesSchemasResponseBuffering {
     /**
      * ID of the zone setting.
      */
-    id: 'automatic_platform_optimization';
+    id: 'response_buffering';
 
     /**
      * Current value of the zone setting.
      */
-    value: SettingsAPI.AutomaticPlatformOptimization;
+    value: 'on' | 'off';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -1881,18 +3446,27 @@ export namespace SettingEditResponse {
   }
 
   /**
-   * Allow SHA1 support.
+   * Rocket Loader is a general-purpose asynchronous JavaScript optimisation that
+   * prioritises rendering your content while loading your site's Javascript
+   * asynchronously. Turning on Rocket Loader will immediately improve a web page's
+   * rendering time sometimes measured as Time to First Paint (TTFP), and also the
+   * `window.onload` time (assuming there is JavaScript on the page). This can have a
+   * positive impact on your Google search ranking. When turned on, Rocket Loader
+   * will automatically defer the loading of all Javascript referenced in your HTML,
+   * with no configuration required. Refer to
+   * [Understanding Rocket Loader](https://support.cloudflare.com/hc/articles/200168056)
+   * for more information.
    */
-  export interface ZonesSha1Support {
+  export interface ZonesSchemasRocketLoader {
     /**
-     * Zone setting identifier.
+     * ID of the zone setting.
      */
-    id: 'sha1_support';
+    id: 'rocket_loader';
 
     /**
      * Current value of the zone setting.
      */
-    value: 'off' | 'on';
+    value: 'on' | 'off';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -1907,18 +3481,20 @@ export namespace SettingEditResponse {
   }
 
   /**
-   * Only allows TLS1.2.
+   * [Automatic Platform Optimization for WordPress](https://developers.cloudflare.com/automatic-platform-optimization/)
+   * serves your WordPress site from Cloudflare's edge network and caches third-party
+   * fonts.
    */
-  export interface ZonesTLS1_2Only {
+  export interface ZonesSchemasAutomaticPlatformOptimization {
     /**
-     * Zone setting identifier.
+     * ID of the zone setting.
      */
-    id: 'tls_1_2_only';
+    id: 'automatic_platform_optimization';
 
     /**
      * Current value of the zone setting.
      */
-    value: 'off' | 'on';
+    value: SettingsAPI.AutomaticPlatformOptimization;
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -1931,82 +3507,23 @@ export namespace SettingEditResponse {
      */
     modified_on?: string | null;
   }
-}
-
-/**
- * 0-RTT session resumption enabled for this zone.
- */
-export type SettingGetResponse =
-  | ZeroRTT
-  | AdvancedDDoS
-  | AlwaysOnline
-  | AlwaysUseHTTPS
-  | AutomaticHTTPSRewrites
-  | Brotli
-  | BrowserCacheTTL
-  | BrowserCheck
-  | CacheLevel
-  | ChallengeTTL
-  | Ciphers
-  | SettingGetResponse.ZonesCNAMEFlattening
-  | DevelopmentMode
-  | EarlyHints
-  | SettingGetResponse.ZonesEdgeCacheTTL
-  | EmailObfuscation
-  | H2Prioritization
-  | HotlinkProtection
-  | HTTP2
-  | HTTP3
-  | ImageResizing
-  | IPGeolocation
-  | IPV6
-  | SettingGetResponse.ZonesMaxUpload
-  | MinTLSVersion
-  | Minify
-  | Mirage
-  | MobileRedirect
-  | NEL
-  | OpportunisticEncryption
-  | OpportunisticOnion
-  | OrangeToOrange
-  | OriginErrorPagePassThru
-  | Polish
-  | PrefetchPreload
-  | ProxyReadTimeout
-  | PseudoIPV4
-  | SettingGetResponse.ZonesReplaceInsecureJS
-  | ResponseBuffering
-  | RocketLoader
-  | SettingGetResponse.ZonesSchemasAutomaticPlatformOptimization
-  | SecurityHeaders
-  | SecurityLevel
-  | ServerSideExcludes
-  | SettingGetResponse.ZonesSha1Support
-  | SortQueryStringForCache
-  | SSL
-  | SSLRecommender
-  | SettingGetResponse.ZonesTLS1_2Only
-  | TLS1_3
-  | TLSClientAuth
-  | TrueClientIPHeader
-  | WAF
-  | WebP
-  | Websocket;
 
-export namespace SettingGetResponse {
   /**
-   * Whether or not cname flattening is on.
+   * Choose the appropriate security profile for your website, which will
+   * automatically adjust each of the security settings. If you choose to customize
+   * an individual security setting, the profile will become Custom.
+   * (https://support.cloudflare.com/hc/en-us/articles/200170056).
    */
-  export interface ZonesCNAMEFlattening {
+  export interface ZonesSchemasSecurityLevel {
     /**
-     * How to flatten the cname destination.
+     * ID of the zone setting.
      */
-    id: 'cname_flattening';
+    id: 'security_level';
 
     /**
      * Current value of the zone setting.
      */
-    value: 'flatten_at_root' | 'flatten_all';
+    value: 'off' | 'essentially_off' | 'low' | 'medium' | 'high' | 'under_attack';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -2021,40 +3538,18 @@ export namespace SettingGetResponse {
   }
 
   /**
-   * Time (in seconds) that a resource will be ensured to remain on Cloudflare's
-   * cache servers.
+   * Allow SHA1 support.
    */
-  export interface ZonesEdgeCacheTTL {
+  export interface ZonesSha1Support {
     /**
-     * ID of the zone setting.
+     * Zone setting identifier.
      */
-    id: 'edge_cache_ttl';
+    id: 'sha1_support';
 
     /**
      * Current value of the zone setting.
      */
-    value:
-      | 30
-      | 60
-      | 300
-      | 1200
-      | 1800
-      | 3600
-      | 7200
-      | 10800
-      | 14400
-      | 18000
-      | 28800
-      | 43200
-      | 57600
-      | 72000
-      | 86400
-      | 172800
-      | 259200
-      | 345600
-      | 432000
-      | 518400
-      | 604800;
+    value: 'off' | 'on';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -2069,18 +3564,20 @@ export namespace SettingGetResponse {
   }
 
   /**
-   * Maximum size of an allowable upload.
+   * Cloudflare will treat files with the same query strings as the same file in
+   * cache, regardless of the order of the query strings. This is limited to
+   * Enterprise Zones.
    */
-  export interface ZonesMaxUpload {
+  export interface ZonesSchemasSortQueryStringForCache {
     /**
-     * identifier of the zone setting.
+     * ID of the zone setting.
      */
-    id: 'max_upload';
+    id: 'sort_query_string_for_cache';
 
     /**
      * Current value of the zone setting.
      */
-    value: 100 | 200 | 500;
+    value: 'on' | 'off';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -2095,20 +3592,33 @@ export namespace SettingGetResponse {
   }
 
   /**
-   * Automatically replace insecure JavaScript libraries with safer and faster
-   * alternatives provided under cdnjs and powered by Cloudflare. Currently supports
-   * the following libraries: Polyfill under polyfill.io.
-   */
-  export interface ZonesReplaceInsecureJS {
+   * SSL encrypts your visitor's connection and safeguards credit card numbers and
+   * other personal data to and from your website. SSL can take up to 5 minutes to
+   * fully activate. Requires Cloudflare active on your root domain or www domain.
+   * Off: no SSL between the visitor and Cloudflare, and no SSL between Cloudflare
+   * and your web server (all HTTP traffic). Flexible: SSL between the visitor and
+   * Cloudflare -- visitor sees HTTPS on your site, but no SSL between Cloudflare and
+   * your web server. You don't need to have an SSL cert on your web server, but your
+   * vistors will still see the site as being HTTPS enabled. Full: SSL between the
+   * visitor and Cloudflare -- visitor sees HTTPS on your site, and SSL between
+   * Cloudflare and your web server. You'll need to have your own SSL cert or
+   * self-signed cert at the very least. Full (Strict): SSL between the visitor and
+   * Cloudflare -- visitor sees HTTPS on your site, and SSL between Cloudflare and
+   * your web server. You'll need to have a valid SSL certificate installed on your
+   * web server. This certificate must be signed by a certificate authority, have an
+   * expiration date in the future, and respond for the request domain name
+   * (hostname). (https://support.cloudflare.com/hc/en-us/articles/200170416).
+   */
+  export interface ZonesSchemasSSL {
     /**
      * ID of the zone setting.
      */
-    id: 'replace_insecure_js';
+    id: 'ssl';
 
     /**
      * Current value of the zone setting.
      */
-    value: 'on' | 'off';
+    value: 'off' | 'flexible' | 'full' | 'strict';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -2123,20 +3633,18 @@ export namespace SettingGetResponse {
   }
 
   /**
-   * [Automatic Platform Optimization for WordPress](https://developers.cloudflare.com/automatic-platform-optimization/)
-   * serves your WordPress site from Cloudflare's edge network and caches third-party
-   * fonts.
+   * Only allows TLS1.2.
    */
-  export interface ZonesSchemasAutomaticPlatformOptimization {
+  export interface ZonesTLS1_2Only {
     /**
-     * ID of the zone setting.
+     * Zone setting identifier.
      */
-    id: 'automatic_platform_optimization';
+    id: 'tls_1_2_only';
 
     /**
      * Current value of the zone setting.
      */
-    value: SettingsAPI.AutomaticPlatformOptimization;
+    value: 'off' | 'on';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -2151,18 +3659,19 @@ export namespace SettingGetResponse {
   }
 
   /**
-   * Allow SHA1 support.
+   * Allows customer to continue to use True Client IP (Akamai feature) in the
+   * headers we send to the origin. This is limited to Enterprise Zones.
    */
-  export interface ZonesSha1Support {
+  export interface ZonesSchemasTrueClientIPHeader {
     /**
-     * Zone setting identifier.
+     * ID of the zone setting.
      */
-    id: 'sha1_support';
+    id: 'true_client_ip_header';
 
     /**
      * Current value of the zone setting.
      */
-    value: 'off' | 'on';
+    value: 'on' | 'off';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -2177,18 +3686,27 @@ export namespace SettingGetResponse {
   }
 
   /**
-   * Only allows TLS1.2.
+   * The WAF examines HTTP requests to your website. It inspects both GET and POST
+   * requests and applies rules to help filter out illegitimate traffic from
+   * legitimate website visitors. The Cloudflare WAF inspects website addresses or
+   * URLs to detect anything out of the ordinary. If the Cloudflare WAF determines
+   * suspicious user behavior, then the WAF will 'challenge' the web visitor with a
+   * page that asks them to submit a CAPTCHA successfully to continue their action.
+   * If the challenge is failed, the action will be stopped. What this means is that
+   * Cloudflare's WAF will block any traffic identified as illegitimate before it
+   * reaches your origin web server.
+   * (https://support.cloudflare.com/hc/en-us/articles/200172016).
    */
-  export interface ZonesTLS1_2Only {
+  export interface ZonesSchemasWAF {
     /**
-     * Zone setting identifier.
+     * ID of the zone setting.
      */
-    id: 'tls_1_2_only';
+    id: 'waf';
 
     /**
      * Current value of the zone setting.
      */
-    value: 'off' | 'on';
+    value: 'on' | 'off';
 
     /**
      * Whether or not this setting can be modified for this zone (based on your
@@ -2207,60 +3725,58 @@ export type SettingEditParams =
   | SettingEditParams.ZeroRTT
   | SettingEditParams.AdvancedDDoS
   | SettingEditParams.AlwaysOnline
-  | SettingEditParams.AlwaysUseHTTPS
-  | SettingEditParams.AutomaticHTTPSRewrites
+  | SettingEditParams.ZonesSchemasAlwaysUseHTTPS
+  | SettingEditParams.ZonesSchemasAutomaticHTTPSRewrites
   | SettingEditParams.Brotli
-  | SettingEditParams.BrowserCacheTTL
-  | SettingEditParams.BrowserCheck
-  | SettingEditParams.CacheLevel
+  | SettingEditParams.ZonesSchemasBrowserCacheTTL
+  | SettingEditParams.ZonesSchemasBrowserCheck
+  | SettingEditParams.ZonesSchemasCacheLevel
   | SettingEditParams.ChallengeTTL
   | SettingEditParams.Ciphers
   | SettingEditParams.ZonesCNAMEFlattening
   | SettingEditParams.DevelopmentMode
   | SettingEditParams.EarlyHints
-  | SettingEditParams.ZonesEdgeCacheTTL
-  | SettingEditParams.EmailObfuscation
+  | SettingEditParams.ZonesSchemasEdgeCacheTTL
+  | SettingEditParams.ZonesSchemasEmailObfuscation
   | SettingEditParams.H2Prioritization
   | SettingEditParams.HotlinkProtection
   | SettingEditParams.HTTP2
   | SettingEditParams.HTTP3
   | SettingEditParams.ImageResizing
-  | SettingEditParams.IPGeolocation
+  | SettingEditParams.ZonesSchemasIPGeolocation
   | SettingEditParams.IPV6
   | SettingEditParams.ZonesMaxUpload
   | SettingEditParams.MinTLSVersion
-  | SettingEditParams.Minify
-  | SettingEditParams.Mirage
-  | SettingEditParams.MobileRedirect
+  | SettingEditParams.ZonesSchemasMirage
   | SettingEditParams.NEL
-  | SettingEditParams.OpportunisticEncryption
+  | SettingEditParams.ZonesSchemasOpportunisticEncryption
   | SettingEditParams.OpportunisticOnion
   | SettingEditParams.OrangeToOrange
-  | SettingEditParams.OriginErrorPagePassThru
-  | SettingEditParams.Polish
+  | SettingEditParams.ZonesSchemasOriginErrorPagePassThru
+  | SettingEditParams.ZonesSchemasPolish
   | SettingEditParams.PrefetchPreload
   | SettingEditParams.ProxyReadTimeout
   | SettingEditParams.PseudoIPV4
   | SettingEditParams.ZonesReplaceInsecureJS
-  | SettingEditParams.ResponseBuffering
-  | SettingEditParams.RocketLoader
+  | SettingEditParams.ZonesSchemasResponseBuffering
+  | SettingEditParams.ZonesSchemasRocketLoader
   | SettingEditParams.ZonesSchemasAutomaticPlatformOptimization
   | SettingEditParams.SecurityHeaders
-  | SettingEditParams.SecurityLevel
+  | SettingEditParams.ZonesSchemasSecurityLevel
   | SettingEditParams.ServerSideExcludes
   | SettingEditParams.ZonesSha1Support
-  | SettingEditParams.SortQueryStringForCache
-  | SettingEditParams.SSL
+  | SettingEditParams.ZonesSchemasSortQueryStringForCache
+  | SettingEditParams.ZonesSchemasSSL
   | SettingEditParams.SSLRecommender
   | SettingEditParams.ZonesTLS1_2Only
   | SettingEditParams.TLS1_3
   | SettingEditParams.TLSClientAuth
-  | SettingEditParams.TrueClientIPHeader
-  | SettingEditParams.WAF
+  | SettingEditParams.ZonesSchemasTrueClientIPHeader
+  | SettingEditParams.ZonesSchemasWAF
   | SettingEditParams.WebP
   | SettingEditParams.Websocket;
 
-export namespace SettingEditParams {
+export declare namespace SettingEditParams {
   export interface ZeroRTT {
     /**
      * Path param: Identifier
@@ -2312,7 +3828,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface AlwaysUseHTTPS {
+  export interface ZonesSchemasAlwaysUseHTTPS {
     /**
      * Path param: Identifier
      */
@@ -2329,7 +3845,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface AutomaticHTTPSRewrites {
+  export interface ZonesSchemasAutomaticHTTPSRewrites {
     /**
      * Path param: Identifier
      */
@@ -2363,7 +3879,7 @@ export namespace SettingEditParams {
     value: 'off' | 'on';
   }
 
-  export interface BrowserCacheTTL {
+  export interface ZonesSchemasBrowserCacheTTL {
     /**
      * Path param: Identifier
      */
@@ -2408,7 +3924,7 @@ export namespace SettingEditParams {
       | 31536000;
   }
 
-  export interface BrowserCheck {
+  export interface ZonesSchemasBrowserCheck {
     /**
      * Path param: Identifier
      */
@@ -2425,7 +3941,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface CacheLevel {
+  export interface ZonesSchemasCacheLevel {
     /**
      * Path param: Identifier
      */
@@ -2541,7 +4057,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface ZonesEdgeCacheTTL {
+  export interface ZonesSchemasEdgeCacheTTL {
     /**
      * Path param: Identifier
      */
@@ -2579,7 +4095,7 @@ export namespace SettingEditParams {
       | 604800;
   }
 
-  export interface EmailObfuscation {
+  export interface ZonesSchemasEmailObfuscation {
     /**
      * Path param: Identifier
      */
@@ -2681,7 +4197,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off' | 'open';
   }
 
-  export interface IPGeolocation {
+  export interface ZonesSchemasIPGeolocation {
     /**
      * Path param: Identifier
      */
@@ -2749,46 +4265,7 @@ export namespace SettingEditParams {
     value: '1.0' | '1.1' | '1.2' | '1.3';
   }
 
-  export interface Minify {
-    /**
-     * Path param: Identifier
-     */
-    zone_id: string;
-
-    /**
-     * Body param: Zone setting identifier.
-     */
-    id: 'minify';
-
-    /**
-     * Body param: Current value of the zone setting.
-     */
-    value: SettingEditParams.Minify.Value;
-  }
-
-  export namespace Minify {
-    /**
-     * Current value of the zone setting.
-     */
-    export interface Value {
-      /**
-       * Automatically minify all CSS files for your website.
-       */
-      css?: 'on' | 'off';
-
-      /**
-       * Automatically minify all HTML files for your website.
-       */
-      html?: 'on' | 'off';
-
-      /**
-       * Automatically minify all JavaScript files for your website.
-       */
-      js?: 'on' | 'off';
-    }
-  }
-
-  export interface Mirage {
+  export interface ZonesSchemasMirage {
     /**
      * Path param: Identifier
      */
@@ -2805,49 +4282,6 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface MobileRedirect {
-    /**
-     * Path param: Identifier
-     */
-    zone_id: string;
-
-    /**
-     * Body param: Identifier of the zone setting.
-     */
-    id: 'mobile_redirect';
-
-    /**
-     * Body param: Current value of the zone setting.
-     */
-    value: SettingEditParams.MobileRedirect.Value;
-  }
-
-  export namespace MobileRedirect {
-    /**
-     * @deprecated: Current value of the zone setting.
-     */
-    export interface Value {
-      /**
-       * Which subdomain prefix you wish to redirect visitors on mobile devices to
-       * (subdomain must already exist).
-       */
-      mobile_subdomain?: string | null;
-
-      /**
-       * Deprecated: Use Single Redirects instead
-       * https://developers.cloudflare.com/rules/url-forwarding/single-redirects/examples/#perform-mobile-redirects.
-       * Whether or not mobile redirect is enabled.
-       */
-      status?: 'on' | 'off';
-
-      /**
-       * Whether to drop the current page path and redirect to the mobile subdomain URL
-       * root, or keep the path and redirect to the same page on the mobile subdomain.
-       */
-      strip_uri?: boolean;
-    }
-  }
-
   export interface NEL {
     /**
      * Path param: Identifier
@@ -2874,7 +4308,7 @@ export namespace SettingEditParams {
     }
   }
 
-  export interface OpportunisticEncryption {
+  export interface ZonesSchemasOpportunisticEncryption {
     /**
      * Path param: Identifier
      */
@@ -2925,7 +4359,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface OriginErrorPagePassThru {
+  export interface ZonesSchemasOriginErrorPagePassThru {
     /**
      * Path param: Identifier
      */
@@ -2942,7 +4376,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface Polish {
+  export interface ZonesSchemasPolish {
     /**
      * Path param: Identifier
      */
@@ -3027,7 +4461,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface ResponseBuffering {
+  export interface ZonesSchemasResponseBuffering {
     /**
      * Path param: Identifier
      */
@@ -3044,7 +4478,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface RocketLoader {
+  export interface ZonesSchemasRocketLoader {
     /**
      * Path param: Identifier
      */
@@ -3139,7 +4573,7 @@ export namespace SettingEditParams {
     }
   }
 
-  export interface SecurityLevel {
+  export interface ZonesSchemasSecurityLevel {
     /**
      * Path param: Identifier
      */
@@ -3190,7 +4624,7 @@ export namespace SettingEditParams {
     value: 'off' | 'on';
   }
 
-  export interface SortQueryStringForCache {
+  export interface ZonesSchemasSortQueryStringForCache {
     /**
      * Path param: Identifier
      */
@@ -3207,7 +4641,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface SSL {
+  export interface ZonesSchemasSSL {
     /**
      * Path param: Identifier
      */
@@ -3292,7 +4726,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface TrueClientIPHeader {
+  export interface ZonesSchemasTrueClientIPHeader {
     /**
      * Path param: Identifier
      */
@@ -3309,7 +4743,7 @@ export namespace SettingEditParams {
     value: 'on' | 'off';
   }
 
-  export interface WAF {
+  export interface ZonesSchemasWAF {
     /**
      * Path param: Identifier
      */
@@ -3368,60 +4802,61 @@ export interface SettingGetParams {
   zone_id: string;
 }
 
-export namespace Settings {
-  export import AdvancedDDoS = SettingsAPI.AdvancedDDoS;
-  export import AlwaysOnline = SettingsAPI.AlwaysOnline;
-  export import AlwaysUseHTTPS = SettingsAPI.AlwaysUseHTTPS;
-  export import AutomaticHTTPSRewrites = SettingsAPI.AutomaticHTTPSRewrites;
-  export import AutomaticPlatformOptimization = SettingsAPI.AutomaticPlatformOptimization;
-  export import Brotli = SettingsAPI.Brotli;
-  export import BrowserCacheTTL = SettingsAPI.BrowserCacheTTL;
-  export import BrowserCheck = SettingsAPI.BrowserCheck;
-  export import CacheLevel = SettingsAPI.CacheLevel;
-  export import ChallengeTTL = SettingsAPI.ChallengeTTL;
-  export import Ciphers = SettingsAPI.Ciphers;
-  export import DevelopmentMode = SettingsAPI.DevelopmentMode;
-  export import EarlyHints = SettingsAPI.EarlyHints;
-  export import EmailObfuscation = SettingsAPI.EmailObfuscation;
-  export import FontSettings = SettingsAPI.FontSettings;
-  export import H2Prioritization = SettingsAPI.H2Prioritization;
-  export import HotlinkProtection = SettingsAPI.HotlinkProtection;
-  export import HTTP2 = SettingsAPI.HTTP2;
-  export import HTTP3 = SettingsAPI.HTTP3;
-  export import ImageResizing = SettingsAPI.ImageResizing;
-  export import IPGeolocation = SettingsAPI.IPGeolocation;
-  export import IPV6 = SettingsAPI.IPV6;
-  export import MinTLSVersion = SettingsAPI.MinTLSVersion;
-  export import Minify = SettingsAPI.Minify;
-  export import Mirage = SettingsAPI.Mirage;
-  export import MobileRedirect = SettingsAPI.MobileRedirect;
-  export import NEL = SettingsAPI.NEL;
-  export import OpportunisticEncryption = SettingsAPI.OpportunisticEncryption;
-  export import OpportunisticOnion = SettingsAPI.OpportunisticOnion;
-  export import OrangeToOrange = SettingsAPI.OrangeToOrange;
-  export import OriginErrorPagePassThru = SettingsAPI.OriginErrorPagePassThru;
-  export import OriginMaxHTTPVersion = SettingsAPI.OriginMaxHTTPVersion;
-  export import Polish = SettingsAPI.Polish;
-  export import PrefetchPreload = SettingsAPI.PrefetchPreload;
-  export import ProxyReadTimeout = SettingsAPI.ProxyReadTimeout;
-  export import PseudoIPV4 = SettingsAPI.PseudoIPV4;
-  export import ResponseBuffering = SettingsAPI.ResponseBuffering;
-  export import RocketLoader = SettingsAPI.RocketLoader;
-  export import SecurityHeaders = SettingsAPI.SecurityHeaders;
-  export import SecurityLevel = SettingsAPI.SecurityLevel;
-  export import ServerSideExcludes = SettingsAPI.ServerSideExcludes;
-  export import SortQueryStringForCache = SettingsAPI.SortQueryStringForCache;
-  export import SSL = SettingsAPI.SSL;
-  export import SSLRecommender = SettingsAPI.SSLRecommender;
-  export import TLS1_3 = SettingsAPI.TLS1_3;
-  export import TLSClientAuth = SettingsAPI.TLSClientAuth;
-  export import TrueClientIPHeader = SettingsAPI.TrueClientIPHeader;
-  export import WAF = SettingsAPI.WAF;
-  export import WebP = SettingsAPI.WebP;
-  export import Websocket = SettingsAPI.Websocket;
-  export import ZeroRTT = SettingsAPI.ZeroRTT;
-  export import SettingEditResponse = SettingsAPI.SettingEditResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
+export declare namespace Settings {
+  export {
+    type AdvancedDDoS as AdvancedDDoS,
+    type Aegis as Aegis,
+    type AlwaysOnline as AlwaysOnline,
+    type AlwaysUseHTTPS as AlwaysUseHTTPS,
+    type AutomaticHTTPSRewrites as AutomaticHTTPSRewrites,
+    type AutomaticPlatformOptimization as AutomaticPlatformOptimization,
+    type Brotli as Brotli,
+    type BrowserCacheTTL as BrowserCacheTTL,
+    type BrowserCheck as BrowserCheck,
+    type CacheLevel as CacheLevel,
+    type ChallengeTTL as ChallengeTTL,
+    type Ciphers as Ciphers,
+    type DevelopmentMode as DevelopmentMode,
+    type EarlyHints as EarlyHints,
+    type EmailObfuscation as EmailObfuscation,
+    type FontSettings as FontSettings,
+    type H2Prioritization as H2Prioritization,
+    type HotlinkProtection as HotlinkProtection,
+    type HTTP2 as HTTP2,
+    type HTTP3 as HTTP3,
+    type ImageResizing as ImageResizing,
+    type IPGeolocation as IPGeolocation,
+    type IPV6 as IPV6,
+    type MinTLSVersion as MinTLSVersion,
+    type Mirage as Mirage,
+    type NEL as NEL,
+    type OpportunisticEncryption as OpportunisticEncryption,
+    type OpportunisticOnion as OpportunisticOnion,
+    type OrangeToOrange as OrangeToOrange,
+    type OriginErrorPagePassThru as OriginErrorPagePassThru,
+    type OriginMaxHTTPVersion as OriginMaxHTTPVersion,
+    type Polish as Polish,
+    type PrefetchPreload as PrefetchPreload,
+    type ProxyReadTimeout as ProxyReadTimeout,
+    type PseudoIPV4 as PseudoIPV4,
+    type ResponseBuffering as ResponseBuffering,
+    type RocketLoader as RocketLoader,
+    type SecurityHeaders as SecurityHeaders,
+    type SecurityLevel as SecurityLevel,
+    type ServerSideExcludes as ServerSideExcludes,
+    type SortQueryStringForCache as SortQueryStringForCache,
+    type SSL as SSL,
+    type SSLRecommender as SSLRecommender,
+    type TLS1_3 as TLS1_3,
+    type TLSClientAuth as TLSClientAuth,
+    type TrueClientIPHeader as TrueClientIPHeader,
+    type WAF as WAF,
+    type WebP as WebP,
+    type Websocket as Websocket,
+    type ZeroRTT as ZeroRTT,
+    type SettingEditResponse as SettingEditResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingEditParams as SettingEditParams,
+    type SettingGetParams as SettingGetParams,
+  };
 }
diff --git a/src/resources/zones/subscriptions.ts b/src/resources/zones/subscriptions.ts
index c2e4553f4c..4ed69c387a 100644
--- a/src/resources/zones/subscriptions.ts
+++ b/src/resources/zones/subscriptions.ts
@@ -2,9 +2,7 @@
 
 import { APIResource } from '../../resource';
 import * as Core from '../../core';
-import * as ZonesSubscriptionsAPI from './subscriptions';
-import * as SubscriptionsAPI from '../user/subscriptions';
-import { SubscriptionsSinglePage } from '../user/subscriptions';
+import * as Shared from '../shared';
 
 export class Subscriptions extends APIResource {
   /**
@@ -23,17 +21,18 @@ export class Subscriptions extends APIResource {
   }
 
   /**
-   * Lists all of an account's subscriptions.
+   * Updates zone subscriptions, either plan or add-ons.
    */
-  list(
-    accountIdentifier: string,
+  update(
+    identifier: string,
+    body: SubscriptionUpdateParams,
     options?: Core.RequestOptions,
-  ): Core.PagePromise<SubscriptionsSinglePage, SubscriptionsAPI.Subscription> {
-    return this._client.getAPIList(
-      `/accounts/${accountIdentifier}/subscriptions`,
-      SubscriptionsSinglePage,
-      options,
-    );
+  ): Core.APIPromise<SubscriptionUpdateResponse> {
+    return (
+      this._client.put(`/zones/${identifier}/subscription`, { body, ...options }) as Core.APIPromise<{
+        result: SubscriptionUpdateResponse;
+      }>
+    )._thenUnwrap((obj) => obj.result);
   }
 
   /**
@@ -50,16 +49,11 @@ export class Subscriptions extends APIResource {
 
 export type SubscriptionCreateResponse = unknown | string | null;
 
+export type SubscriptionUpdateResponse = unknown | string | null;
+
 export type SubscriptionGetResponse = unknown | string | null;
 
 export interface SubscriptionCreateParams {
-  app?: SubscriptionCreateParams.App;
-
-  /**
-   * The list of add-ons subscribed to.
-   */
-  component_values?: Array<SubscriptionsAPI.SubscriptionComponentParam>;
-
   /**
    * How often the subscription is renewed automatically.
    */
@@ -68,27 +62,27 @@ export interface SubscriptionCreateParams {
   /**
    * The rate plan applied to the subscription.
    */
-  rate_plan?: SubscriptionsAPI.RatePlanParam;
+  rate_plan?: Shared.RatePlanParam;
+}
 
+export interface SubscriptionUpdateParams {
   /**
-   * A simple zone object. May have null properties if not a zone subscription.
+   * How often the subscription is renewed automatically.
    */
-  zone?: SubscriptionsAPI.SubscriptionZoneParam;
-}
+  frequency?: 'weekly' | 'monthly' | 'quarterly' | 'yearly';
 
-export namespace SubscriptionCreateParams {
-  export interface App {
-    /**
-     * app install id.
-     */
-    install_id?: string;
-  }
+  /**
+   * The rate plan applied to the subscription.
+   */
+  rate_plan?: Shared.RatePlanParam;
 }
 
-export namespace Subscriptions {
-  export import SubscriptionCreateResponse = ZonesSubscriptionsAPI.SubscriptionCreateResponse;
-  export import SubscriptionGetResponse = ZonesSubscriptionsAPI.SubscriptionGetResponse;
-  export import SubscriptionCreateParams = ZonesSubscriptionsAPI.SubscriptionCreateParams;
+export declare namespace Subscriptions {
+  export {
+    type SubscriptionCreateResponse as SubscriptionCreateResponse,
+    type SubscriptionUpdateResponse as SubscriptionUpdateResponse,
+    type SubscriptionGetResponse as SubscriptionGetResponse,
+    type SubscriptionCreateParams as SubscriptionCreateParams,
+    type SubscriptionUpdateParams as SubscriptionUpdateParams,
+  };
 }
-
-export { SubscriptionsSinglePage };
diff --git a/src/resources/zones/zones.ts b/src/resources/zones/zones.ts
index b5de730ca5..2a983d1bcd 100644
--- a/src/resources/zones/zones.ts
+++ b/src/resources/zones/zones.ts
@@ -4,10 +4,98 @@ import { APIResource } from '../../resource';
 import { isRequestOptions } from '../../core';
 import * as Core from '../../core';
 import * as ActivationCheckAPI from './activation-check';
+import {
+  ActivationCheck,
+  ActivationCheckTriggerParams,
+  ActivationCheckTriggerResponse,
+} from './activation-check';
 import * as CustomNameserversAPI from './custom-nameservers';
+import {
+  CustomNameserverGetParams,
+  CustomNameserverGetResponse,
+  CustomNameserverUpdateParams,
+  CustomNameserverUpdateResponse,
+  CustomNameservers,
+} from './custom-nameservers';
 import * as HoldsAPI from './holds';
+import { HoldCreateParams, HoldDeleteParams, HoldEditParams, HoldGetParams, Holds, ZoneHold } from './holds';
+import * as PlansAPI from './plans';
+import {
+  AvailableRatePlan,
+  AvailableRatePlansSinglePage,
+  PlanGetParams,
+  PlanListParams,
+  Plans,
+} from './plans';
+import * as RatePlansAPI from './rate-plans';
+import { RatePlanGetParams, RatePlanGetResponse, RatePlans } from './rate-plans';
 import * as SettingsAPI from './settings';
+import {
+  AdvancedDDoS,
+  Aegis,
+  AlwaysOnline,
+  AlwaysUseHTTPS,
+  AutomaticHTTPSRewrites,
+  AutomaticPlatformOptimization,
+  Brotli,
+  BrowserCacheTTL,
+  BrowserCheck,
+  CacheLevel,
+  ChallengeTTL,
+  Ciphers,
+  DevelopmentMode,
+  EarlyHints,
+  EmailObfuscation,
+  FontSettings,
+  H2Prioritization,
+  HTTP2,
+  HTTP3,
+  HotlinkProtection,
+  IPGeolocation,
+  IPV6,
+  ImageResizing,
+  MinTLSVersion,
+  Mirage,
+  NEL,
+  OpportunisticEncryption,
+  OpportunisticOnion,
+  OrangeToOrange,
+  OriginErrorPagePassThru,
+  OriginMaxHTTPVersion,
+  Polish,
+  PrefetchPreload,
+  ProxyReadTimeout,
+  PseudoIPV4,
+  ResponseBuffering,
+  RocketLoader,
+  SSL,
+  SSLRecommender,
+  SecurityHeaders,
+  SecurityLevel,
+  ServerSideExcludes,
+  SettingEditParams,
+  SettingEditResponse,
+  SettingGetParams,
+  SettingGetResponse,
+  Settings,
+  SortQueryStringForCache,
+  TLS1_3,
+  TLSClientAuth,
+  TrueClientIPHeader,
+  WAF,
+  WebP,
+  Websocket,
+  ZeroRTT,
+} from './settings';
 import * as SubscriptionsAPI from './subscriptions';
+import {
+  SubscriptionCreateParams,
+  SubscriptionCreateResponse,
+  SubscriptionGetResponse,
+  SubscriptionUpdateParams,
+  SubscriptionUpdateResponse,
+  Subscriptions,
+} from './subscriptions';
 import { V4PagePaginationArray, type V4PagePaginationArrayParams } from '../../pagination';
 
 export class Zones extends APIResource {
@@ -18,6 +106,8 @@ export class Zones extends APIResource {
   );
   holds: HoldsAPI.Holds = new HoldsAPI.Holds(this._client);
   subscriptions: SubscriptionsAPI.Subscriptions = new SubscriptionsAPI.Subscriptions(this._client);
+  plans: PlansAPI.Plans = new PlansAPI.Plans(this._client);
+  ratePlans: RatePlansAPI.RatePlans = new RatePlansAPI.RatePlans(this._client);
 
   /**
    * Create Zone
@@ -29,7 +119,8 @@ export class Zones extends APIResource {
   }
 
   /**
-   * Lists, searches, sorts, and filters your zones.
+   * Lists, searches, sorts, and filters your zones. Listing zones across more than
+   * 500 accounts is currently not allowed.
    */
   list(
     query?: ZoneListParams,
@@ -164,6 +255,23 @@ export interface Zone {
    */
   owner: Zone.Owner;
 
+  /**
+   * Indicates whether the zone is only using Cloudflare DNS services. A true value
+   * means the zone will not receive security or performance benefits.
+   */
+  paused?: boolean;
+
+  /**
+   * The zone status on Cloudflare.
+   */
+  status?: 'initializing' | 'pending' | 'active' | 'moved';
+
+  /**
+   * A full zone implies that DNS is hosted with Cloudflare. A partial zone is
+   * typically a partner-hosted zone or a CNAME setup.
+   */
+  type?: Type;
+
   /**
    * An array of domains used for custom name servers. This is only available for
    * Business and Enterprise plans.
@@ -352,13 +460,6 @@ export interface ZoneEditParams {
    */
   zone_id: string;
 
-  /**
-   * Body param: (Deprecated) Please use the `/zones/{zone_id}/subscription` API to
-   * update a zone's plan. Changing this value will create/cancel associated
-   * subscriptions. To view available plans for this zone, see Zone Plans.
-   */
-  plan?: ZoneEditParams.Plan;
-
   /**
    * Body param: A full zone implies that DNS is hosted with Cloudflare. A partial
    * zone is typically a partner-hosted zone or a CNAME setup. This parameter is only
@@ -374,20 +475,6 @@ export interface ZoneEditParams {
   vanity_name_servers?: Array<string>;
 }
 
-export namespace ZoneEditParams {
-  /**
-   * (Deprecated) Please use the `/zones/{zone_id}/subscription` API to update a
-   * zone's plan. Changing this value will create/cancel associated subscriptions. To
-   * view available plans for this zone, see Zone Plans.
-   */
-  export interface Plan {
-    /**
-     * Identifier
-     */
-    id?: string;
-  }
-}
-
 export interface ZoneGetParams {
   /**
    * Identifier
@@ -395,78 +482,117 @@ export interface ZoneGetParams {
   zone_id: string;
 }
 
-export namespace Zones {
-  export import ActivationCheck = ActivationCheckAPI.ActivationCheck;
-  export import ActivationCheckTriggerResponse = ActivationCheckAPI.ActivationCheckTriggerResponse;
-  export import ActivationCheckTriggerParams = ActivationCheckAPI.ActivationCheckTriggerParams;
-  export import Settings = SettingsAPI.Settings;
-  export import AdvancedDDoS = SettingsAPI.AdvancedDDoS;
-  export import AlwaysOnline = SettingsAPI.AlwaysOnline;
-  export import AlwaysUseHTTPS = SettingsAPI.AlwaysUseHTTPS;
-  export import AutomaticHTTPSRewrites = SettingsAPI.AutomaticHTTPSRewrites;
-  export import AutomaticPlatformOptimization = SettingsAPI.AutomaticPlatformOptimization;
-  export import Brotli = SettingsAPI.Brotli;
-  export import BrowserCacheTTL = SettingsAPI.BrowserCacheTTL;
-  export import BrowserCheck = SettingsAPI.BrowserCheck;
-  export import CacheLevel = SettingsAPI.CacheLevel;
-  export import ChallengeTTL = SettingsAPI.ChallengeTTL;
-  export import Ciphers = SettingsAPI.Ciphers;
-  export import DevelopmentMode = SettingsAPI.DevelopmentMode;
-  export import EarlyHints = SettingsAPI.EarlyHints;
-  export import EmailObfuscation = SettingsAPI.EmailObfuscation;
-  export import FontSettings = SettingsAPI.FontSettings;
-  export import H2Prioritization = SettingsAPI.H2Prioritization;
-  export import HotlinkProtection = SettingsAPI.HotlinkProtection;
-  export import HTTP2 = SettingsAPI.HTTP2;
-  export import HTTP3 = SettingsAPI.HTTP3;
-  export import ImageResizing = SettingsAPI.ImageResizing;
-  export import IPGeolocation = SettingsAPI.IPGeolocation;
-  export import IPV6 = SettingsAPI.IPV6;
-  export import MinTLSVersion = SettingsAPI.MinTLSVersion;
-  export import Minify = SettingsAPI.Minify;
-  export import Mirage = SettingsAPI.Mirage;
-  export import MobileRedirect = SettingsAPI.MobileRedirect;
-  export import NEL = SettingsAPI.NEL;
-  export import OpportunisticEncryption = SettingsAPI.OpportunisticEncryption;
-  export import OpportunisticOnion = SettingsAPI.OpportunisticOnion;
-  export import OrangeToOrange = SettingsAPI.OrangeToOrange;
-  export import OriginErrorPagePassThru = SettingsAPI.OriginErrorPagePassThru;
-  export import OriginMaxHTTPVersion = SettingsAPI.OriginMaxHTTPVersion;
-  export import Polish = SettingsAPI.Polish;
-  export import PrefetchPreload = SettingsAPI.PrefetchPreload;
-  export import ProxyReadTimeout = SettingsAPI.ProxyReadTimeout;
-  export import PseudoIPV4 = SettingsAPI.PseudoIPV4;
-  export import ResponseBuffering = SettingsAPI.ResponseBuffering;
-  export import RocketLoader = SettingsAPI.RocketLoader;
-  export import SecurityHeaders = SettingsAPI.SecurityHeaders;
-  export import SecurityLevel = SettingsAPI.SecurityLevel;
-  export import ServerSideExcludes = SettingsAPI.ServerSideExcludes;
-  export import SortQueryStringForCache = SettingsAPI.SortQueryStringForCache;
-  export import SSL = SettingsAPI.SSL;
-  export import SSLRecommender = SettingsAPI.SSLRecommender;
-  export import TLS1_3 = SettingsAPI.TLS1_3;
-  export import TLSClientAuth = SettingsAPI.TLSClientAuth;
-  export import TrueClientIPHeader = SettingsAPI.TrueClientIPHeader;
-  export import WAF = SettingsAPI.WAF;
-  export import WebP = SettingsAPI.WebP;
-  export import Websocket = SettingsAPI.Websocket;
-  export import ZeroRTT = SettingsAPI.ZeroRTT;
-  export import SettingEditResponse = SettingsAPI.SettingEditResponse;
-  export import SettingGetResponse = SettingsAPI.SettingGetResponse;
-  export import SettingEditParams = SettingsAPI.SettingEditParams;
-  export import SettingGetParams = SettingsAPI.SettingGetParams;
-  export import CustomNameservers = CustomNameserversAPI.CustomNameservers;
-  export import CustomNameserverUpdateResponse = CustomNameserversAPI.CustomNameserverUpdateResponse;
-  export import CustomNameserverGetResponse = CustomNameserversAPI.CustomNameserverGetResponse;
-  export import CustomNameserverUpdateParams = CustomNameserversAPI.CustomNameserverUpdateParams;
-  export import CustomNameserverGetParams = CustomNameserversAPI.CustomNameserverGetParams;
-  export import Holds = HoldsAPI.Holds;
-  export import ZoneHold = HoldsAPI.ZoneHold;
-  export import HoldCreateParams = HoldsAPI.HoldCreateParams;
-  export import HoldDeleteParams = HoldsAPI.HoldDeleteParams;
-  export import HoldGetParams = HoldsAPI.HoldGetParams;
-  export import Subscriptions = SubscriptionsAPI.Subscriptions;
-  export import SubscriptionCreateResponse = SubscriptionsAPI.SubscriptionCreateResponse;
-  export import SubscriptionGetResponse = SubscriptionsAPI.SubscriptionGetResponse;
-  export import SubscriptionCreateParams = SubscriptionsAPI.SubscriptionCreateParams;
+Zones.ActivationCheck = ActivationCheck;
+Zones.Settings = Settings;
+Zones.CustomNameservers = CustomNameservers;
+Zones.Holds = Holds;
+Zones.Subscriptions = Subscriptions;
+Zones.Plans = Plans;
+Zones.AvailableRatePlansSinglePage = AvailableRatePlansSinglePage;
+Zones.RatePlans = RatePlans;
+
+export declare namespace Zones {
+  export {
+    ActivationCheck as ActivationCheck,
+    type ActivationCheckTriggerResponse as ActivationCheckTriggerResponse,
+    type ActivationCheckTriggerParams as ActivationCheckTriggerParams,
+  };
+
+  export {
+    Settings as Settings,
+    type AdvancedDDoS as AdvancedDDoS,
+    type Aegis as Aegis,
+    type AlwaysOnline as AlwaysOnline,
+    type AlwaysUseHTTPS as AlwaysUseHTTPS,
+    type AutomaticHTTPSRewrites as AutomaticHTTPSRewrites,
+    type AutomaticPlatformOptimization as AutomaticPlatformOptimization,
+    type Brotli as Brotli,
+    type BrowserCacheTTL as BrowserCacheTTL,
+    type BrowserCheck as BrowserCheck,
+    type CacheLevel as CacheLevel,
+    type ChallengeTTL as ChallengeTTL,
+    type Ciphers as Ciphers,
+    type DevelopmentMode as DevelopmentMode,
+    type EarlyHints as EarlyHints,
+    type EmailObfuscation as EmailObfuscation,
+    type FontSettings as FontSettings,
+    type H2Prioritization as H2Prioritization,
+    type HotlinkProtection as HotlinkProtection,
+    type HTTP2 as HTTP2,
+    type HTTP3 as HTTP3,
+    type ImageResizing as ImageResizing,
+    type IPGeolocation as IPGeolocation,
+    type IPV6 as IPV6,
+    type MinTLSVersion as MinTLSVersion,
+    type Mirage as Mirage,
+    type NEL as NEL,
+    type OpportunisticEncryption as OpportunisticEncryption,
+    type OpportunisticOnion as OpportunisticOnion,
+    type OrangeToOrange as OrangeToOrange,
+    type OriginErrorPagePassThru as OriginErrorPagePassThru,
+    type OriginMaxHTTPVersion as OriginMaxHTTPVersion,
+    type Polish as Polish,
+    type PrefetchPreload as PrefetchPreload,
+    type ProxyReadTimeout as ProxyReadTimeout,
+    type PseudoIPV4 as PseudoIPV4,
+    type ResponseBuffering as ResponseBuffering,
+    type RocketLoader as RocketLoader,
+    type SecurityHeaders as SecurityHeaders,
+    type SecurityLevel as SecurityLevel,
+    type ServerSideExcludes as ServerSideExcludes,
+    type SortQueryStringForCache as SortQueryStringForCache,
+    type SSL as SSL,
+    type SSLRecommender as SSLRecommender,
+    type TLS1_3 as TLS1_3,
+    type TLSClientAuth as TLSClientAuth,
+    type TrueClientIPHeader as TrueClientIPHeader,
+    type WAF as WAF,
+    type WebP as WebP,
+    type Websocket as Websocket,
+    type ZeroRTT as ZeroRTT,
+    type SettingEditResponse as SettingEditResponse,
+    type SettingGetResponse as SettingGetResponse,
+    type SettingEditParams as SettingEditParams,
+    type SettingGetParams as SettingGetParams,
+  };
+
+  export {
+    CustomNameservers as CustomNameservers,
+    type CustomNameserverUpdateResponse as CustomNameserverUpdateResponse,
+    type CustomNameserverGetResponse as CustomNameserverGetResponse,
+    type CustomNameserverUpdateParams as CustomNameserverUpdateParams,
+    type CustomNameserverGetParams as CustomNameserverGetParams,
+  };
+
+  export {
+    Holds as Holds,
+    type ZoneHold as ZoneHold,
+    type HoldCreateParams as HoldCreateParams,
+    type HoldDeleteParams as HoldDeleteParams,
+    type HoldEditParams as HoldEditParams,
+    type HoldGetParams as HoldGetParams,
+  };
+
+  export {
+    Subscriptions as Subscriptions,
+    type SubscriptionCreateResponse as SubscriptionCreateResponse,
+    type SubscriptionUpdateResponse as SubscriptionUpdateResponse,
+    type SubscriptionGetResponse as SubscriptionGetResponse,
+    type SubscriptionCreateParams as SubscriptionCreateParams,
+    type SubscriptionUpdateParams as SubscriptionUpdateParams,
+  };
+
+  export {
+    Plans as Plans,
+    type AvailableRatePlan as AvailableRatePlan,
+    AvailableRatePlansSinglePage as AvailableRatePlansSinglePage,
+    type PlanListParams as PlanListParams,
+    type PlanGetParams as PlanGetParams,
+  };
+
+  export {
+    RatePlans as RatePlans,
+    type RatePlanGetResponse as RatePlanGetResponse,
+    type RatePlanGetParams as RatePlanGetParams,
+  };
 }
diff --git a/src/uploads.ts b/src/uploads.ts
index 081827c9a1..8fd2154d4b 100644
--- a/src/uploads.ts
+++ b/src/uploads.ts
@@ -107,21 +107,28 @@ export async function toFile(
   // If it's a promise, resolve it.
   value = await value;
 
-  // Use the file's options if there isn't one provided
-  options ??= isFileLike(value) ? { lastModified: value.lastModified, type: value.type } : {};
+  // If we've been given a `File` we don't need to do anything
+  if (isFileLike(value)) {
+    return value;
+  }
 
   if (isResponseLike(value)) {
     const blob = await value.blob();
     name ||= new URL(value.url).pathname.split(/[\\/]/).pop() ?? 'unknown_file';
 
-    return new File([blob as any], name, options);
+    // we need to convert the `Blob` into an array buffer because the `Blob` class
+    // that `node-fetch` defines is incompatible with the web standard which results
+    // in `new File` interpreting it as a string instead of binary data.
+    const data = isBlobLike(blob) ? [(await blob.arrayBuffer()) as any] : [blob];
+
+    return new File(data, name, options);
   }
 
   const bits = await getBytes(value);
 
   name ||= getName(value) ?? 'unknown_file';
 
-  if (!options.type) {
+  if (!options?.type) {
     const type = (bits[0] as any)?.type;
     if (typeof type === 'string') {
       options = { ...options, type };
diff --git a/src/version.ts b/src/version.ts
index ce3f15b1df..ca6b851898 100644
--- a/src/version.ts
+++ b/src/version.ts
@@ -1 +1 @@
-export const VERSION = '3.5.0'; // x-release-please-version
+export const VERSION = '4.0.0'; // x-release-please-version
diff --git a/tests/api-resources/abuse-reports.test.ts b/tests/api-resources/abuse-reports.test.ts
new file mode 100644
index 0000000000..c59dc80c62
--- /dev/null
+++ b/tests/api-resources/abuse-reports.test.ts
@@ -0,0 +1,68 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource abuseReports', () => {
+  // TODO: investigate unauthorized HTTP response
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.abuseReports.create('abuse_dmca', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      act: 'abuse_dmca',
+      email: 'email',
+      email2: 'email2',
+      host_notification: 'send',
+      ncmec_notification: 'send',
+      owner_notification: 'send',
+      urls: 'urls',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate unauthorized HTTP response
+  test.skip('create: required and optional params', async () => {
+    const response = await client.abuseReports.create('abuse_dmca', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      act: 'abuse_dmca',
+      email: 'email',
+      email2: 'email2',
+      host_notification: 'send',
+      ncmec_notification: 'send',
+      owner_notification: 'send',
+      urls: 'urls',
+      address1: 'x',
+      agent_name: 'x',
+      agree: 0,
+      city: 'x',
+      comments: 'x',
+      company: 'x',
+      country: 'x',
+      destination_ips: 'destination_ips',
+      justification: 'x',
+      name: 'x',
+      ncsei_subject_representation: true,
+      original_work: 'x',
+      ports_protocols: 'ports_protocols',
+      signature: 'signature',
+      source_ips: 'source_ips',
+      state: 'x',
+      tele: 'x',
+      title: 'x',
+      trademark_number: 'x',
+      trademark_office: 'x',
+      trademark_symbol: 'x',
+    });
+  });
+});
diff --git a/tests/api-resources/accounts/accounts.test.ts b/tests/api-resources/accounts/accounts.test.ts
index 7ef7a68693..b122463a1d 100644
--- a/tests/api-resources/accounts/accounts.test.ts
+++ b/tests/api-resources/accounts/accounts.test.ts
@@ -3,15 +3,37 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource accounts', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.accounts.create({ name: 'name', type: 'standard' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.accounts.create({
+      name: 'name',
+      type: 'standard',
+      unit: { id: 'f267e341f3dd4697bd3b9f71dd96247f' },
+    });
+  });
+
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.accounts.update({ account_id: {}, name: 'Demo Account' });
+    const responsePromise = client.accounts.update({
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+      name: 'Demo Account',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,8 +44,8 @@ describe('resource accounts', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.accounts.update({
-      account_id: {},
+    const response = await client.accounts.update({
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
       name: 'Demo Account',
       settings: {
         abuse_contact_email: 'abuse_contact_email',
@@ -35,7 +57,7 @@ describe('resource accounts', () => {
   });
 
   test('list', async () => {
-    const responsePromise = cloudflare.accounts.list();
+    const responsePromise = client.accounts.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -47,7 +69,7 @@ describe('resource accounts', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.accounts.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.accounts.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -55,15 +77,30 @@ describe('resource accounts', () => {
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.accounts.list(
-        { direction: 'desc', name: 'example.com', page: 1, per_page: 5 },
+      client.accounts.list(
+        { direction: 'asc', name: 'example.com', page: 1, per_page: 5 },
         { path: '/_stainless_unknown_path' },
       ),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
+  test('delete: only required params', async () => {
+    const responsePromise = client.accounts.delete({ account_id: 'account_id' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.accounts.delete({ account_id: 'account_id' });
+  });
+
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.accounts.get({ account_id: {} });
+    const responsePromise = client.accounts.get({ account_id: 'eb78d65290b24279ba6f44721b3ea3c4' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -74,6 +111,6 @@ describe('resource accounts', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.accounts.get({ account_id: {} });
+    const response = await client.accounts.get({ account_id: 'eb78d65290b24279ba6f44721b3ea3c4' });
   });
 });
diff --git a/tests/api-resources/accounts/logs/audit.test.ts b/tests/api-resources/accounts/logs/audit.test.ts
new file mode 100644
index 0000000000..8d954a7eba
--- /dev/null
+++ b/tests/api-resources/accounts/logs/audit.test.ts
@@ -0,0 +1,61 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource audit', () => {
+  // TODO:investigate broken test
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.accounts.logs.audit.list({
+      account_id: 'a67e14daa5f8dceeb91fe5449ba496ef',
+      before: '2024-10-31',
+      since: '2024-10-30',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO:investigate broken test
+  test.skip('list: required and optional params', async () => {
+    const response = await client.accounts.logs.audit.list({
+      account_id: 'a67e14daa5f8dceeb91fe5449ba496ef',
+      before: '2024-10-31',
+      since: '2024-10-30',
+      account_name: 'account_name',
+      action_result: 'success',
+      action_type: 'create',
+      actor_context: 'api_key',
+      actor_email: 'alice@example.com',
+      actor_id: '1d20c3afe174f18b642710cec6298a9d',
+      actor_ip_address: '17.168.228.63',
+      actor_token_id: '144cdb2e39c55e203cf225d8d8208647',
+      actor_token_name: 'Test Token',
+      actor_type: 'cloudflare_admin',
+      audit_log_id: 'f174be97-19b1-40d6-954d-70cd5fbd52db',
+      cursor: 'Q1buH-__DQqqig7SVYXT-SsMOTGY2Z3Y80W-fGgva7yaDdmPKveucH5ddOcHsJRhNb-xUK8agZQqkJSMAENGO8NU6g==',
+      direction: 'desc',
+      limit: 25,
+      raw_cf_ray_id: '8e8dd2156ef28414',
+      raw_method: 'GET',
+      raw_status_code: 200,
+      raw_uri: 'raw_uri',
+      resource_id: 'resource_id',
+      resource_product: 'Stream',
+      resource_scope: 'accounts',
+      resource_type: 'Video',
+      zone_id: 'zone_id',
+      zone_name: 'example.com',
+    });
+  });
+});
diff --git a/tests/api-resources/accounts/members.test.ts b/tests/api-resources/accounts/members.test.ts
index ae04659bef..9e99f87916 100644
--- a/tests/api-resources/accounts/members.test.ts
+++ b/tests/api-resources/accounts/members.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,14 +12,10 @@ const cloudflare = new Cloudflare({
 describe('resource members', () => {
   // HTTP 422 error from prism
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.accounts.members.create({
+    const responsePromise = client.accounts.members.create({
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
       email: 'user@example.com',
-      roles: [
-        '3536bcfad5faccb999b47003c79917fb',
-        '3536bcfad5faccb999b47003c79917fb',
-        '3536bcfad5faccb999b47003c79917fb',
-      ],
+      roles: ['3536bcfad5faccb999b47003c79917fb'],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -32,21 +28,17 @@ describe('resource members', () => {
 
   // HTTP 422 error from prism
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.accounts.members.create({
+    const response = await client.accounts.members.create({
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
       email: 'user@example.com',
-      roles: [
-        '3536bcfad5faccb999b47003c79917fb',
-        '3536bcfad5faccb999b47003c79917fb',
-        '3536bcfad5faccb999b47003c79917fb',
-      ],
+      roles: ['3536bcfad5faccb999b47003c79917fb'],
       status: 'accepted',
     });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.accounts.members.update('4536bcfad5faccb111b47003c79917fa', {
+    const responsePromise = client.accounts.members.update('4536bcfad5faccb111b47003c79917fa', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -60,20 +52,14 @@ describe('resource members', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.accounts.members.update('4536bcfad5faccb111b47003c79917fa', {
+    const response = await client.accounts.members.update('4536bcfad5faccb111b47003c79917fa', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
-      roles: [
-        { id: '3536bcfad5faccb999b47003c79917fb' },
-        { id: '3536bcfad5faccb999b47003c79917fb' },
-        { id: '3536bcfad5faccb999b47003c79917fb' },
-      ],
+      roles: [{ id: '3536bcfad5faccb999b47003c79917fb' }],
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.accounts.members.list({
-      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
-    });
+    const responsePromise = client.accounts.members.list({ account_id: 'eb78d65290b24279ba6f44721b3ea3c4' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -84,10 +70,10 @@ describe('resource members', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.accounts.members.list({
+    const response = await client.accounts.members.list({
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
-      direction: 'desc',
-      order: 'status',
+      direction: 'asc',
+      order: 'user.first_name',
       page: 1,
       per_page: 5,
       status: 'accepted',
@@ -96,7 +82,7 @@ describe('resource members', () => {
 
   // HTTP 422 error from prism
   test.skip('delete: only required params', async () => {
-    const responsePromise = cloudflare.accounts.members.delete('4536bcfad5faccb111b47003c79917fa', {
+    const responsePromise = client.accounts.members.delete('4536bcfad5faccb111b47003c79917fa', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -110,14 +96,14 @@ describe('resource members', () => {
 
   // HTTP 422 error from prism
   test.skip('delete: required and optional params', async () => {
-    const response = await cloudflare.accounts.members.delete('4536bcfad5faccb111b47003c79917fa', {
+    const response = await client.accounts.members.delete('4536bcfad5faccb111b47003c79917fa', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
   });
 
   // HTTP 422 error from prism
   test.skip('get: only required params', async () => {
-    const responsePromise = cloudflare.accounts.members.get('4536bcfad5faccb111b47003c79917fa', {
+    const responsePromise = client.accounts.members.get('4536bcfad5faccb111b47003c79917fa', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -131,7 +117,7 @@ describe('resource members', () => {
 
   // HTTP 422 error from prism
   test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.accounts.members.get('4536bcfad5faccb111b47003c79917fa', {
+    const response = await client.accounts.members.get('4536bcfad5faccb111b47003c79917fa', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
   });
diff --git a/tests/api-resources/accounts/roles.test.ts b/tests/api-resources/accounts/roles.test.ts
index e14eeae7df..a1cbc0abcc 100644
--- a/tests/api-resources/accounts/roles.test.ts
+++ b/tests/api-resources/accounts/roles.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource roles', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.accounts.roles.list({
-      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
-    });
+    const responsePromise = client.accounts.roles.list({ account_id: 'eb78d65290b24279ba6f44721b3ea3c4' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,14 +22,13 @@ describe('resource roles', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.accounts.roles.list({ account_id: 'eb78d65290b24279ba6f44721b3ea3c4' });
+    const response = await client.accounts.roles.list({ account_id: 'eb78d65290b24279ba6f44721b3ea3c4' });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.accounts.roles.get(
-      {},
-      { account_id: 'eb78d65290b24279ba6f44721b3ea3c4' },
-    );
+    const responsePromise = client.accounts.roles.get('3536bcfad5faccb999b47003c79917fb', {
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -42,9 +39,8 @@ describe('resource roles', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.accounts.roles.get(
-      {},
-      { account_id: 'eb78d65290b24279ba6f44721b3ea3c4' },
-    );
+    const response = await client.accounts.roles.get('3536bcfad5faccb999b47003c79917fb', {
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+    });
   });
 });
diff --git a/tests/api-resources/r2/buckets.test.ts b/tests/api-resources/accounts/subscriptions.test.ts
similarity index 65%
rename from tests/api-resources/r2/buckets.test.ts
rename to tests/api-resources/accounts/subscriptions.test.ts
index a1b79bb0d1..31b523f38a 100644
--- a/tests/api-resources/r2/buckets.test.ts
+++ b/tests/api-resources/accounts/subscriptions.test.ts
@@ -3,17 +3,16 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource buckets', () => {
+describe('resource subscriptions', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.r2.buckets.create({
+    const responsePromise = client.accounts.subscriptions.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      name: 'example-bucket',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,16 +24,25 @@ describe('resource buckets', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.r2.buckets.create({
+    const response = await client.accounts.subscriptions.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      name: 'example-bucket',
-      locationHint: 'apac',
-      storageClass: 'Standard',
+      frequency: 'weekly',
+      rate_plan: {
+        id: 'free',
+        currency: 'USD',
+        externally_managed: false,
+        is_contract: false,
+        public_name: 'Business Plan',
+        scope: 'zone',
+        sets: ['string'],
+      },
     });
   });
 
-  test('list: only required params', async () => {
-    const responsePromise = cloudflare.r2.buckets.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  test('update: only required params', async () => {
+    const responsePromise = client.accounts.subscriptions.update('506e3185e9c882d175a2d0cb0093d9f2', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -44,20 +52,24 @@ describe('resource buckets', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: required and optional params', async () => {
-    const response = await cloudflare.r2.buckets.list({
+  test('update: required and optional params', async () => {
+    const response = await client.accounts.subscriptions.update('506e3185e9c882d175a2d0cb0093d9f2', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      cursor: 'cursor',
-      direction: 'desc',
-      name_contains: 'my-bucket',
-      order: 'name',
-      per_page: 1,
-      start_after: 'my-bucket',
+      frequency: 'weekly',
+      rate_plan: {
+        id: 'free',
+        currency: 'USD',
+        externally_managed: false,
+        is_contract: false,
+        public_name: 'Business Plan',
+        scope: 'zone',
+        sets: ['string'],
+      },
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.r2.buckets.delete('example-bucket', {
+    const responsePromise = client.accounts.subscriptions.delete('506e3185e9c882d175a2d0cb0093d9f2', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -70,13 +82,13 @@ describe('resource buckets', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.r2.buckets.delete('example-bucket', {
+    const response = await client.accounts.subscriptions.delete('506e3185e9c882d175a2d0cb0093d9f2', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.r2.buckets.get('example-bucket', {
+    const responsePromise = client.accounts.subscriptions.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -89,7 +101,7 @@ describe('resource buckets', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.r2.buckets.get('example-bucket', {
+    const response = await client.accounts.subscriptions.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/accounts/tokens/permission-groups.test.ts b/tests/api-resources/accounts/tokens/permission-groups.test.ts
new file mode 100644
index 0000000000..b4a1d06a1f
--- /dev/null
+++ b/tests/api-resources/accounts/tokens/permission-groups.test.ts
@@ -0,0 +1,33 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource permissionGroups', () => {
+  // TODO: investigate broken test
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.accounts.tokens.permissionGroups.list({
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('list: required and optional params', async () => {
+    const response = await client.accounts.tokens.permissionGroups.list({
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+    });
+  });
+});
diff --git a/tests/api-resources/accounts/tokens/tokens.test.ts b/tests/api-resources/accounts/tokens/tokens.test.ts
new file mode 100644
index 0000000000..303ee135e2
--- /dev/null
+++ b/tests/api-resources/accounts/tokens/tokens.test.ts
@@ -0,0 +1,191 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource tokens', () => {
+  // TODO: investigate broken test
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.accounts.tokens.create({
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+      name: 'readonly token',
+      policies: [
+        {
+          effect: 'allow',
+          permission_groups: [{}, {}],
+          resources: {
+            'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
+            'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
+          },
+        },
+      ],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('create: required and optional params', async () => {
+    const response = await client.accounts.tokens.create({
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+      name: 'readonly token',
+      policies: [
+        {
+          effect: 'allow',
+          permission_groups: [
+            { meta: { key: 'key', value: 'value' } },
+            { meta: { key: 'key', value: 'value' } },
+          ],
+          resources: {
+            'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
+            'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
+          },
+        },
+      ],
+      condition: {
+        request_ip: {
+          in: ['123.123.123.0/24', '2606:4700::/32'],
+          not_in: ['123.123.123.100/24', '2606:4700:4700::/48'],
+        },
+      },
+      expires_on: '2020-01-01T00:00:00Z',
+      not_before: '2018-07-01T05:20:00Z',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.accounts.tokens.update('ed17574386854bf78a67040be0a770b0', {
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.accounts.tokens.update('ed17574386854bf78a67040be0a770b0', {
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+      condition: {
+        request_ip: {
+          in: ['123.123.123.0/24', '2606:4700::/32'],
+          not_in: ['123.123.123.100/24', '2606:4700:4700::/48'],
+        },
+      },
+      expires_on: '2020-01-01T00:00:00Z',
+      name: 'readonly token',
+      not_before: '2018-07-01T05:20:00Z',
+      policies: [
+        {
+          effect: 'allow',
+          permission_groups: [
+            { meta: { key: 'key', value: 'value' } },
+            { meta: { key: 'key', value: 'value' } },
+          ],
+          resources: {
+            'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
+            'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
+          },
+        },
+      ],
+      status: 'active',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.accounts.tokens.list({ account_id: 'eb78d65290b24279ba6f44721b3ea3c4' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('list: required and optional params', async () => {
+    const response = await client.accounts.tokens.list({
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+      direction: 'asc',
+      page: 1,
+      per_page: 5,
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('delete: only required params', async () => {
+    const responsePromise = client.accounts.tokens.delete('ed17574386854bf78a67040be0a770b0', {
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('delete: required and optional params', async () => {
+    const response = await client.accounts.tokens.delete('ed17574386854bf78a67040be0a770b0', {
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.accounts.tokens.get('ed17574386854bf78a67040be0a770b0', {
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: required and optional params', async () => {
+    const response = await client.accounts.tokens.get('ed17574386854bf78a67040be0a770b0', {
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('verify: only required params', async () => {
+    const responsePromise = client.accounts.tokens.verify({ account_id: 'eb78d65290b24279ba6f44721b3ea3c4' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('verify: required and optional params', async () => {
+    const response = await client.accounts.tokens.verify({ account_id: 'eb78d65290b24279ba6f44721b3ea3c4' });
+  });
+});
diff --git a/tests/api-resources/accounts/tokens/value.test.ts b/tests/api-resources/accounts/tokens/value.test.ts
new file mode 100644
index 0000000000..f745d1302d
--- /dev/null
+++ b/tests/api-resources/accounts/tokens/value.test.ts
@@ -0,0 +1,35 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource value', () => {
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.accounts.tokens.value.update('ed17574386854bf78a67040be0a770b0', {
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+      body: {},
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.accounts.tokens.value.update('ed17574386854bf78a67040be0a770b0', {
+      account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
+      body: {},
+    });
+  });
+});
diff --git a/tests/api-resources/acm/total-tls.test.ts b/tests/api-resources/acm/total-tls.test.ts
index f76fb3d816..aed3d7d47a 100644
--- a/tests/api-resources/acm/total-tls.test.ts
+++ b/tests/api-resources/acm/total-tls.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource totalTLS', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.acm.totalTLS.create({
+    const responsePromise = client.acm.totalTLS.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       enabled: true,
     });
@@ -25,7 +25,7 @@ describe('resource totalTLS', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.acm.totalTLS.create({
+    const response = await client.acm.totalTLS.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       enabled: true,
       certificate_authority: 'google',
@@ -33,7 +33,7 @@ describe('resource totalTLS', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.acm.totalTLS.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.acm.totalTLS.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -44,6 +44,6 @@ describe('resource totalTLS', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.acm.totalTLS.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.acm.totalTLS.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/addressing/address-maps/accounts.test.ts b/tests/api-resources/addressing/address-maps/accounts.test.ts
index 616a3bb48d..a2a3c028a3 100644
--- a/tests/api-resources/addressing/address-maps/accounts.test.ts
+++ b/tests/api-resources/addressing/address-maps/accounts.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource accounts', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.addressing.addressMaps.accounts.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
+    const responsePromise = client.addressing.addressMaps.accounts.update(
+      '055817b111884e0227e1be16a0be6ee0',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2', body: {} },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,16 +25,16 @@ describe('resource accounts', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.addressing.addressMaps.accounts.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
-    );
+    const response = await client.addressing.addressMaps.accounts.update('055817b111884e0227e1be16a0be6ee0', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+      body: {},
+    });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.addressing.addressMaps.accounts.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    const responsePromise = client.addressing.addressMaps.accounts.delete(
+      '055817b111884e0227e1be16a0be6ee0',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -46,9 +46,8 @@ describe('resource accounts', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.addressing.addressMaps.accounts.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.addressing.addressMaps.accounts.delete('055817b111884e0227e1be16a0be6ee0', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+    });
   });
 });
diff --git a/tests/api-resources/addressing/address-maps/address-maps.test.ts b/tests/api-resources/addressing/address-maps/address-maps.test.ts
index 452db3e7b9..d7a0a31a8b 100644
--- a/tests/api-resources/addressing/address-maps/address-maps.test.ts
+++ b/tests/api-resources/addressing/address-maps/address-maps.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,8 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource addressMaps', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.addressing.addressMaps.create({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.addressMaps.create({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -24,34 +24,18 @@ describe('resource addressMaps', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.addressing.addressMaps.create({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.addressMaps.create({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
       description: 'My Ecommerce zones',
       enabled: true,
-      ips: ['192.0.2.1', '192.0.2.1', '192.0.2.1'],
-      memberships: [
-        {
-          created_at: '2014-01-01T05:20:00.12345Z',
-          identifier: '023e105f4ecef8ad9ca31a8372d0c353',
-          kind: 'zone',
-        },
-        {
-          created_at: '2014-01-01T05:20:00.12345Z',
-          identifier: '023e105f4ecef8ad9ca31a8372d0c353',
-          kind: 'zone',
-        },
-        {
-          created_at: '2014-01-01T05:20:00.12345Z',
-          identifier: '023e105f4ecef8ad9ca31a8372d0c353',
-          kind: 'zone',
-        },
-      ],
+      ips: ['192.0.2.1'],
+      memberships: [{ identifier: '023e105f4ecef8ad9ca31a8372d0c353', kind: 'zone' }],
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.addressing.addressMaps.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.addressMaps.list({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -63,14 +47,14 @@ describe('resource addressMaps', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.addressing.addressMaps.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.addressMaps.list({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.addressing.addressMaps.delete('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.addressMaps.delete('055817b111884e0227e1be16a0be6ee0', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -82,14 +66,14 @@ describe('resource addressMaps', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.addressing.addressMaps.delete('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.addressMaps.delete('055817b111884e0227e1be16a0be6ee0', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.addressing.addressMaps.edit('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.addressMaps.edit('055817b111884e0227e1be16a0be6ee0', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -101,8 +85,8 @@ describe('resource addressMaps', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.addressing.addressMaps.edit('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.addressMaps.edit('055817b111884e0227e1be16a0be6ee0', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
       default_sni: '*.example.com',
       description: 'My Ecommerce zones',
       enabled: true,
@@ -110,8 +94,8 @@ describe('resource addressMaps', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.addressing.addressMaps.get('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.addressMaps.get('055817b111884e0227e1be16a0be6ee0', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -123,8 +107,8 @@ describe('resource addressMaps', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.addressing.addressMaps.get('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.addressMaps.get('055817b111884e0227e1be16a0be6ee0', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
   });
 });
diff --git a/tests/api-resources/addressing/address-maps/ips.test.ts b/tests/api-resources/addressing/address-maps/ips.test.ts
index 2a8af3b8e0..703d739d84 100644
--- a/tests/api-resources/addressing/address-maps/ips.test.ts
+++ b/tests/api-resources/addressing/address-maps/ips.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource ips', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.addressing.addressMaps.ips.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.addressMaps.ips.update(
+      '055817b111884e0227e1be16a0be6ee0',
       '192.0.2.1',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
+      { account_id: '258def64c72dae45f3e4c8516e2111f2', body: {} },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,18 +26,18 @@ describe('resource ips', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.addressing.addressMaps.ips.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.addressMaps.ips.update(
+      '055817b111884e0227e1be16a0be6ee0',
       '192.0.2.1',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
+      { account_id: '258def64c72dae45f3e4c8516e2111f2', body: {} },
     );
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.addressing.addressMaps.ips.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.addressMaps.ips.delete(
+      '055817b111884e0227e1be16a0be6ee0',
       '192.0.2.1',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -49,10 +49,10 @@ describe('resource ips', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.addressing.addressMaps.ips.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.addressMaps.ips.delete(
+      '055817b111884e0227e1be16a0be6ee0',
       '192.0.2.1',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
     );
   });
 });
diff --git a/tests/api-resources/addressing/address-maps/zones.test.ts b/tests/api-resources/addressing/address-maps/zones.test.ts
index b6d8f4d4a3..8ba1012acd 100644
--- a/tests/api-resources/addressing/address-maps/zones.test.ts
+++ b/tests/api-resources/addressing/address-maps/zones.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,14 +11,11 @@ const cloudflare = new Cloudflare({
 
 describe('resource zones', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.addressing.addressMaps.zones.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      {
-        zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        body: {},
-      },
-    );
+    const responsePromise = client.addressing.addressMaps.zones.update('055817b111884e0227e1be16a0be6ee0', {
+      zone_id: '8ac8489932db6327334c9b6d58544cfe',
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+      body: {},
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -29,21 +26,18 @@ describe('resource zones', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.addressing.addressMaps.zones.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      {
-        zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        body: {},
-      },
-    );
+    const response = await client.addressing.addressMaps.zones.update('055817b111884e0227e1be16a0be6ee0', {
+      zone_id: '8ac8489932db6327334c9b6d58544cfe',
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+      body: {},
+    });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.addressing.addressMaps.zones.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353', account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.addressing.addressMaps.zones.delete('055817b111884e0227e1be16a0be6ee0', {
+      zone_id: '8ac8489932db6327334c9b6d58544cfe',
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -54,9 +48,9 @@ describe('resource zones', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.addressing.addressMaps.zones.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353', account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.addressing.addressMaps.zones.delete('055817b111884e0227e1be16a0be6ee0', {
+      zone_id: '8ac8489932db6327334c9b6d58544cfe',
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+    });
   });
 });
diff --git a/tests/api-resources/addressing/loa-documents.test.ts b/tests/api-resources/addressing/loa-documents.test.ts
new file mode 100644
index 0000000000..e8a6340277
--- /dev/null
+++ b/tests/api-resources/addressing/loa-documents.test.ts
@@ -0,0 +1,42 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource loaDocuments', () => {
+  // TODO: investigate broken test
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.addressing.loaDocuments.create({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+      loa_document: '@document.pdf',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('create: required and optional params', async () => {
+    const response = await client.addressing.loaDocuments.create({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+      loa_document: '@document.pdf',
+    });
+  });
+
+  // TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489
+  test.skip('get: required and optional params', async () => {
+    const response = await client.addressing.loaDocuments.get('d933b1530bc56c9953cf8ce166da8004', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+    });
+  });
+});
diff --git a/tests/api-resources/addressing/loa-documents/downloads.test.ts b/tests/api-resources/addressing/loa-documents/downloads.test.ts
deleted file mode 100644
index dc17eb1db5..0000000000
--- a/tests/api-resources/addressing/loa-documents/downloads.test.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import Cloudflare from 'cloudflare';
-
-const cloudflare = new Cloudflare({
-  apiKey: '144c9defac04969c7bfad8efaa8ea194',
-  apiEmail: 'user@example.com',
-  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
-});
-
-describe('resource downloads', () => {
-  // TODO: address broken spotlight error - https://github.com/cloudflare/cloudflare-typescript/actions/runs/9456639475/job/26048931174?pr=498#step:5:489
-  test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.addressing.loaDocuments.downloads.get(
-      'd933b1530bc56c9953cf8ce166da8004',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
-  });
-});
diff --git a/tests/api-resources/addressing/prefixes/bgp/statuses.test.ts b/tests/api-resources/addressing/prefixes/advertisement-status.test.ts
similarity index 62%
rename from tests/api-resources/addressing/prefixes/bgp/statuses.test.ts
rename to tests/api-resources/addressing/prefixes/advertisement-status.test.ts
index 806be2c0a3..e0b84c1cdc 100644
--- a/tests/api-resources/addressing/prefixes/bgp/statuses.test.ts
+++ b/tests/api-resources/addressing/prefixes/advertisement-status.test.ts
@@ -3,17 +3,17 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource statuses', () => {
+describe('resource advertisementStatus', () => {
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.bgp.statuses.edit(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', advertised: true },
+    const responsePromise = client.addressing.prefixes.advertisementStatus.edit(
+      '2af39739cc4e3b5910c918468bb89828',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2', advertised: true },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,16 +25,16 @@ describe('resource statuses', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.bgp.statuses.edit(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', advertised: true },
+    const response = await client.addressing.prefixes.advertisementStatus.edit(
+      '2af39739cc4e3b5910c918468bb89828',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2', advertised: true },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.bgp.statuses.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    const responsePromise = client.addressing.prefixes.advertisementStatus.get(
+      '2af39739cc4e3b5910c918468bb89828',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -46,9 +46,9 @@ describe('resource statuses', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.bgp.statuses.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    const response = await client.addressing.prefixes.advertisementStatus.get(
+      '2af39739cc4e3b5910c918468bb89828',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
     );
   });
 });
diff --git a/tests/api-resources/addressing/prefixes/bgp-prefixes.test.ts b/tests/api-resources/addressing/prefixes/bgp-prefixes.test.ts
new file mode 100644
index 0000000000..62cd4148cd
--- /dev/null
+++ b/tests/api-resources/addressing/prefixes/bgp-prefixes.test.ts
@@ -0,0 +1,98 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource bgpPrefixes', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.addressing.prefixes.bgpPrefixes.create(
+      '2af39739cc4e3b5910c918468bb89828',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.addressing.prefixes.bgpPrefixes.create('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+      cidr: '192.0.2.0/24',
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.addressing.prefixes.bgpPrefixes.list('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.addressing.prefixes.bgpPrefixes.list('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+    });
+  });
+
+  test('edit: only required params', async () => {
+    const responsePromise = client.addressing.prefixes.bgpPrefixes.edit(
+      '2af39739cc4e3b5910c918468bb89828',
+      '7009ba364c7a5760798ceb430e603b74',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.addressing.prefixes.bgpPrefixes.edit(
+      '2af39739cc4e3b5910c918468bb89828',
+      '7009ba364c7a5760798ceb430e603b74',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2', on_demand: { advertised: true } },
+    );
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.addressing.prefixes.bgpPrefixes.get(
+      '2af39739cc4e3b5910c918468bb89828',
+      '7009ba364c7a5760798ceb430e603b74',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.addressing.prefixes.bgpPrefixes.get(
+      '2af39739cc4e3b5910c918468bb89828',
+      '7009ba364c7a5760798ceb430e603b74',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
+    );
+  });
+});
diff --git a/tests/api-resources/addressing/prefixes/delegations.test.ts b/tests/api-resources/addressing/prefixes/delegations.test.ts
index 98f5fb6f72..6476b45315 100644
--- a/tests/api-resources/addressing/prefixes/delegations.test.ts
+++ b/tests/api-resources/addressing/prefixes/delegations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource delegations', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.delegations.create(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.prefixes.delegations.create(
+      '2af39739cc4e3b5910c918468bb89828',
       {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+        account_id: '258def64c72dae45f3e4c8516e2111f2',
         cidr: '192.0.2.0/24',
         delegated_account_id: 'b1946ac92492d2347c6235b4d2611184',
       },
@@ -29,21 +29,17 @@ describe('resource delegations', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.delegations.create(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        cidr: '192.0.2.0/24',
-        delegated_account_id: 'b1946ac92492d2347c6235b4d2611184',
-      },
-    );
+    const response = await client.addressing.prefixes.delegations.create('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+      cidr: '192.0.2.0/24',
+      delegated_account_id: 'b1946ac92492d2347c6235b4d2611184',
+    });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.delegations.list(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.addressing.prefixes.delegations.list('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -54,17 +50,16 @@ describe('resource delegations', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.delegations.list(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.addressing.prefixes.delegations.list('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
+    });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.delegations.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.prefixes.delegations.delete(
+      '2af39739cc4e3b5910c918468bb89828',
       'd933b1530bc56c9953cf8ce166da8004',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -76,10 +71,10 @@ describe('resource delegations', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.delegations.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.prefixes.delegations.delete(
+      '2af39739cc4e3b5910c918468bb89828',
       'd933b1530bc56c9953cf8ce166da8004',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
     );
   });
 });
diff --git a/tests/api-resources/addressing/prefixes/prefixes.test.ts b/tests/api-resources/addressing/prefixes/prefixes.test.ts
index f79489b8c6..f912acb647 100644
--- a/tests/api-resources/addressing/prefixes/prefixes.test.ts
+++ b/tests/api-resources/addressing/prefixes/prefixes.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,8 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource prefixes', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.create({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.prefixes.create({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
       asn: 209242,
       cidr: '192.0.2.0/24',
       loa_document_id: 'd933b1530bc56c9953cf8ce166da8004',
@@ -27,8 +27,8 @@ describe('resource prefixes', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.create({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.prefixes.create({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
       asn: 209242,
       cidr: '192.0.2.0/24',
       loa_document_id: 'd933b1530bc56c9953cf8ce166da8004',
@@ -36,8 +36,8 @@ describe('resource prefixes', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.prefixes.list({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -49,14 +49,14 @@ describe('resource prefixes', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.prefixes.list({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.delete('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.prefixes.delete('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -68,14 +68,14 @@ describe('resource prefixes', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.delete('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.prefixes.delete('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.edit('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.prefixes.edit('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
       description: 'Internal test prefix',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -88,15 +88,15 @@ describe('resource prefixes', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.edit('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.prefixes.edit('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
       description: 'Internal test prefix',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.get('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.prefixes.get('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -108,8 +108,8 @@ describe('resource prefixes', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.get('023e105f4ecef8ad9ca31a8372d0c353', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.prefixes.get('2af39739cc4e3b5910c918468bb89828', {
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
   });
 });
diff --git a/tests/api-resources/addressing/prefixes/service-bindings.test.ts b/tests/api-resources/addressing/prefixes/service-bindings.test.ts
new file mode 100644
index 0000000000..bd7c31b0da
--- /dev/null
+++ b/tests/api-resources/addressing/prefixes/service-bindings.test.ts
@@ -0,0 +1,104 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource serviceBindings', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.addressing.prefixes.serviceBindings.create(
+      '2af39739cc4e3b5910c918468bb89828',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.addressing.prefixes.serviceBindings.create(
+      '2af39739cc4e3b5910c918468bb89828',
+      {
+        account_id: '258def64c72dae45f3e4c8516e2111f2',
+        cidr: '192.0.2.0/24',
+        service_id: '2db684ee7ca04e159946fd05b99e1bcd',
+      },
+    );
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.addressing.prefixes.serviceBindings.list(
+      '2af39739cc4e3b5910c918468bb89828',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.addressing.prefixes.serviceBindings.list(
+      '2af39739cc4e3b5910c918468bb89828',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
+    );
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.addressing.prefixes.serviceBindings.delete(
+      '2af39739cc4e3b5910c918468bb89828',
+      '0429b49b6a5155297b78e75a44b09e14',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.addressing.prefixes.serviceBindings.delete(
+      '2af39739cc4e3b5910c918468bb89828',
+      '0429b49b6a5155297b78e75a44b09e14',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
+    );
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.addressing.prefixes.serviceBindings.get(
+      '2af39739cc4e3b5910c918468bb89828',
+      '0429b49b6a5155297b78e75a44b09e14',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.addressing.prefixes.serviceBindings.get(
+      '2af39739cc4e3b5910c918468bb89828',
+      '0429b49b6a5155297b78e75a44b09e14',
+      { account_id: '258def64c72dae45f3e4c8516e2111f2' },
+    );
+  });
+});
diff --git a/tests/api-resources/addressing/regional-hostnames/regional-hostnames.test.ts b/tests/api-resources/addressing/regional-hostnames/regional-hostnames.test.ts
index 3fddf66f0b..083ea7576b 100644
--- a/tests/api-resources/addressing/regional-hostnames/regional-hostnames.test.ts
+++ b/tests/api-resources/addressing/regional-hostnames/regional-hostnames.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource regionalHostnames', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.addressing.regionalHostnames.create({
+    const responsePromise = client.addressing.regionalHostnames.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       hostname: 'foo.example.com',
       region_key: 'ca',
@@ -26,7 +26,7 @@ describe('resource regionalHostnames', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.addressing.regionalHostnames.create({
+    const response = await client.addressing.regionalHostnames.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       hostname: 'foo.example.com',
       region_key: 'ca',
@@ -34,7 +34,7 @@ describe('resource regionalHostnames', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.addressing.regionalHostnames.list({
+    const responsePromise = client.addressing.regionalHostnames.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -47,13 +47,13 @@ describe('resource regionalHostnames', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.addressing.regionalHostnames.list({
+    const response = await client.addressing.regionalHostnames.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.addressing.regionalHostnames.delete('foo.example.com', {
+    const responsePromise = client.addressing.regionalHostnames.delete('foo.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -66,13 +66,13 @@ describe('resource regionalHostnames', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.addressing.regionalHostnames.delete('foo.example.com', {
+    const response = await client.addressing.regionalHostnames.delete('foo.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.addressing.regionalHostnames.edit('foo.example.com', {
+    const responsePromise = client.addressing.regionalHostnames.edit('foo.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       region_key: 'ca',
     });
@@ -86,14 +86,14 @@ describe('resource regionalHostnames', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.addressing.regionalHostnames.edit('foo.example.com', {
+    const response = await client.addressing.regionalHostnames.edit('foo.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       region_key: 'ca',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.addressing.regionalHostnames.get('foo.example.com', {
+    const responsePromise = client.addressing.regionalHostnames.get('foo.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -106,7 +106,7 @@ describe('resource regionalHostnames', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.addressing.regionalHostnames.get('foo.example.com', {
+    const response = await client.addressing.regionalHostnames.get('foo.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/addressing/regional-hostnames/regions.test.ts b/tests/api-resources/addressing/regional-hostnames/regions.test.ts
index 6118f5e872..4eb06fad02 100644
--- a/tests/api-resources/addressing/regional-hostnames/regions.test.ts
+++ b/tests/api-resources/addressing/regional-hostnames/regions.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource regions', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.addressing.regionalHostnames.regions.list({
+    const responsePromise = client.addressing.regionalHostnames.regions.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource regions', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.addressing.regionalHostnames.regions.list({
+    const response = await client.addressing.regionalHostnames.regions.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/addressing/services.test.ts b/tests/api-resources/addressing/services.test.ts
index 7ca2358d1e..81166d23a9 100644
--- a/tests/api-resources/addressing/services.test.ts
+++ b/tests/api-resources/addressing/services.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,8 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource services', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.addressing.services.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.addressing.services.list({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -24,8 +24,8 @@ describe('resource services', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.addressing.services.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.addressing.services.list({
+      account_id: '258def64c72dae45f3e4c8516e2111f2',
     });
   });
 });
diff --git a/tests/api-resources/ai-gateway/ai-gateway.test.ts b/tests/api-resources/ai-gateway/ai-gateway.test.ts
index 19d951cff9..4510043e13 100644
--- a/tests/api-resources/ai-gateway/ai-gateway.test.ts
+++ b/tests/api-resources/ai-gateway/ai-gateway.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource aiGateway', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.aiGateway.create({
+    const responsePromise = client.aiGateway.create({
       account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
       id: 'my-gateway',
       cache_invalidate_on_update: true,
@@ -31,7 +31,7 @@ describe('resource aiGateway', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.aiGateway.create({
+    const response = await client.aiGateway.create({
       account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
       id: 'my-gateway',
       cache_invalidate_on_update: true,
@@ -40,11 +40,13 @@ describe('resource aiGateway', () => {
       rate_limiting_interval: 0,
       rate_limiting_limit: 0,
       rate_limiting_technique: 'fixed',
+      logpush: true,
+      logpush_public_key: 'xxxxxxxxxxxxxxxx',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.aiGateway.update('my-gateway', {
+    const responsePromise = client.aiGateway.update('my-gateway', {
       account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
       cache_invalidate_on_update: true,
       cache_ttl: 0,
@@ -63,7 +65,7 @@ describe('resource aiGateway', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.aiGateway.update('my-gateway', {
+    const response = await client.aiGateway.update('my-gateway', {
       account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
       cache_invalidate_on_update: true,
       cache_ttl: 0,
@@ -71,11 +73,13 @@ describe('resource aiGateway', () => {
       rate_limiting_interval: 0,
       rate_limiting_limit: 0,
       rate_limiting_technique: 'fixed',
+      logpush: true,
+      logpush_public_key: 'xxxxxxxxxxxxxxxx',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.aiGateway.list({ account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0' });
+    const responsePromise = client.aiGateway.list({ account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -86,17 +90,16 @@ describe('resource aiGateway', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.aiGateway.list({
+    const response = await client.aiGateway.list({
       account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
-      id: 'my-gateway',
-      order_by: 'order_by',
       page: 1,
-      per_page: 5,
+      per_page: 1,
+      search: 'search',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.aiGateway.delete('id', {
+    const responsePromise = client.aiGateway.delete('my-gateway', {
       account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -109,13 +112,13 @@ describe('resource aiGateway', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.aiGateway.delete('id', {
+    const response = await client.aiGateway.delete('my-gateway', {
       account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.aiGateway.get('my-gateway', {
+    const responsePromise = client.aiGateway.get('my-gateway', {
       account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -128,7 +131,7 @@ describe('resource aiGateway', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.aiGateway.get('my-gateway', {
+    const response = await client.aiGateway.get('my-gateway', {
       account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
     });
   });
diff --git a/tests/api-resources/ai-gateway/datasets.test.ts b/tests/api-resources/ai-gateway/datasets.test.ts
new file mode 100644
index 0000000000..e8c23e00a1
--- /dev/null
+++ b/tests/api-resources/ai-gateway/datasets.test.ts
@@ -0,0 +1,124 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource datasets', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.aiGateway.datasets.create('my-gateway', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+      enable: true,
+      filters: [{ key: 'created_at', operator: 'eq', value: ['string'] }],
+      name: 'name',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.aiGateway.datasets.create('my-gateway', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+      enable: true,
+      filters: [{ key: 'created_at', operator: 'eq', value: ['string'] }],
+      name: 'name',
+    });
+  });
+
+  test('update: only required params', async () => {
+    const responsePromise = client.aiGateway.datasets.update('my-gateway', 'id', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+      enable: true,
+      filters: [{ key: 'created_at', operator: 'eq', value: ['string'] }],
+      name: 'name',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.aiGateway.datasets.update('my-gateway', 'id', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+      enable: true,
+      filters: [{ key: 'created_at', operator: 'eq', value: ['string'] }],
+      name: 'name',
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.aiGateway.datasets.list('my-gateway', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.aiGateway.datasets.list('my-gateway', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+      enable: true,
+      name: 'name',
+      page: 1,
+      per_page: 1,
+      search: 'search',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.aiGateway.datasets.delete('my-gateway', 'id', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.aiGateway.datasets.delete('my-gateway', 'id', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.aiGateway.datasets.get('my-gateway', 'id', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.aiGateway.datasets.get('my-gateway', 'id', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+    });
+  });
+});
diff --git a/tests/api-resources/event-notifications/r2/configuration/configuration.test.ts b/tests/api-resources/ai-gateway/evaluation-types.test.ts
similarity index 64%
rename from tests/api-resources/event-notifications/r2/configuration/configuration.test.ts
rename to tests/api-resources/ai-gateway/evaluation-types.test.ts
index 99aae3b551..972f55bad1 100644
--- a/tests/api-resources/event-notifications/r2/configuration/configuration.test.ts
+++ b/tests/api-resources/ai-gateway/evaluation-types.test.ts
@@ -3,18 +3,17 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource configuration', () => {
+describe('resource evaluationTypes', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.eventNotifications.r2.configuration.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.aiGateway.evaluationTypes.get({
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -25,9 +24,12 @@ describe('resource configuration', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.eventNotifications.r2.configuration.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.aiGateway.evaluationTypes.get({
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+      order_by: 'order_by',
+      order_by_direction: 'asc',
+      page: 1,
+      per_page: 5,
+    });
   });
 });
diff --git a/tests/api-resources/ai-gateway/evaluations.test.ts b/tests/api-resources/ai-gateway/evaluations.test.ts
new file mode 100644
index 0000000000..c5e414b96d
--- /dev/null
+++ b/tests/api-resources/ai-gateway/evaluations.test.ts
@@ -0,0 +1,99 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource evaluations', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.aiGateway.evaluations.create('my-gateway', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+      dataset_ids: ['string'],
+      evaluation_type_ids: ['string'],
+      name: 'name',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.aiGateway.evaluations.create('my-gateway', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+      dataset_ids: ['string'],
+      evaluation_type_ids: ['string'],
+      name: 'name',
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.aiGateway.evaluations.list('my-gateway', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.aiGateway.evaluations.list('my-gateway', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+      name: 'name',
+      page: 1,
+      per_page: 1,
+      processed: true,
+      search: 'search',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.aiGateway.evaluations.delete('my-gateway', 'id', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.aiGateway.evaluations.delete('my-gateway', 'id', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.aiGateway.evaluations.get('my-gateway', 'id', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.aiGateway.evaluations.get('my-gateway', 'id', {
+      account_id: '3ebbcb006d4d46d7bb6a8c7f14676cb0',
+    });
+  });
+});
diff --git a/tests/api-resources/ai-gateway/logs.test.ts b/tests/api-resources/ai-gateway/logs.test.ts
index eadc8b753d..33df78db1d 100644
--- a/tests/api-resources/ai-gateway/logs.test.ts
+++ b/tests/api-resources/ai-gateway/logs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource logs', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.aiGateway.logs.list('my-gateway', {
+    const responsePromise = client.aiGateway.logs.list('my-gateway', {
       account_id: '0d37909e38d3e99c29fa2cd343ac421a',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,17 +24,138 @@ describe('resource logs', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.aiGateway.logs.list('my-gateway', {
+    const response = await client.aiGateway.logs.list('my-gateway', {
       account_id: '0d37909e38d3e99c29fa2cd343ac421a',
       cached: true,
       direction: 'asc',
       end_date: '2019-12-27T18:11:19.117Z',
+      feedback: 0,
+      filters: [{ key: 'id', operator: 'eq', value: ['string'] }],
+      max_cost: 0,
+      max_duration: 0,
+      max_tokens_in: 0,
+      max_tokens_out: 0,
+      max_total_tokens: 0,
+      meta_info: true,
+      min_cost: 0,
+      min_duration: 0,
+      min_tokens_in: 0,
+      min_tokens_out: 0,
+      min_total_tokens: 0,
+      model: 'model',
+      model_type: 'model_type',
       order_by: 'created_at',
+      order_by_direction: 'asc',
       page: 1,
-      per_page: 5,
+      per_page: 1,
+      provider: 'provider',
+      request_content_type: 'request_content_type',
+      response_content_type: 'response_content_type',
       search: 'search',
       start_date: '2019-12-27T18:11:19.117Z',
       success: true,
     });
   });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.aiGateway.logs.delete('my-gateway', {
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.aiGateway.logs.delete('my-gateway', {
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+      filters: [{ key: 'id', operator: 'eq', value: ['string'] }],
+      limit: 1,
+      order_by: 'created_at',
+      order_by_direction: 'asc',
+    });
+  });
+
+  test('edit: only required params', async () => {
+    const responsePromise = client.aiGateway.logs.edit('my-gateway', 'id', {
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.aiGateway.logs.edit('my-gateway', 'id', {
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+      feedback: -1,
+      metadata: { foo: 'string' },
+      score: 0,
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.aiGateway.logs.get('my-gateway', 'id', {
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.aiGateway.logs.get('my-gateway', 'id', {
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+    });
+  });
+
+  test('request: only required params', async () => {
+    const responsePromise = client.aiGateway.logs.request('my-gateway', 'id', {
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('request: required and optional params', async () => {
+    const response = await client.aiGateway.logs.request('my-gateway', 'id', {
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+    });
+  });
+
+  test('response: only required params', async () => {
+    const responsePromise = client.aiGateway.logs.response('my-gateway', 'id', {
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('response: required and optional params', async () => {
+    const response = await client.aiGateway.logs.response('my-gateway', 'id', {
+      account_id: '0d37909e38d3e99c29fa2cd343ac421a',
+    });
+  });
 });
diff --git a/tests/api-resources/workers/ai/ai.test.ts b/tests/api-resources/ai/ai.test.ts
similarity index 85%
rename from tests/api-resources/workers/ai/ai.test.ts
rename to tests/api-resources/ai/ai.test.ts
index ee346955ab..17fe0d1694 100644
--- a/tests/api-resources/workers/ai/ai.test.ts
+++ b/tests/api-resources/ai/ai.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ai', () => {
   test('run: only required params', async () => {
-    const responsePromise = cloudflare.workers.ai.run('model_name', {
+    const responsePromise = client.ai.run('model_name', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       text: 'x',
     });
@@ -25,7 +25,7 @@ describe('resource ai', () => {
   });
 
   test('run: required and optional params', async () => {
-    const response = await cloudflare.workers.ai.run('model_name', {
+    const response = await client.ai.run('model_name', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       text: 'x',
     });
diff --git a/tests/api-resources/ai/authors.test.ts b/tests/api-resources/ai/authors.test.ts
new file mode 100644
index 0000000000..f5fd755349
--- /dev/null
+++ b/tests/api-resources/ai/authors.test.ts
@@ -0,0 +1,27 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource authors', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.ai.authors.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.ai.authors.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+});
diff --git a/tests/api-resources/ai/finetunes/assets.test.ts b/tests/api-resources/ai/finetunes/assets.test.ts
new file mode 100644
index 0000000000..a1c77c98a8
--- /dev/null
+++ b/tests/api-resources/ai/finetunes/assets.test.ts
@@ -0,0 +1,33 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare, { toFile } from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource assets', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.ai.finetunes.assets.create('bc451aef-f723-4b26-a6b2-901afd2e7a8a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.ai.finetunes.assets.create('bc451aef-f723-4b26-a6b2-901afd2e7a8a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      file: await toFile(Buffer.from('# my file contents'), 'README.md'),
+      file_name: 'file_name',
+    });
+  });
+});
diff --git a/tests/api-resources/ai/finetunes/finetunes.test.ts b/tests/api-resources/ai/finetunes/finetunes.test.ts
new file mode 100644
index 0000000000..2241f4ff8d
--- /dev/null
+++ b/tests/api-resources/ai/finetunes/finetunes.test.ts
@@ -0,0 +1,52 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource finetunes', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.ai.finetunes.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      model: 'model',
+      name: 'name',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.ai.finetunes.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      model: 'model',
+      name: 'name',
+      description: 'description',
+      public: true,
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.ai.finetunes.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.ai.finetunes.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+});
diff --git a/tests/api-resources/ai/finetunes/public.test.ts b/tests/api-resources/ai/finetunes/public.test.ts
new file mode 100644
index 0000000000..a39bc6a55d
--- /dev/null
+++ b/tests/api-resources/ai/finetunes/public.test.ts
@@ -0,0 +1,34 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource public', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.ai.finetunes.public.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.ai.finetunes.public.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      limit: 0,
+      offset: 0,
+      orderBy: 'orderBy',
+    });
+  });
+});
diff --git a/tests/api-resources/ai/models/models.test.ts b/tests/api-resources/ai/models/models.test.ts
new file mode 100644
index 0000000000..dd734d822b
--- /dev/null
+++ b/tests/api-resources/ai/models/models.test.ts
@@ -0,0 +1,36 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource models', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.ai.models.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.ai.models.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      author: 'author',
+      hide_experimental: true,
+      page: 0,
+      per_page: 0,
+      search: 'search',
+      source: 0,
+      task: 'Text Generation',
+    });
+  });
+});
diff --git a/tests/api-resources/workers/ai/models/schema.test.ts b/tests/api-resources/ai/models/schema.test.ts
similarity index 85%
rename from tests/api-resources/workers/ai/models/schema.test.ts
rename to tests/api-resources/ai/models/schema.test.ts
index 6995114932..7a2ae24945 100644
--- a/tests/api-resources/workers/ai/models/schema.test.ts
+++ b/tests/api-resources/ai/models/schema.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource schema', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workers.ai.models.schema.get({
+    const responsePromise = client.ai.models.schema.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       model: 'model',
     });
@@ -25,7 +25,7 @@ describe('resource schema', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workers.ai.models.schema.get({
+    const response = await client.ai.models.schema.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       model: 'model',
     });
diff --git a/tests/api-resources/ai/tasks.test.ts b/tests/api-resources/ai/tasks.test.ts
new file mode 100644
index 0000000000..30c7864229
--- /dev/null
+++ b/tests/api-resources/ai/tasks.test.ts
@@ -0,0 +1,27 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource tasks', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.ai.tasks.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.ai.tasks.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+});
diff --git a/tests/api-resources/alerting/available-alerts.test.ts b/tests/api-resources/alerting/available-alerts.test.ts
index b5c94ba00d..41b1225c90 100644
--- a/tests/api-resources/alerting/available-alerts.test.ts
+++ b/tests/api-resources/alerting/available-alerts.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource availableAlerts', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.alerting.availableAlerts.list({
+    const responsePromise = client.alerting.availableAlerts.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource availableAlerts', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.alerting.availableAlerts.list({
+    const response = await client.alerting.availableAlerts.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/alerting/destinations/eligible.test.ts b/tests/api-resources/alerting/destinations/eligible.test.ts
index 7539538e7a..bf5a5f3077 100644
--- a/tests/api-resources/alerting/destinations/eligible.test.ts
+++ b/tests/api-resources/alerting/destinations/eligible.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource eligible', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.alerting.destinations.eligible.get({
+    const responsePromise = client.alerting.destinations.eligible.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource eligible', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.alerting.destinations.eligible.get({
+    const response = await client.alerting.destinations.eligible.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/alerting/destinations/pagerduty.test.ts b/tests/api-resources/alerting/destinations/pagerduty.test.ts
index fd79dddf45..2664692e13 100644
--- a/tests/api-resources/alerting/destinations/pagerduty.test.ts
+++ b/tests/api-resources/alerting/destinations/pagerduty.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource pagerduty', () => {
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4285
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.alerting.destinations.pagerduty.create({
+    const responsePromise = client.alerting.destinations.pagerduty.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -26,13 +26,13 @@ describe('resource pagerduty', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4285
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.alerting.destinations.pagerduty.create({
+    const response = await client.alerting.destinations.pagerduty.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.alerting.destinations.pagerduty.delete({
+    const responsePromise = client.alerting.destinations.pagerduty.delete({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,13 +45,13 @@ describe('resource pagerduty', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.alerting.destinations.pagerduty.delete({
+    const response = await client.alerting.destinations.pagerduty.delete({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.alerting.destinations.pagerduty.get({
+    const responsePromise = client.alerting.destinations.pagerduty.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -64,17 +64,16 @@ describe('resource pagerduty', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.alerting.destinations.pagerduty.get({
+    const response = await client.alerting.destinations.pagerduty.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4285
   test.skip('link: only required params', async () => {
-    const responsePromise = cloudflare.alerting.destinations.pagerduty.link(
-      '8c71e667571b4f61b94d9e4b12158038',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.alerting.destinations.pagerduty.link('8c71e667571b4f61b94d9e4b12158038', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -86,9 +85,8 @@ describe('resource pagerduty', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4285
   test.skip('link: required and optional params', async () => {
-    const response = await cloudflare.alerting.destinations.pagerduty.link(
-      '8c71e667571b4f61b94d9e4b12158038',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.alerting.destinations.pagerduty.link('8c71e667571b4f61b94d9e4b12158038', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/alerting/destinations/webhooks.test.ts b/tests/api-resources/alerting/destinations/webhooks.test.ts
index d50bd2b83e..400214bb31 100644
--- a/tests/api-resources/alerting/destinations/webhooks.test.ts
+++ b/tests/api-resources/alerting/destinations/webhooks.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource webhooks', () => {
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4291
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.alerting.destinations.webhooks.create({
+    const responsePromise = client.alerting.destinations.webhooks.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'Slack Webhook',
       url: 'https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd',
@@ -28,7 +28,7 @@ describe('resource webhooks', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4291
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.alerting.destinations.webhooks.create({
+    const response = await client.alerting.destinations.webhooks.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'Slack Webhook',
       url: 'https://hooks.slack.com/services/Ds3fdBFbV/456464Gdd',
@@ -38,7 +38,7 @@ describe('resource webhooks', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4291
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.alerting.destinations.webhooks.update(
+    const responsePromise = client.alerting.destinations.webhooks.update(
       'b115d5ec-15c6-41ee-8b76-92c449b5227b',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
@@ -57,7 +57,7 @@ describe('resource webhooks', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4291
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.alerting.destinations.webhooks.update(
+    const response = await client.alerting.destinations.webhooks.update(
       'b115d5ec-15c6-41ee-8b76-92c449b5227b',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
@@ -69,7 +69,7 @@ describe('resource webhooks', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.alerting.destinations.webhooks.list({
+    const responsePromise = client.alerting.destinations.webhooks.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -82,13 +82,13 @@ describe('resource webhooks', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.alerting.destinations.webhooks.list({
+    const response = await client.alerting.destinations.webhooks.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.alerting.destinations.webhooks.delete(
+    const responsePromise = client.alerting.destinations.webhooks.delete(
       'b115d5ec-15c6-41ee-8b76-92c449b5227b',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -102,7 +102,7 @@ describe('resource webhooks', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.alerting.destinations.webhooks.delete(
+    const response = await client.alerting.destinations.webhooks.delete(
       'b115d5ec-15c6-41ee-8b76-92c449b5227b',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -110,7 +110,7 @@ describe('resource webhooks', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4291
   test.skip('get: only required params', async () => {
-    const responsePromise = cloudflare.alerting.destinations.webhooks.get(
+    const responsePromise = client.alerting.destinations.webhooks.get(
       'b115d5ec-15c6-41ee-8b76-92c449b5227b',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -125,9 +125,8 @@ describe('resource webhooks', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4291
   test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.alerting.destinations.webhooks.get(
-      'b115d5ec-15c6-41ee-8b76-92c449b5227b',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.alerting.destinations.webhooks.get('b115d5ec-15c6-41ee-8b76-92c449b5227b', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/alerting/history.test.ts b/tests/api-resources/alerting/history.test.ts
index 8a5b73601c..51482787b1 100644
--- a/tests/api-resources/alerting/history.test.ts
+++ b/tests/api-resources/alerting/history.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource history', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.alerting.history.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.alerting.history.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,7 +22,7 @@ describe('resource history', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.alerting.history.list({
+    const response = await client.alerting.history.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       before: '2022-05-20T20:29:58.679897Z',
       page: 1,
diff --git a/tests/api-resources/alerting/policies.test.ts b/tests/api-resources/alerting/policies.test.ts
index 1caae47476..bd00587051 100644
--- a/tests/api-resources/alerting/policies.test.ts
+++ b/tests/api-resources/alerting/policies.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,9 +12,9 @@ const cloudflare = new Cloudflare({
 describe('resource policies', () => {
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4274
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.alerting.policies.create({
+    const responsePromise = client.alerting.policies.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      alert_type: 'universal_ssl_event_type',
+      alert_type: 'access_custom_certificate_expiration_type',
       enabled: true,
       mechanisms: { email: [{}], pagerduty: [{}], webhooks: [{}] },
       name: 'SSL Notification Event Policy',
@@ -30,9 +30,9 @@ describe('resource policies', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4274
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.alerting.policies.create({
+    const response = await client.alerting.policies.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      alert_type: 'universal_ssl_event_type',
+      alert_type: 'access_custom_certificate_expiration_type',
       enabled: true,
       mechanisms: {
         email: [{ id: 'test@example.com' }],
@@ -40,55 +40,57 @@ describe('resource policies', () => {
         webhooks: [{ id: '14cc1190-5d2b-4b98-a696-c424cb2ad05f' }],
       },
       name: 'SSL Notification Event Policy',
+      alert_interval: '30m',
       description: 'Something describing the policy.',
       filters: {
-        actions: ['string', 'string', 'string'],
-        affected_asns: ['string', 'string', 'string'],
-        affected_components: ['string', 'string', 'string'],
-        affected_locations: ['string', 'string', 'string'],
-        airport_code: ['string', 'string', 'string'],
-        alert_trigger_preferences: ['string', 'string', 'string'],
-        alert_trigger_preferences_value: ['99.0', '98.0', '97.0'],
-        enabled: ['string', 'string', 'string'],
-        environment: ['string', 'string', 'string'],
-        event: ['string', 'string', 'string'],
-        event_source: ['string', 'string', 'string'],
-        event_type: ['string', 'string', 'string'],
-        group_by: ['string', 'string', 'string'],
-        health_check_id: ['string', 'string', 'string'],
-        incident_impact: ['INCIDENT_IMPACT_NONE', 'INCIDENT_IMPACT_MINOR', 'INCIDENT_IMPACT_MAJOR'],
-        input_id: ['string', 'string', 'string'],
-        limit: ['string', 'string', 'string'],
-        logo_tag: ['string', 'string', 'string'],
-        megabits_per_second: ['string', 'string', 'string'],
-        new_health: ['string', 'string', 'string'],
-        new_status: ['string', 'string', 'string'],
-        packets_per_second: ['string', 'string', 'string'],
-        pool_id: ['string', 'string', 'string'],
-        product: ['string', 'string', 'string'],
-        project_id: ['string', 'string', 'string'],
-        protocol: ['string', 'string', 'string'],
-        query_tag: ['string', 'string', 'string'],
-        requests_per_second: ['string', 'string', 'string'],
-        selectors: ['string', 'string', 'string'],
-        services: ['string', 'string', 'string'],
+        actions: ['string'],
+        affected_asns: ['string'],
+        affected_components: ['string'],
+        affected_locations: ['string'],
+        airport_code: ['string'],
+        alert_trigger_preferences: ['string'],
+        alert_trigger_preferences_value: ['string'],
+        enabled: ['string'],
+        environment: ['string'],
+        event: ['string'],
+        event_source: ['string'],
+        event_type: ['string'],
+        group_by: ['string'],
+        health_check_id: ['string'],
+        incident_impact: ['INCIDENT_IMPACT_NONE'],
+        input_id: ['string'],
+        limit: ['string'],
+        logo_tag: ['string'],
+        megabits_per_second: ['string'],
+        new_health: ['string'],
+        new_status: ['string'],
+        packets_per_second: ['string'],
+        pool_id: ['string'],
+        pop_name: ['string'],
+        product: ['string'],
+        project_id: ['string'],
+        protocol: ['string'],
+        query_tag: ['string'],
+        requests_per_second: ['string'],
+        selectors: ['string'],
+        services: ['string'],
         slo: ['99.9'],
-        status: ['string', 'string', 'string'],
-        target_hostname: ['string', 'string', 'string'],
-        target_ip: ['string', 'string', 'string'],
-        target_zone_name: ['string', 'string', 'string'],
+        status: ['string'],
+        target_hostname: ['string'],
+        target_ip: ['string'],
+        target_zone_name: ['string'],
         traffic_exclusions: ['security_events'],
-        tunnel_id: ['string', 'string', 'string'],
-        tunnel_name: ['string', 'string', 'string'],
-        where: ['string', 'string', 'string'],
-        zones: ['string', 'string', 'string'],
+        tunnel_id: ['string'],
+        tunnel_name: ['string'],
+        where: ['string'],
+        zones: ['string'],
       },
     });
   });
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4274
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.alerting.policies.update('0da2b59e-f118-439d-8097-bdfb215203c9', {
+    const responsePromise = client.alerting.policies.update('0da2b59e-f118-439d-8097-bdfb215203c9', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -102,52 +104,54 @@ describe('resource policies', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4274
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.alerting.policies.update('0da2b59e-f118-439d-8097-bdfb215203c9', {
+    const response = await client.alerting.policies.update('0da2b59e-f118-439d-8097-bdfb215203c9', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      alert_type: 'universal_ssl_event_type',
+      alert_interval: '30m',
+      alert_type: 'access_custom_certificate_expiration_type',
       description: 'Something describing the policy.',
       enabled: true,
       filters: {
-        actions: ['string', 'string', 'string'],
-        affected_asns: ['string', 'string', 'string'],
-        affected_components: ['string', 'string', 'string'],
-        affected_locations: ['string', 'string', 'string'],
-        airport_code: ['string', 'string', 'string'],
-        alert_trigger_preferences: ['string', 'string', 'string'],
-        alert_trigger_preferences_value: ['99.0', '98.0', '97.0'],
-        enabled: ['string', 'string', 'string'],
-        environment: ['string', 'string', 'string'],
-        event: ['string', 'string', 'string'],
-        event_source: ['string', 'string', 'string'],
-        event_type: ['string', 'string', 'string'],
-        group_by: ['string', 'string', 'string'],
-        health_check_id: ['string', 'string', 'string'],
-        incident_impact: ['INCIDENT_IMPACT_NONE', 'INCIDENT_IMPACT_MINOR', 'INCIDENT_IMPACT_MAJOR'],
-        input_id: ['string', 'string', 'string'],
-        limit: ['string', 'string', 'string'],
-        logo_tag: ['string', 'string', 'string'],
-        megabits_per_second: ['string', 'string', 'string'],
-        new_health: ['string', 'string', 'string'],
-        new_status: ['string', 'string', 'string'],
-        packets_per_second: ['string', 'string', 'string'],
-        pool_id: ['string', 'string', 'string'],
-        product: ['string', 'string', 'string'],
-        project_id: ['string', 'string', 'string'],
-        protocol: ['string', 'string', 'string'],
-        query_tag: ['string', 'string', 'string'],
-        requests_per_second: ['string', 'string', 'string'],
-        selectors: ['string', 'string', 'string'],
-        services: ['string', 'string', 'string'],
+        actions: ['string'],
+        affected_asns: ['string'],
+        affected_components: ['string'],
+        affected_locations: ['string'],
+        airport_code: ['string'],
+        alert_trigger_preferences: ['string'],
+        alert_trigger_preferences_value: ['string'],
+        enabled: ['string'],
+        environment: ['string'],
+        event: ['string'],
+        event_source: ['string'],
+        event_type: ['string'],
+        group_by: ['string'],
+        health_check_id: ['string'],
+        incident_impact: ['INCIDENT_IMPACT_NONE'],
+        input_id: ['string'],
+        limit: ['string'],
+        logo_tag: ['string'],
+        megabits_per_second: ['string'],
+        new_health: ['string'],
+        new_status: ['string'],
+        packets_per_second: ['string'],
+        pool_id: ['string'],
+        pop_name: ['string'],
+        product: ['string'],
+        project_id: ['string'],
+        protocol: ['string'],
+        query_tag: ['string'],
+        requests_per_second: ['string'],
+        selectors: ['string'],
+        services: ['string'],
         slo: ['99.9'],
-        status: ['string', 'string', 'string'],
-        target_hostname: ['string', 'string', 'string'],
-        target_ip: ['string', 'string', 'string'],
-        target_zone_name: ['string', 'string', 'string'],
+        status: ['string'],
+        target_hostname: ['string'],
+        target_ip: ['string'],
+        target_zone_name: ['string'],
         traffic_exclusions: ['security_events'],
-        tunnel_id: ['string', 'string', 'string'],
-        tunnel_name: ['string', 'string', 'string'],
-        where: ['string', 'string', 'string'],
-        zones: ['string', 'string', 'string'],
+        tunnel_id: ['string'],
+        tunnel_name: ['string'],
+        where: ['string'],
+        zones: ['string'],
       },
       mechanisms: {
         email: [{ id: 'test@example.com' }],
@@ -159,9 +163,7 @@ describe('resource policies', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.alerting.policies.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.alerting.policies.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -172,13 +174,11 @@ describe('resource policies', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.alerting.policies.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.alerting.policies.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.alerting.policies.delete('0da2b59e-f118-439d-8097-bdfb215203c9', {
+    const responsePromise = client.alerting.policies.delete('0da2b59e-f118-439d-8097-bdfb215203c9', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -191,14 +191,14 @@ describe('resource policies', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.alerting.policies.delete('0da2b59e-f118-439d-8097-bdfb215203c9', {
+    const response = await client.alerting.policies.delete('0da2b59e-f118-439d-8097-bdfb215203c9', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4274
   test.skip('get: only required params', async () => {
-    const responsePromise = cloudflare.alerting.policies.get('0da2b59e-f118-439d-8097-bdfb215203c9', {
+    const responsePromise = client.alerting.policies.get('0da2b59e-f118-439d-8097-bdfb215203c9', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -212,7 +212,7 @@ describe('resource policies', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9327225061/job/25676826349?pr=482#step:5:4274
   test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.alerting.policies.get('0da2b59e-f118-439d-8097-bdfb215203c9', {
+    const response = await client.alerting.policies.get('0da2b59e-f118-439d-8097-bdfb215203c9', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/api-gateway/configurations.test.ts b/tests/api-resources/api-gateway/configurations.test.ts
index 9cdd49f095..307fcd648e 100644
--- a/tests/api-resources/api-gateway/configurations.test.ts
+++ b/tests/api-resources/api-gateway/configurations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource configurations', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.configurations.update({
+    const responsePromise = client.apiGateway.configurations.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       auth_id_characteristics: [{ name: 'authorization', type: 'header' }],
     });
@@ -25,14 +25,14 @@ describe('resource configurations', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.configurations.update({
+    const response = await client.apiGateway.configurations.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       auth_id_characteristics: [{ name: 'authorization', type: 'header' }],
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.configurations.get({
+    const responsePromise = client.apiGateway.configurations.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,7 +45,7 @@ describe('resource configurations', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.configurations.get({
+    const response = await client.apiGateway.configurations.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       properties: ['auth_id_characteristics'],
     });
diff --git a/tests/api-resources/api-gateway/discovery/discovery.test.ts b/tests/api-resources/api-gateway/discovery/discovery.test.ts
index e3d2829f59..6abbb61145 100644
--- a/tests/api-resources/api-gateway/discovery/discovery.test.ts
+++ b/tests/api-resources/api-gateway/discovery/discovery.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource discovery', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.discovery.get({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.apiGateway.discovery.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,8 +22,6 @@ describe('resource discovery', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.discovery.get({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.apiGateway.discovery.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/api-gateway/discovery/operations.test.ts b/tests/api-resources/api-gateway/discovery/operations.test.ts
index e746c613e2..7a171a3354 100644
--- a/tests/api-resources/api-gateway/discovery/operations.test.ts
+++ b/tests/api-resources/api-gateway/discovery/operations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource operations', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.discovery.operations.list({
+    const responsePromise = client.apiGateway.discovery.operations.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,14 +24,14 @@ describe('resource operations', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.discovery.operations.list({
+    const response = await client.apiGateway.discovery.operations.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       diff: true,
-      direction: 'desc',
+      direction: 'asc',
       endpoint: '/api/v1',
       host: ['api.cloudflare.com'],
       method: ['GET'],
-      order: 'method',
+      order: 'host',
       origin: 'ML',
       page: 1,
       per_page: 5,
@@ -39,8 +39,32 @@ describe('resource operations', () => {
     });
   });
 
+  test('bulkEdit: only required params', async () => {
+    const responsePromise = client.apiGateway.discovery.operations.bulkEdit({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: { '3818d821-5901-4147-a474-f5f5aec1d54e': {}, 'b17c8043-99a0-4202-b7d9-8f7cdbee02cd': {} },
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkEdit: required and optional params', async () => {
+    const response = await client.apiGateway.discovery.operations.bulkEdit({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {
+        '3818d821-5901-4147-a474-f5f5aec1d54e': { state: 'review' },
+        'b17c8043-99a0-4202-b7d9-8f7cdbee02cd': { state: 'review' },
+      },
+    });
+  });
+
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.discovery.operations.edit(
+    const responsePromise = client.apiGateway.discovery.operations.edit(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -54,7 +78,7 @@ describe('resource operations', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.discovery.operations.edit(
+    const response = await client.apiGateway.discovery.operations.edit(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353', state: 'review' },
     );
diff --git a/tests/api-resources/ssl/certificate-packs/order.test.ts b/tests/api-resources/api-gateway/expression-template/fallthrough.test.ts
similarity index 59%
rename from tests/api-resources/ssl/certificate-packs/order.test.ts
rename to tests/api-resources/api-gateway/expression-template/fallthrough.test.ts
index 4c3dff9670..afa2ef3872 100644
--- a/tests/api-resources/ssl/certificate-packs/order.test.ts
+++ b/tests/api-resources/api-gateway/expression-template/fallthrough.test.ts
@@ -3,21 +3,17 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource order', () => {
+describe('resource fallthrough', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.ssl.certificatePacks.order.create({
+    const responsePromise = client.apiGateway.expressionTemplate.fallthrough.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      certificate_authority: 'lets_encrypt',
-      hosts: ['example.com', '*.example.com', 'www.example.com'],
-      type: 'advanced',
-      validation_method: 'txt',
-      validity_days: 14,
+      hosts: ['{zone}.domain1.tld', 'domain2.tld'],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -29,14 +25,9 @@ describe('resource order', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.ssl.certificatePacks.order.create({
+    const response = await client.apiGateway.expressionTemplate.fallthrough.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      certificate_authority: 'lets_encrypt',
-      hosts: ['example.com', '*.example.com', 'www.example.com'],
-      type: 'advanced',
-      validation_method: 'txt',
-      validity_days: 14,
-      cloudflare_branding: false,
+      hosts: ['{zone}.domain1.tld', 'domain2.tld'],
     });
   });
 });
diff --git a/tests/api-resources/api-gateway/operations/operations.test.ts b/tests/api-resources/api-gateway/operations/operations.test.ts
index 3aeecfe58f..11ef3ed995 100644
--- a/tests/api-resources/api-gateway/operations/operations.test.ts
+++ b/tests/api-resources/api-gateway/operations/operations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,13 +11,11 @@ const cloudflare = new Cloudflare({
 
 describe('resource operations', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.operations.create({
+    const responsePromise = client.apiGateway.operations.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: [
-        { endpoint: '/api/v1/users/{var1}', host: 'www.example.com', method: 'GET' },
-        { endpoint: '/api/v1/users/{var1}', host: 'www.example.com', method: 'GET' },
-        { endpoint: '/api/v1/users/{var1}', host: 'www.example.com', method: 'GET' },
-      ],
+      endpoint: '/api/v1/users/{var1}',
+      host: 'www.example.com',
+      method: 'GET',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -29,18 +27,16 @@ describe('resource operations', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.operations.create({
+    const response = await client.apiGateway.operations.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: [
-        { endpoint: '/api/v1/users/{var1}', host: 'www.example.com', method: 'GET' },
-        { endpoint: '/api/v1/users/{var1}', host: 'www.example.com', method: 'GET' },
-        { endpoint: '/api/v1/users/{var1}', host: 'www.example.com', method: 'GET' },
-      ],
+      endpoint: '/api/v1/users/{var1}',
+      host: 'www.example.com',
+      method: 'GET',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.operations.list({
+    const responsePromise = client.apiGateway.operations.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -53,9 +49,9 @@ describe('resource operations', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.operations.list({
+    const response = await client.apiGateway.operations.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      direction: 'desc',
+      direction: 'asc',
       endpoint: '/api/v1',
       feature: ['thresholds'],
       host: ['api.cloudflare.com'],
@@ -67,7 +63,7 @@ describe('resource operations', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.operations.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.apiGateway.operations.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -80,13 +76,53 @@ describe('resource operations', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.operations.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.apiGateway.operations.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('bulkCreate: only required params', async () => {
+    const responsePromise = client.apiGateway.operations.bulkCreate({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: [{ endpoint: '/api/v1/users/{var1}', host: 'www.example.com', method: 'GET' }],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkCreate: required and optional params', async () => {
+    const response = await client.apiGateway.operations.bulkCreate({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: [{ endpoint: '/api/v1/users/{var1}', host: 'www.example.com', method: 'GET' }],
+    });
+  });
+
+  test('bulkDelete: only required params', async () => {
+    const responsePromise = client.apiGateway.operations.bulkDelete({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkDelete: required and optional params', async () => {
+    const response = await client.apiGateway.operations.bulkDelete({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.operations.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.apiGateway.operations.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -99,7 +135,7 @@ describe('resource operations', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.operations.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.apiGateway.operations.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       feature: ['thresholds'],
     });
diff --git a/tests/api-resources/api-gateway/operations/schema-validation.test.ts b/tests/api-resources/api-gateway/operations/schema-validation.test.ts
index 09209477dc..6db1381197 100644
--- a/tests/api-resources/api-gateway/operations/schema-validation.test.ts
+++ b/tests/api-resources/api-gateway/operations/schema-validation.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource schemaValidation', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.operations.schemaValidation.update(
+    const responsePromise = client.apiGateway.operations.schemaValidation.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -25,14 +25,14 @@ describe('resource schemaValidation', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.operations.schemaValidation.update(
+    const response = await client.apiGateway.operations.schemaValidation.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353', mitigation_action: 'block' },
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353', mitigation_action: 'log' },
     );
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.operations.schemaValidation.edit({
+    const responsePromise = client.apiGateway.operations.schemaValidation.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       settings_multiple_request: {
         '3818d821-5901-4147-a474-f5f5aec1d54e': {},
@@ -49,17 +49,17 @@ describe('resource schemaValidation', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.operations.schemaValidation.edit({
+    const response = await client.apiGateway.operations.schemaValidation.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       settings_multiple_request: {
         '3818d821-5901-4147-a474-f5f5aec1d54e': { mitigation_action: 'log' },
-        'b17c8043-99a0-4202-b7d9-8f7cdbee02cd': { mitigation_action: 'block' },
+        'b17c8043-99a0-4202-b7d9-8f7cdbee02cd': { mitigation_action: 'log' },
       },
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.operations.schemaValidation.get(
+    const responsePromise = client.apiGateway.operations.schemaValidation.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -73,7 +73,7 @@ describe('resource schemaValidation', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.operations.schemaValidation.get(
+    const response = await client.apiGateway.operations.schemaValidation.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
diff --git a/tests/api-resources/api-gateway/schemas.test.ts b/tests/api-resources/api-gateway/schemas.test.ts
index 56d4e47af0..e2d64f0d5c 100644
--- a/tests/api-resources/api-gateway/schemas.test.ts
+++ b/tests/api-resources/api-gateway/schemas.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource schemas', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.schemas.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.apiGateway.schemas.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,7 +22,7 @@ describe('resource schemas', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.schemas.list({
+    const response = await client.apiGateway.schemas.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       feature: ['thresholds'],
       host: ['www.example.com'],
diff --git a/tests/api-resources/api-gateway/settings/schema-validation.test.ts b/tests/api-resources/api-gateway/settings/schema-validation.test.ts
index 2f06ec1e95..0513dff7ea 100644
--- a/tests/api-resources/api-gateway/settings/schema-validation.test.ts
+++ b/tests/api-resources/api-gateway/settings/schema-validation.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource schemaValidation', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.settings.schemaValidation.update({
+    const responsePromise = client.apiGateway.settings.schemaValidation.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      validation_default_mitigation_action: 'block',
+      validation_default_mitigation_action: 'none',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,15 +25,15 @@ describe('resource schemaValidation', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.settings.schemaValidation.update({
+    const response = await client.apiGateway.settings.schemaValidation.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      validation_default_mitigation_action: 'block',
+      validation_default_mitigation_action: 'none',
       validation_override_mitigation_action: 'none',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.settings.schemaValidation.edit({
+    const responsePromise = client.apiGateway.settings.schemaValidation.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -46,15 +46,15 @@ describe('resource schemaValidation', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.settings.schemaValidation.edit({
+    const response = await client.apiGateway.settings.schemaValidation.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      validation_default_mitigation_action: 'block',
+      validation_default_mitigation_action: 'none',
       validation_override_mitigation_action: 'none',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.settings.schemaValidation.get({
+    const responsePromise = client.apiGateway.settings.schemaValidation.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -67,7 +67,7 @@ describe('resource schemaValidation', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.settings.schemaValidation.get({
+    const response = await client.apiGateway.settings.schemaValidation.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/pagerules/settings.test.ts b/tests/api-resources/api-gateway/user-schemas/hosts.test.ts
similarity index 79%
rename from tests/api-resources/pagerules/settings.test.ts
rename to tests/api-resources/api-gateway/user-schemas/hosts.test.ts
index 7eb8b69046..e040c57585 100644
--- a/tests/api-resources/pagerules/settings.test.ts
+++ b/tests/api-resources/api-gateway/user-schemas/hosts.test.ts
@@ -3,15 +3,15 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource settings', () => {
+describe('resource hosts', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.pagerules.settings.list({
+    const responsePromise = client.apiGateway.userSchemas.hosts.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,8 +24,10 @@ describe('resource settings', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.pagerules.settings.list({
+    const response = await client.apiGateway.userSchemas.hosts.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      page: 1,
+      per_page: 5,
     });
   });
 });
diff --git a/tests/api-resources/api-gateway/user-schemas/operations.test.ts b/tests/api-resources/api-gateway/user-schemas/operations.test.ts
index e6dab481df..b8309148cc 100644
--- a/tests/api-resources/api-gateway/user-schemas/operations.test.ts
+++ b/tests/api-resources/api-gateway/user-schemas/operations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource operations', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.userSchemas.operations.list(
+    const responsePromise = client.apiGateway.userSchemas.operations.list(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -25,7 +25,7 @@ describe('resource operations', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.userSchemas.operations.list(
+    const response = await client.apiGateway.userSchemas.operations.list(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
diff --git a/tests/api-resources/api-gateway/user-schemas/user-schemas.test.ts b/tests/api-resources/api-gateway/user-schemas/user-schemas.test.ts
index da9f18265e..07e71b4452 100644
--- a/tests/api-resources/api-gateway/user-schemas/user-schemas.test.ts
+++ b/tests/api-resources/api-gateway/user-schemas/user-schemas.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare, { toFile } from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource userSchemas', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.userSchemas.create({
+    const responsePromise = client.apiGateway.userSchemas.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       file: await toFile(Buffer.from('# my file contents'), 'README.md'),
       kind: 'openapi_v3',
@@ -26,7 +26,7 @@ describe('resource userSchemas', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.userSchemas.create({
+    const response = await client.apiGateway.userSchemas.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       file: await toFile(Buffer.from('# my file contents'), 'README.md'),
       kind: 'openapi_v3',
@@ -36,7 +36,7 @@ describe('resource userSchemas', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.userSchemas.list({
+    const responsePromise = client.apiGateway.userSchemas.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -49,7 +49,7 @@ describe('resource userSchemas', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.userSchemas.list({
+    const response = await client.apiGateway.userSchemas.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       omit_source: true,
       page: 1,
@@ -59,7 +59,7 @@ describe('resource userSchemas', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.userSchemas.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.apiGateway.userSchemas.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -72,13 +72,13 @@ describe('resource userSchemas', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.userSchemas.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.apiGateway.userSchemas.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.userSchemas.edit('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.apiGateway.userSchemas.edit('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -91,14 +91,14 @@ describe('resource userSchemas', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.userSchemas.edit('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.apiGateway.userSchemas.edit('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       validation_enabled: true,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.apiGateway.userSchemas.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.apiGateway.userSchemas.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -111,7 +111,7 @@ describe('resource userSchemas', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.apiGateway.userSchemas.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.apiGateway.userSchemas.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       omit_source: true,
     });
diff --git a/tests/api-resources/argo/smart-routing.test.ts b/tests/api-resources/argo/smart-routing.test.ts
index 6a2ea75f09..46c00a5353 100644
--- a/tests/api-resources/argo/smart-routing.test.ts
+++ b/tests/api-resources/argo/smart-routing.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource smartRouting', () => {
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.argo.smartRouting.edit({
+    const responsePromise = client.argo.smartRouting.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'on',
     });
@@ -25,14 +25,14 @@ describe('resource smartRouting', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.argo.smartRouting.edit({
+    const response = await client.argo.smartRouting.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'on',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.argo.smartRouting.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.argo.smartRouting.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -43,6 +43,6 @@ describe('resource smartRouting', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.argo.smartRouting.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.argo.smartRouting.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/argo/tiered-caching.test.ts b/tests/api-resources/argo/tiered-caching.test.ts
index c960c682b9..2059d14ca4 100644
--- a/tests/api-resources/argo/tiered-caching.test.ts
+++ b/tests/api-resources/argo/tiered-caching.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource tieredCaching', () => {
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.argo.tieredCaching.edit({
+    const responsePromise = client.argo.tieredCaching.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'on',
     });
@@ -25,16 +25,14 @@ describe('resource tieredCaching', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.argo.tieredCaching.edit({
+    const response = await client.argo.tieredCaching.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'on',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.argo.tieredCaching.get({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.argo.tieredCaching.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -45,6 +43,6 @@ describe('resource tieredCaching', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.argo.tieredCaching.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.argo.tieredCaching.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/audit-logs.test.ts b/tests/api-resources/audit-logs.test.ts
index be50e67e4e..cbcee7c8c6 100644
--- a/tests/api-resources/audit-logs.test.ts
+++ b/tests/api-resources/audit-logs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource auditLogs', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.auditLogs.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.auditLogs.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,18 +22,18 @@ describe('resource auditLogs', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.auditLogs.list({
+    const response = await client.auditLogs.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       id: 'f174be97-19b1-40d6-954d-70cd5fbd52db',
       action: { type: 'add' },
-      actor: { ip: '17.168.228.63', email: 'alice@example.com' },
-      before: '2019-04-30T01:12:20Z',
+      actor: { email: 'alice@example.com', ip: '17.168.228.63' },
+      before: '2019-04-30',
       direction: 'desc',
       export: true,
       hide_user_logs: true,
       page: 50,
       per_page: 25,
-      since: '2019-04-30T01:12:20Z',
+      since: '2019-04-30',
       zone: { name: 'example.com' },
     });
   });
diff --git a/tests/api-resources/billing/profiles.test.ts b/tests/api-resources/billing/profiles.test.ts
index 91f0ad7522..7baf165b20 100644
--- a/tests/api-resources/billing/profiles.test.ts
+++ b/tests/api-resources/billing/profiles.test.ts
@@ -3,15 +3,15 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource profiles', () => {
-  test('get', async () => {
-    const responsePromise = cloudflare.billing.profiles.get({});
+  test('get: only required params', async () => {
+    const responsePromise = client.billing.profiles.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,10 +21,7 @@ describe('resource profiles', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.billing.profiles.get({}, { path: '/_stainless_unknown_path' })).rejects.toThrow(
-      Cloudflare.NotFoundError,
-    );
+  test('get: required and optional params', async () => {
+    const response = await client.billing.profiles.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/bot-management.test.ts b/tests/api-resources/bot-management.test.ts
index 9cb5a02b19..2989e1aa95 100644
--- a/tests/api-resources/bot-management.test.ts
+++ b/tests/api-resources/bot-management.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource botManagement', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.botManagement.update({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.botManagement.update({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,15 +22,16 @@ describe('resource botManagement', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.botManagement.update({
+    const response = await client.botManagement.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      ai_bots_protection: 'block',
       enable_js: true,
       fight_mode: true,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.botManagement.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.botManagement.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -41,6 +42,6 @@ describe('resource botManagement', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.botManagement.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.botManagement.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/botnet-feed/asn.test.ts b/tests/api-resources/botnet-feed/asn.test.ts
new file mode 100755
index 0000000000..44ae24a4a5
--- /dev/null
+++ b/tests/api-resources/botnet-feed/asn.test.ts
@@ -0,0 +1,51 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource asn', () => {
+  test('dayReport: only required params', async () => {
+    const responsePromise = client.botnetFeed.asn.dayReport(0, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('dayReport: required and optional params', async () => {
+    const response = await client.botnetFeed.asn.dayReport(0, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      date: '2014-01-01T05:20:00.12345Z',
+    });
+  });
+
+  test('fullReport: only required params', async () => {
+    const responsePromise = client.botnetFeed.asn.fullReport(0, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('fullReport: required and optional params', async () => {
+    const response = await client.botnetFeed.asn.fullReport(0, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/kv/namespaces/bulk.test.ts b/tests/api-resources/botnet-feed/configs/asn.test.ts
old mode 100644
new mode 100755
similarity index 53%
rename from tests/api-resources/kv/namespaces/bulk.test.ts
rename to tests/api-resources/botnet-feed/configs/asn.test.ts
index 83d5d7f92b..98ebe99bfc
--- a/tests/api-resources/kv/namespaces/bulk.test.ts
+++ b/tests/api-resources/botnet-feed/configs/asn.test.ts
@@ -3,17 +3,16 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource bulk', () => {
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.kv.namespaces.bulk.update('0f2ac74b498b48028cb68387c421e279', {
+describe('resource asn', () => {
+  test('delete: only required params', async () => {
+    const responsePromise = client.botnetFeed.configs.asn.delete(0, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: [{}, {}, {}],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -24,40 +23,14 @@ describe('resource bulk', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.bulk.update('0f2ac74b498b48028cb68387c421e279', {
+  test('delete: required and optional params', async () => {
+    const response = await client.botnetFeed.configs.asn.delete(0, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: [
-        {
-          base64: true,
-          expiration: 1578435000,
-          expiration_ttl: 300,
-          key: 'My-Key',
-          metadata: { someMetadataKey: 'bar' },
-          value: 'Some string',
-        },
-        {
-          base64: true,
-          expiration: 1578435000,
-          expiration_ttl: 300,
-          key: 'My-Key',
-          metadata: { someMetadataKey: 'bar' },
-          value: 'Some string',
-        },
-        {
-          base64: true,
-          expiration: 1578435000,
-          expiration_ttl: 300,
-          key: 'My-Key',
-          metadata: { someMetadataKey: 'bar' },
-          value: 'Some string',
-        },
-      ],
     });
   });
 
-  test('delete: only required params', async () => {
-    const responsePromise = cloudflare.kv.namespaces.bulk.delete('0f2ac74b498b48028cb68387c421e279', {
+  test('get: only required params', async () => {
+    const responsePromise = client.botnetFeed.configs.asn.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -69,8 +42,8 @@ describe('resource bulk', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.bulk.delete('0f2ac74b498b48028cb68387c421e279', {
+  test('get: required and optional params', async () => {
+    const response = await client.botnetFeed.configs.asn.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/brand-protection.test.ts b/tests/api-resources/brand-protection.test.ts
index 99b8ab540d..e971478004 100644
--- a/tests/api-resources/brand-protection.test.ts
+++ b/tests/api-resources/brand-protection.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource brandProtection', () => {
   test('submit: only required params', async () => {
-    const responsePromise = cloudflare.brandProtection.submit({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.brandProtection.submit({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,14 +22,14 @@ describe('resource brandProtection', () => {
   });
 
   test('submit: required and optional params', async () => {
-    const response = await cloudflare.brandProtection.submit({
+    const response = await client.brandProtection.submit({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       url: 'https://www.cloudflare.com',
     });
   });
 
   test('urlInfo: only required params', async () => {
-    const responsePromise = cloudflare.brandProtection.urlInfo({
+    const responsePromise = client.brandProtection.urlInfo({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -44,10 +42,10 @@ describe('resource brandProtection', () => {
   });
 
   test('urlInfo: required and optional params', async () => {
-    const response = await cloudflare.brandProtection.urlInfo({
+    const response = await client.brandProtection.urlInfo({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      url: 'url',
-      url_id_param: { url_id: 0 },
+      url: ['string'],
+      url_id: [0],
     });
   });
 });
diff --git a/tests/api-resources/cache/cache-reserve.test.ts b/tests/api-resources/cache/cache-reserve.test.ts
index 84eadb66b7..bffb2e1962 100644
--- a/tests/api-resources/cache/cache-reserve.test.ts
+++ b/tests/api-resources/cache/cache-reserve.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource cacheReserve', () => {
   test('clear: only required params', async () => {
-    const responsePromise = cloudflare.cache.cacheReserve.clear({
+    const responsePromise = client.cache.cacheReserve.clear({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: '{}',
+      body: {},
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,14 +25,14 @@ describe('resource cacheReserve', () => {
   });
 
   test('clear: required and optional params', async () => {
-    const response = await cloudflare.cache.cacheReserve.clear({
+    const response = await client.cache.cacheReserve.clear({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: '{}',
+      body: {},
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.cache.cacheReserve.edit({
+    const responsePromise = client.cache.cacheReserve.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'on',
     });
@@ -46,16 +46,14 @@ describe('resource cacheReserve', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.cache.cacheReserve.edit({
+    const response = await client.cache.cacheReserve.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'on',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.cache.cacheReserve.get({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.cache.cacheReserve.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -66,13 +64,11 @@ describe('resource cacheReserve', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.cache.cacheReserve.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.cache.cacheReserve.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('status: only required params', async () => {
-    const responsePromise = cloudflare.cache.cacheReserve.status({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.cache.cacheReserve.status({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -83,8 +79,6 @@ describe('resource cacheReserve', () => {
   });
 
   test('status: required and optional params', async () => {
-    const response = await cloudflare.cache.cacheReserve.status({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.cache.cacheReserve.status({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/cache/cache.test.ts b/tests/api-resources/cache/cache.test.ts
index ee574f4b64..c46b109ff9 100644
--- a/tests/api-resources/cache/cache.test.ts
+++ b/tests/api-resources/cache/cache.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource cache', () => {
   test('purge: only required params', async () => {
-    const responsePromise = cloudflare.cache.purge({ zone_id: 'zone_id' });
+    const responsePromise = client.cache.purge({ zone_id: 'zone_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource cache', () => {
   });
 
   test('purge: required and optional params', async () => {
-    const response = await cloudflare.cache.purge({
+    const response = await client.cache.purge({
       zone_id: 'zone_id',
       tags: ['a-cache-tag', 'another-cache-tag'],
     });
diff --git a/tests/api-resources/cache/regional-tiered-cache.test.ts b/tests/api-resources/cache/regional-tiered-cache.test.ts
index 44d5b01276..13a1d997f0 100644
--- a/tests/api-resources/cache/regional-tiered-cache.test.ts
+++ b/tests/api-resources/cache/regional-tiered-cache.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource regionalTieredCache', () => {
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.cache.regionalTieredCache.edit({
+    const responsePromise = client.cache.regionalTieredCache.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'on',
     });
@@ -25,14 +25,14 @@ describe('resource regionalTieredCache', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.cache.regionalTieredCache.edit({
+    const response = await client.cache.regionalTieredCache.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'on',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.cache.regionalTieredCache.get({
+    const responsePromise = client.cache.regionalTieredCache.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,7 +45,7 @@ describe('resource regionalTieredCache', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.cache.regionalTieredCache.get({
+    const response = await client.cache.regionalTieredCache.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/cache/smart-tiered-cache.test.ts b/tests/api-resources/cache/smart-tiered-cache.test.ts
index 5c53642ab0..b1409dc28a 100644
--- a/tests/api-resources/cache/smart-tiered-cache.test.ts
+++ b/tests/api-resources/cache/smart-tiered-cache.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource smartTieredCache', () => {
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.cache.smartTieredCache.delete({
+    const responsePromise = client.cache.smartTieredCache.delete({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,13 +24,13 @@ describe('resource smartTieredCache', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.cache.smartTieredCache.delete({
+    const response = await client.cache.smartTieredCache.delete({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.cache.smartTieredCache.edit({
+    const responsePromise = client.cache.smartTieredCache.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'on',
     });
@@ -44,14 +44,14 @@ describe('resource smartTieredCache', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.cache.smartTieredCache.edit({
+    const response = await client.cache.smartTieredCache.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'on',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.cache.smartTieredCache.get({
+    const responsePromise = client.cache.smartTieredCache.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -64,8 +64,6 @@ describe('resource smartTieredCache', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.cache.smartTieredCache.get({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.cache.smartTieredCache.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/cache/variants.test.ts b/tests/api-resources/cache/variants.test.ts
index adde379670..d0abda448a 100644
--- a/tests/api-resources/cache/variants.test.ts
+++ b/tests/api-resources/cache/variants.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource variants', () => {
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.cache.variants.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.cache.variants.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,11 +22,12 @@ describe('resource variants', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.cache.variants.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.cache.variants.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
-  test('edit: only required params', async () => {
-    const responsePromise = cloudflare.cache.variants.edit({
+  // TODO: investigate HTTP 422 errors on test suite
+  test.skip('edit: only required params', async () => {
+    const responsePromise = client.cache.variants.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: {},
     });
@@ -39,8 +40,9 @@ describe('resource variants', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('edit: required and optional params', async () => {
-    const response = await cloudflare.cache.variants.edit({
+  // TODO: investigate HTTP 422 errors on test suite
+  test.skip('edit: required and optional params', async () => {
+    const response = await client.cache.variants.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: {
         avif: ['image/webp', 'image/jpeg'],
@@ -58,8 +60,9 @@ describe('resource variants', () => {
     });
   });
 
-  test('get: only required params', async () => {
-    const responsePromise = cloudflare.cache.variants.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  // TODO: investigate HTTP 422 errors on test suite
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.cache.variants.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -69,7 +72,8 @@ describe('resource variants', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: required and optional params', async () => {
-    const response = await cloudflare.cache.variants.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  // TODO: investigate HTTP 422 errors on test suite
+  test.skip('get: required and optional params', async () => {
+    const response = await client.cache.variants.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/calls/sfu.test.ts b/tests/api-resources/calls/sfu.test.ts
new file mode 100644
index 0000000000..49029ab1e5
--- /dev/null
+++ b/tests/api-resources/calls/sfu.test.ts
@@ -0,0 +1,113 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource sfu', () => {
+  // TODO: investigate auth errors on test suite
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.calls.sfu.create({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('create: required and optional params', async () => {
+    const response = await client.calls.sfu.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'production-realtime-app',
+    });
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.calls.sfu.update('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('update: required and optional params', async () => {
+    const response = await client.calls.sfu.update('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'production-realtime-app',
+    });
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.calls.sfu.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('list: required and optional params', async () => {
+    const response = await client.calls.sfu.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('delete: only required params', async () => {
+    const responsePromise = client.calls.sfu.delete('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('delete: required and optional params', async () => {
+    const response = await client.calls.sfu.delete('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.calls.sfu.get('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('get: required and optional params', async () => {
+    const response = await client.calls.sfu.get('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/calls/turn.test.ts b/tests/api-resources/calls/turn.test.ts
new file mode 100644
index 0000000000..aacb77c924
--- /dev/null
+++ b/tests/api-resources/calls/turn.test.ts
@@ -0,0 +1,113 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource turn', () => {
+  // TODO: investigate auth errors on test suite
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.calls.turn.create({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('create: required and optional params', async () => {
+    const response = await client.calls.turn.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'my-turn-key',
+    });
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.calls.turn.update('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('update: required and optional params', async () => {
+    const response = await client.calls.turn.update('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'my-turn-key',
+    });
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.calls.turn.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('list: required and optional params', async () => {
+    const response = await client.calls.turn.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('delete: only required params', async () => {
+    const responsePromise = client.calls.turn.delete('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('delete: required and optional params', async () => {
+    const response = await client.calls.turn.delete('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.calls.turn.get('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('get: required and optional params', async () => {
+    const response = await client.calls.turn.get('2a95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/certificate-authorities/hostname-associations.test.ts b/tests/api-resources/certificate-authorities/hostname-associations.test.ts
index a95f027141..828f4f2fe3 100644
--- a/tests/api-resources/certificate-authorities/hostname-associations.test.ts
+++ b/tests/api-resources/certificate-authorities/hostname-associations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource hostnameAssociations', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.certificateAuthorities.hostnameAssociations.update({
+    const responsePromise = client.certificateAuthorities.hostnameAssociations.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,15 +24,15 @@ describe('resource hostnameAssociations', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.certificateAuthorities.hostnameAssociations.update({
+    const response = await client.certificateAuthorities.hostnameAssociations.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      hostnames: ['api.example.com', 'api.example.com', 'api.example.com'],
+      hostnames: ['api.example.com'],
       mtls_certificate_id: 'xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.certificateAuthorities.hostnameAssociations.get({
+    const responsePromise = client.certificateAuthorities.hostnameAssociations.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,7 +45,7 @@ describe('resource hostnameAssociations', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.certificateAuthorities.hostnameAssociations.get({
+    const response = await client.certificateAuthorities.hostnameAssociations.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       mtls_certificate_id: 'b2134436-2555-4acf-be5b-26c48136575e',
     });
diff --git a/tests/api-resources/client-certificates.test.ts b/tests/api-resources/client-certificates.test.ts
index fd3553a605..2b7dad55dc 100644
--- a/tests/api-resources/client-certificates.test.ts
+++ b/tests/api-resources/client-certificates.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource clientCertificates', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.clientCertificates.create({
+    const responsePromise = client.clientCertificates.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      csr: '-----BEGIN CERTIFICATE REQUEST-----\nMIICY....\n-----END CERTIFICATE REQUEST-----\n',
+      csr: '-----BEGIN CERTIFICATE REQUEST-----\\nMIICY....\\n-----END CERTIFICATE REQUEST-----\\n',
       validity_days: 3650,
     });
     const rawResponse = await responsePromise.asResponse();
@@ -26,17 +26,15 @@ describe('resource clientCertificates', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.clientCertificates.create({
+    const response = await client.clientCertificates.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      csr: '-----BEGIN CERTIFICATE REQUEST-----\nMIICY....\n-----END CERTIFICATE REQUEST-----\n',
+      csr: '-----BEGIN CERTIFICATE REQUEST-----\\nMIICY....\\n-----END CERTIFICATE REQUEST-----\\n',
       validity_days: 3650,
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.clientCertificates.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.clientCertificates.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -47,7 +45,7 @@ describe('resource clientCertificates', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.clientCertificates.list({
+    const response = await client.clientCertificates.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       limit: 10,
       offset: 10,
@@ -58,7 +56,7 @@ describe('resource clientCertificates', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.clientCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.clientCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -71,13 +69,13 @@ describe('resource clientCertificates', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.clientCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.clientCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.clientCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.clientCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -90,13 +88,13 @@ describe('resource clientCertificates', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.clientCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.clientCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.clientCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.clientCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -109,7 +107,7 @@ describe('resource clientCertificates', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.clientCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.clientCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/cloud-connector/rules.test.ts b/tests/api-resources/cloud-connector/rules.test.ts
index fd07781de0..30954d0661 100644
--- a/tests/api-resources/cloud-connector/rules.test.ts
+++ b/tests/api-resources/cloud-connector/rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource rules', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.cloudConnector.rules.update({
+    const responsePromise = client.cloudConnector.rules.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: [{}, {}, {}],
+      rules: [{}],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,30 +25,14 @@ describe('resource rules', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.cloudConnector.rules.update({
+    const response = await client.cloudConnector.rules.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: [
+      rules: [
         {
-          description: 'Rule description',
-          enabled: true,
-          expression: 'http.cookie eq "a=b"',
-          id: '95c365e17e1b46599cd99e5b231fac4e',
-          parameters: { host: 'examplebucket.s3.eu-north-1.amazonaws.com' },
-          provider: 'aws_s3',
-        },
-        {
-          description: 'Rule description',
-          enabled: true,
-          expression: 'http.cookie eq "a=b"',
           id: '95c365e17e1b46599cd99e5b231fac4e',
-          parameters: { host: 'examplebucket.s3.eu-north-1.amazonaws.com' },
-          provider: 'aws_s3',
-        },
-        {
           description: 'Rule description',
           enabled: true,
           expression: 'http.cookie eq "a=b"',
-          id: '95c365e17e1b46599cd99e5b231fac4e',
           parameters: { host: 'examplebucket.s3.eu-north-1.amazonaws.com' },
           provider: 'aws_s3',
         },
@@ -57,9 +41,7 @@ describe('resource rules', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.cloudConnector.rules.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.cloudConnector.rules.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -70,8 +52,6 @@ describe('resource rules', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.cloudConnector.rules.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.cloudConnector.rules.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/subscriptions.test.ts b/tests/api-resources/cloudforce-one/requests/assets.test.ts
similarity index 63%
rename from tests/api-resources/subscriptions.test.ts
rename to tests/api-resources/cloudforce-one/requests/assets.test.ts
index 65fc34dbbe..7325e0c7e9 100644
--- a/tests/api-resources/subscriptions.test.ts
+++ b/tests/api-resources/cloudforce-one/requests/assets.test.ts
@@ -3,15 +3,19 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource subscriptions', () => {
-  test('create', async () => {
-    const responsePromise = cloudflare.subscriptions.create('506e3185e9c882d175a2d0cb0093d9f2', {});
+describe('resource assets', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.cloudforceOne.requests.assets.create(
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { page: 0, per_page: 10 },
+    );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,23 +25,21 @@ describe('resource subscriptions', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update', async () => {
-    const responsePromise = cloudflare.subscriptions.update(
+  test('create: required and optional params', async () => {
+    const response = await client.cloudforceOne.requests.assets.create(
       '023e105f4ecef8ad9ca31a8372d0c353',
-      '506e3185e9c882d175a2d0cb0093d9f2',
-      {},
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { page: 0, per_page: 10 },
     );
-    const rawResponse = await responsePromise.asResponse();
-    expect(rawResponse).toBeInstanceOf(Response);
-    const response = await responsePromise;
-    expect(response).not.toBeInstanceOf(Response);
-    const dataAndResponse = await responsePromise.withResponse();
-    expect(dataAndResponse.data).toBe(response);
-    expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.subscriptions.list('023e105f4ecef8ad9ca31a8372d0c353');
+  test('update', async () => {
+    const responsePromise = client.cloudforceOne.requests.assets.update(
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      {},
+    );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -47,17 +49,11 @@ describe('resource subscriptions', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.subscriptions.list('023e105f4ecef8ad9ca31a8372d0c353', { path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
   test('delete', async () => {
-    const responsePromise = cloudflare.subscriptions.delete(
+    const responsePromise = client.cloudforceOne.requests.assets.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
-      '506e3185e9c882d175a2d0cb0093d9f2',
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -71,16 +67,21 @@ describe('resource subscriptions', () => {
   test('delete: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.subscriptions.delete(
+      client.cloudforceOne.requests.assets.delete(
         '023e105f4ecef8ad9ca31a8372d0c353',
-        '506e3185e9c882d175a2d0cb0093d9f2',
+        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
         { path: '/_stainless_unknown_path' },
       ),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.subscriptions.get('506e3185e9c882d175a2d0cb0093d9f2');
+    const responsePromise = client.cloudforceOne.requests.assets.get(
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+    );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -93,7 +94,12 @@ describe('resource subscriptions', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.subscriptions.get('506e3185e9c882d175a2d0cb0093d9f2', { path: '/_stainless_unknown_path' }),
+      client.cloudforceOne.requests.assets.get(
+        '023e105f4ecef8ad9ca31a8372d0c353',
+        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+        { path: '/_stainless_unknown_path' },
+      ),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 });
diff --git a/tests/api-resources/cloudforce-one/requests/message.test.ts b/tests/api-resources/cloudforce-one/requests/message.test.ts
index f242f397d7..b701488af4 100644
--- a/tests/api-resources/cloudforce-one/requests/message.test.ts
+++ b/tests/api-resources/cloudforce-one/requests/message.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource message', () => {
   test('create', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.message.create(
+    const responsePromise = client.cloudforceOne.requests.message.create(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {},
@@ -26,7 +26,7 @@ describe('resource message', () => {
   });
 
   test('update', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.message.update(
+    const responsePromise = client.cloudforceOne.requests.message.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       0,
@@ -42,7 +42,7 @@ describe('resource message', () => {
   });
 
   test('delete', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.message.delete(
+    const responsePromise = client.cloudforceOne.requests.message.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       0,
@@ -59,7 +59,7 @@ describe('resource message', () => {
   test('delete: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.cloudforceOne.requests.message.delete(
+      client.cloudforceOne.requests.message.delete(
         '023e105f4ecef8ad9ca31a8372d0c353',
         'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
         0,
@@ -69,7 +69,7 @@ describe('resource message', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.message.get(
+    const responsePromise = client.cloudforceOne.requests.message.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { page: 0, per_page: 10 },
@@ -84,7 +84,7 @@ describe('resource message', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.cloudforceOne.requests.message.get(
+    const response = await client.cloudforceOne.requests.message.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
diff --git a/tests/api-resources/cloudforce-one/requests/priority.test.ts b/tests/api-resources/cloudforce-one/requests/priority.test.ts
index 3f9e4760a4..5bc1135d04 100644
--- a/tests/api-resources/cloudforce-one/requests/priority.test.ts
+++ b/tests/api-resources/cloudforce-one/requests/priority.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource priority', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.priority.create(
+    const responsePromise = client.cloudforceOne.requests.priority.create(
       '023e105f4ecef8ad9ca31a8372d0c353',
       { labels: ['DoS', 'CVE'], priority: 1, requirement: 'DoS attacks carried out by CVEs', tlp: 'clear' },
     );
@@ -25,14 +25,16 @@ describe('resource priority', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.cloudforceOne.requests.priority.create(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { labels: ['DoS', 'CVE'], priority: 1, requirement: 'DoS attacks carried out by CVEs', tlp: 'clear' },
-    );
+    const response = await client.cloudforceOne.requests.priority.create('023e105f4ecef8ad9ca31a8372d0c353', {
+      labels: ['DoS', 'CVE'],
+      priority: 1,
+      requirement: 'DoS attacks carried out by CVEs',
+      tlp: 'clear',
+    });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.priority.update(
+    const responsePromise = client.cloudforceOne.requests.priority.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { labels: ['DoS', 'CVE'], priority: 1, requirement: 'DoS attacks carried out by CVEs', tlp: 'clear' },
@@ -47,7 +49,7 @@ describe('resource priority', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.cloudforceOne.requests.priority.update(
+    const response = await client.cloudforceOne.requests.priority.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { labels: ['DoS', 'CVE'], priority: 1, requirement: 'DoS attacks carried out by CVEs', tlp: 'clear' },
@@ -55,7 +57,7 @@ describe('resource priority', () => {
   });
 
   test('delete', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.priority.delete(
+    const responsePromise = client.cloudforceOne.requests.priority.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
     );
@@ -71,7 +73,7 @@ describe('resource priority', () => {
   test('delete: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.cloudforceOne.requests.priority.delete(
+      client.cloudforceOne.requests.priority.delete(
         '023e105f4ecef8ad9ca31a8372d0c353',
         'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
         { path: '/_stainless_unknown_path' },
@@ -80,7 +82,7 @@ describe('resource priority', () => {
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.priority.get(
+    const responsePromise = client.cloudforceOne.requests.priority.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
     );
@@ -96,7 +98,7 @@ describe('resource priority', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.cloudforceOne.requests.priority.get(
+      client.cloudforceOne.requests.priority.get(
         '023e105f4ecef8ad9ca31a8372d0c353',
         'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
         { path: '/_stainless_unknown_path' },
@@ -105,9 +107,7 @@ describe('resource priority', () => {
   });
 
   test('quota', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.priority.quota(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-    );
+    const responsePromise = client.cloudforceOne.requests.priority.quota('023e105f4ecef8ad9ca31a8372d0c353');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -120,7 +120,7 @@ describe('resource priority', () => {
   test('quota: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.cloudforceOne.requests.priority.quota('023e105f4ecef8ad9ca31a8372d0c353', {
+      client.cloudforceOne.requests.priority.quota('023e105f4ecef8ad9ca31a8372d0c353', {
         path: '/_stainless_unknown_path',
       }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
diff --git a/tests/api-resources/cloudforce-one/requests/requests.test.ts b/tests/api-resources/cloudforce-one/requests/requests.test.ts
index 9875a49bef..4d9a1e00b3 100644
--- a/tests/api-resources/cloudforce-one/requests/requests.test.ts
+++ b/tests/api-resources/cloudforce-one/requests/requests.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource requests', () => {
   test('create', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const responsePromise = client.cloudforceOne.requests.create('023e105f4ecef8ad9ca31a8372d0c353', {});
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource requests', () => {
   });
 
   test('update', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.update(
+    const responsePromise = client.cloudforceOne.requests.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {},
@@ -37,7 +37,7 @@ describe('resource requests', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.list('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.cloudforceOne.requests.list('023e105f4ecef8ad9ca31a8372d0c353', {
       page: 0,
       per_page: 10,
     });
@@ -51,7 +51,7 @@ describe('resource requests', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.cloudforceOne.requests.list('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.cloudforceOne.requests.list('023e105f4ecef8ad9ca31a8372d0c353', {
       page: 0,
       per_page: 10,
       completed_after: '2022-01-01T00:00:00Z',
@@ -66,7 +66,7 @@ describe('resource requests', () => {
   });
 
   test('delete', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.delete(
+    const responsePromise = client.cloudforceOne.requests.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
     );
@@ -82,7 +82,7 @@ describe('resource requests', () => {
   test('delete: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.cloudforceOne.requests.delete(
+      client.cloudforceOne.requests.delete(
         '023e105f4ecef8ad9ca31a8372d0c353',
         'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
         { path: '/_stainless_unknown_path' },
@@ -91,7 +91,7 @@ describe('resource requests', () => {
   });
 
   test('constants', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.constants('023e105f4ecef8ad9ca31a8372d0c353');
+    const responsePromise = client.cloudforceOne.requests.constants('023e105f4ecef8ad9ca31a8372d0c353');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -104,14 +104,14 @@ describe('resource requests', () => {
   test('constants: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.cloudforceOne.requests.constants('023e105f4ecef8ad9ca31a8372d0c353', {
+      client.cloudforceOne.requests.constants('023e105f4ecef8ad9ca31a8372d0c353', {
         path: '/_stainless_unknown_path',
       }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.get(
+    const responsePromise = client.cloudforceOne.requests.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
     );
@@ -127,7 +127,7 @@ describe('resource requests', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.cloudforceOne.requests.get(
+      client.cloudforceOne.requests.get(
         '023e105f4ecef8ad9ca31a8372d0c353',
         'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
         { path: '/_stainless_unknown_path' },
@@ -136,7 +136,7 @@ describe('resource requests', () => {
   });
 
   test('quota', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.quota('023e105f4ecef8ad9ca31a8372d0c353');
+    const responsePromise = client.cloudforceOne.requests.quota('023e105f4ecef8ad9ca31a8372d0c353');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -149,14 +149,14 @@ describe('resource requests', () => {
   test('quota: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.cloudforceOne.requests.quota('023e105f4ecef8ad9ca31a8372d0c353', {
+      client.cloudforceOne.requests.quota('023e105f4ecef8ad9ca31a8372d0c353', {
         path: '/_stainless_unknown_path',
       }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('types', async () => {
-    const responsePromise = cloudflare.cloudforceOne.requests.types('023e105f4ecef8ad9ca31a8372d0c353');
+    const responsePromise = client.cloudforceOne.requests.types('023e105f4ecef8ad9ca31a8372d0c353');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -169,7 +169,7 @@ describe('resource requests', () => {
   test('types: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.cloudforceOne.requests.types('023e105f4ecef8ad9ca31a8372d0c353', {
+      client.cloudforceOne.requests.types('023e105f4ecef8ad9ca31a8372d0c353', {
         path: '/_stainless_unknown_path',
       }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
diff --git a/tests/api-resources/content-scanning/content-scanning.test.ts b/tests/api-resources/content-scanning/content-scanning.test.ts
new file mode 100644
index 0000000000..6df0f4d23d
--- /dev/null
+++ b/tests/api-resources/content-scanning/content-scanning.test.ts
@@ -0,0 +1,42 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource contentScanning', () => {
+  test('disable: only required params', async () => {
+    const responsePromise = client.contentScanning.disable({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('disable: required and optional params', async () => {
+    const response = await client.contentScanning.disable({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+
+  test('enable: only required params', async () => {
+    const responsePromise = client.contentScanning.enable({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('enable: required and optional params', async () => {
+    const response = await client.contentScanning.enable({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+});
diff --git a/tests/api-resources/content-scanning/payloads.test.ts b/tests/api-resources/content-scanning/payloads.test.ts
new file mode 100644
index 0000000000..be670a1d96
--- /dev/null
+++ b/tests/api-resources/content-scanning/payloads.test.ts
@@ -0,0 +1,71 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource payloads', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.contentScanning.payloads.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: [{ payload: 'lookup_json_string(http.request.body.raw, "file")' }],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.contentScanning.payloads.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: [{ payload: 'lookup_json_string(http.request.body.raw, "file")' }],
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.contentScanning.payloads.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.contentScanning.payloads.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.contentScanning.payloads.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.contentScanning.payloads.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/content-scanning/settings.test.ts b/tests/api-resources/content-scanning/settings.test.ts
new file mode 100644
index 0000000000..6bae022272
--- /dev/null
+++ b/tests/api-resources/content-scanning/settings.test.ts
@@ -0,0 +1,31 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource settings', () => {
+  test('get: only required params', async () => {
+    const responsePromise = client.contentScanning.settings.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.contentScanning.settings.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/custom-certificates/custom-certificates.test.ts b/tests/api-resources/custom-certificates/custom-certificates.test.ts
index f106a483ac..1d8b1f281e 100644
--- a/tests/api-resources/custom-certificates/custom-certificates.test.ts
+++ b/tests/api-resources/custom-certificates/custom-certificates.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource customCertificates', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.customCertificates.create({
+    const responsePromise = client.customCertificates.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       certificate:
         '-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n',
@@ -28,7 +28,7 @@ describe('resource customCertificates', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.customCertificates.create({
+    const response = await client.customCertificates.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       certificate:
         '-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n',
@@ -37,14 +37,12 @@ describe('resource customCertificates', () => {
       bundle_method: 'ubiquitous',
       geo_restrictions: { label: 'us' },
       policy: '(country: US) or (region: EU)',
-      type: 'sni_custom',
+      type: 'legacy_custom',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.customCertificates.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.customCertificates.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -55,7 +53,7 @@ describe('resource customCertificates', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.customCertificates.list({
+    const response = await client.customCertificates.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       match: 'any',
       page: 1,
@@ -65,7 +63,7 @@ describe('resource customCertificates', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.customCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.customCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -78,13 +76,13 @@ describe('resource customCertificates', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.customCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.customCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.customCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.customCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -97,7 +95,7 @@ describe('resource customCertificates', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.customCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.customCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       bundle_method: 'ubiquitous',
       certificate:
@@ -110,7 +108,7 @@ describe('resource customCertificates', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.customCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.customCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -123,7 +121,7 @@ describe('resource customCertificates', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.customCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.customCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/custom-certificates/prioritize.test.ts b/tests/api-resources/custom-certificates/prioritize.test.ts
index b9eb4699b6..ee32934827 100644
--- a/tests/api-resources/custom-certificates/prioritize.test.ts
+++ b/tests/api-resources/custom-certificates/prioritize.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource prioritize', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.customCertificates.prioritize.update({
+    const responsePromise = client.customCertificates.prioritize.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       certificates: [{}, {}],
     });
@@ -25,7 +25,7 @@ describe('resource prioritize', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.customCertificates.prioritize.update({
+    const response = await client.customCertificates.prioritize.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       certificates: [
         { id: '5a7805061c76ada191ed06f989cc3dac', priority: 2 },
diff --git a/tests/api-resources/custom-hostnames/custom-hostnames.test.ts b/tests/api-resources/custom-hostnames/custom-hostnames.test.ts
index 6e1be3445b..a2b3c55466 100644
--- a/tests/api-resources/custom-hostnames/custom-hostnames.test.ts
+++ b/tests/api-resources/custom-hostnames/custom-hostnames.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource customHostnames', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.customHostnames.create({
+    const responsePromise = client.customHostnames.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       hostname: 'app.example.com',
       ssl: {},
@@ -26,14 +26,15 @@ describe('resource customHostnames', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.customHostnames.create({
+    const response = await client.customHostnames.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       hostname: 'app.example.com',
       ssl: {
         bundle_method: 'ubiquitous',
-        certificate_authority: 'google',
+        certificate_authority: 'digicert',
+        cloudflare_branding: false,
         custom_certificate:
-          '-----BEGIN CERTIFICATE-----\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\n-----END CERTIFICATE-----\n',
+          '-----BEGIN CERTIFICATE-----\\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\\n-----END CERTIFICATE-----\\n',
         custom_key:
           '-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n',
         method: 'http',
@@ -41,18 +42,18 @@ describe('resource customHostnames', () => {
           ciphers: ['ECDHE-RSA-AES128-GCM-SHA256', 'AES128-SHA'],
           early_hints: 'on',
           http2: 'on',
-          min_tls_version: '1.2',
+          min_tls_version: '1.0',
           tls_1_3: 'on',
         },
         type: 'dv',
         wildcard: false,
       },
-      custom_metadata: { key: 'value' },
+      custom_metadata: { foo: 'string' },
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.customHostnames.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.customHostnames.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,10 +64,10 @@ describe('resource customHostnames', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.customHostnames.list({
+    const response = await client.customHostnames.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       id: '0d89c70d-ad9f-4843-b99f-6cc0252067e9',
-      direction: 'desc',
+      direction: 'asc',
       hostname: 'app.example.com',
       order: 'ssl',
       page: 1,
@@ -76,7 +77,7 @@ describe('resource customHostnames', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.customHostnames.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.customHostnames.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -89,13 +90,13 @@ describe('resource customHostnames', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.customHostnames.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.customHostnames.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.customHostnames.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.customHostnames.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -108,16 +109,17 @@ describe('resource customHostnames', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.customHostnames.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.customHostnames.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      custom_metadata: { key: 'value' },
+      custom_metadata: { foo: 'string' },
       custom_origin_server: 'origin2.example.com',
       custom_origin_sni: 'sni.example.com',
       ssl: {
         bundle_method: 'ubiquitous',
-        certificate_authority: 'google',
+        certificate_authority: 'digicert',
+        cloudflare_branding: false,
         custom_certificate:
-          '-----BEGIN CERTIFICATE-----\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\n-----END CERTIFICATE-----\n',
+          '-----BEGIN CERTIFICATE-----\\nMIIFJDCCBAygAwIBAgIQD0ifmj/Yi5NP/2gdUySbfzANBgkqhkiG9w0BAQsFADBN\\nMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMScwJQYDVQQDEx5E...SzSHfXp5lnu/3V08I72q1QNzOCgY1XeL4GKVcj4or6cT6tX6oJH7ePPmfrBfqI/O\\nOeH8gMJ+FuwtXYEPa4hBf38M5eU5xWG7\\n-----END CERTIFICATE-----\\n',
         custom_key:
           '-----BEGIN RSA PRIVATE KEY-----\nMIIEowIBAAKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmG\ndtcGbg/1CGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKn\nabIRuGvBKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpid\ntnKX/a+50GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+py\nFxIXjbEIdZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pE\newooaeO2izNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABAoIBACbhTYXBZYKmYPCb\nHBR1IBlCQA2nLGf0qRuJNJZg5iEzXows/6tc8YymZkQE7nolapWsQ+upk2y5Xdp/\naxiuprIs9JzkYK8Ox0r+dlwCG1kSW+UAbX0bQ/qUqlsTvU6muVuMP8vZYHxJ3wmb\n+ufRBKztPTQ/rYWaYQcgC0RWI20HTFBMxlTAyNxYNWzX7RKFkGVVyB9RsAtmcc8g\n+j4OdosbfNoJPS0HeIfNpAznDfHKdxDk2Yc1tV6RHBrC1ynyLE9+TaflIAdo2MVv\nKLMLq51GqYKtgJFIlBRPQqKoyXdz3fGvXrTkf/WY9QNq0J1Vk5ERePZ54mN8iZB7\n9lwy/AkCgYEA6FXzosxswaJ2wQLeoYc7ceaweX/SwTvxHgXzRyJIIT0eJWgx13Wo\n/WA3Iziimsjf6qE+SI/8laxPp2A86VMaIt3Z3mJN/CqSVGw8LK2AQst+OwdPyDMu\niacE8lj/IFGC8mwNUAb9CzGU3JpU4PxxGFjS/eMtGeRXCWkK4NE+G08CgYEA1Kp9\nN2JrVlqUz+gAX+LPmE9OEMAS9WQSQsfCHGogIFDGGcNf7+uwBM7GAaSJIP01zcoe\nVAgWdzXCv3FLhsaZoJ6RyLOLay5phbu1iaTr4UNYm5WtYTzMzqh8l1+MFFDl9xDB\nvULuCIIrglM5MeS/qnSg1uMoH2oVPj9TVst/ir8CgYEAxrI7Ws9Zc4Bt70N1As+U\nlySjaEVZCMkqvHJ6TCuVZFfQoE0r0whdLdRLU2PsLFP+q7qaeZQqgBaNSKeVcDYR\n9B+nY/jOmQoPewPVsp/vQTCnE/R81spu0mp0YI6cIheT1Z9zAy322svcc43JaWB7\nmEbeqyLOP4Z4qSOcmghZBSECgYACvR9Xs0DGn+wCsW4vze/2ei77MD4OQvepPIFX\ndFZtlBy5ADcgE9z0cuVB6CiL8DbdK5kwY9pGNr8HUCI03iHkW6Zs+0L0YmihfEVe\nPG19PSzK9CaDdhD9KFZSbLyVFmWfxOt50H7YRTTiPMgjyFpfi5j2q348yVT0tEQS\nfhRqaQKBgAcWPokmJ7EbYQGeMbS7HC8eWO/RyamlnSffdCdSc7ue3zdVJxpAkQ8W\nqu80pEIF6raIQfAf8MXiiZ7auFOSnHQTXUbhCpvDLKi0Mwq3G8Pl07l+2s6dQG6T\nlv6XTQaMyf6n1yjzL+fzDrH3qXMxHMO/b13EePXpDMpY7HQpoLDi\n-----END RSA PRIVATE KEY-----\n',
         method: 'http',
@@ -125,7 +127,7 @@ describe('resource customHostnames', () => {
           ciphers: ['ECDHE-RSA-AES128-GCM-SHA256', 'AES128-SHA'],
           early_hints: 'on',
           http2: 'on',
-          min_tls_version: '1.2',
+          min_tls_version: '1.0',
           tls_1_3: 'on',
         },
         type: 'dv',
@@ -135,7 +137,7 @@ describe('resource customHostnames', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.customHostnames.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.customHostnames.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -148,7 +150,7 @@ describe('resource customHostnames', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.customHostnames.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.customHostnames.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/custom-hostnames/fallback-origin.test.ts b/tests/api-resources/custom-hostnames/fallback-origin.test.ts
index ed2cf56e2a..6939b0c17f 100644
--- a/tests/api-resources/custom-hostnames/fallback-origin.test.ts
+++ b/tests/api-resources/custom-hostnames/fallback-origin.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource fallbackOrigin', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.customHostnames.fallbackOrigin.update({
+    const responsePromise = client.customHostnames.fallbackOrigin.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       origin: 'fallback.example.com',
     });
@@ -25,14 +25,14 @@ describe('resource fallbackOrigin', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.customHostnames.fallbackOrigin.update({
+    const response = await client.customHostnames.fallbackOrigin.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       origin: 'fallback.example.com',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.customHostnames.fallbackOrigin.delete({
+    const responsePromise = client.customHostnames.fallbackOrigin.delete({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,13 +45,13 @@ describe('resource fallbackOrigin', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.customHostnames.fallbackOrigin.delete({
+    const response = await client.customHostnames.fallbackOrigin.delete({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.customHostnames.fallbackOrigin.get({
+    const responsePromise = client.customHostnames.fallbackOrigin.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -64,7 +64,7 @@ describe('resource fallbackOrigin', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.customHostnames.fallbackOrigin.get({
+    const response = await client.customHostnames.fallbackOrigin.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/custom-nameservers.test.ts b/tests/api-resources/custom-nameservers.test.ts
index fc9f4db071..382546c3ae 100644
--- a/tests/api-resources/custom-nameservers.test.ts
+++ b/tests/api-resources/custom-nameservers.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource customNameservers', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.customNameservers.create({
+    const responsePromise = client.customNameservers.create({
       account_id: '372e67954025e0ba6aaa6d586b9e0b59',
       ns_name: 'ns1.example.com',
     });
@@ -25,7 +25,7 @@ describe('resource customNameservers', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.customNameservers.create({
+    const response = await client.customNameservers.create({
       account_id: '372e67954025e0ba6aaa6d586b9e0b59',
       ns_name: 'ns1.example.com',
       ns_set: 1,
@@ -33,7 +33,7 @@ describe('resource customNameservers', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.customNameservers.delete('ns1.example.com', {
+    const responsePromise = client.customNameservers.delete('ns1.example.com', {
       account_id: '372e67954025e0ba6aaa6d586b9e0b59',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -46,13 +46,13 @@ describe('resource customNameservers', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.customNameservers.delete('ns1.example.com', {
+    const response = await client.customNameservers.delete('ns1.example.com', {
       account_id: '372e67954025e0ba6aaa6d586b9e0b59',
     });
   });
 
   test('availabilty: only required params', async () => {
-    const responsePromise = cloudflare.customNameservers.availabilty({
+    const responsePromise = client.customNameservers.availabilty({
       account_id: '372e67954025e0ba6aaa6d586b9e0b59',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -65,15 +65,13 @@ describe('resource customNameservers', () => {
   });
 
   test('availabilty: required and optional params', async () => {
-    const response = await cloudflare.customNameservers.availabilty({
+    const response = await client.customNameservers.availabilty({
       account_id: '372e67954025e0ba6aaa6d586b9e0b59',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.customNameservers.get({
-      account_id: '372e67954025e0ba6aaa6d586b9e0b59',
-    });
+    const responsePromise = client.customNameservers.get({ account_id: '372e67954025e0ba6aaa6d586b9e0b59' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -84,8 +82,6 @@ describe('resource customNameservers', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.customNameservers.get({
-      account_id: '372e67954025e0ba6aaa6d586b9e0b59',
-    });
+    const response = await client.customNameservers.get({ account_id: '372e67954025e0ba6aaa6d586b9e0b59' });
   });
 });
diff --git a/tests/api-resources/d1/database.test.ts b/tests/api-resources/d1/database.test.ts
index 36ffc6f60f..bfc13e16af 100644
--- a/tests/api-resources/d1/database.test.ts
+++ b/tests/api-resources/d1/database.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource database', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.d1.database.create({
+    const responsePromise = client.d1.database.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'my-database',
     });
@@ -25,7 +25,7 @@ describe('resource database', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.d1.database.create({
+    const response = await client.d1.database.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'my-database',
       primary_location_hint: 'wnam',
@@ -33,7 +33,7 @@ describe('resource database', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.d1.database.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.d1.database.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -44,7 +44,7 @@ describe('resource database', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.d1.database.list({
+    const response = await client.d1.database.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'name',
       page: 1,
@@ -53,7 +53,7 @@ describe('resource database', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.d1.database.delete('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+    const responsePromise = client.d1.database.delete('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -66,13 +66,36 @@ describe('resource database', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.d1.database.delete('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+    const response = await client.d1.database.delete('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
+  test('export: only required params', async () => {
+    const responsePromise = client.d1.database.export('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      output_format: 'polling',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('export: required and optional params', async () => {
+    const response = await client.d1.database.export('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      output_format: 'polling',
+      current_bookmark: 'current_bookmark',
+      dump_options: { no_data: true, no_schema: true, tables: ['string'] },
+    });
+  });
+
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.d1.database.get('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+    const responsePromise = client.d1.database.get('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -85,13 +108,36 @@ describe('resource database', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.d1.database.get('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+    const response = await client.d1.database.get('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('import: only required params', async () => {
+    const responsePromise = client.d1.database.import('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      action: 'init',
+      etag: 'etag',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('import: required and optional params', async () => {
+    const response = await client.d1.database.import('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      action: 'init',
+      etag: 'etag',
     });
   });
 
   test('query: only required params', async () => {
-    const responsePromise = cloudflare.d1.database.query('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+    const responsePromise = client.d1.database.query('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       sql: 'SELECT * FROM myTable WHERE field = ? OR field = ?;',
     });
@@ -105,7 +151,7 @@ describe('resource database', () => {
   });
 
   test('query: required and optional params', async () => {
-    const response = await cloudflare.d1.database.query('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+    const response = await client.d1.database.query('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       sql: 'SELECT * FROM myTable WHERE field = ? OR field = ?;',
       params: ['firstParam', 'secondParam'],
@@ -113,7 +159,7 @@ describe('resource database', () => {
   });
 
   test('raw: only required params', async () => {
-    const responsePromise = cloudflare.d1.database.raw('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+    const responsePromise = client.d1.database.raw('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       sql: 'SELECT * FROM myTable WHERE field = ? OR field = ?;',
     });
@@ -127,7 +173,7 @@ describe('resource database', () => {
   });
 
   test('raw: required and optional params', async () => {
-    const response = await cloudflare.d1.database.raw('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
+    const response = await client.d1.database.raw('xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       sql: 'SELECT * FROM myTable WHERE field = ? OR field = ?;',
       params: ['firstParam', 'secondParam'],
diff --git a/tests/api-resources/dcv-delegation.test.ts b/tests/api-resources/dcv-delegation.test.ts
index 1b8f950ff6..ecfbadf638 100644
--- a/tests/api-resources/dcv-delegation.test.ts
+++ b/tests/api-resources/dcv-delegation.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource dcvDelegation', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.dcvDelegation.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.dcvDelegation.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,6 +22,6 @@ describe('resource dcvDelegation', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.dcvDelegation.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.dcvDelegation.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/diagnostics/traceroutes.test.ts b/tests/api-resources/diagnostics/traceroutes.test.ts
index 3d4fd89143..0c3b153b25 100644
--- a/tests/api-resources/diagnostics/traceroutes.test.ts
+++ b/tests/api-resources/diagnostics/traceroutes.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource traceroutes', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.diagnostics.traceroutes.create({
+    const responsePromise = client.diagnostics.traceroutes.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       targets: ['203.0.113.1', 'cloudflare.com'],
     });
@@ -25,7 +25,7 @@ describe('resource traceroutes', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.diagnostics.traceroutes.create({
+    const response = await client.diagnostics.traceroutes.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       targets: ['203.0.113.1', 'cloudflare.com'],
       colos: ['den', 'sin'],
diff --git a/tests/api-resources/dns/firewall/analytics/reports/bytimes.test.ts b/tests/api-resources/dns-firewall/analytics/reports/bytimes.test.ts
similarity index 85%
rename from tests/api-resources/dns/firewall/analytics/reports/bytimes.test.ts
rename to tests/api-resources/dns-firewall/analytics/reports/bytimes.test.ts
index 2c68a49567..5b816cfaec 100644
--- a/tests/api-resources/dns/firewall/analytics/reports/bytimes.test.ts
+++ b/tests/api-resources/dns-firewall/analytics/reports/bytimes.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource bytimes', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.dns.firewall.analytics.reports.bytimes.get(
+    const responsePromise = client.dnsFirewall.analytics.reports.bytimes.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -25,7 +25,7 @@ describe('resource bytimes', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.dns.firewall.analytics.reports.bytimes.get(
+    const response = await client.dnsFirewall.analytics.reports.bytimes.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
@@ -35,7 +35,7 @@ describe('resource bytimes', () => {
         metrics: 'queryCount,uncachedCount',
         since: '2023-11-11T12:00:00Z',
         sort: '+responseCode,-queryName',
-        time_delta: 'hour',
+        time_delta: 'all',
         until: '2023-11-11T13:00:00Z',
       },
     );
diff --git a/tests/api-resources/dns/firewall/analytics/reports/reports.test.ts b/tests/api-resources/dns-firewall/analytics/reports/reports.test.ts
similarity index 78%
rename from tests/api-resources/dns/firewall/analytics/reports/reports.test.ts
rename to tests/api-resources/dns-firewall/analytics/reports/reports.test.ts
index 7cd5649c4d..3620e5a2a9 100644
--- a/tests/api-resources/dns/firewall/analytics/reports/reports.test.ts
+++ b/tests/api-resources/dns-firewall/analytics/reports/reports.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource reports', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.dns.firewall.analytics.reports.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.dnsFirewall.analytics.reports.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -25,7 +24,7 @@ describe('resource reports', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.dns.firewall.analytics.reports.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.dnsFirewall.analytics.reports.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       dimensions: 'queryType',
       filters: 'responseCode==NOERROR,queryType==A',
diff --git a/tests/api-resources/dns/firewall/firewall.test.ts b/tests/api-resources/dns-firewall/dns-firewall.test.ts
similarity index 65%
rename from tests/api-resources/dns/firewall/firewall.test.ts
rename to tests/api-resources/dns-firewall/dns-firewall.test.ts
index b50783f0fe..0dc4d6e3ee 100644
--- a/tests/api-resources/dns/firewall/firewall.test.ts
+++ b/tests/api-resources/dns-firewall/dns-firewall.test.ts
@@ -3,19 +3,16 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource firewall', () => {
-  test('create: only required params', async () => {
-    const responsePromise = cloudflare.dns.firewall.create({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      name: 'My Awesome DNS Firewall cluster',
-      upstream_ips: ['192.0.2.1', '198.51.100.1', '2001:DB8:100::CF'],
-    });
+describe('resource dnsFirewall', () => {
+  // TODO: investigate broken test
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.dnsFirewall.create({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -25,24 +22,25 @@ describe('resource firewall', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('create: required and optional params', async () => {
-    const response = await cloudflare.dns.firewall.create({
+  // TODO: investigate broken test
+  test.skip('create: required and optional params', async () => {
+    const response = await client.dnsFirewall.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      name: 'My Awesome DNS Firewall cluster',
-      upstream_ips: ['192.0.2.1', '198.51.100.1', '2001:DB8:100::CF'],
       attack_mitigation: { enabled: true, only_when_upstream_unhealthy: false },
       deprecate_any_requests: true,
       ecs_fallback: false,
       maximum_cache_ttl: 900,
       minimum_cache_ttl: 60,
+      name: 'My Awesome DNS Firewall cluster',
       negative_cache_ttl: 900,
       ratelimit: 600,
       retries: 2,
+      upstream_ips: ['192.0.2.1', '198.51.100.1', 'string'],
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.dns.firewall.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.dnsFirewall.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -53,7 +51,7 @@ describe('resource firewall', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.dns.firewall.list({
+    const response = await client.dnsFirewall.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       page: 1,
       per_page: 1,
@@ -61,7 +59,7 @@ describe('resource firewall', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.dns.firewall.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.dnsFirewall.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -74,22 +72,15 @@ describe('resource firewall', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.dns.firewall.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.dnsFirewall.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
-  test('edit: only required params', async () => {
-    const responsePromise = cloudflare.dns.firewall.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+  // TODO: investigate broken test
+  test.skip('edit: only required params', async () => {
+    const responsePromise = client.dnsFirewall.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      id: '023e105f4ecef8ad9ca31a8372d0c353',
-      deprecate_any_requests: true,
-      dns_firewall_ips: ['203.0.113.1', '203.0.113.254', '2001:DB8:AB::CF', '2001:DB8:CD::CF'],
-      ecs_fallback: false,
-      maximum_cache_ttl: 900,
-      minimum_cache_ttl: 60,
-      name: 'My Awesome DNS Firewall cluster',
-      upstream_ips: ['192.0.2.1', '198.51.100.1', '2001:DB8:100::CF'],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -100,26 +91,25 @@ describe('resource firewall', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('edit: required and optional params', async () => {
-    const response = await cloudflare.dns.firewall.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+  // TODO: investigate broken test
+  test.skip('edit: required and optional params', async () => {
+    const response = await client.dnsFirewall.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      id: '023e105f4ecef8ad9ca31a8372d0c353',
+      attack_mitigation: { enabled: true, only_when_upstream_unhealthy: false },
       deprecate_any_requests: true,
-      dns_firewall_ips: ['203.0.113.1', '203.0.113.254', '2001:DB8:AB::CF', '2001:DB8:CD::CF'],
       ecs_fallback: false,
       maximum_cache_ttl: 900,
       minimum_cache_ttl: 60,
       name: 'My Awesome DNS Firewall cluster',
-      upstream_ips: ['192.0.2.1', '198.51.100.1', '2001:DB8:100::CF'],
-      attack_mitigation: { enabled: true, only_when_upstream_unhealthy: false },
       negative_cache_ttl: 900,
       ratelimit: 600,
       retries: 2,
+      upstream_ips: ['192.0.2.1', '198.51.100.1', 'string'],
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.dns.firewall.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.dnsFirewall.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -132,7 +122,7 @@ describe('resource firewall', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.dns.firewall.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.dnsFirewall.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/dns-firewall/reverse-dns.test.ts b/tests/api-resources/dns-firewall/reverse-dns.test.ts
new file mode 100644
index 0000000000..6ec48835b0
--- /dev/null
+++ b/tests/api-resources/dns-firewall/reverse-dns.test.ts
@@ -0,0 +1,51 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource reverseDNS', () => {
+  test('edit: only required params', async () => {
+    const responsePromise = client.dnsFirewall.reverseDNS.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.dnsFirewall.reverseDNS.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      ptr: { foo: 'string' },
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.dnsFirewall.reverseDNS.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.dnsFirewall.reverseDNS.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/dns/analytics/reports/bytimes.test.ts b/tests/api-resources/dns/analytics/reports/bytimes.test.ts
index 6487075adb..92b93a9e99 100644
--- a/tests/api-resources/dns/analytics/reports/bytimes.test.ts
+++ b/tests/api-resources/dns/analytics/reports/bytimes.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource bytimes', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.dns.analytics.reports.bytimes.get({
+    const responsePromise = client.dns.analytics.reports.bytimes.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource bytimes', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.dns.analytics.reports.bytimes.get({
+    const response = await client.dns.analytics.reports.bytimes.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       dimensions: 'queryType',
       filters: 'responseCode==NOERROR,queryType==A',
@@ -32,7 +32,7 @@ describe('resource bytimes', () => {
       metrics: 'queryCount,uncachedCount',
       since: '2023-11-11T12:00:00Z',
       sort: '+responseCode,-queryName',
-      time_delta: 'hour',
+      time_delta: 'all',
       until: '2023-11-11T13:00:00Z',
     });
   });
diff --git a/tests/api-resources/dns/analytics/reports/reports.test.ts b/tests/api-resources/dns/analytics/reports/reports.test.ts
index d6617b0398..535fb300f3 100644
--- a/tests/api-resources/dns/analytics/reports/reports.test.ts
+++ b/tests/api-resources/dns/analytics/reports/reports.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource reports', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.dns.analytics.reports.get({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.dns.analytics.reports.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,7 +22,7 @@ describe('resource reports', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.dns.analytics.reports.get({
+    const response = await client.dns.analytics.reports.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       dimensions: 'queryType',
       filters: 'responseCode==NOERROR,queryType==A',
diff --git a/tests/api-resources/dnssec.test.ts b/tests/api-resources/dns/dnssec.test.ts
similarity index 84%
rename from tests/api-resources/dnssec.test.ts
rename to tests/api-resources/dns/dnssec.test.ts
index bb0ad02e5b..e0d4fea328 100644
--- a/tests/api-resources/dnssec.test.ts
+++ b/tests/api-resources/dns/dnssec.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource dnssec', () => {
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.dnssec.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.dns.dnssec.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,11 +22,11 @@ describe('resource dnssec', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.dnssec.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.dns.dnssec.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.dnssec.edit({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.dns.dnssec.edit({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -37,7 +37,7 @@ describe('resource dnssec', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.dnssec.edit({
+    const response = await client.dns.dnssec.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       dnssec_multi_signer: false,
       dnssec_presigned: true,
@@ -46,7 +46,7 @@ describe('resource dnssec', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.dnssec.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.dns.dnssec.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -57,6 +57,6 @@ describe('resource dnssec', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.dnssec.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.dns.dnssec.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/dns/records.test.ts b/tests/api-resources/dns/records.test.ts
index b1a94834c3..3fb585e3c1 100644
--- a/tests/api-resources/dns/records.test.ts
+++ b/tests/api-resources/dns/records.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,12 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource records', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.dns.records.create({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      content: '198.51.100.4',
-      name: 'example.com',
-      type: 'A',
-    });
+    const responsePromise = client.dns.records.create({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -29,26 +24,23 @@ describe('resource records', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.dns.records.create({
+    const response = await client.dns.records.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      comment: 'Domain verification record',
       content: '198.51.100.4',
       name: 'example.com',
-      type: 'A',
-      id: '023e105f4ecef8ad9ca31a8372d0c353',
-      comment: 'Domain verification record',
-      proxied: false,
-      tags: ['owner:dns-team', 'owner:dns-team', 'owner:dns-team'],
+      proxied: true,
+      settings: { ipv4_only: true, ipv6_only: true },
+      tags: ['owner:dns-team'],
       ttl: 3600,
+      type: 'A',
     });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.dns.records.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.dns.records.update('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      content: '198.51.100.4',
-      name: 'example.com',
-      type: 'A',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -61,21 +53,22 @@ describe('resource records', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.dns.records.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.dns.records.update('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      comment: 'Domain verification record',
       content: '198.51.100.4',
       name: 'example.com',
-      type: 'A',
-      id: '023e105f4ecef8ad9ca31a8372d0c353',
-      comment: 'Domain verification record',
-      proxied: false,
-      tags: ['owner:dns-team', 'owner:dns-team', 'owner:dns-team'],
+      proxied: true,
+      settings: { ipv4_only: true, ipv6_only: true },
+      tags: ['owner:dns-team'],
       ttl: 3600,
+      type: 'A',
     });
   });
 
-  test('list: only required params', async () => {
-    const responsePromise = cloudflare.dns.records.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  // mock server returns invalid data
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.dns.records.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -85,33 +78,39 @@ describe('resource records', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: required and optional params', async () => {
-    const response = await cloudflare.dns.records.list({
+  // mock server returns invalid data
+  test.skip('list: required and optional params', async () => {
+    const response = await client.dns.records.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       comment: {
-        present: 'present',
         absent: 'absent',
-        exact: 'Hello, world',
         contains: 'ello, worl',
-        startswith: 'Hello, w',
         endswith: 'o, world',
+        exact: 'Hello, world',
+        present: 'present',
+        startswith: 'Hello, w',
       },
-      content: '127.0.0.1',
+      content: { contains: '7.0.0.', endswith: '.0.1', exact: '127.0.0.1', startswith: '127.0.' },
       direction: 'asc',
       match: 'any',
-      name: 'example.com',
+      name: {
+        contains: 'w.example.',
+        endswith: '.example.com',
+        exact: 'www.example.com',
+        startswith: 'www.example',
+      },
       order: 'type',
       page: 1,
       per_page: 5,
-      proxied: false,
+      proxied: true,
       search: 'www.cloudflare.com',
       tag: {
-        present: 'important',
         absent: 'important',
-        exact: 'greeting:Hello, world',
         contains: 'greeting:ello, worl',
-        startswith: 'greeting:Hello, w',
         endswith: 'greeting:o, world',
+        exact: 'greeting:Hello, world',
+        present: 'important',
+        startswith: 'greeting:Hello, w',
       },
       tag_match: 'any',
       type: 'A',
@@ -119,7 +118,7 @@ describe('resource records', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.dns.records.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.dns.records.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -132,18 +131,73 @@ describe('resource records', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.dns.records.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.dns.records.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('batch: only required params', async () => {
+    const responsePromise = client.dns.records.batch({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('batch: required and optional params', async () => {
+    const response = await client.dns.records.batch({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      deletes: [{ id: '023e105f4ecef8ad9ca31a8372d0c353' }],
+      patches: [
+        {
+          comment: 'Domain verification record',
+          content: '198.51.100.4',
+          name: 'example.com',
+          proxied: true,
+          settings: { ipv4_only: true, ipv6_only: true },
+          tags: ['owner:dns-team'],
+          ttl: 3600,
+          type: 'A',
+          id: '023e105f4ecef8ad9ca31a8372d0c353',
+        },
+      ],
+      posts: [
+        {
+          comment: 'Domain verification record',
+          content: '198.51.100.4',
+          name: 'example.com',
+          proxied: true,
+          settings: { ipv4_only: true, ipv6_only: true },
+          tags: ['owner:dns-team'],
+          ttl: 3600,
+          type: 'A',
+        },
+      ],
+      puts: [
+        {
+          comment: 'Domain verification record',
+          content: '198.51.100.4',
+          name: 'example.com',
+          proxied: true,
+          settings: { ipv4_only: true, ipv6_only: true },
+          tags: ['owner:dns-team'],
+          ttl: 3600,
+          type: 'A',
+          id: '023e105f4ecef8ad9ca31a8372d0c353',
+        },
+      ],
     });
   });
 
   // TODO: investigate broken test
   test.skip('edit: only required params', async () => {
-    const responsePromise = cloudflare.dns.records.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.dns.records.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      content: '198.51.100.4',
-      name: 'example.com',
-      type: 'A',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -156,21 +210,21 @@ describe('resource records', () => {
 
   // TODO: investigate broken test
   test.skip('edit: required and optional params', async () => {
-    const response = await cloudflare.dns.records.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.dns.records.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      comment: 'Domain verification record',
       content: '198.51.100.4',
       name: 'example.com',
-      type: 'A',
-      id: '023e105f4ecef8ad9ca31a8372d0c353',
-      comment: 'Domain verification record',
-      proxied: false,
-      tags: ['owner:dns-team', 'owner:dns-team', 'owner:dns-team'],
+      proxied: true,
+      settings: { ipv4_only: true, ipv6_only: true },
+      tags: ['owner:dns-team'],
       ttl: 3600,
+      type: 'A',
     });
   });
 
   test('export: only required params', async () => {
-    const responsePromise = cloudflare.dns.records.export({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.dns.records.export({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -181,11 +235,12 @@ describe('resource records', () => {
   });
 
   test('export: required and optional params', async () => {
-    const response = await cloudflare.dns.records.export({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.dns.records.export({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
-  test('get: only required params', async () => {
-    const responsePromise = cloudflare.dns.records.get('023e105f4ecef8ad9ca31a8372d0c353', {
+  // mock server returns invalid data
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.dns.records.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -197,15 +252,16 @@ describe('resource records', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: required and optional params', async () => {
-    const response = await cloudflare.dns.records.get('023e105f4ecef8ad9ca31a8372d0c353', {
+  // mock server returns invalid data
+  test.skip('get: required and optional params', async () => {
+    const response = await client.dns.records.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   // TODO: investigate broken test
   test.skip('import: only required params', async () => {
-    const responsePromise = cloudflare.dns.records.import({
+    const responsePromise = client.dns.records.import({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       file: 'www.example.com. 300 IN  A 127.0.0.1',
     });
@@ -220,7 +276,7 @@ describe('resource records', () => {
 
   // TODO: investigate broken test
   test.skip('import: required and optional params', async () => {
-    const response = await cloudflare.dns.records.import({
+    const response = await client.dns.records.import({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       file: 'www.example.com. 300 IN  A 127.0.0.1',
       proxied: 'true',
@@ -228,7 +284,7 @@ describe('resource records', () => {
   });
 
   test('scan: only required params', async () => {
-    const responsePromise = cloudflare.dns.records.scan({
+    const responsePromise = client.dns.records.scan({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
     });
@@ -242,9 +298,6 @@ describe('resource records', () => {
   });
 
   test('scan: required and optional params', async () => {
-    const response = await cloudflare.dns.records.scan({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: {},
-    });
+    const response = await client.dns.records.scan({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} });
   });
 });
diff --git a/tests/api-resources/dns/settings.test.ts b/tests/api-resources/dns/settings/settings.test.ts
similarity index 85%
rename from tests/api-resources/dns/settings.test.ts
rename to tests/api-resources/dns/settings/settings.test.ts
index 8bface3b68..7bef4a4826 100644
--- a/tests/api-resources/dns/settings.test.ts
+++ b/tests/api-resources/dns/settings/settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource settings', () => {
   // HTTP 422 from prism
   test.skip('edit', async () => {
-    const responsePromise = cloudflare.dns.settings.edit({ account_id: 'account_id' });
+    const responsePromise = client.dns.settings.edit({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,7 +24,7 @@ describe('resource settings', () => {
 
   // HTTP 422 from prism
   test.skip('get', async () => {
-    const responsePromise = cloudflare.dns.settings.get({ account_id: 'account_id' });
+    const responsePromise = client.dns.settings.get({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
diff --git a/tests/api-resources/dns/settings/views.test.ts b/tests/api-resources/dns/settings/views.test.ts
new file mode 100644
index 0000000000..eec2490f80
--- /dev/null
+++ b/tests/api-resources/dns/settings/views.test.ts
@@ -0,0 +1,121 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource views', () => {
+  // generated params are incorrect
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.dns.settings.views.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // generated params are incorrect
+  test.skip('create: required and optional params', async () => {
+    const response = await client.dns.settings.views.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'my view',
+      zones: ['372e67954025e0ba6aaa6d586b9e0b59'],
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.dns.settings.views.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.dns.settings.views.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      direction: 'asc',
+      match: 'any',
+      name: { contains: 'view', endswith: 'ew', exact: 'my view', startswith: 'my' },
+      order: 'name',
+      page: 1,
+      per_page: 5,
+      zone_id: 'ae29bea30e2e427ba9cd8d78b628177b',
+      zone_name: 'www.example.com',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.dns.settings.views.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.dns.settings.views.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('edit: only required params', async () => {
+    const responsePromise = client.dns.settings.views.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.dns.settings.views.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'my view',
+      zones: ['372e67954025e0ba6aaa6d586b9e0b59'],
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.dns.settings.views.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.dns.settings.views.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/secondary-dns/acls.test.ts b/tests/api-resources/dns/zone-transfers/acls.test.ts
similarity index 80%
rename from tests/api-resources/secondary-dns/acls.test.ts
rename to tests/api-resources/dns/zone-transfers/acls.test.ts
index c7ae7e4698..256756f263 100644
--- a/tests/api-resources/secondary-dns/acls.test.ts
+++ b/tests/api-resources/dns/zone-transfers/acls.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,9 +12,10 @@ const cloudflare = new Cloudflare({
 describe('resource acls', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.acls.create({
+    const responsePromise = client.dns.zoneTransfers.acls.create({
       account_id: '01a7362d577a6c3019a474fd6f485823',
-      body: {},
+      ip_range: '192.0.2.53/28',
+      name: 'my-acl-1',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -27,14 +28,15 @@ describe('resource acls', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.acls.create({
+    const response = await client.dns.zoneTransfers.acls.create({
       account_id: '01a7362d577a6c3019a474fd6f485823',
-      body: {},
+      ip_range: '192.0.2.53/28',
+      name: 'my-acl-1',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.acls.update('23ff594956f20c2a721606e94745a8aa', {
+    const responsePromise = client.dns.zoneTransfers.acls.update('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
       ip_range: '192.0.2.53/28',
       name: 'my-acl-1',
@@ -49,7 +51,7 @@ describe('resource acls', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.acls.update('23ff594956f20c2a721606e94745a8aa', {
+    const response = await client.dns.zoneTransfers.acls.update('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
       ip_range: '192.0.2.53/28',
       name: 'my-acl-1',
@@ -57,7 +59,7 @@ describe('resource acls', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.acls.list({
+    const responsePromise = client.dns.zoneTransfers.acls.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -70,13 +72,13 @@ describe('resource acls', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.acls.list({
+    const response = await client.dns.zoneTransfers.acls.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.acls.delete('23ff594956f20c2a721606e94745a8aa', {
+    const responsePromise = client.dns.zoneTransfers.acls.delete('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -89,13 +91,13 @@ describe('resource acls', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.acls.delete('23ff594956f20c2a721606e94745a8aa', {
+    const response = await client.dns.zoneTransfers.acls.delete('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.acls.get('23ff594956f20c2a721606e94745a8aa', {
+    const responsePromise = client.dns.zoneTransfers.acls.get('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -108,7 +110,7 @@ describe('resource acls', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.acls.get('23ff594956f20c2a721606e94745a8aa', {
+    const response = await client.dns.zoneTransfers.acls.get('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
   });
diff --git a/tests/api-resources/secondary-dns/force-axfr.test.ts b/tests/api-resources/dns/zone-transfers/force-axfr.test.ts
similarity index 85%
rename from tests/api-resources/secondary-dns/force-axfr.test.ts
rename to tests/api-resources/dns/zone-transfers/force-axfr.test.ts
index 297b1c8167..a386a59f71 100644
--- a/tests/api-resources/secondary-dns/force-axfr.test.ts
+++ b/tests/api-resources/dns/zone-transfers/force-axfr.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource forceAXFR', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.forceAXFR.create({
+    const responsePromise = client.dns.zoneTransfers.forceAXFR.create({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       body: {},
     });
@@ -25,7 +25,7 @@ describe('resource forceAXFR', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.forceAXFR.create({
+    const response = await client.dns.zoneTransfers.forceAXFR.create({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       body: {},
     });
diff --git a/tests/api-resources/secondary-dns/incoming.test.ts b/tests/api-resources/dns/zone-transfers/incoming.test.ts
similarity index 85%
rename from tests/api-resources/secondary-dns/incoming.test.ts
rename to tests/api-resources/dns/zone-transfers/incoming.test.ts
index 490893d50c..c918219752 100644
--- a/tests/api-resources/secondary-dns/incoming.test.ts
+++ b/tests/api-resources/dns/zone-transfers/incoming.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource incoming', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.incoming.create({
+    const responsePromise = client.dns.zoneTransfers.incoming.create({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       auto_refresh_seconds: 86400,
       name: 'www.example.com.',
@@ -27,7 +27,7 @@ describe('resource incoming', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.incoming.create({
+    const response = await client.dns.zoneTransfers.incoming.create({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       auto_refresh_seconds: 86400,
       name: 'www.example.com.',
@@ -36,7 +36,7 @@ describe('resource incoming', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.incoming.update({
+    const responsePromise = client.dns.zoneTransfers.incoming.update({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       auto_refresh_seconds: 86400,
       name: 'www.example.com.',
@@ -52,7 +52,7 @@ describe('resource incoming', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.incoming.update({
+    const response = await client.dns.zoneTransfers.incoming.update({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       auto_refresh_seconds: 86400,
       name: 'www.example.com.',
@@ -61,7 +61,7 @@ describe('resource incoming', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.incoming.delete({
+    const responsePromise = client.dns.zoneTransfers.incoming.delete({
       zone_id: '269d8f4853475ca241c4e730be286b20',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -74,13 +74,13 @@ describe('resource incoming', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.incoming.delete({
+    const response = await client.dns.zoneTransfers.incoming.delete({
       zone_id: '269d8f4853475ca241c4e730be286b20',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.incoming.get({
+    const responsePromise = client.dns.zoneTransfers.incoming.get({
       zone_id: '269d8f4853475ca241c4e730be286b20',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -93,7 +93,7 @@ describe('resource incoming', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.incoming.get({
+    const response = await client.dns.zoneTransfers.incoming.get({
       zone_id: '269d8f4853475ca241c4e730be286b20',
     });
   });
diff --git a/tests/api-resources/secondary-dns/outgoing/outgoing.test.ts b/tests/api-resources/dns/zone-transfers/outgoing/outgoing.test.ts
similarity index 84%
rename from tests/api-resources/secondary-dns/outgoing/outgoing.test.ts
rename to tests/api-resources/dns/zone-transfers/outgoing/outgoing.test.ts
index c60779422c..9c8988a1ca 100644
--- a/tests/api-resources/secondary-dns/outgoing/outgoing.test.ts
+++ b/tests/api-resources/dns/zone-transfers/outgoing/outgoing.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource outgoing', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.outgoing.create({
+    const responsePromise = client.dns.zoneTransfers.outgoing.create({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       name: 'www.example.com.',
       peers: ['23ff594956f20c2a721606e94745a8aa', '00920f38ce07c2e2f4df50b1f61d4194'],
@@ -26,7 +26,7 @@ describe('resource outgoing', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.outgoing.create({
+    const response = await client.dns.zoneTransfers.outgoing.create({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       name: 'www.example.com.',
       peers: ['23ff594956f20c2a721606e94745a8aa', '00920f38ce07c2e2f4df50b1f61d4194'],
@@ -34,7 +34,7 @@ describe('resource outgoing', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.outgoing.update({
+    const responsePromise = client.dns.zoneTransfers.outgoing.update({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       name: 'www.example.com.',
       peers: ['23ff594956f20c2a721606e94745a8aa', '00920f38ce07c2e2f4df50b1f61d4194'],
@@ -49,7 +49,7 @@ describe('resource outgoing', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.outgoing.update({
+    const response = await client.dns.zoneTransfers.outgoing.update({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       name: 'www.example.com.',
       peers: ['23ff594956f20c2a721606e94745a8aa', '00920f38ce07c2e2f4df50b1f61d4194'],
@@ -57,7 +57,7 @@ describe('resource outgoing', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.outgoing.delete({
+    const responsePromise = client.dns.zoneTransfers.outgoing.delete({
       zone_id: '269d8f4853475ca241c4e730be286b20',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -70,13 +70,13 @@ describe('resource outgoing', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.outgoing.delete({
+    const response = await client.dns.zoneTransfers.outgoing.delete({
       zone_id: '269d8f4853475ca241c4e730be286b20',
     });
   });
 
   test('disable: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.outgoing.disable({
+    const responsePromise = client.dns.zoneTransfers.outgoing.disable({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       body: {},
     });
@@ -90,14 +90,14 @@ describe('resource outgoing', () => {
   });
 
   test('disable: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.outgoing.disable({
+    const response = await client.dns.zoneTransfers.outgoing.disable({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       body: {},
     });
   });
 
   test('enable: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.outgoing.enable({
+    const responsePromise = client.dns.zoneTransfers.outgoing.enable({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       body: {},
     });
@@ -111,14 +111,14 @@ describe('resource outgoing', () => {
   });
 
   test('enable: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.outgoing.enable({
+    const response = await client.dns.zoneTransfers.outgoing.enable({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       body: {},
     });
   });
 
   test('forceNotify: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.outgoing.forceNotify({
+    const responsePromise = client.dns.zoneTransfers.outgoing.forceNotify({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       body: {},
     });
@@ -132,14 +132,14 @@ describe('resource outgoing', () => {
   });
 
   test('forceNotify: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.outgoing.forceNotify({
+    const response = await client.dns.zoneTransfers.outgoing.forceNotify({
       zone_id: '269d8f4853475ca241c4e730be286b20',
       body: {},
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.outgoing.get({
+    const responsePromise = client.dns.zoneTransfers.outgoing.get({
       zone_id: '269d8f4853475ca241c4e730be286b20',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -152,7 +152,7 @@ describe('resource outgoing', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.outgoing.get({
+    const response = await client.dns.zoneTransfers.outgoing.get({
       zone_id: '269d8f4853475ca241c4e730be286b20',
     });
   });
diff --git a/tests/api-resources/secondary-dns/outgoing/status.test.ts b/tests/api-resources/dns/zone-transfers/outgoing/status.test.ts
similarity index 85%
rename from tests/api-resources/secondary-dns/outgoing/status.test.ts
rename to tests/api-resources/dns/zone-transfers/outgoing/status.test.ts
index 3e007c71bc..a9371c58fb 100644
--- a/tests/api-resources/secondary-dns/outgoing/status.test.ts
+++ b/tests/api-resources/dns/zone-transfers/outgoing/status.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource status', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.outgoing.status.get({
+    const responsePromise = client.dns.zoneTransfers.outgoing.status.get({
       zone_id: '269d8f4853475ca241c4e730be286b20',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource status', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.outgoing.status.get({
+    const response = await client.dns.zoneTransfers.outgoing.status.get({
       zone_id: '269d8f4853475ca241c4e730be286b20',
     });
   });
diff --git a/tests/api-resources/secondary-dns/peers.test.ts b/tests/api-resources/dns/zone-transfers/peers.test.ts
similarity index 82%
rename from tests/api-resources/secondary-dns/peers.test.ts
rename to tests/api-resources/dns/zone-transfers/peers.test.ts
index d8c4ff3972..75ef3b4d7e 100644
--- a/tests/api-resources/secondary-dns/peers.test.ts
+++ b/tests/api-resources/dns/zone-transfers/peers.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,9 +12,9 @@ const cloudflare = new Cloudflare({
 describe('resource peers', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.peers.create({
+    const responsePromise = client.dns.zoneTransfers.peers.create({
       account_id: '01a7362d577a6c3019a474fd6f485823',
-      body: {},
+      name: 'my-peer-1',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -27,14 +27,14 @@ describe('resource peers', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.peers.create({
+    const response = await client.dns.zoneTransfers.peers.create({
       account_id: '01a7362d577a6c3019a474fd6f485823',
-      body: {},
+      name: 'my-peer-1',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.peers.update('23ff594956f20c2a721606e94745a8aa', {
+    const responsePromise = client.dns.zoneTransfers.peers.update('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
       name: 'my-peer-1',
     });
@@ -48,7 +48,7 @@ describe('resource peers', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.peers.update('23ff594956f20c2a721606e94745a8aa', {
+    const response = await client.dns.zoneTransfers.peers.update('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
       name: 'my-peer-1',
       ip: '192.0.2.53',
@@ -59,7 +59,7 @@ describe('resource peers', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.peers.list({
+    const responsePromise = client.dns.zoneTransfers.peers.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -72,13 +72,13 @@ describe('resource peers', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.peers.list({
+    const response = await client.dns.zoneTransfers.peers.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.peers.delete('23ff594956f20c2a721606e94745a8aa', {
+    const responsePromise = client.dns.zoneTransfers.peers.delete('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -91,13 +91,13 @@ describe('resource peers', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.peers.delete('23ff594956f20c2a721606e94745a8aa', {
+    const response = await client.dns.zoneTransfers.peers.delete('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.peers.get('23ff594956f20c2a721606e94745a8aa', {
+    const responsePromise = client.dns.zoneTransfers.peers.get('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -110,7 +110,7 @@ describe('resource peers', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.peers.get('23ff594956f20c2a721606e94745a8aa', {
+    const response = await client.dns.zoneTransfers.peers.get('23ff594956f20c2a721606e94745a8aa', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
   });
diff --git a/tests/api-resources/secondary-dns/tsigs.test.ts b/tests/api-resources/dns/zone-transfers/tsigs.test.ts
similarity index 84%
rename from tests/api-resources/secondary-dns/tsigs.test.ts
rename to tests/api-resources/dns/zone-transfers/tsigs.test.ts
index 48d3300068..cb0a9d7cb6 100644
--- a/tests/api-resources/secondary-dns/tsigs.test.ts
+++ b/tests/api-resources/dns/zone-transfers/tsigs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource tsigs', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.tsigs.create({
+    const responsePromise = client.dns.zoneTransfers.tsigs.create({
       account_id: '01a7362d577a6c3019a474fd6f485823',
       algo: 'hmac-sha512.',
       name: 'tsig.customer.cf.',
@@ -28,7 +28,7 @@ describe('resource tsigs', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.tsigs.create({
+    const response = await client.dns.zoneTransfers.tsigs.create({
       account_id: '01a7362d577a6c3019a474fd6f485823',
       algo: 'hmac-sha512.',
       name: 'tsig.customer.cf.',
@@ -38,7 +38,7 @@ describe('resource tsigs', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.tsigs.update('69cd1e104af3e6ed3cb344f263fd0d5a', {
+    const responsePromise = client.dns.zoneTransfers.tsigs.update('69cd1e104af3e6ed3cb344f263fd0d5a', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
       algo: 'hmac-sha512.',
       name: 'tsig.customer.cf.',
@@ -55,7 +55,7 @@ describe('resource tsigs', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.tsigs.update('69cd1e104af3e6ed3cb344f263fd0d5a', {
+    const response = await client.dns.zoneTransfers.tsigs.update('69cd1e104af3e6ed3cb344f263fd0d5a', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
       algo: 'hmac-sha512.',
       name: 'tsig.customer.cf.',
@@ -65,7 +65,7 @@ describe('resource tsigs', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.tsigs.list({
+    const responsePromise = client.dns.zoneTransfers.tsigs.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -78,13 +78,13 @@ describe('resource tsigs', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.tsigs.list({
+    const response = await client.dns.zoneTransfers.tsigs.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.tsigs.delete('69cd1e104af3e6ed3cb344f263fd0d5a', {
+    const responsePromise = client.dns.zoneTransfers.tsigs.delete('69cd1e104af3e6ed3cb344f263fd0d5a', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -97,13 +97,13 @@ describe('resource tsigs', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.tsigs.delete('69cd1e104af3e6ed3cb344f263fd0d5a', {
+    const response = await client.dns.zoneTransfers.tsigs.delete('69cd1e104af3e6ed3cb344f263fd0d5a', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.secondaryDNS.tsigs.get('69cd1e104af3e6ed3cb344f263fd0d5a', {
+    const responsePromise = client.dns.zoneTransfers.tsigs.get('69cd1e104af3e6ed3cb344f263fd0d5a', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -116,7 +116,7 @@ describe('resource tsigs', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.secondaryDNS.tsigs.get('69cd1e104af3e6ed3cb344f263fd0d5a', {
+    const response = await client.dns.zoneTransfers.tsigs.get('69cd1e104af3e6ed3cb344f263fd0d5a', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
   });
diff --git a/tests/api-resources/durable-objects/namespaces/namespaces.test.ts b/tests/api-resources/durable-objects/namespaces/namespaces.test.ts
index 69b1d4bca1..42e52d5807 100644
--- a/tests/api-resources/durable-objects/namespaces/namespaces.test.ts
+++ b/tests/api-resources/durable-objects/namespaces/namespaces.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource namespaces', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.durableObjects.namespaces.list({
+    const responsePromise = client.durableObjects.namespaces.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource namespaces', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.durableObjects.namespaces.list({
+    const response = await client.durableObjects.namespaces.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/durable-objects/namespaces/objects.test.ts b/tests/api-resources/durable-objects/namespaces/objects.test.ts
index fa4057be13..5f57132e9a 100644
--- a/tests/api-resources/durable-objects/namespaces/objects.test.ts
+++ b/tests/api-resources/durable-objects/namespaces/objects.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource objects', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.durableObjects.namespaces.objects.list(
+    const responsePromise = client.durableObjects.namespaces.objects.list(
       '5fd1cafff895419c8bcc647fc64ab8f0',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -25,14 +25,11 @@ describe('resource objects', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.durableObjects.namespaces.objects.list(
-      '5fd1cafff895419c8bcc647fc64ab8f0',
-      {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        cursor:
-          'AAAAANuhDN7SjacTnSVsDu3WW1Lvst6dxJGTjRY5BhxPXdf6L6uTcpd_NVtjhn11OUYRsVEykxoUwF-JQU4dn6QylZSKTOJuG0indrdn_MlHpMRtsxgXjs-RPdHYIVm3odE_uvEQ_dTQGFm8oikZMohns34DLBgrQpc',
-        limit: 10,
-      },
-    );
+    const response = await client.durableObjects.namespaces.objects.list('5fd1cafff895419c8bcc647fc64ab8f0', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      cursor:
+        'AAAAANuhDN7SjacTnSVsDu3WW1Lvst6dxJGTjRY5BhxPXdf6L6uTcpd_NVtjhn11OUYRsVEykxoUwF-JQU4dn6QylZSKTOJuG0indrdn_MlHpMRtsxgXjs-RPdHYIVm3odE_uvEQ_dTQGFm8oikZMohns34DLBgrQpc',
+      limit: 10,
+    });
   });
 });
diff --git a/tests/api-resources/email-routing/addresses.test.ts b/tests/api-resources/email-routing/addresses.test.ts
index 87d508bf68..76e8dad82c 100644
--- a/tests/api-resources/email-routing/addresses.test.ts
+++ b/tests/api-resources/email-routing/addresses.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource addresses', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.emailRouting.addresses.create('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.emailRouting.addresses.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       email: 'user@example.com',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,13 +25,16 @@ describe('resource addresses', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.emailRouting.addresses.create('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.emailRouting.addresses.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       email: 'user@example.com',
     });
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.emailRouting.addresses.list('023e105f4ecef8ad9ca31a8372d0c353');
+  test('list: only required params', async () => {
+    const responsePromise = client.emailRouting.addresses.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -40,31 +44,20 @@ describe('resource addresses', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.emailRouting.addresses.list('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('list: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.emailRouting.addresses.list(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { direction: 'asc', page: 1, per_page: 5, verified: true },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('list: required and optional params', async () => {
+    const response = await client.emailRouting.addresses.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      direction: 'asc',
+      page: 1,
+      per_page: 5,
+      verified: true,
+    });
   });
 
-  test('delete', async () => {
-    const responsePromise = cloudflare.emailRouting.addresses.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'ea95132c15732412d22c1476fa83f27a',
-    );
+  test('delete: only required params', async () => {
+    const responsePromise = client.emailRouting.addresses.delete('ea95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -74,22 +67,16 @@ describe('resource addresses', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.emailRouting.addresses.delete(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        'ea95132c15732412d22c1476fa83f27a',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('delete: required and optional params', async () => {
+    const response = await client.emailRouting.addresses.delete('ea95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.emailRouting.addresses.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'ea95132c15732412d22c1476fa83f27a',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.emailRouting.addresses.get('ea95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -99,14 +86,9 @@ describe('resource addresses', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.emailRouting.addresses.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        'ea95132c15732412d22c1476fa83f27a',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.emailRouting.addresses.get('ea95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/email-routing/dns.test.ts b/tests/api-resources/email-routing/dns.test.ts
index f01ceba0c6..a8ae33410c 100644
--- a/tests/api-resources/email-routing/dns.test.ts
+++ b/tests/api-resources/email-routing/dns.test.ts
@@ -3,15 +3,18 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource dns', () => {
-  test('get', async () => {
-    const responsePromise = cloudflare.emailRouting.dns.get('023e105f4ecef8ad9ca31a8372d0c353');
+  test('create: only required params', async () => {
+    const responsePromise = client.emailRouting.dns.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'example.net',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,12 +24,64 @@ describe('resource dns', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.emailRouting.dns.get('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('create: required and optional params', async () => {
+    const response = await client.emailRouting.dns.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'example.net',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.emailRouting.dns.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.emailRouting.dns.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+
+  test('edit: only required params', async () => {
+    const responsePromise = client.emailRouting.dns.edit({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'example.net',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.emailRouting.dns.edit({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'example.net',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.emailRouting.dns.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.emailRouting.dns.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      subdomain: 'example.net',
+    });
   });
 });
diff --git a/tests/api-resources/email-routing/email-routing.test.ts b/tests/api-resources/email-routing/email-routing.test.ts
index 9131337e61..559c35a559 100644
--- a/tests/api-resources/email-routing/email-routing.test.ts
+++ b/tests/api-resources/email-routing/email-routing.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource emailRouting', () => {
   test('disable: only required params', async () => {
-    const responsePromise = cloudflare.emailRouting.disable('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const responsePromise = client.emailRouting.disable({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,11 +25,17 @@ describe('resource emailRouting', () => {
   });
 
   test('disable: required and optional params', async () => {
-    const response = await cloudflare.emailRouting.disable('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const response = await client.emailRouting.disable({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
   });
 
   test('enable: only required params', async () => {
-    const responsePromise = cloudflare.emailRouting.enable('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const responsePromise = client.emailRouting.enable({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -37,11 +46,14 @@ describe('resource emailRouting', () => {
   });
 
   test('enable: required and optional params', async () => {
-    const response = await cloudflare.emailRouting.enable('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const response = await client.emailRouting.enable({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.emailRouting.get('023e105f4ecef8ad9ca31a8372d0c353');
+  test('get: only required params', async () => {
+    const responsePromise = client.emailRouting.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -51,10 +63,7 @@ describe('resource emailRouting', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.emailRouting.get('023e105f4ecef8ad9ca31a8372d0c353', { path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.emailRouting.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/email-routing/rules/catch-alls.test.ts b/tests/api-resources/email-routing/rules/catch-alls.test.ts
index e0e9813d64..aaf4cce456 100644
--- a/tests/api-resources/email-routing/rules/catch-alls.test.ts
+++ b/tests/api-resources/email-routing/rules/catch-alls.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,13 +11,11 @@ const cloudflare = new Cloudflare({
 
 describe('resource catchAlls', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.emailRouting.rules.catchAlls.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      {
-        actions: [{ type: 'forward' }, { type: 'forward' }, { type: 'forward' }],
-        matchers: [{ type: 'all' }, { type: 'all' }, { type: 'all' }],
-      },
-    );
+    const responsePromise = client.emailRouting.rules.catchAlls.update({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      actions: [{ type: 'drop' }],
+      matchers: [{ type: 'all' }],
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -28,44 +26,19 @@ describe('resource catchAlls', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.emailRouting.rules.catchAlls.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      {
-        actions: [
-          {
-            type: 'forward',
-            value: [
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-            ],
-          },
-          {
-            type: 'forward',
-            value: [
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-            ],
-          },
-          {
-            type: 'forward',
-            value: [
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-            ],
-          },
-        ],
-        matchers: [{ type: 'all' }, { type: 'all' }, { type: 'all' }],
-        enabled: true,
-        name: 'Send to user@example.net rule.',
-      },
-    );
+    const response = await client.emailRouting.rules.catchAlls.update({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      actions: [{ type: 'drop', value: ['destinationaddress@example.net'] }],
+      matchers: [{ type: 'all' }],
+      enabled: true,
+      name: 'Send to user@example.net rule.',
+    });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.emailRouting.rules.catchAlls.get('023e105f4ecef8ad9ca31a8372d0c353');
+  test('get: only required params', async () => {
+    const responsePromise = client.emailRouting.rules.catchAlls.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -75,12 +48,9 @@ describe('resource catchAlls', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.emailRouting.rules.catchAlls.get('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.emailRouting.rules.catchAlls.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/email-routing/rules/rules.test.ts b/tests/api-resources/email-routing/rules/rules.test.ts
index 5cb4658954..0898d97374 100644
--- a/tests/api-resources/email-routing/rules/rules.test.ts
+++ b/tests/api-resources/email-routing/rules/rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,38 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource rules', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.emailRouting.rules.create('023e105f4ecef8ad9ca31a8372d0c353', {
-      actions: [
-        {
-          type: 'forward',
-          value: [
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-          ],
-        },
-        {
-          type: 'forward',
-          value: [
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-          ],
-        },
-        {
-          type: 'forward',
-          value: [
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-          ],
-        },
-      ],
-      matchers: [
-        { field: 'to', type: 'literal', value: 'test@example.com' },
-        { field: 'to', type: 'literal', value: 'test@example.com' },
-        { field: 'to', type: 'literal', value: 'test@example.com' },
-      ],
+    const responsePromise = client.emailRouting.rules.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      actions: [{ type: 'drop', value: ['destinationaddress@example.net'] }],
+      matchers: [{ field: 'to', type: 'literal', value: 'test@example.com' }],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -54,38 +26,10 @@ describe('resource rules', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.emailRouting.rules.create('023e105f4ecef8ad9ca31a8372d0c353', {
-      actions: [
-        {
-          type: 'forward',
-          value: [
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-          ],
-        },
-        {
-          type: 'forward',
-          value: [
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-          ],
-        },
-        {
-          type: 'forward',
-          value: [
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-            'destinationaddress@example.net',
-          ],
-        },
-      ],
-      matchers: [
-        { field: 'to', type: 'literal', value: 'test@example.com' },
-        { field: 'to', type: 'literal', value: 'test@example.com' },
-        { field: 'to', type: 'literal', value: 'test@example.com' },
-      ],
+    const response = await client.emailRouting.rules.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      actions: [{ type: 'drop', value: ['destinationaddress@example.net'] }],
+      matchers: [{ field: 'to', type: 'literal', value: 'test@example.com' }],
       enabled: true,
       name: 'Send to user@example.net rule.',
       priority: 0,
@@ -93,43 +37,11 @@ describe('resource rules', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.emailRouting.rules.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'a7e6fb77503c41d8a7f3113c6918f10c',
-      {
-        actions: [
-          {
-            type: 'forward',
-            value: [
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-            ],
-          },
-          {
-            type: 'forward',
-            value: [
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-            ],
-          },
-          {
-            type: 'forward',
-            value: [
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-            ],
-          },
-        ],
-        matchers: [
-          { field: 'to', type: 'literal', value: 'test@example.com' },
-          { field: 'to', type: 'literal', value: 'test@example.com' },
-          { field: 'to', type: 'literal', value: 'test@example.com' },
-        ],
-      },
-    );
+    const responsePromise = client.emailRouting.rules.update('a7e6fb77503c41d8a7f3113c6918f10c', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      actions: [{ type: 'drop', value: ['destinationaddress@example.net'] }],
+      matchers: [{ field: 'to', type: 'literal', value: 'test@example.com' }],
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -140,50 +52,18 @@ describe('resource rules', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.emailRouting.rules.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'a7e6fb77503c41d8a7f3113c6918f10c',
-      {
-        actions: [
-          {
-            type: 'forward',
-            value: [
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-            ],
-          },
-          {
-            type: 'forward',
-            value: [
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-            ],
-          },
-          {
-            type: 'forward',
-            value: [
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-              'destinationaddress@example.net',
-            ],
-          },
-        ],
-        matchers: [
-          { field: 'to', type: 'literal', value: 'test@example.com' },
-          { field: 'to', type: 'literal', value: 'test@example.com' },
-          { field: 'to', type: 'literal', value: 'test@example.com' },
-        ],
-        enabled: true,
-        name: 'Send to user@example.net rule.',
-        priority: 0,
-      },
-    );
+    const response = await client.emailRouting.rules.update('a7e6fb77503c41d8a7f3113c6918f10c', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      actions: [{ type: 'drop', value: ['destinationaddress@example.net'] }],
+      matchers: [{ field: 'to', type: 'literal', value: 'test@example.com' }],
+      enabled: true,
+      name: 'Send to user@example.net rule.',
+      priority: 0,
+    });
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.emailRouting.rules.list('023e105f4ecef8ad9ca31a8372d0c353');
+  test('list: only required params', async () => {
+    const responsePromise = client.emailRouting.rules.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -193,31 +73,19 @@ describe('resource rules', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.emailRouting.rules.list('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('list: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.emailRouting.rules.list(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { enabled: true, page: 1, per_page: 5 },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('list: required and optional params', async () => {
+    const response = await client.emailRouting.rules.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      enabled: true,
+      page: 1,
+      per_page: 5,
+    });
   });
 
-  test('delete', async () => {
-    const responsePromise = cloudflare.emailRouting.rules.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'a7e6fb77503c41d8a7f3113c6918f10c',
-    );
+  test('delete: only required params', async () => {
+    const responsePromise = client.emailRouting.rules.delete('a7e6fb77503c41d8a7f3113c6918f10c', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -227,22 +95,16 @@ describe('resource rules', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.emailRouting.rules.delete(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        'a7e6fb77503c41d8a7f3113c6918f10c',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('delete: required and optional params', async () => {
+    const response = await client.emailRouting.rules.delete('a7e6fb77503c41d8a7f3113c6918f10c', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.emailRouting.rules.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'a7e6fb77503c41d8a7f3113c6918f10c',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.emailRouting.rules.get('a7e6fb77503c41d8a7f3113c6918f10c', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -252,14 +114,9 @@ describe('resource rules', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.emailRouting.rules.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        'a7e6fb77503c41d8a7f3113c6918f10c',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.emailRouting.rules.get('a7e6fb77503c41d8a7f3113c6918f10c', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/email-security/investigate/detections.test.ts b/tests/api-resources/email-security/investigate/detections.test.ts
new file mode 100644
index 0000000000..56b5ad3358
--- /dev/null
+++ b/tests/api-resources/email-security/investigate/detections.test.ts
@@ -0,0 +1,31 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource detections', () => {
+  test('get: only required params', async () => {
+    const responsePromise = client.emailSecurity.investigate.detections.get('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.emailSecurity.investigate.detections.get('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/email-security/investigate/investigate.test.ts b/tests/api-resources/email-security/investigate/investigate.test.ts
new file mode 100644
index 0000000000..d1be643f53
--- /dev/null
+++ b/tests/api-resources/email-security/investigate/investigate.test.ts
@@ -0,0 +1,65 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource investigate', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.emailSecurity.investigate.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.emailSecurity.investigate.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      action_log: true,
+      alert_id: 'alert_id',
+      detections_only: true,
+      domain: 'domain',
+      end: '2019-12-27T18:11:19.117Z',
+      final_disposition: 'MALICIOUS',
+      message_action: 'PREVIEW',
+      message_id: 'message_id',
+      metric: 'metric',
+      page: 1,
+      per_page: 1,
+      query: 'query',
+      recipient: 'recipient',
+      sender: 'sender',
+      start: '2019-12-27T18:11:19.117Z',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.emailSecurity.investigate.get('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.emailSecurity.investigate.get('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/email-security/investigate/move.test.ts b/tests/api-resources/email-security/investigate/move.test.ts
new file mode 100644
index 0000000000..bcc4da09cf
--- /dev/null
+++ b/tests/api-resources/email-security/investigate/move.test.ts
@@ -0,0 +1,56 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource move', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.emailSecurity.investigate.move.create('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      destination: 'Inbox',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.emailSecurity.investigate.move.create('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      destination: 'Inbox',
+    });
+  });
+
+  test('bulk: only required params', async () => {
+    const responsePromise = client.emailSecurity.investigate.move.bulk({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      destination: 'Inbox',
+      postfix_ids: ['4Njp3P0STMz2c02Q'],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulk: required and optional params', async () => {
+    const response = await client.emailSecurity.investigate.move.bulk({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      destination: 'Inbox',
+      postfix_ids: ['4Njp3P0STMz2c02Q'],
+    });
+  });
+});
diff --git a/tests/api-resources/email-security/investigate/preview.test.ts b/tests/api-resources/email-security/investigate/preview.test.ts
new file mode 100644
index 0000000000..fe02814552
--- /dev/null
+++ b/tests/api-resources/email-security/investigate/preview.test.ts
@@ -0,0 +1,52 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource preview', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.emailSecurity.investigate.preview.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      postfix_id: '4Njp3P0STMz2c02Q',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.emailSecurity.investigate.preview.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      postfix_id: '4Njp3P0STMz2c02Q',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.emailSecurity.investigate.preview.get('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.emailSecurity.investigate.preview.get('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/email-security/investigate/raw.test.ts b/tests/api-resources/email-security/investigate/raw.test.ts
new file mode 100644
index 0000000000..2ae9e66eb8
--- /dev/null
+++ b/tests/api-resources/email-security/investigate/raw.test.ts
@@ -0,0 +1,31 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource raw', () => {
+  test('get: only required params', async () => {
+    const responsePromise = client.emailSecurity.investigate.raw.get('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.emailSecurity.investigate.raw.get('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/email-security/investigate/reclassify.test.ts b/tests/api-resources/email-security/investigate/reclassify.test.ts
new file mode 100644
index 0000000000..bb721e52bb
--- /dev/null
+++ b/tests/api-resources/email-security/investigate/reclassify.test.ts
@@ -0,0 +1,34 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource reclassify', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.emailSecurity.investigate.reclassify.create('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      expected_disposition: 'NONE',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.emailSecurity.investigate.reclassify.create('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      expected_disposition: 'NONE',
+      eml_content: 'eml_content',
+    });
+  });
+});
diff --git a/tests/api-resources/email-security/investigate/release.test.ts b/tests/api-resources/email-security/investigate/release.test.ts
new file mode 100644
index 0000000000..67a26c80f8
--- /dev/null
+++ b/tests/api-resources/email-security/investigate/release.test.ts
@@ -0,0 +1,33 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource release', () => {
+  test('bulk: only required params', async () => {
+    const responsePromise = client.emailSecurity.investigate.release.bulk({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: ['4Njp3P0STMz2c02Q'],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulk: required and optional params', async () => {
+    const response = await client.emailSecurity.investigate.release.bulk({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: ['4Njp3P0STMz2c02Q'],
+    });
+  });
+});
diff --git a/tests/api-resources/email-security/investigate/trace.test.ts b/tests/api-resources/email-security/investigate/trace.test.ts
new file mode 100644
index 0000000000..e09f1b7c9e
--- /dev/null
+++ b/tests/api-resources/email-security/investigate/trace.test.ts
@@ -0,0 +1,31 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource trace', () => {
+  test('get: only required params', async () => {
+    const responsePromise = client.emailSecurity.investigate.trace.get('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.emailSecurity.investigate.trace.get('4Njp3P0STMz2c02Q', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/email-security/settings/allow-policies.test.ts b/tests/api-resources/email-security/settings/allow-policies.test.ts
new file mode 100644
index 0000000000..a9b6aa9da2
--- /dev/null
+++ b/tests/api-resources/email-security/settings/allow-policies.test.ts
@@ -0,0 +1,146 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource allowPolicies', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.allowPolicies.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      is_acceptable_sender: false,
+      is_exempt_recipient: false,
+      is_regex: false,
+      is_trusted_sender: true,
+      pattern: 'test@example.com',
+      pattern_type: 'EMAIL',
+      verify_sender: true,
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.allowPolicies.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      is_acceptable_sender: false,
+      is_exempt_recipient: false,
+      is_regex: false,
+      is_trusted_sender: true,
+      pattern: 'test@example.com',
+      pattern_type: 'EMAIL',
+      verify_sender: true,
+      comments: 'Trust all messages send from test@example.com',
+      is_recipient: false,
+      is_sender: true,
+      is_spoof: false,
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.allowPolicies.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.allowPolicies.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      direction: 'asc',
+      is_acceptable_sender: true,
+      is_exempt_recipient: true,
+      is_recipient: true,
+      is_sender: true,
+      is_spoof: true,
+      is_trusted_sender: true,
+      order: 'pattern',
+      page: 1,
+      pattern_type: 'EMAIL',
+      per_page: 1,
+      search: 'search',
+      verify_sender: true,
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.allowPolicies.delete(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.allowPolicies.delete(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('edit: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.allowPolicies.edit(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.allowPolicies.edit(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      comments: 'comments',
+      is_acceptable_sender: true,
+      is_exempt_recipient: true,
+      is_regex: true,
+      is_trusted_sender: true,
+      pattern: 'x',
+      pattern_type: 'EMAIL',
+      verify_sender: true,
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.allowPolicies.get(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.allowPolicies.get(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/email-security/settings/block-senders.test.ts b/tests/api-resources/email-security/settings/block-senders.test.ts
new file mode 100644
index 0000000000..9188c89aca
--- /dev/null
+++ b/tests/api-resources/email-security/settings/block-senders.test.ts
@@ -0,0 +1,124 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource blockSenders', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.blockSenders.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      is_regex: false,
+      pattern: 'test@example.com',
+      pattern_type: 'EMAIL',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.blockSenders.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      is_regex: false,
+      pattern: 'test@example.com',
+      pattern_type: 'EMAIL',
+      comments: 'block sender with email test@example.com',
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.blockSenders.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.blockSenders.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      direction: 'asc',
+      order: 'pattern',
+      page: 1,
+      pattern_type: 'EMAIL',
+      per_page: 1,
+      search: 'search',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.blockSenders.delete(2402, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.blockSenders.delete(2402, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('edit: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.blockSenders.edit(2402, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.blockSenders.edit(2402, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      comments: 'comments',
+      is_regex: true,
+      pattern: 'x',
+      pattern_type: 'EMAIL',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.blockSenders.get(2402, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.blockSenders.get(2402, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/email-security/settings/domains.test.ts b/tests/api-resources/email-security/settings/domains.test.ts
new file mode 100644
index 0000000000..6869c66d21
--- /dev/null
+++ b/tests/api-resources/email-security/settings/domains.test.ts
@@ -0,0 +1,124 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource domains', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.domains.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.domains.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      allowed_delivery_mode: 'DIRECT',
+      direction: 'asc',
+      domain: ['string'],
+      order: 'domain',
+      page: 1,
+      per_page: 1,
+      search: 'search',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.domains.delete(2400, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.domains.delete(2400, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('bulkDelete: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.domains.bulkDelete({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkDelete: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.domains.bulkDelete({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('edit: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.domains.edit(2400, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      ip_restrictions: ['192.0.2.0/24', '2001:db8::/32'],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.domains.edit(2400, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      ip_restrictions: ['192.0.2.0/24', '2001:db8::/32'],
+      domain: 'domain',
+      drop_dispositions: ['MALICIOUS'],
+      folder: 'AllItems',
+      integration_id: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      lookback_hops: 1,
+      require_tls_inbound: true,
+      require_tls_outbound: true,
+      transport: 'transport',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.domains.get(2400, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.domains.get(2400, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/calls/turn/keys.test.ts b/tests/api-resources/email-security/settings/impersonation-registry.test.ts
similarity index 69%
rename from tests/api-resources/calls/turn/keys.test.ts
rename to tests/api-resources/email-security/settings/impersonation-registry.test.ts
index fd67d29cbf..f5667a07d5 100644
--- a/tests/api-resources/calls/turn/keys.test.ts
+++ b/tests/api-resources/email-security/settings/impersonation-registry.test.ts
@@ -3,16 +3,19 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource keys', () => {
+describe('resource impersonationRegistry', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.calls.turn.keys.create({
+    const responsePromise = client.emailSecurity.settings.impersonationRegistry.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      email: 'email',
+      is_email_regex: true,
+      name: 'name',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -24,14 +27,16 @@ describe('resource keys', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.calls.turn.keys.create({
+    const response = await client.emailSecurity.settings.impersonationRegistry.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      name: 'my-turn-key',
+      email: 'email',
+      is_email_regex: true,
+      name: 'name',
     });
   });
 
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.calls.turn.keys.update('2a95132c15732412d22c1476fa83f27a', {
+  test('list: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.impersonationRegistry.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -43,15 +48,20 @@ describe('resource keys', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.calls.turn.keys.update('2a95132c15732412d22c1476fa83f27a', {
+  test('list: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.impersonationRegistry.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      name: 'my-turn-key',
+      direction: 'asc',
+      order: 'name',
+      page: 1,
+      per_page: 1,
+      provenance: 'A1S_INTERNAL',
+      search: 'search',
     });
   });
 
-  test('list: only required params', async () => {
-    const responsePromise = cloudflare.calls.turn.keys.list({
+  test('delete: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.impersonationRegistry.delete(2403, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -63,14 +73,14 @@ describe('resource keys', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: required and optional params', async () => {
-    const response = await cloudflare.calls.turn.keys.list({
+  test('delete: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.impersonationRegistry.delete(2403, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
-  test('delete: only required params', async () => {
-    const responsePromise = cloudflare.calls.turn.keys.delete('2a95132c15732412d22c1476fa83f27a', {
+  test('edit: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.impersonationRegistry.edit(2403, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -82,14 +92,17 @@ describe('resource keys', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: required and optional params', async () => {
-    const response = await cloudflare.calls.turn.keys.delete('2a95132c15732412d22c1476fa83f27a', {
+  test('edit: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.impersonationRegistry.edit(2403, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      email: 'email',
+      is_email_regex: true,
+      name: 'name',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.calls.turn.keys.get('2a95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.emailSecurity.settings.impersonationRegistry.get(2403, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -102,7 +115,7 @@ describe('resource keys', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.calls.turn.keys.get('2a95132c15732412d22c1476fa83f27a', {
+    const response = await client.emailSecurity.settings.impersonationRegistry.get(2403, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/email-security/settings/trusted-domains.test.ts b/tests/api-resources/email-security/settings/trusted-domains.test.ts
new file mode 100644
index 0000000000..b0012161f3
--- /dev/null
+++ b/tests/api-resources/email-security/settings/trusted-domains.test.ts
@@ -0,0 +1,130 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource trustedDomains', () => {
+  // TODO: investigate HTTP 422 errors on test suite
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.trustedDomains.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      is_recent: true,
+      is_regex: false,
+      is_similarity: false,
+      pattern: 'example.com',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate HTTP 422 errors on test suite
+  test.skip('create: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.trustedDomains.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      is_recent: true,
+      is_regex: false,
+      is_similarity: false,
+      pattern: 'example.com',
+      comments: null,
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.trustedDomains.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.trustedDomains.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      direction: 'asc',
+      is_recent: true,
+      is_similarity: true,
+      order: 'pattern',
+      page: 1,
+      per_page: 1,
+      search: 'search',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.trustedDomains.delete(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.trustedDomains.delete(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('edit: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.trustedDomains.edit(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.trustedDomains.edit(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      comments: 'comments',
+      is_recent: true,
+      is_regex: true,
+      is_similarity: true,
+      pattern: 'x',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.emailSecurity.settings.trustedDomains.get(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.emailSecurity.settings.trustedDomains.get(2401, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/email-security/submissions.test.ts b/tests/api-resources/email-security/submissions.test.ts
new file mode 100644
index 0000000000..a53f6ea8ff
--- /dev/null
+++ b/tests/api-resources/email-security/submissions.test.ts
@@ -0,0 +1,37 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource submissions', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.emailSecurity.submissions.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.emailSecurity.submissions.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      end: '2019-12-27T18:11:19.117Z',
+      page: 1,
+      per_page: 1,
+      start: '2019-12-27T18:11:19.117Z',
+      submission_id: 'submission_id',
+      type: 'TEAM',
+    });
+  });
+});
diff --git a/tests/api-resources/filters.test.ts b/tests/api-resources/filters.test.ts
index aaf40ccc99..4378b9ee73 100644
--- a/tests/api-resources/filters.test.ts
+++ b/tests/api-resources/filters.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,11 @@ const cloudflare = new Cloudflare({
 describe('resource filters', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.filters.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const responsePromise = client.filters.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      expression:
+        '(http.request.uri.path ~ ".*wp-login.php" or http.request.uri.path ~ ".*xmlrpc.php") and ip.addr ne 172.16.22.155',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,16 +28,19 @@ describe('resource filters', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.filters.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const response = await client.filters.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      expression:
+        '(http.request.uri.path ~ ".*wp-login.php" or http.request.uri.path ~ ".*xmlrpc.php") and ip.addr ne 172.16.22.155',
+    });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.filters.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b61',
-      {},
-    );
+    const responsePromise = client.filters.update('372e67954025e0ba6aaa6d586b9e0b61', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -45,15 +52,14 @@ describe('resource filters', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.filters.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b61',
-      {},
-    );
+    const response = await client.filters.update('372e67954025e0ba6aaa6d586b9e0b61', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.filters.list('023e105f4ecef8ad9ca31a8372d0c353');
+  test('list: only required params', async () => {
+    const responsePromise = client.filters.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,37 +69,56 @@ describe('resource filters', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.filters.list('023e105f4ecef8ad9ca31a8372d0c353', { path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('list: required and optional params', async () => {
+    const response = await client.filters.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      id: '372e67954025e0ba6aaa6d586b9e0b61',
+      description: 'browsers',
+      expression: 'php',
+      page: 1,
+      paused: false,
+      per_page: 5,
+      ref: 'FIL-100',
+    });
   });
 
-  test('list: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.filters.list(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        {
-          id: '372e67954025e0ba6aaa6d586b9e0b61',
-          description: 'browsers',
-          expression: 'php',
-          page: 1,
-          paused: false,
-          per_page: 5,
-          ref: 'FIL-100',
-        },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('delete: only required params', async () => {
+    const responsePromise = client.filters.delete('372e67954025e0ba6aaa6d586b9e0b61', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.filters.delete('372e67954025e0ba6aaa6d586b9e0b61', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('bulkDelete: only required params', async () => {
+    const responsePromise = client.filters.bulkDelete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkDelete: required and optional params', async () => {
+    const response = await client.filters.bulkDelete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
-  test('delete', async () => {
-    const responsePromise = cloudflare.filters.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b61',
-    );
+  // TODO: investigate broken test
+  test.skip('bulkUpdate: only required params', async () => {
+    const responsePromise = client.filters.bulkUpdate({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -103,20 +128,15 @@ describe('resource filters', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.filters.delete('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b61', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  // TODO: investigate broken test
+  test.skip('bulkUpdate: required and optional params', async () => {
+    const response = await client.filters.bulkUpdate({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.filters.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b61',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.filters.get('372e67954025e0ba6aaa6d586b9e0b61', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -126,12 +146,9 @@ describe('resource filters', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.filters.get('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b61', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.filters.get('372e67954025e0ba6aaa6d586b9e0b61', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/firewall/access-rules.test.ts b/tests/api-resources/firewall/access-rules.test.ts
index e91efe7cd6..d74b626157 100644
--- a/tests/api-resources/firewall/access-rules.test.ts
+++ b/tests/api-resources/firewall/access-rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,9 +12,9 @@ const cloudflare = new Cloudflare({
 describe('resource accessRules', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.firewall.accessRules.create({
+    const responsePromise = client.firewall.accessRules.create({
       configuration: {},
-      mode: 'challenge',
+      mode: 'block',
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -28,9 +28,9 @@ describe('resource accessRules', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.firewall.accessRules.create({
+    const response = await client.firewall.accessRules.create({
       configuration: { target: 'ip', value: '198.51.100.4' },
-      mode: 'challenge',
+      mode: 'block',
       account_id: 'account_id',
       notes: 'This rule is enabled because of an event that occurred on date X.',
     });
@@ -38,7 +38,7 @@ describe('resource accessRules', () => {
 
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.firewall.accessRules.list({ account_id: 'account_id' });
+    const responsePromise = client.firewall.accessRules.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -50,7 +50,9 @@ describe('resource accessRules', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.firewall.accessRules.delete({}, { account_id: 'account_id' });
+    const responsePromise = client.firewall.accessRules.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -62,10 +64,11 @@ describe('resource accessRules', () => {
 
   // TODO: investigate broken test
   test.skip('edit: only required params', async () => {
-    const responsePromise = cloudflare.firewall.accessRules.edit(
-      {},
-      { configuration: {}, mode: 'challenge', account_id: 'account_id' },
-    );
+    const responsePromise = client.firewall.accessRules.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+      configuration: {},
+      mode: 'block',
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -77,20 +80,19 @@ describe('resource accessRules', () => {
 
   // TODO: investigate broken test
   test.skip('edit: required and optional params', async () => {
-    const response = await cloudflare.firewall.accessRules.edit(
-      {},
-      {
-        configuration: { target: 'ip', value: '198.51.100.4' },
-        mode: 'challenge',
-        account_id: 'account_id',
-        notes: 'This rule is enabled because of an event that occurred on date X.',
-      },
-    );
+    const response = await client.firewall.accessRules.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+      configuration: { target: 'ip', value: '198.51.100.4' },
+      mode: 'block',
+      account_id: 'account_id',
+      notes: 'This rule is enabled because of an event that occurred on date X.',
+    });
   });
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.firewall.accessRules.get({}, { account_id: 'account_id' });
+    const responsePromise = client.firewall.accessRules.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
diff --git a/tests/api-resources/firewall/lockdowns.test.ts b/tests/api-resources/firewall/lockdowns.test.ts
index c27821d34b..0f718dcaba 100644
--- a/tests/api-resources/firewall/lockdowns.test.ts
+++ b/tests/api-resources/firewall/lockdowns.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,11 @@ const cloudflare = new Cloudflare({
 describe('resource lockdowns', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.firewall.lockdowns.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const responsePromise = client.firewall.lockdowns.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      configurations: [{}],
+      urls: ['shop.example.com/*'],
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,16 +28,20 @@ describe('resource lockdowns', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.firewall.lockdowns.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const response = await client.firewall.lockdowns.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      configurations: [{ target: 'ip', value: '198.51.100.4' }],
+      urls: ['shop.example.com/*'],
+    });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.firewall.lockdowns.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-      {},
-    );
+    const responsePromise = client.firewall.lockdowns.update('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      configurations: [{}],
+      urls: ['shop.example.com/*'],
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -45,15 +53,15 @@ describe('resource lockdowns', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.firewall.lockdowns.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-      {},
-    );
+    const response = await client.firewall.lockdowns.update('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      configurations: [{ target: 'ip', value: '198.51.100.4' }],
+      urls: ['shop.example.com/*'],
+    });
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.firewall.lockdowns.list('023e105f4ecef8ad9ca31a8372d0c353');
+  test('list: only required params', async () => {
+    const responsePromise = client.firewall.lockdowns.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,43 +71,27 @@ describe('resource lockdowns', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.lockdowns.list('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('list: required and optional params', async () => {
+    const response = await client.firewall.lockdowns.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      created_on: '2014-01-01T05:20:00.12345Z',
+      description: 'endpoints',
+      description_search: 'endpoints',
+      ip: '1.2.3.4',
+      ip_range_search: '1.2.3.0/16',
+      ip_search: '1.2.3.4',
+      modified_on: '2014-01-01T05:20:00.12345Z',
+      page: 1,
+      per_page: 1,
+      priority: 5,
+      uri_search: '/some/path',
+    });
   });
 
-  test('list: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.lockdowns.list(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        {
-          created_on: '2014-01-01T05:20:00.12345Z',
-          description: 'endpoints',
-          description_search: 'endpoints',
-          ip: '1.2.3.4',
-          ip_range_search: '1.2.3.0/16',
-          ip_search: '1.2.3.4',
-          modified_on: '2014-01-01T05:20:00.12345Z',
-          page: 1,
-          per_page: 1,
-          priority: 5,
-          uri_search: '/some/path',
-        },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('delete', async () => {
-    const responsePromise = cloudflare.firewall.lockdowns.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-    );
+  test('delete: only required params', async () => {
+    const responsePromise = client.firewall.lockdowns.delete('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -109,22 +101,16 @@ describe('resource lockdowns', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.lockdowns.delete(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '372e67954025e0ba6aaa6d586b9e0b59',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('delete: required and optional params', async () => {
+    const response = await client.firewall.lockdowns.delete('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.firewall.lockdowns.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.firewall.lockdowns.get('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -134,14 +120,9 @@ describe('resource lockdowns', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.lockdowns.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '372e67954025e0ba6aaa6d586b9e0b59',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.firewall.lockdowns.get('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/firewall/rules.test.ts b/tests/api-resources/firewall/rules.test.ts
index a8cb9116c8..17cf9fee87 100644
--- a/tests/api-resources/firewall/rules.test.ts
+++ b/tests/api-resources/firewall/rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,11 @@ const cloudflare = new Cloudflare({
 describe('resource rules', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.firewall.rules.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const responsePromise = client.firewall.rules.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      action: {},
+      filter: {},
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,16 +28,30 @@ describe('resource rules', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.firewall.rules.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const response = await client.firewall.rules.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      action: {
+        mode: 'simulate',
+        response: { body: '<error>This request has been rate-limited.</error>', content_type: 'text/xml' },
+        timeout: 86400,
+      },
+      filter: {
+        description: 'Restrict access from these browsers on this address range.',
+        expression:
+          '(http.request.uri.path ~ ".*wp-login.php" or http.request.uri.path ~ ".*xmlrpc.php") and ip.addr ne 172.16.22.155',
+        paused: false,
+        ref: 'FIL-100',
+      },
+    });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.firewall.rules.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b60',
-      {},
-    );
+    const responsePromise = client.firewall.rules.update('372e67954025e0ba6aaa6d586b9e0b60', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      action: {},
+      filter: {},
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -45,15 +63,68 @@ describe('resource rules', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.firewall.rules.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b60',
-      {},
-    );
+    const response = await client.firewall.rules.update('372e67954025e0ba6aaa6d586b9e0b60', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      action: {
+        mode: 'simulate',
+        response: { body: '<error>This request has been rate-limited.</error>', content_type: 'text/xml' },
+        timeout: 86400,
+      },
+      filter: {
+        description: 'Restrict access from these browsers on this address range.',
+        expression:
+          '(http.request.uri.path ~ ".*wp-login.php" or http.request.uri.path ~ ".*xmlrpc.php") and ip.addr ne 172.16.22.155',
+        paused: false,
+        ref: 'FIL-100',
+      },
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.firewall.rules.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.firewall.rules.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      id: '372e67954025e0ba6aaa6d586b9e0b60',
+      action: 'block',
+      description: 'mir',
+      page: 1,
+      paused: false,
+      per_page: 5,
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.firewall.rules.delete('372e67954025e0ba6aaa6d586b9e0b60', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.firewall.rules.delete('372e67954025e0ba6aaa6d586b9e0b60', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.firewall.rules.list('023e105f4ecef8ad9ca31a8372d0c353');
+  // TODO: investigate broken test
+  test.skip('bulkDelete: only required params', async () => {
+    const responsePromise = client.firewall.rules.bulkDelete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,38 +134,17 @@ describe('resource rules', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.rules.list('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('list: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.rules.list(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        {
-          id: '372e67954025e0ba6aaa6d586b9e0b60',
-          action: 'block',
-          description: 'mir',
-          page: 1,
-          paused: false,
-          per_page: 5,
-        },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('delete', async () => {
-    const responsePromise = cloudflare.firewall.rules.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b60',
-    );
+  // TODO: investigate broken test
+  test.skip('bulkDelete: required and optional params', async () => {
+    const response = await client.firewall.rules.bulkDelete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+
+  // TODO: investigate broken test
+  test.skip('bulkEdit: only required params', async () => {
+    const responsePromise = client.firewall.rules.bulkEdit({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -104,24 +154,42 @@ describe('resource rules', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.rules.delete(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '372e67954025e0ba6aaa6d586b9e0b60',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  // TODO: investigate broken test
+  test.skip('bulkEdit: required and optional params', async () => {
+    const response = await client.firewall.rules.bulkEdit({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('bulkUpdate: only required params', async () => {
+    const responsePromise = client.firewall.rules.bulkUpdate({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('bulkUpdate: required and optional params', async () => {
+    const response = await client.firewall.rules.bulkUpdate({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
   });
 
   // TODO: investigate broken test
   test.skip('edit: only required params', async () => {
-    const responsePromise = cloudflare.firewall.rules.edit(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b60',
-      {},
-    );
+    const responsePromise = client.firewall.rules.edit('372e67954025e0ba6aaa6d586b9e0b60', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -133,16 +201,14 @@ describe('resource rules', () => {
 
   // TODO: investigate broken test
   test.skip('edit: required and optional params', async () => {
-    const response = await cloudflare.firewall.rules.edit(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b60',
-      {},
-    );
+    const response = await client.firewall.rules.edit('372e67954025e0ba6aaa6d586b9e0b60', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.firewall.rules.get('023e105f4ecef8ad9ca31a8372d0c353', {
-      path_id: '372e67954025e0ba6aaa6d586b9e0b60',
+    const responsePromise = client.firewall.rules.get('372e67954025e0ba6aaa6d586b9e0b60', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -154,9 +220,9 @@ describe('resource rules', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.firewall.rules.get('023e105f4ecef8ad9ca31a8372d0c353', {
-      path_id: '372e67954025e0ba6aaa6d586b9e0b60',
-      query_id: '372e67954025e0ba6aaa6d586b9e0b60',
+    const response = await client.firewall.rules.get('372e67954025e0ba6aaa6d586b9e0b60', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      id: '372e67954025e0ba6aaa6d586b9e0b60',
     });
   });
 });
diff --git a/tests/api-resources/firewall/ua-rules.test.ts b/tests/api-resources/firewall/ua-rules.test.ts
index 8ed5f4a540..19ac730ea9 100644
--- a/tests/api-resources/firewall/ua-rules.test.ts
+++ b/tests/api-resources/firewall/ua-rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,11 @@ const cloudflare = new Cloudflare({
 describe('resource uaRules', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.firewall.uaRules.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const responsePromise = client.firewall.uaRules.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      configuration: {},
+      mode: 'block',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,16 +28,20 @@ describe('resource uaRules', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.firewall.uaRules.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const response = await client.firewall.uaRules.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      configuration: { target: 'ip', value: '198.51.100.4' },
+      mode: 'block',
+    });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.firewall.uaRules.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-      {},
-    );
+    const responsePromise = client.firewall.uaRules.update('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      configuration: {},
+      mode: 'block',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -45,15 +53,15 @@ describe('resource uaRules', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.firewall.uaRules.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-      {},
-    );
+    const response = await client.firewall.uaRules.update('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      configuration: { target: 'ip', value: '198.51.100.4' },
+      mode: 'block',
+    });
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.firewall.uaRules.list('023e105f4ecef8ad9ca31a8372d0c353');
+  test('list: only required params', async () => {
+    const responsePromise = client.firewall.uaRules.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,31 +71,21 @@ describe('resource uaRules', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.uaRules.list('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('list: required and optional params', async () => {
+    const response = await client.firewall.uaRules.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      description: 'abusive',
+      description_search: 'abusive',
+      page: 1,
+      per_page: 1,
+      ua_search: 'Safari',
+    });
   });
 
-  test('list: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.uaRules.list(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { description: 'abusive', description_search: 'abusive', page: 1, per_page: 1, ua_search: 'Safari' },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('delete', async () => {
-    const responsePromise = cloudflare.firewall.uaRules.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-    );
+  test('delete: only required params', async () => {
+    const responsePromise = client.firewall.uaRules.delete('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -97,22 +95,16 @@ describe('resource uaRules', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.uaRules.delete(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '372e67954025e0ba6aaa6d586b9e0b59',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('delete: required and optional params', async () => {
+    const response = await client.firewall.uaRules.delete('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.firewall.uaRules.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.firewall.uaRules.get('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -122,14 +114,9 @@ describe('resource uaRules', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.uaRules.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '372e67954025e0ba6aaa6d586b9e0b59',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.firewall.uaRules.get('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/firewall/waf/overrides.test.ts b/tests/api-resources/firewall/waf/overrides.test.ts
index 0b7e55044d..fa20db5135 100644
--- a/tests/api-resources/firewall/waf/overrides.test.ts
+++ b/tests/api-resources/firewall/waf/overrides.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,10 @@ const cloudflare = new Cloudflare({
 describe('resource overrides', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.firewall.waf.overrides.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const responsePromise = client.firewall.waf.overrides.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      urls: ['shop.example.com/*'],
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,16 +27,21 @@ describe('resource overrides', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.firewall.waf.overrides.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const response = await client.firewall.waf.overrides.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      urls: ['shop.example.com/*'],
+    });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.firewall.waf.overrides.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'de677e5818985db1285d0e80225f06e5',
-      {},
-    );
+    const responsePromise = client.firewall.waf.overrides.update('de677e5818985db1285d0e80225f06e5', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      id: '023e105f4ecef8ad9ca31a8372d0c353',
+      rewrite_action: {},
+      rules: { '100015': 'challenge' },
+      urls: ['shop.example.com/*'],
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -45,15 +53,25 @@ describe('resource overrides', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.firewall.waf.overrides.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'de677e5818985db1285d0e80225f06e5',
-      {},
-    );
+    const response = await client.firewall.waf.overrides.update('de677e5818985db1285d0e80225f06e5', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      id: '023e105f4ecef8ad9ca31a8372d0c353',
+      rewrite_action: {
+        block: 'challenge',
+        challenge: 'challenge',
+        default: 'challenge',
+        disable: 'challenge',
+        simulate: 'challenge',
+      },
+      rules: { '100015': 'challenge' },
+      urls: ['shop.example.com/*'],
+    });
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.firewall.waf.overrides.list('023e105f4ecef8ad9ca31a8372d0c353');
+  test('list: only required params', async () => {
+    const responsePromise = client.firewall.waf.overrides.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,31 +81,18 @@ describe('resource overrides', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.waf.overrides.list('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('list: required and optional params', async () => {
+    const response = await client.firewall.waf.overrides.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      page: 1,
+      per_page: 5,
+    });
   });
 
-  test('list: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.waf.overrides.list(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { page: 1, per_page: 5 },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('delete', async () => {
-    const responsePromise = cloudflare.firewall.waf.overrides.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'de677e5818985db1285d0e80225f06e5',
-    );
+  test('delete: only required params', async () => {
+    const responsePromise = client.firewall.waf.overrides.delete('de677e5818985db1285d0e80225f06e5', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -97,22 +102,16 @@ describe('resource overrides', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.waf.overrides.delete(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        'de677e5818985db1285d0e80225f06e5',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('delete: required and optional params', async () => {
+    const response = await client.firewall.waf.overrides.delete('de677e5818985db1285d0e80225f06e5', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.firewall.waf.overrides.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'de677e5818985db1285d0e80225f06e5',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.firewall.waf.overrides.get('de677e5818985db1285d0e80225f06e5', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -122,14 +121,9 @@ describe('resource overrides', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.waf.overrides.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        'de677e5818985db1285d0e80225f06e5',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.firewall.waf.overrides.get('de677e5818985db1285d0e80225f06e5', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/firewall/waf/packages/groups.test.ts b/tests/api-resources/firewall/waf/packages/groups.test.ts
index 47dd19b149..c117c3fcfa 100644
--- a/tests/api-resources/firewall/waf/packages/groups.test.ts
+++ b/tests/api-resources/firewall/waf/packages/groups.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource groups', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.firewall.waf.packages.groups.list('a25a9a7e9c00afc1fb2e0245519d725b', {
+    const responsePromise = client.firewall.waf.packages.groups.list('a25a9a7e9c00afc1fb2e0245519d725b', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,9 +24,9 @@ describe('resource groups', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.firewall.waf.packages.groups.list('a25a9a7e9c00afc1fb2e0245519d725b', {
+    const response = await client.firewall.waf.packages.groups.list('a25a9a7e9c00afc1fb2e0245519d725b', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      direction: 'desc',
+      direction: 'asc',
       match: 'any',
       mode: 'on',
       name: 'Project Honey Pot',
@@ -38,7 +38,7 @@ describe('resource groups', () => {
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.firewall.waf.packages.groups.edit(
+    const responsePromise = client.firewall.waf.packages.groups.edit(
       'a25a9a7e9c00afc1fb2e0245519d725b',
       'a25a9a7e9c00afc1fb2e0245519d725b',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -53,7 +53,7 @@ describe('resource groups', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.firewall.waf.packages.groups.edit(
+    const response = await client.firewall.waf.packages.groups.edit(
       'a25a9a7e9c00afc1fb2e0245519d725b',
       'a25a9a7e9c00afc1fb2e0245519d725b',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353', mode: 'on' },
@@ -61,7 +61,7 @@ describe('resource groups', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.firewall.waf.packages.groups.get(
+    const responsePromise = client.firewall.waf.packages.groups.get(
       'a25a9a7e9c00afc1fb2e0245519d725b',
       'a25a9a7e9c00afc1fb2e0245519d725b',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -76,7 +76,7 @@ describe('resource groups', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.firewall.waf.packages.groups.get(
+    const response = await client.firewall.waf.packages.groups.get(
       'a25a9a7e9c00afc1fb2e0245519d725b',
       'a25a9a7e9c00afc1fb2e0245519d725b',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/firewall/waf/packages/packages.test.ts b/tests/api-resources/firewall/waf/packages/packages.test.ts
index a88370e202..635987a357 100644
--- a/tests/api-resources/firewall/waf/packages/packages.test.ts
+++ b/tests/api-resources/firewall/waf/packages/packages.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,8 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource packages', () => {
   // TODO: investigate broken test
-  test.skip('list', async () => {
-    const responsePromise = cloudflare.firewall.waf.packages.list('023e105f4ecef8ad9ca31a8372d0c353');
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.firewall.waf.packages.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,32 +25,22 @@ describe('resource packages', () => {
   });
 
   // TODO: investigate broken test
-  test.skip('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.waf.packages.list('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test.skip('list: required and optional params', async () => {
+    const response = await client.firewall.waf.packages.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      direction: 'asc',
+      match: 'any',
+      name: 'USER',
+      order: 'name',
+      page: 1,
+      per_page: 5,
+    });
   });
 
-  // TODO: investigate broken test
-  test.skip('list: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.waf.packages.list(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { direction: 'desc', match: 'any', name: 'USER', order: 'name', page: 1, per_page: 5 },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('get', async () => {
-    const responsePromise = cloudflare.firewall.waf.packages.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.firewall.waf.packages.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -58,14 +50,9 @@ describe('resource packages', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.firewall.waf.packages.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.firewall.waf.packages.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/firewall/waf/packages/rules.test.ts b/tests/api-resources/firewall/waf/packages/rules.test.ts
index 30be968bb6..5f4159efc4 100644
--- a/tests/api-resources/firewall/waf/packages/rules.test.ts
+++ b/tests/api-resources/firewall/waf/packages/rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource rules', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.firewall.waf.packages.rules.list('a25a9a7e9c00afc1fb2e0245519d725b', {
+    const responsePromise = client.firewall.waf.packages.rules.list('a25a9a7e9c00afc1fb2e0245519d725b', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,13 +24,13 @@ describe('resource rules', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.firewall.waf.packages.rules.list('a25a9a7e9c00afc1fb2e0245519d725b', {
+    const response = await client.firewall.waf.packages.rules.list('a25a9a7e9c00afc1fb2e0245519d725b', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       description: 'SQL injection prevention for SELECT statements',
-      direction: 'desc',
+      direction: 'asc',
       group_id: 'de677e5818985db1285d0e80225f06e5',
       match: 'any',
-      mode: 'CHL',
+      mode: 'DIS',
       order: 'priority',
       page: 1,
       per_page: 5,
@@ -39,7 +39,7 @@ describe('resource rules', () => {
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.firewall.waf.packages.rules.edit(
+    const responsePromise = client.firewall.waf.packages.rules.edit(
       'a25a9a7e9c00afc1fb2e0245519d725b',
       'a25a9a7e9c00afc1fb2e0245519d725b',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -54,15 +54,15 @@ describe('resource rules', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.firewall.waf.packages.rules.edit(
+    const response = await client.firewall.waf.packages.rules.edit(
       'a25a9a7e9c00afc1fb2e0245519d725b',
       'a25a9a7e9c00afc1fb2e0245519d725b',
-      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353', mode: 'on' },
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353', mode: 'default' },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.firewall.waf.packages.rules.get(
+    const responsePromise = client.firewall.waf.packages.rules.get(
       'a25a9a7e9c00afc1fb2e0245519d725b',
       'a25a9a7e9c00afc1fb2e0245519d725b',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -77,7 +77,7 @@ describe('resource rules', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.firewall.waf.packages.rules.get(
+    const response = await client.firewall.waf.packages.rules.get(
       'a25a9a7e9c00afc1fb2e0245519d725b',
       'a25a9a7e9c00afc1fb2e0245519d725b',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/healthchecks/healthchecks.test.ts b/tests/api-resources/healthchecks/healthchecks.test.ts
index d61884db3a..2ffb4a76ab 100644
--- a/tests/api-resources/healthchecks/healthchecks.test.ts
+++ b/tests/api-resources/healthchecks/healthchecks.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource healthchecks', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.healthchecks.create({
+    const responsePromise = client.healthchecks.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       address: 'www.example.com',
       name: 'server-1',
@@ -26,11 +26,11 @@ describe('resource healthchecks', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.healthchecks.create({
+    const response = await client.healthchecks.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       address: 'www.example.com',
       name: 'server-1',
-      check_regions: ['WEU', 'ENAM'],
+      check_regions: ['WNAM', 'ENAM'],
       consecutive_fails: 0,
       consecutive_successes: 0,
       description: 'Health check for www.example.com',
@@ -54,7 +54,7 @@ describe('resource healthchecks', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.healthchecks.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.healthchecks.update('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       address: 'www.example.com',
       name: 'server-1',
@@ -69,11 +69,11 @@ describe('resource healthchecks', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.healthchecks.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.healthchecks.update('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       address: 'www.example.com',
       name: 'server-1',
-      check_regions: ['WEU', 'ENAM'],
+      check_regions: ['WNAM', 'ENAM'],
       consecutive_fails: 0,
       consecutive_successes: 0,
       description: 'Health check for www.example.com',
@@ -97,7 +97,7 @@ describe('resource healthchecks', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.healthchecks.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.healthchecks.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -108,15 +108,15 @@ describe('resource healthchecks', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.healthchecks.list({
+    const response = await client.healthchecks.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      page: {},
-      per_page: {},
+      page: 1,
+      per_page: 5,
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.healthchecks.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.healthchecks.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -129,13 +129,13 @@ describe('resource healthchecks', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.healthchecks.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.healthchecks.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.healthchecks.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.healthchecks.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       address: 'www.example.com',
       name: 'server-1',
@@ -150,11 +150,11 @@ describe('resource healthchecks', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.healthchecks.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.healthchecks.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       address: 'www.example.com',
       name: 'server-1',
-      check_regions: ['WEU', 'ENAM'],
+      check_regions: ['WNAM', 'ENAM'],
       consecutive_fails: 0,
       consecutive_successes: 0,
       description: 'Health check for www.example.com',
@@ -178,7 +178,7 @@ describe('resource healthchecks', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.healthchecks.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.healthchecks.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -191,7 +191,7 @@ describe('resource healthchecks', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.healthchecks.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.healthchecks.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/healthchecks/previews.test.ts b/tests/api-resources/healthchecks/previews.test.ts
index 13d2e5a92b..b116ab5a0d 100644
--- a/tests/api-resources/healthchecks/previews.test.ts
+++ b/tests/api-resources/healthchecks/previews.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource previews', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.healthchecks.previews.create({
+    const responsePromise = client.healthchecks.previews.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       address: 'www.example.com',
       name: 'server-1',
@@ -26,11 +26,11 @@ describe('resource previews', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.healthchecks.previews.create({
+    const response = await client.healthchecks.previews.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       address: 'www.example.com',
       name: 'server-1',
-      check_regions: ['WEU', 'ENAM'],
+      check_regions: ['WNAM', 'ENAM'],
       consecutive_fails: 0,
       consecutive_successes: 0,
       description: 'Health check for www.example.com',
@@ -54,7 +54,7 @@ describe('resource previews', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.healthchecks.previews.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.healthchecks.previews.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -67,13 +67,13 @@ describe('resource previews', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.healthchecks.previews.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.healthchecks.previews.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.healthchecks.previews.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.healthchecks.previews.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -86,7 +86,7 @@ describe('resource previews', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.healthchecks.previews.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.healthchecks.previews.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/hostnames/settings/tls.test.ts b/tests/api-resources/hostnames/settings/tls.test.ts
index f14abcedd1..bcc77ac5f0 100644
--- a/tests/api-resources/hostnames/settings/tls.test.ts
+++ b/tests/api-resources/hostnames/settings/tls.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource tls', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.hostnames.settings.tls.update('ciphers', 'app.example.com', {
+    const responsePromise = client.hostnames.settings.tls.update('ciphers', 'app.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: ['ECDHE-RSA-AES128-GCM-SHA256', 'AES128-GCM-SHA256'],
     });
@@ -25,14 +25,14 @@ describe('resource tls', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.hostnames.settings.tls.update('ciphers', 'app.example.com', {
+    const response = await client.hostnames.settings.tls.update('ciphers', 'app.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: ['ECDHE-RSA-AES128-GCM-SHA256', 'AES128-GCM-SHA256'],
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.hostnames.settings.tls.delete('ciphers', 'app.example.com', {
+    const responsePromise = client.hostnames.settings.tls.delete('ciphers', 'app.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,13 +45,13 @@ describe('resource tls', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.hostnames.settings.tls.delete('ciphers', 'app.example.com', {
+    const response = await client.hostnames.settings.tls.delete('ciphers', 'app.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.hostnames.settings.tls.get('ciphers', {
+    const responsePromise = client.hostnames.settings.tls.get('ciphers', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -64,7 +64,7 @@ describe('resource tls', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.hostnames.settings.tls.get('ciphers', {
+    const response = await client.hostnames.settings.tls.get('ciphers', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/hyperdrive/configs.test.ts b/tests/api-resources/hyperdrive/configs.test.ts
index ea363df815..f0b247cef3 100644
--- a/tests/api-resources/hyperdrive/configs.test.ts
+++ b/tests/api-resources/hyperdrive/configs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,10 +12,17 @@ const cloudflare = new Cloudflare({
 describe('resource configs', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.hyperdrive.configs.create({
+    const responsePromise = client.hyperdrive.configs.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'example-hyperdrive',
-      origin: { database: 'postgres', host: 'database.example.com', scheme: 'postgres', user: 'postgres' },
+      origin: {
+        database: 'postgres',
+        host: 'database.example.com',
+        password: 'password',
+        port: 5432,
+        scheme: 'postgres',
+        user: 'postgres',
+      },
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -28,27 +35,34 @@ describe('resource configs', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.hyperdrive.configs.create({
+    const response = await client.hyperdrive.configs.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'example-hyperdrive',
       origin: {
-        access_client_id: '0123456789abcdef0123456789abcdef.access',
         database: 'postgres',
         host: 'database.example.com',
+        password: 'password',
         port: 5432,
         scheme: 'postgres',
         user: 'postgres',
       },
-      caching: { disabled: false, max_age: 60, stale_while_revalidate: 15 },
+      caching: { disabled: true },
     });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.hyperdrive.configs.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.hyperdrive.configs.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'example-hyperdrive',
-      origin: { database: 'postgres', host: 'database.example.com', scheme: 'postgres', user: 'postgres' },
+      origin: {
+        database: 'postgres',
+        host: 'database.example.com',
+        password: 'password',
+        port: 5432,
+        scheme: 'postgres',
+        user: 'postgres',
+      },
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -61,23 +75,23 @@ describe('resource configs', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.hyperdrive.configs.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.hyperdrive.configs.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'example-hyperdrive',
       origin: {
-        access_client_id: '0123456789abcdef0123456789abcdef.access',
         database: 'postgres',
         host: 'database.example.com',
+        password: 'password',
         port: 5432,
         scheme: 'postgres',
         user: 'postgres',
       },
-      caching: { disabled: false, max_age: 60, stale_while_revalidate: 15 },
+      caching: { disabled: true },
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.hyperdrive.configs.list({
+    const responsePromise = client.hyperdrive.configs.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -90,13 +104,11 @@ describe('resource configs', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.hyperdrive.configs.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.hyperdrive.configs.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.hyperdrive.configs.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.hyperdrive.configs.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -109,14 +121,14 @@ describe('resource configs', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.hyperdrive.configs.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.hyperdrive.configs.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   // TODO: investigate broken test
   test.skip('edit: only required params', async () => {
-    const responsePromise = cloudflare.hyperdrive.configs.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.hyperdrive.configs.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -130,23 +142,16 @@ describe('resource configs', () => {
 
   // TODO: investigate broken test
   test.skip('edit: required and optional params', async () => {
-    const response = await cloudflare.hyperdrive.configs.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.hyperdrive.configs.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      caching: { disabled: false, max_age: 60, stale_while_revalidate: 15 },
+      caching: { disabled: true },
       name: 'example-hyperdrive',
-      origin: {
-        access_client_id: '0123456789abcdef0123456789abcdef.access',
-        database: 'postgres',
-        host: 'database.example.com',
-        port: 5432,
-        scheme: 'postgres',
-        user: 'postgres',
-      },
+      origin: { database: 'postgres', password: 'password', scheme: 'postgres', user: 'postgres' },
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.hyperdrive.configs.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.hyperdrive.configs.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -159,7 +164,7 @@ describe('resource configs', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.hyperdrive.configs.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.hyperdrive.configs.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/iam/permission-groups.test.ts b/tests/api-resources/iam/permission-groups.test.ts
index 93ac0c9a1d..a9b82dfc3f 100644
--- a/tests/api-resources/iam/permission-groups.test.ts
+++ b/tests/api-resources/iam/permission-groups.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource permissionGroups', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.iam.permissionGroups.list({
+    const responsePromise = client.iam.permissionGroups.list({
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource permissionGroups', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.iam.permissionGroups.list({
+    const response = await client.iam.permissionGroups.list({
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
       id: '6d7f2f5f5b1d4a0e9081fdc98d432fd1',
       label: 'labelOfThePermissionGroup',
@@ -35,7 +35,7 @@ describe('resource permissionGroups', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.iam.permissionGroups.get('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
+    const responsePromise = client.iam.permissionGroups.get('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -48,7 +48,7 @@ describe('resource permissionGroups', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.iam.permissionGroups.get('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
+    const response = await client.iam.permissionGroups.get('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
   });
diff --git a/tests/api-resources/iam/resource-groups.test.ts b/tests/api-resources/iam/resource-groups.test.ts
index b47fe9bec7..a0a12ff8b7 100644
--- a/tests/api-resources/iam/resource-groups.test.ts
+++ b/tests/api-resources/iam/resource-groups.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,15 +11,11 @@ const cloudflare = new Cloudflare({
 
 describe('resource resourceGroups', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.iam.resourceGroups.create({
+    const responsePromise = client.iam.resourceGroups.create({
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
       scope: {
         key: 'com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4',
-        objects: [
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-        ],
+        objects: [{ key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' }],
       },
     });
     const rawResponse = await responsePromise.asResponse();
@@ -32,30 +28,22 @@ describe('resource resourceGroups', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.iam.resourceGroups.create({
+    const response = await client.iam.resourceGroups.create({
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
       scope: {
         key: 'com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4',
-        objects: [
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-        ],
+        objects: [{ key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' }],
       },
       meta: { editable: 'false' },
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.iam.resourceGroups.update('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
+    const responsePromise = client.iam.resourceGroups.update('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
       scope: {
         key: 'com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4',
-        objects: [
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-        ],
+        objects: [{ key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' }],
       },
     });
     const rawResponse = await responsePromise.asResponse();
@@ -68,22 +56,18 @@ describe('resource resourceGroups', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.iam.resourceGroups.update('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
+    const response = await client.iam.resourceGroups.update('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
       scope: {
         key: 'com.cloudflare.api.account.eb78d65290b24279ba6f44721b3ea3c4',
-        objects: [
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-          { key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' },
-        ],
+        objects: [{ key: 'com.cloudflare.api.account.zone.23f8d65290b24279ba6f44721b3eaad5' }],
       },
       meta: { editable: 'false' },
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.iam.resourceGroups.list({
+    const responsePromise = client.iam.resourceGroups.list({
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -96,7 +80,7 @@ describe('resource resourceGroups', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.iam.resourceGroups.list({
+    const response = await client.iam.resourceGroups.list({
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
       id: '6d7f2f5f5b1d4a0e9081fdc98d432fd1',
       name: 'NameOfTheResourceGroup',
@@ -106,7 +90,7 @@ describe('resource resourceGroups', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.iam.resourceGroups.delete('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
+    const responsePromise = client.iam.resourceGroups.delete('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -119,13 +103,13 @@ describe('resource resourceGroups', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.iam.resourceGroups.delete('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
+    const response = await client.iam.resourceGroups.delete('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.iam.resourceGroups.get('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
+    const responsePromise = client.iam.resourceGroups.get('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -138,7 +122,7 @@ describe('resource resourceGroups', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.iam.resourceGroups.get('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
+    const response = await client.iam.resourceGroups.get('6d7f2f5f5b1d4a0e9081fdc98d432fd1', {
       account_id: 'eb78d65290b24279ba6f44721b3ea3c4',
     });
   });
diff --git a/tests/api-resources/images/v1/blobs.test.ts b/tests/api-resources/images/v1/blobs.test.ts
index 0a508e9996..486effaddd 100644
--- a/tests/api-resources/images/v1/blobs.test.ts
+++ b/tests/api-resources/images/v1/blobs.test.ts
@@ -2,7 +2,7 @@
 
 import Cloudflare from 'cloudflare';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 describe('resource blobs', () => {
   // TODO: investigate broken test
   test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.images.v1.blobs.get('image_id', {
+    const response = await client.images.v1.blobs.get('image_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/images/v1/keys.test.ts b/tests/api-resources/images/v1/keys.test.ts
index 4cabc434ac..88259e08da 100644
--- a/tests/api-resources/images/v1/keys.test.ts
+++ b/tests/api-resources/images/v1/keys.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource keys', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.keys.update('someKey', {
+    const responsePromise = client.images.v1.keys.update('someKey', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,15 +24,13 @@ describe('resource keys', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.images.v1.keys.update('someKey', {
+    const response = await client.images.v1.keys.update('someKey', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.keys.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.images.v1.keys.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -43,11 +41,11 @@ describe('resource keys', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.images.v1.keys.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.images.v1.keys.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.keys.delete('someKey', {
+    const responsePromise = client.images.v1.keys.delete('someKey', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -60,7 +58,7 @@ describe('resource keys', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.images.v1.keys.delete('someKey', {
+    const response = await client.images.v1.keys.delete('someKey', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/images/v1/stats.test.ts b/tests/api-resources/images/v1/stats.test.ts
index 44c58092f6..f482059d20 100644
--- a/tests/api-resources/images/v1/stats.test.ts
+++ b/tests/api-resources/images/v1/stats.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource stats', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.stats.get({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.images.v1.stats.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,6 +22,6 @@ describe('resource stats', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.images.v1.stats.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.images.v1.stats.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/images/v1/v1.test.ts b/tests/api-resources/images/v1/v1.test.ts
index 83a1e2c821..20ee905bfd 100644
--- a/tests/api-resources/images/v1/v1.test.ts
+++ b/tests/api-resources/images/v1/v1.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource v1', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.create({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.images.v1.create({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,7 +24,7 @@ describe('resource v1', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.images.v1.create({
+    const response = await client.images.v1.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       file: {},
       metadata: {},
@@ -34,7 +34,7 @@ describe('resource v1', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.images.v1.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -45,7 +45,7 @@ describe('resource v1', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.images.v1.list({
+    const response = await client.images.v1.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       page: 1,
       per_page: 10,
@@ -53,7 +53,7 @@ describe('resource v1', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.delete('image_id', {
+    const responsePromise = client.images.v1.delete('image_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -66,13 +66,13 @@ describe('resource v1', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.images.v1.delete('image_id', {
+    const response = await client.images.v1.delete('image_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.edit('image_id', {
+    const responsePromise = client.images.v1.edit('image_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -85,7 +85,7 @@ describe('resource v1', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.images.v1.edit('image_id', {
+    const response = await client.images.v1.edit('image_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       metadata: {},
       requireSignedURLs: true,
@@ -93,7 +93,7 @@ describe('resource v1', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.get('image_id', {
+    const responsePromise = client.images.v1.get('image_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -106,7 +106,7 @@ describe('resource v1', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.images.v1.get('image_id', {
+    const response = await client.images.v1.get('image_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/images/v1/variants.test.ts b/tests/api-resources/images/v1/variants.test.ts
index c458a455ff..ecef242a19 100644
--- a/tests/api-resources/images/v1/variants.test.ts
+++ b/tests/api-resources/images/v1/variants.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource variants', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.variants.create({
+    const responsePromise = client.images.v1.variants.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       id: 'hero',
-      options: { fit: 'scale-down', height: 768, metadata: 'none', width: 1366 },
+      options: { fit: 'scale-down', height: 768, metadata: 'keep', width: 1366 },
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,16 +26,16 @@ describe('resource variants', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.images.v1.variants.create({
+    const response = await client.images.v1.variants.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       id: 'hero',
-      options: { fit: 'scale-down', height: 768, metadata: 'none', width: 1366 },
+      options: { fit: 'scale-down', height: 768, metadata: 'keep', width: 1366 },
       neverRequireSignedURLs: true,
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.variants.list({
+    const responsePromise = client.images.v1.variants.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -48,13 +48,11 @@ describe('resource variants', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.images.v1.variants.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.images.v1.variants.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.variants.delete('hero', {
+    const responsePromise = client.images.v1.variants.delete('hero', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -67,15 +65,15 @@ describe('resource variants', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.images.v1.variants.delete('hero', {
+    const response = await client.images.v1.variants.delete('hero', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.variants.edit('hero', {
+    const responsePromise = client.images.v1.variants.edit('hero', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      options: { fit: 'scale-down', height: 768, metadata: 'none', width: 1366 },
+      options: { fit: 'scale-down', height: 768, metadata: 'keep', width: 1366 },
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -87,15 +85,15 @@ describe('resource variants', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.images.v1.variants.edit('hero', {
+    const response = await client.images.v1.variants.edit('hero', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      options: { fit: 'scale-down', height: 768, metadata: 'none', width: 1366 },
+      options: { fit: 'scale-down', height: 768, metadata: 'keep', width: 1366 },
       neverRequireSignedURLs: true,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.images.v1.variants.get('hero', {
+    const responsePromise = client.images.v1.variants.get('hero', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -108,7 +106,7 @@ describe('resource variants', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.images.v1.variants.get('hero', {
+    const response = await client.images.v1.variants.get('hero', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/images/v2/direct-uploads.test.ts b/tests/api-resources/images/v2/direct-uploads.test.ts
index 81b6b8dec6..7322e2c265 100644
--- a/tests/api-resources/images/v2/direct-uploads.test.ts
+++ b/tests/api-resources/images/v2/direct-uploads.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource directUploads', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.images.v2.directUploads.create({
+    const responsePromise = client.images.v2.directUploads.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -26,7 +26,7 @@ describe('resource directUploads', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.images.v2.directUploads.create({
+    const response = await client.images.v2.directUploads.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       id: 'this/is/my-customid',
       expiry: '2021-01-02T02:20:00Z',
diff --git a/tests/api-resources/images/v2/v2.test.ts b/tests/api-resources/images/v2/v2.test.ts
index 36b6b9523f..4ab436dde7 100644
--- a/tests/api-resources/images/v2/v2.test.ts
+++ b/tests/api-resources/images/v2/v2.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource v2', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.images.v2.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.images.v2.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource v2', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.images.v2.list({
+    const response = await client.images.v2.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       continuation_token: 'continuation_token',
       per_page: 10,
diff --git a/tests/api-resources/intel/asn/asn.test.ts b/tests/api-resources/intel/asn/asn.test.ts
index fb715ca8f7..70aeabc0ed 100644
--- a/tests/api-resources/intel/asn/asn.test.ts
+++ b/tests/api-resources/intel/asn/asn.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource asn', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.intel.asn.get(0, { account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.intel.asn.get(0, { account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,6 +22,6 @@ describe('resource asn', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.intel.asn.get(0, { account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.intel.asn.get(0, { account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/intel/asn/subnets.test.ts b/tests/api-resources/intel/asn/subnets.test.ts
index 438846814a..78f228e69f 100644
--- a/tests/api-resources/intel/asn/subnets.test.ts
+++ b/tests/api-resources/intel/asn/subnets.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource subnets', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.intel.asn.subnets.get(0, {
+    const responsePromise = client.intel.asn.subnets.get(0, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource subnets', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.intel.asn.subnets.get(0, {
+    const response = await client.intel.asn.subnets.get(0, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/intel/attack-surface-report/issue-types.test.ts b/tests/api-resources/intel/attack-surface-report/issue-types.test.ts
index 60ab037613..6b3ad142ba 100644
--- a/tests/api-resources/intel/attack-surface-report/issue-types.test.ts
+++ b/tests/api-resources/intel/attack-surface-report/issue-types.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource issueTypes', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.intel.attackSurfaceReport.issueTypes.get({
+    const responsePromise = client.intel.attackSurfaceReport.issueTypes.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource issueTypes', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.intel.attackSurfaceReport.issueTypes.get({
+    const response = await client.intel.attackSurfaceReport.issueTypes.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/intel/attack-surface-report/issues.test.ts b/tests/api-resources/intel/attack-surface-report/issues.test.ts
index 0aeeb16c5f..db7830e045 100644
--- a/tests/api-resources/intel/attack-surface-report/issues.test.ts
+++ b/tests/api-resources/intel/attack-surface-report/issues.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource issues', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.intel.attackSurfaceReport.issues.list({
+    const responsePromise = client.intel.attackSurfaceReport.issues.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource issues', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.intel.attackSurfaceReport.issues.list({
+    const response = await client.intel.attackSurfaceReport.issues.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       dismissed: false,
       issue_class: ['a_record_dangling', 'always_use_https_not_enabled'],
@@ -37,13 +37,13 @@ describe('resource issues', () => {
       'product~neq': ['access', 'dns'],
       severity: ['low', 'moderate'],
       'severity~neq': ['low', 'moderate'],
-      subject: ['example.com', 'example.com', 'example.com'],
-      'subject~neq': ['example.com', 'example.com', 'example.com'],
+      subject: ['example.com'],
+      'subject~neq': ['example.com'],
     });
   });
 
   test('class: only required params', async () => {
-    const responsePromise = cloudflare.intel.attackSurfaceReport.issues.class({
+    const responsePromise = client.intel.attackSurfaceReport.issues.class({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -56,7 +56,7 @@ describe('resource issues', () => {
   });
 
   test('class: required and optional params', async () => {
-    const response = await cloudflare.intel.attackSurfaceReport.issues.class({
+    const response = await client.intel.attackSurfaceReport.issues.class({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       dismissed: false,
       issue_class: ['a_record_dangling', 'always_use_https_not_enabled'],
@@ -67,13 +67,13 @@ describe('resource issues', () => {
       'product~neq': ['access', 'dns'],
       severity: ['low', 'moderate'],
       'severity~neq': ['low', 'moderate'],
-      subject: ['example.com', 'example.com', 'example.com'],
-      'subject~neq': ['example.com', 'example.com', 'example.com'],
+      subject: ['example.com'],
+      'subject~neq': ['example.com'],
     });
   });
 
   test('dismiss: only required params', async () => {
-    const responsePromise = cloudflare.intel.attackSurfaceReport.issues.dismiss('issue_id', {
+    const responsePromise = client.intel.attackSurfaceReport.issues.dismiss('issue_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -86,14 +86,14 @@ describe('resource issues', () => {
   });
 
   test('dismiss: required and optional params', async () => {
-    const response = await cloudflare.intel.attackSurfaceReport.issues.dismiss('issue_id', {
+    const response = await client.intel.attackSurfaceReport.issues.dismiss('issue_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       dismiss: true,
     });
   });
 
   test('severity: only required params', async () => {
-    const responsePromise = cloudflare.intel.attackSurfaceReport.issues.severity({
+    const responsePromise = client.intel.attackSurfaceReport.issues.severity({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -106,7 +106,7 @@ describe('resource issues', () => {
   });
 
   test('severity: required and optional params', async () => {
-    const response = await cloudflare.intel.attackSurfaceReport.issues.severity({
+    const response = await client.intel.attackSurfaceReport.issues.severity({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       dismissed: false,
       issue_class: ['a_record_dangling', 'always_use_https_not_enabled'],
@@ -117,13 +117,13 @@ describe('resource issues', () => {
       'product~neq': ['access', 'dns'],
       severity: ['low', 'moderate'],
       'severity~neq': ['low', 'moderate'],
-      subject: ['example.com', 'example.com', 'example.com'],
-      'subject~neq': ['example.com', 'example.com', 'example.com'],
+      subject: ['example.com'],
+      'subject~neq': ['example.com'],
     });
   });
 
   test('type: only required params', async () => {
-    const responsePromise = cloudflare.intel.attackSurfaceReport.issues.type({
+    const responsePromise = client.intel.attackSurfaceReport.issues.type({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -136,7 +136,7 @@ describe('resource issues', () => {
   });
 
   test('type: required and optional params', async () => {
-    const response = await cloudflare.intel.attackSurfaceReport.issues.type({
+    const response = await client.intel.attackSurfaceReport.issues.type({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       dismissed: false,
       issue_class: ['a_record_dangling', 'always_use_https_not_enabled'],
@@ -147,8 +147,8 @@ describe('resource issues', () => {
       'product~neq': ['access', 'dns'],
       severity: ['low', 'moderate'],
       'severity~neq': ['low', 'moderate'],
-      subject: ['example.com', 'example.com', 'example.com'],
-      'subject~neq': ['example.com', 'example.com', 'example.com'],
+      subject: ['example.com'],
+      'subject~neq': ['example.com'],
     });
   });
 });
diff --git a/tests/api-resources/intel/dns.test.ts b/tests/api-resources/intel/dns.test.ts
index a6a3ed9523..3a926dafb8 100644
--- a/tests/api-resources/intel/dns.test.ts
+++ b/tests/api-resources/intel/dns.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource dns', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.intel.dns.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.intel.dns.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource dns', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.intel.dns.list({
+    const response = await client.intel.dns.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       ipv4: 'ipv4',
       page: 1,
diff --git a/tests/api-resources/intel/domain-history.test.ts b/tests/api-resources/intel/domain-history.test.ts
index a5987be06c..e11d5a496a 100644
--- a/tests/api-resources/intel/domain-history.test.ts
+++ b/tests/api-resources/intel/domain-history.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource domainHistory', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.intel.domainHistory.get({
+    const responsePromise = client.intel.domainHistory.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource domainHistory', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.intel.domainHistory.get({
+    const response = await client.intel.domainHistory.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       domain: 'example.com',
     });
diff --git a/tests/api-resources/intel/domains/bulks.test.ts b/tests/api-resources/intel/domains/bulks.test.ts
index 797b20de1b..17e4f356bd 100644
--- a/tests/api-resources/intel/domains/bulks.test.ts
+++ b/tests/api-resources/intel/domains/bulks.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource bulks', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.intel.domains.bulks.get({
+    const responsePromise = client.intel.domains.bulks.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource bulks', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.intel.domains.bulks.get({
+    const response = await client.intel.domains.bulks.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       domain: {},
     });
diff --git a/tests/api-resources/intel/domains/domains.test.ts b/tests/api-resources/intel/domains/domains.test.ts
index 6e3f9072f1..e027d5b2a0 100644
--- a/tests/api-resources/intel/domains/domains.test.ts
+++ b/tests/api-resources/intel/domains/domains.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource domains', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.intel.domains.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.intel.domains.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource domains', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.intel.domains.get({
+    const response = await client.intel.domains.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       domain: 'domain',
     });
diff --git a/tests/api-resources/intel/indicator-feeds/downloads.test.ts b/tests/api-resources/intel/indicator-feeds/downloads.test.ts
new file mode 100644
index 0000000000..f3c8ce4f34
--- /dev/null
+++ b/tests/api-resources/intel/indicator-feeds/downloads.test.ts
@@ -0,0 +1,31 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource downloads', () => {
+  test('get: only required params', async () => {
+    const responsePromise = client.intel.indicatorFeeds.downloads.get(12, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.intel.indicatorFeeds.downloads.get(12, {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/intel/indicator-feeds/indicator-feeds.test.ts b/tests/api-resources/intel/indicator-feeds/indicator-feeds.test.ts
index e2d24b5361..6ac57f45c3 100644
--- a/tests/api-resources/intel/indicator-feeds/indicator-feeds.test.ts
+++ b/tests/api-resources/intel/indicator-feeds/indicator-feeds.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource indicatorFeeds', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.intel.indicatorFeeds.create({
+    const responsePromise = client.intel.indicatorFeeds.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource indicatorFeeds', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.intel.indicatorFeeds.create({
+    const response = await client.intel.indicatorFeeds.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       description: 'example feed description',
       name: 'example_feed_1',
@@ -32,7 +32,7 @@ describe('resource indicatorFeeds', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.intel.indicatorFeeds.update(12, {
+    const responsePromise = client.intel.indicatorFeeds.update(12, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,17 +45,18 @@ describe('resource indicatorFeeds', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.intel.indicatorFeeds.update(12, {
+    const response = await client.intel.indicatorFeeds.update(12, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       description: 'This is an example description',
       is_attributable: true,
+      is_downloadable: true,
       is_public: true,
       name: 'indicator_list',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.intel.indicatorFeeds.list({
+    const responsePromise = client.intel.indicatorFeeds.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -68,13 +69,13 @@ describe('resource indicatorFeeds', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.intel.indicatorFeeds.list({
+    const response = await client.intel.indicatorFeeds.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('data: only required params', async () => {
-    const responsePromise = cloudflare.intel.indicatorFeeds.data(12, {
+    const responsePromise = client.intel.indicatorFeeds.data(12, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -87,13 +88,13 @@ describe('resource indicatorFeeds', () => {
   });
 
   test('data: required and optional params', async () => {
-    const response = await cloudflare.intel.indicatorFeeds.data(12, {
+    const response = await client.intel.indicatorFeeds.data(12, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.intel.indicatorFeeds.get(12, {
+    const responsePromise = client.intel.indicatorFeeds.get(12, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -106,7 +107,7 @@ describe('resource indicatorFeeds', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.intel.indicatorFeeds.get(12, {
+    const response = await client.intel.indicatorFeeds.get(12, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/intel/indicator-feeds/permissions.test.ts b/tests/api-resources/intel/indicator-feeds/permissions.test.ts
index 98731bb3bb..006c5edc79 100644
--- a/tests/api-resources/intel/indicator-feeds/permissions.test.ts
+++ b/tests/api-resources/intel/indicator-feeds/permissions.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource permissions', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.intel.indicatorFeeds.permissions.create({
+    const responsePromise = client.intel.indicatorFeeds.permissions.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource permissions', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.intel.indicatorFeeds.permissions.create({
+    const response = await client.intel.indicatorFeeds.permissions.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       account_tag: '823f45f16fd2f7e21e1e054aga4d2859',
       feed_id: 1,
@@ -32,7 +32,7 @@ describe('resource permissions', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.intel.indicatorFeeds.permissions.list({
+    const responsePromise = client.intel.indicatorFeeds.permissions.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,13 +45,13 @@ describe('resource permissions', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.intel.indicatorFeeds.permissions.list({
+    const response = await client.intel.indicatorFeeds.permissions.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.intel.indicatorFeeds.permissions.delete({
+    const responsePromise = client.intel.indicatorFeeds.permissions.delete({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -64,7 +64,7 @@ describe('resource permissions', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.intel.indicatorFeeds.permissions.delete({
+    const response = await client.intel.indicatorFeeds.permissions.delete({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       account_tag: '823f45f16fd2f7e21e1e054aga4d2859',
       feed_id: 1,
diff --git a/tests/api-resources/intel/indicator-feeds/snapshots.test.ts b/tests/api-resources/intel/indicator-feeds/snapshots.test.ts
index 77d4097a26..27176f03d5 100644
--- a/tests/api-resources/intel/indicator-feeds/snapshots.test.ts
+++ b/tests/api-resources/intel/indicator-feeds/snapshots.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource snapshots', () => {
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.intel.indicatorFeeds.snapshots.update(12, {
+    const responsePromise = client.intel.indicatorFeeds.snapshots.update(12, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -26,7 +26,7 @@ describe('resource snapshots', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.intel.indicatorFeeds.snapshots.update(12, {
+    const response = await client.intel.indicatorFeeds.snapshots.update(12, {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       source: '@/Users/me/test.stix2',
     });
diff --git a/tests/api-resources/intel/ip-lists.test.ts b/tests/api-resources/intel/ip-lists.test.ts
index ba4ad54d0e..25f4e35796 100644
--- a/tests/api-resources/intel/ip-lists.test.ts
+++ b/tests/api-resources/intel/ip-lists.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ipLists', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.intel.ipLists.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.intel.ipLists.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,6 +22,6 @@ describe('resource ipLists', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.intel.ipLists.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.intel.ipLists.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/intel/ips.test.ts b/tests/api-resources/intel/ips.test.ts
index cd4943d680..6f6af310b0 100644
--- a/tests/api-resources/intel/ips.test.ts
+++ b/tests/api-resources/intel/ips.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ips', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.intel.ips.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.intel.ips.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource ips', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.intel.ips.get({
+    const response = await client.intel.ips.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       ipv4: 'ipv4',
       ipv6: 'ipv6',
diff --git a/tests/api-resources/intel/miscategorizations.test.ts b/tests/api-resources/intel/miscategorizations.test.ts
index fcfe914ae9..90800775c2 100644
--- a/tests/api-resources/intel/miscategorizations.test.ts
+++ b/tests/api-resources/intel/miscategorizations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource miscategorizations', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.intel.miscategorizations.create({
+    const responsePromise = client.intel.miscategorizations.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,12 +24,12 @@ describe('resource miscategorizations', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.intel.miscategorizations.create({
+    const response = await client.intel.miscategorizations.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       content_adds: [82],
       content_removes: [155],
       indicator_type: 'domain',
-      ip: {},
+      ip: 'ip',
       security_adds: [117, 131],
       security_removes: [83],
       url: 'url',
diff --git a/tests/api-resources/intel/sinkholes.test.ts b/tests/api-resources/intel/sinkholes.test.ts
index c25053bc53..9316919ec0 100644
--- a/tests/api-resources/intel/sinkholes.test.ts
+++ b/tests/api-resources/intel/sinkholes.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource sinkholes', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.intel.sinkholes.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.intel.sinkholes.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,8 +22,6 @@ describe('resource sinkholes', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.intel.sinkholes.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.intel.sinkholes.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/intel/whois.test.ts b/tests/api-resources/intel/whois.test.ts
index 81365ef81b..16f3ecafeb 100644
--- a/tests/api-resources/intel/whois.test.ts
+++ b/tests/api-resources/intel/whois.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource whois', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.intel.whois.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.intel.whois.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource whois', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.intel.whois.get({
+    const response = await client.intel.whois.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       domain: 'domain',
     });
diff --git a/tests/api-resources/ips.test.ts b/tests/api-resources/ips.test.ts
index 4e3d532eaf..56ac99c687 100644
--- a/tests/api-resources/ips.test.ts
+++ b/tests/api-resources/ips.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ips', () => {
   test('list', async () => {
-    const responsePromise = cloudflare.ips.list();
+    const responsePromise = client.ips.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource ips', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.ips.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.ips.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,7 +31,7 @@ describe('resource ips', () => {
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.ips.list({ networks: 'networks' }, { path: '/_stainless_unknown_path' }),
+      client.ips.list({ networks: 'networks' }, { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 });
diff --git a/tests/api-resources/keyless-certificates.test.ts b/tests/api-resources/keyless-certificates.test.ts
index 3b39531dc4..d0ce6c286f 100644
--- a/tests/api-resources/keyless-certificates.test.ts
+++ b/tests/api-resources/keyless-certificates.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource keylessCertificates', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.keylessCertificates.create({
+    const responsePromise = client.keylessCertificates.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       certificate:
         '-----BEGIN CERTIFICATE----- MIIDtTCCAp2gAwIBAgIJAM15n7fdxhRtMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMTQwMzExMTkyMTU5WhcNMTQwNDEwMTkyMTU5WjBF MQswCQYDVQQGEwJVUzETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB CgKCAQEAvq3sKsHpeduJHimOK+fvQdKsI8z8A05MZyyLp2/R/GE8FjNv+hkVY1WQ LIyTNNQH7CJecE1nbTfo8Y56S7x/rhxC6/DJ8MIulapFPnorq46KU6yRxiM0MQ3N nTJHlHA2ozZta6YBBfVfhHWl1F0IfNbXCLKvGwWWMbCx43OfW6KTkbRnE6gFWKuO fSO5h2u5TaWVuSIzBvYs7Vza6m+gtYAvKAJV2nSZ+eSEFPDo29corOy8+huEOUL8 5FAw4BFPsr1TlrlGPFitduQUHGrSL7skk1ESGza0to3bOtrodKei2s9bk5MXm7lZ qI+WZJX4Zu9+mzZhc9pCVi8r/qlXuQIDAQABo4GnMIGkMB0GA1UdDgQWBBRvavf+ sWM4IwKiH9X9w1vl6nUVRDB1BgNVHSMEbjBsgBRvavf+sWM4IwKiH9X9w1vl6nUV RKFJpEcwRTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAM15n7fdxhRtMAwGA1UdEwQF MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABY2ZzBaW0dMsAAT7tPJzrVWVzQx6KU4 UEBLudIlWPlkAwTnINCWR/8eNjCCmGA4heUdHmazdpPa8RzwOmc0NT1NQqzSyktt vTqb4iHD7+8f9MqJ9/FssCfTtqr/Qst/hGH4Wmdf1EJ/6FqYAAb5iRlPgshFZxU8 uXtA8hWn6fK6eISD9HBdcAFToUvKNZ1BIDPvh9f95Ine8ar6yGd56TUNrHR8eHBs ESxz5ddVR/oWRysNJ+aGAyYqHS8S/ttmC7r4XCAHqXptkHPCGRqkAhsterYhd4I8 /cBzejUobNCjjHFbtkAL/SjxZOLW+pNkZwfeYdM8iPkD54Uua1v2tdw= -----END CERTIFICATE-----',
@@ -28,7 +28,7 @@ describe('resource keylessCertificates', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.keylessCertificates.create({
+    const response = await client.keylessCertificates.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       certificate:
         '-----BEGIN CERTIFICATE----- MIIDtTCCAp2gAwIBAgIJAM15n7fdxhRtMA0GCSqGSIb3DQEBBQUAMEUxCzAJBgNV BAYTAlVTMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX aWRnaXRzIFB0eSBMdGQwHhcNMTQwMzExMTkyMTU5WhcNMTQwNDEwMTkyMTU5WjBF MQswCQYDVQQGEwJVUzETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50 ZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB CgKCAQEAvq3sKsHpeduJHimOK+fvQdKsI8z8A05MZyyLp2/R/GE8FjNv+hkVY1WQ LIyTNNQH7CJecE1nbTfo8Y56S7x/rhxC6/DJ8MIulapFPnorq46KU6yRxiM0MQ3N nTJHlHA2ozZta6YBBfVfhHWl1F0IfNbXCLKvGwWWMbCx43OfW6KTkbRnE6gFWKuO fSO5h2u5TaWVuSIzBvYs7Vza6m+gtYAvKAJV2nSZ+eSEFPDo29corOy8+huEOUL8 5FAw4BFPsr1TlrlGPFitduQUHGrSL7skk1ESGza0to3bOtrodKei2s9bk5MXm7lZ qI+WZJX4Zu9+mzZhc9pCVi8r/qlXuQIDAQABo4GnMIGkMB0GA1UdDgQWBBRvavf+ sWM4IwKiH9X9w1vl6nUVRDB1BgNVHSMEbjBsgBRvavf+sWM4IwKiH9X9w1vl6nUV RKFJpEcwRTELMAkGA1UEBhMCVVMxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV BAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAM15n7fdxhRtMAwGA1UdEwQF MAMBAf8wDQYJKoZIhvcNAQEFBQADggEBABY2ZzBaW0dMsAAT7tPJzrVWVzQx6KU4 UEBLudIlWPlkAwTnINCWR/8eNjCCmGA4heUdHmazdpPa8RzwOmc0NT1NQqzSyktt vTqb4iHD7+8f9MqJ9/FssCfTtqr/Qst/hGH4Wmdf1EJ/6FqYAAb5iRlPgshFZxU8 uXtA8hWn6fK6eISD9HBdcAFToUvKNZ1BIDPvh9f95Ine8ar6yGd56TUNrHR8eHBs ESxz5ddVR/oWRysNJ+aGAyYqHS8S/ttmC7r4XCAHqXptkHPCGRqkAhsterYhd4I8 /cBzejUobNCjjHFbtkAL/SjxZOLW+pNkZwfeYdM8iPkD54Uua1v2tdw= -----END CERTIFICATE-----',
@@ -41,9 +41,7 @@ describe('resource keylessCertificates', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.keylessCertificates.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.keylessCertificates.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -54,13 +52,11 @@ describe('resource keylessCertificates', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.keylessCertificates.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.keylessCertificates.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.keylessCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.keylessCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -73,13 +69,13 @@ describe('resource keylessCertificates', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.keylessCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.keylessCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.keylessCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.keylessCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -92,7 +88,7 @@ describe('resource keylessCertificates', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.keylessCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.keylessCertificates.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       enabled: false,
       host: 'example.com',
@@ -103,7 +99,7 @@ describe('resource keylessCertificates', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.keylessCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.keylessCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -116,7 +112,7 @@ describe('resource keylessCertificates', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.keylessCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.keylessCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/storage/analytics.test.ts b/tests/api-resources/kv/namespaces/analytics.test.ts
similarity index 82%
rename from tests/api-resources/storage/analytics.test.ts
rename to tests/api-resources/kv/namespaces/analytics.test.ts
index 6a9f819a1d..e949c584ce 100644
--- a/tests/api-resources/storage/analytics.test.ts
+++ b/tests/api-resources/kv/namespaces/analytics.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource analytics', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.storage.analytics.list({
+    const responsePromise = client.kv.namespaces.analytics.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,13 +24,13 @@ describe('resource analytics', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.storage.analytics.list({
+    const response = await client.kv.namespaces.analytics.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       query: {
-        dimensions: ['accountId', 'responseCode', 'requestType'],
+        dimensions: ['accountId'],
         filters: 'requestType==read AND responseCode!=200',
         limit: 0,
-        metrics: ['requests', 'writeKiB', 'readKiB'],
+        metrics: ['requests'],
         since: '2019-01-02T02:20:00Z',
         sort: ['+requests', '-responseCode'],
         until: '2019-01-02T03:20:00Z',
@@ -39,7 +39,7 @@ describe('resource analytics', () => {
   });
 
   test('stored: only required params', async () => {
-    const responsePromise = cloudflare.storage.analytics.stored({
+    const responsePromise = client.kv.namespaces.analytics.stored({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -52,13 +52,13 @@ describe('resource analytics', () => {
   });
 
   test('stored: required and optional params', async () => {
-    const response = await cloudflare.storage.analytics.stored({
+    const response = await client.kv.namespaces.analytics.stored({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       query: {
         dimensions: ['namespaceId'],
         filters: 'namespaceId==a4e8cbb7-1b58-4990-925e-e026d40c4c64',
         limit: 0,
-        metrics: ['storedBytes', 'storedKeys'],
+        metrics: ['storedBytes'],
         since: '2019-01-02T02:20:00Z',
         sort: ['+storedBytes', '-namespaceId'],
         until: '2019-01-02T03:20:00Z',
diff --git a/tests/api-resources/kv/namespaces/keys.test.ts b/tests/api-resources/kv/namespaces/keys.test.ts
index 2f345d9cd7..e245fa74e1 100644
--- a/tests/api-resources/kv/namespaces/keys.test.ts
+++ b/tests/api-resources/kv/namespaces/keys.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource keys', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.kv.namespaces.keys.list('0f2ac74b498b48028cb68387c421e279', {
+    const responsePromise = client.kv.namespaces.keys.list('0f2ac74b498b48028cb68387c421e279', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource keys', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.keys.list('0f2ac74b498b48028cb68387c421e279', {
+    const response = await client.kv.namespaces.keys.list('0f2ac74b498b48028cb68387c421e279', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       cursor:
         '6Ck1la0VxJ0djhidm1MdX2FyDGxLKVeeHZZmORS_8XeSuhz9SjIJRaSa2lnsF01tQOHrfTGAP3R5X1Kv5iVUuMbNKhWNAXHOl6ePB0TUL8nw',
diff --git a/tests/api-resources/kv/namespaces/metadata.test.ts b/tests/api-resources/kv/namespaces/metadata.test.ts
index 9ea1ea35ce..0be55b20e4 100644
--- a/tests/api-resources/kv/namespaces/metadata.test.ts
+++ b/tests/api-resources/kv/namespaces/metadata.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,11 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource metadata', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.kv.namespaces.metadata.get(
-      '0f2ac74b498b48028cb68387c421e279',
-      'My-Key',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.kv.namespaces.metadata.get('0f2ac74b498b48028cb68387c421e279', 'My-Key', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -26,10 +24,8 @@ describe('resource metadata', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.metadata.get(
-      '0f2ac74b498b48028cb68387c421e279',
-      'My-Key',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.kv.namespaces.metadata.get('0f2ac74b498b48028cb68387c421e279', 'My-Key', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/kv/namespaces/namespaces.test.ts b/tests/api-resources/kv/namespaces/namespaces.test.ts
index 1816b3f4f1..d69492f799 100644
--- a/tests/api-resources/kv/namespaces/namespaces.test.ts
+++ b/tests/api-resources/kv/namespaces/namespaces.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource namespaces', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.kv.namespaces.create({
+    const responsePromise = client.kv.namespaces.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       title: 'My Own Namespace',
     });
@@ -25,14 +25,14 @@ describe('resource namespaces', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.create({
+    const response = await client.kv.namespaces.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       title: 'My Own Namespace',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.kv.namespaces.update('0f2ac74b498b48028cb68387c421e279', {
+    const responsePromise = client.kv.namespaces.update('0f2ac74b498b48028cb68387c421e279', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       title: 'My Own Namespace',
     });
@@ -46,14 +46,14 @@ describe('resource namespaces', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.update('0f2ac74b498b48028cb68387c421e279', {
+    const response = await client.kv.namespaces.update('0f2ac74b498b48028cb68387c421e279', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       title: 'My Own Namespace',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.kv.namespaces.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.kv.namespaces.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -64,7 +64,7 @@ describe('resource namespaces', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.list({
+    const response = await client.kv.namespaces.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       direction: 'asc',
       order: 'id',
@@ -74,7 +74,7 @@ describe('resource namespaces', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.kv.namespaces.delete('0f2ac74b498b48028cb68387c421e279', {
+    const responsePromise = client.kv.namespaces.delete('0f2ac74b498b48028cb68387c421e279', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -87,13 +87,64 @@ describe('resource namespaces', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.delete('0f2ac74b498b48028cb68387c421e279', {
+    const response = await client.kv.namespaces.delete('0f2ac74b498b48028cb68387c421e279', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
+  test('bulkDelete: only required params', async () => {
+    const responsePromise = client.kv.namespaces.bulkDelete('0f2ac74b498b48028cb68387c421e279', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: ['My-Key'],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkDelete: required and optional params', async () => {
+    const response = await client.kv.namespaces.bulkDelete('0f2ac74b498b48028cb68387c421e279', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: ['My-Key'],
+    });
+  });
+
+  test('bulkUpdate: only required params', async () => {
+    const responsePromise = client.kv.namespaces.bulkUpdate('0f2ac74b498b48028cb68387c421e279', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: [{}],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkUpdate: required and optional params', async () => {
+    const response = await client.kv.namespaces.bulkUpdate('0f2ac74b498b48028cb68387c421e279', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: [
+        {
+          base64: true,
+          expiration: 1578435000,
+          expiration_ttl: 300,
+          key: 'My-Key',
+          metadata: { someMetadataKey: 'bar' },
+          value: 'Some string',
+        },
+      ],
+    });
+  });
+
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.kv.namespaces.get('0f2ac74b498b48028cb68387c421e279', {
+    const responsePromise = client.kv.namespaces.get('0f2ac74b498b48028cb68387c421e279', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -106,7 +157,7 @@ describe('resource namespaces', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.get('0f2ac74b498b48028cb68387c421e279', {
+    const response = await client.kv.namespaces.get('0f2ac74b498b48028cb68387c421e279', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/kv/namespaces/values.test.ts b/tests/api-resources/kv/namespaces/values.test.ts
index 1625fe7706..2d1cc3ddf6 100644
--- a/tests/api-resources/kv/namespaces/values.test.ts
+++ b/tests/api-resources/kv/namespaces/values.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,15 +12,11 @@ const cloudflare = new Cloudflare({
 describe('resource values', () => {
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.kv.namespaces.values.update(
-      '0f2ac74b498b48028cb68387c421e279',
-      'My-Key',
-      {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        metadata: '{"someMetadataKey": "someMetadataValue"}',
-        value: 'Some Value',
-      },
-    );
+    const responsePromise = client.kv.namespaces.values.update('0f2ac74b498b48028cb68387c421e279', 'My-Key', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      metadata: '{"someMetadataKey": "someMetadataValue"}',
+      value: 'Some Value',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -32,23 +28,19 @@ describe('resource values', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.values.update(
-      '0f2ac74b498b48028cb68387c421e279',
-      'My-Key',
-      {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        metadata: '{"someMetadataKey": "someMetadataValue"}',
-        value: 'Some Value',
-      },
-    );
+    const response = await client.kv.namespaces.values.update('0f2ac74b498b48028cb68387c421e279', 'My-Key', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      metadata: '{"someMetadataKey": "someMetadataValue"}',
+      value: 'Some Value',
+      expiration: 1578435000,
+      expiration_ttl: 300,
+    });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.kv.namespaces.values.delete(
-      '0f2ac74b498b48028cb68387c421e279',
-      'My-Key',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.kv.namespaces.values.delete('0f2ac74b498b48028cb68387c421e279', 'My-Key', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -59,16 +51,14 @@ describe('resource values', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.values.delete(
-      '0f2ac74b498b48028cb68387c421e279',
-      'My-Key',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.kv.namespaces.values.delete('0f2ac74b498b48028cb68387c421e279', 'My-Key', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
   // HTTP 406 from prism
   test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.kv.namespaces.values.get('0f2ac74b498b48028cb68387c421e279', 'My-Key', {
+    const response = await client.kv.namespaces.values.get('0f2ac74b498b48028cb68387c421e279', 'My-Key', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/leaked-credential-checks/detections.test.ts b/tests/api-resources/leaked-credential-checks/detections.test.ts
new file mode 100644
index 0000000000..a9f770c1c6
--- /dev/null
+++ b/tests/api-resources/leaked-credential-checks/detections.test.ts
@@ -0,0 +1,98 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource detections', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.leakedCredentialChecks.detections.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.leakedCredentialChecks.detections.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      password: 'lookup_json_string(http.request.body.raw, "secret")',
+      username: 'lookup_json_string(http.request.body.raw, "user")',
+    });
+  });
+
+  test('update: only required params', async () => {
+    const responsePromise = client.leakedCredentialChecks.detections.update(
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.leakedCredentialChecks.detections.update(
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      {
+        zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+        password: 'lookup_json_string(http.request.body.raw, "secret")',
+        username: 'lookup_json_string(http.request.body.raw, "user")',
+      },
+    );
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.leakedCredentialChecks.detections.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.leakedCredentialChecks.detections.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.leakedCredentialChecks.detections.delete(
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.leakedCredentialChecks.detections.delete(
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+  });
+});
diff --git a/tests/api-resources/leaked-credential-checks/leaked-credential-checks.test.ts b/tests/api-resources/leaked-credential-checks/leaked-credential-checks.test.ts
new file mode 100644
index 0000000000..c7c208f9ed
--- /dev/null
+++ b/tests/api-resources/leaked-credential-checks/leaked-credential-checks.test.ts
@@ -0,0 +1,49 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource leakedCredentialChecks', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.leakedCredentialChecks.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.leakedCredentialChecks.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      enabled: true,
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.leakedCredentialChecks.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.leakedCredentialChecks.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+});
diff --git a/tests/api-resources/load-balancers/load-balancers.test.ts b/tests/api-resources/load-balancers/load-balancers.test.ts
index 74b41ba913..94531ff815 100644
--- a/tests/api-resources/load-balancers/load-balancers.test.ts
+++ b/tests/api-resources/load-balancers/load-balancers.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,14 +11,14 @@ const cloudflare = new Cloudflare({
 
 describe('resource loadBalancers', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.create({
+    const responsePromise = client.loadBalancers.create({
       zone_id: '699d98642c564d2e855e9661899b7252',
       default_pools: [
         '17b5962d775c646f3f9725cbc7a53df4',
         '9290f38c5d07c2e2f4df57b1f61d4196',
         '00920f38ce07c2e2f4df50b1f61d4194',
       ],
-      fallback_pool: {},
+      fallback_pool: 'fallback_pool',
       name: 'www.example.com',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -31,14 +31,14 @@ describe('resource loadBalancers', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.create({
+    const response = await client.loadBalancers.create({
       zone_id: '699d98642c564d2e855e9661899b7252',
       default_pools: [
         '17b5962d775c646f3f9725cbc7a53df4',
         '9290f38c5d07c2e2f4df57b1f61d4196',
         '00920f38ce07c2e2f4df50b1f61d4194',
       ],
-      fallback_pool: {},
+      fallback_pool: 'fallback_pool',
       name: 'www.example.com',
       adaptive_routing: { failover_across_pools: true },
       country_pools: {
@@ -46,7 +46,8 @@ describe('resource loadBalancers', () => {
         US: ['de90f38ced07c2e2f4df50b1f61d4194', '00920f38ce07c2e2f4df50b1f61d4194'],
       },
       description: 'Load Balancer for www.example.com',
-      location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
+      location_strategy: { mode: 'pop', prefer_ecs: 'always' },
+      networks: ['string'],
       pop_pools: {
         LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
         LHR: ['abd90f38ced07c2e2f4df50b1f61d4194', 'f9138c5d07c2e2f4df57b1f61d4196'],
@@ -83,8 +84,8 @@ describe('resource loadBalancers', () => {
               '9290f38c5d07c2e2f4df57b1f61d4196',
               '00920f38ce07c2e2f4df50b1f61d4194',
             ],
-            fallback_pool: {},
-            location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
+            fallback_pool: 'fallback_pool',
+            location_strategy: { mode: 'pop', prefer_ecs: 'always' },
             pop_pools: {
               LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
               LHR: ['abd90f38ced07c2e2f4df50b1f61d4194', 'f9138c5d07c2e2f4df57b1f61d4196'],
@@ -101,157 +102,47 @@ describe('resource loadBalancers', () => {
               ENAM: ['00920f38ce07c2e2f4df50b1f61d4194'],
               WNAM: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
             },
-            session_affinity: 'cookie',
+            session_affinity: 'none',
             session_affinity_attributes: {
               drain_duration: 100,
               headers: ['x'],
               require_all_headers: true,
               samesite: 'Auto',
               secure: 'Auto',
-              zero_downtime_failover: 'sticky',
+              zero_downtime_failover: 'none',
             },
             session_affinity_ttl: 1800,
-            steering_policy: 'dynamic_latency',
-            ttl: 30,
-          },
-          priority: 0,
-          terminates: true,
-        },
-        {
-          condition: 'http.request.uri.path contains "/testing"',
-          disabled: true,
-          fixed_response: {
-            content_type: 'application/json',
-            location: 'www.example.com',
-            message_body: 'Testing Hello',
-            status_code: 0,
-          },
-          name: 'route the path /testing to testing datacenter.',
-          overrides: {
-            adaptive_routing: { failover_across_pools: true },
-            country_pools: {
-              GB: ['abd90f38ced07c2e2f4df50b1f61d4194'],
-              US: ['de90f38ced07c2e2f4df50b1f61d4194', '00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            default_pools: [
-              '17b5962d775c646f3f9725cbc7a53df4',
-              '9290f38c5d07c2e2f4df57b1f61d4196',
-              '00920f38ce07c2e2f4df50b1f61d4194',
-            ],
-            fallback_pool: {},
-            location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
-            pop_pools: {
-              LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-              LHR: ['abd90f38ced07c2e2f4df50b1f61d4194', 'f9138c5d07c2e2f4df57b1f61d4196'],
-              SJC: ['00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            random_steering: {
-              default_weight: 0.2,
-              pool_weights: {
-                '9290f38c5d07c2e2f4df57b1f61d4196': 0.5,
-                de90f38ced07c2e2f4df50b1f61d4194: 0.3,
-              },
-            },
-            region_pools: {
-              ENAM: ['00920f38ce07c2e2f4df50b1f61d4194'],
-              WNAM: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-            },
-            session_affinity: 'cookie',
-            session_affinity_attributes: {
-              drain_duration: 100,
-              headers: ['x'],
-              require_all_headers: true,
-              samesite: 'Auto',
-              secure: 'Auto',
-              zero_downtime_failover: 'sticky',
-            },
-            session_affinity_ttl: 1800,
-            steering_policy: 'dynamic_latency',
-            ttl: 30,
-          },
-          priority: 0,
-          terminates: true,
-        },
-        {
-          condition: 'http.request.uri.path contains "/testing"',
-          disabled: true,
-          fixed_response: {
-            content_type: 'application/json',
-            location: 'www.example.com',
-            message_body: 'Testing Hello',
-            status_code: 0,
-          },
-          name: 'route the path /testing to testing datacenter.',
-          overrides: {
-            adaptive_routing: { failover_across_pools: true },
-            country_pools: {
-              GB: ['abd90f38ced07c2e2f4df50b1f61d4194'],
-              US: ['de90f38ced07c2e2f4df50b1f61d4194', '00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            default_pools: [
-              '17b5962d775c646f3f9725cbc7a53df4',
-              '9290f38c5d07c2e2f4df57b1f61d4196',
-              '00920f38ce07c2e2f4df50b1f61d4194',
-            ],
-            fallback_pool: {},
-            location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
-            pop_pools: {
-              LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-              LHR: ['abd90f38ced07c2e2f4df50b1f61d4194', 'f9138c5d07c2e2f4df57b1f61d4196'],
-              SJC: ['00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            random_steering: {
-              default_weight: 0.2,
-              pool_weights: {
-                '9290f38c5d07c2e2f4df57b1f61d4196': 0.5,
-                de90f38ced07c2e2f4df50b1f61d4194: 0.3,
-              },
-            },
-            region_pools: {
-              ENAM: ['00920f38ce07c2e2f4df50b1f61d4194'],
-              WNAM: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-            },
-            session_affinity: 'cookie',
-            session_affinity_attributes: {
-              drain_duration: 100,
-              headers: ['x'],
-              require_all_headers: true,
-              samesite: 'Auto',
-              secure: 'Auto',
-              zero_downtime_failover: 'sticky',
-            },
-            session_affinity_ttl: 1800,
-            steering_policy: 'dynamic_latency',
+            steering_policy: 'off',
             ttl: 30,
           },
           priority: 0,
           terminates: true,
         },
       ],
-      session_affinity: 'cookie',
+      session_affinity: 'none',
       session_affinity_attributes: {
         drain_duration: 100,
         headers: ['x'],
         require_all_headers: true,
         samesite: 'Auto',
         secure: 'Auto',
-        zero_downtime_failover: 'sticky',
+        zero_downtime_failover: 'none',
       },
       session_affinity_ttl: 1800,
-      steering_policy: 'dynamic_latency',
+      steering_policy: 'off',
       ttl: 30,
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.update('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.loadBalancers.update('699d98642c564d2e855e9661899b7252', {
       zone_id: '699d98642c564d2e855e9661899b7252',
       default_pools: [
         '17b5962d775c646f3f9725cbc7a53df4',
         '9290f38c5d07c2e2f4df57b1f61d4196',
         '00920f38ce07c2e2f4df50b1f61d4194',
       ],
-      fallback_pool: {},
+      fallback_pool: 'fallback_pool',
       name: 'www.example.com',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -264,14 +155,14 @@ describe('resource loadBalancers', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.update('699d98642c564d2e855e9661899b7252', {
+    const response = await client.loadBalancers.update('699d98642c564d2e855e9661899b7252', {
       zone_id: '699d98642c564d2e855e9661899b7252',
       default_pools: [
         '17b5962d775c646f3f9725cbc7a53df4',
         '9290f38c5d07c2e2f4df57b1f61d4196',
         '00920f38ce07c2e2f4df50b1f61d4194',
       ],
-      fallback_pool: {},
+      fallback_pool: 'fallback_pool',
       name: 'www.example.com',
       adaptive_routing: { failover_across_pools: true },
       country_pools: {
@@ -280,7 +171,8 @@ describe('resource loadBalancers', () => {
       },
       description: 'Load Balancer for www.example.com',
       enabled: true,
-      location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
+      location_strategy: { mode: 'pop', prefer_ecs: 'always' },
+      networks: ['string'],
       pop_pools: {
         LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
         LHR: ['abd90f38ced07c2e2f4df50b1f61d4194', 'f9138c5d07c2e2f4df57b1f61d4196'],
@@ -317,63 +209,8 @@ describe('resource loadBalancers', () => {
               '9290f38c5d07c2e2f4df57b1f61d4196',
               '00920f38ce07c2e2f4df50b1f61d4194',
             ],
-            fallback_pool: {},
-            location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
-            pop_pools: {
-              LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-              LHR: ['abd90f38ced07c2e2f4df50b1f61d4194', 'f9138c5d07c2e2f4df57b1f61d4196'],
-              SJC: ['00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            random_steering: {
-              default_weight: 0.2,
-              pool_weights: {
-                '9290f38c5d07c2e2f4df57b1f61d4196': 0.5,
-                de90f38ced07c2e2f4df50b1f61d4194: 0.3,
-              },
-            },
-            region_pools: {
-              ENAM: ['00920f38ce07c2e2f4df50b1f61d4194'],
-              WNAM: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-            },
-            session_affinity: 'cookie',
-            session_affinity_attributes: {
-              drain_duration: 100,
-              headers: ['x'],
-              require_all_headers: true,
-              samesite: 'Auto',
-              secure: 'Auto',
-              zero_downtime_failover: 'sticky',
-            },
-            session_affinity_ttl: 1800,
-            steering_policy: 'dynamic_latency',
-            ttl: 30,
-          },
-          priority: 0,
-          terminates: true,
-        },
-        {
-          condition: 'http.request.uri.path contains "/testing"',
-          disabled: true,
-          fixed_response: {
-            content_type: 'application/json',
-            location: 'www.example.com',
-            message_body: 'Testing Hello',
-            status_code: 0,
-          },
-          name: 'route the path /testing to testing datacenter.',
-          overrides: {
-            adaptive_routing: { failover_across_pools: true },
-            country_pools: {
-              GB: ['abd90f38ced07c2e2f4df50b1f61d4194'],
-              US: ['de90f38ced07c2e2f4df50b1f61d4194', '00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            default_pools: [
-              '17b5962d775c646f3f9725cbc7a53df4',
-              '9290f38c5d07c2e2f4df57b1f61d4196',
-              '00920f38ce07c2e2f4df50b1f61d4194',
-            ],
-            fallback_pool: {},
-            location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
+            fallback_pool: 'fallback_pool',
+            location_strategy: { mode: 'pop', prefer_ecs: 'always' },
             pop_pools: {
               LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
               LHR: ['abd90f38ced07c2e2f4df50b1f61d4194', 'f9138c5d07c2e2f4df57b1f61d4196'],
@@ -390,95 +227,40 @@ describe('resource loadBalancers', () => {
               ENAM: ['00920f38ce07c2e2f4df50b1f61d4194'],
               WNAM: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
             },
-            session_affinity: 'cookie',
+            session_affinity: 'none',
             session_affinity_attributes: {
               drain_duration: 100,
               headers: ['x'],
               require_all_headers: true,
               samesite: 'Auto',
               secure: 'Auto',
-              zero_downtime_failover: 'sticky',
+              zero_downtime_failover: 'none',
             },
             session_affinity_ttl: 1800,
-            steering_policy: 'dynamic_latency',
-            ttl: 30,
-          },
-          priority: 0,
-          terminates: true,
-        },
-        {
-          condition: 'http.request.uri.path contains "/testing"',
-          disabled: true,
-          fixed_response: {
-            content_type: 'application/json',
-            location: 'www.example.com',
-            message_body: 'Testing Hello',
-            status_code: 0,
-          },
-          name: 'route the path /testing to testing datacenter.',
-          overrides: {
-            adaptive_routing: { failover_across_pools: true },
-            country_pools: {
-              GB: ['abd90f38ced07c2e2f4df50b1f61d4194'],
-              US: ['de90f38ced07c2e2f4df50b1f61d4194', '00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            default_pools: [
-              '17b5962d775c646f3f9725cbc7a53df4',
-              '9290f38c5d07c2e2f4df57b1f61d4196',
-              '00920f38ce07c2e2f4df50b1f61d4194',
-            ],
-            fallback_pool: {},
-            location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
-            pop_pools: {
-              LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-              LHR: ['abd90f38ced07c2e2f4df50b1f61d4194', 'f9138c5d07c2e2f4df57b1f61d4196'],
-              SJC: ['00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            random_steering: {
-              default_weight: 0.2,
-              pool_weights: {
-                '9290f38c5d07c2e2f4df57b1f61d4196': 0.5,
-                de90f38ced07c2e2f4df50b1f61d4194: 0.3,
-              },
-            },
-            region_pools: {
-              ENAM: ['00920f38ce07c2e2f4df50b1f61d4194'],
-              WNAM: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-            },
-            session_affinity: 'cookie',
-            session_affinity_attributes: {
-              drain_duration: 100,
-              headers: ['x'],
-              require_all_headers: true,
-              samesite: 'Auto',
-              secure: 'Auto',
-              zero_downtime_failover: 'sticky',
-            },
-            session_affinity_ttl: 1800,
-            steering_policy: 'dynamic_latency',
+            steering_policy: 'off',
             ttl: 30,
           },
           priority: 0,
           terminates: true,
         },
       ],
-      session_affinity: 'cookie',
+      session_affinity: 'none',
       session_affinity_attributes: {
         drain_duration: 100,
         headers: ['x'],
         require_all_headers: true,
         samesite: 'Auto',
         secure: 'Auto',
-        zero_downtime_failover: 'sticky',
+        zero_downtime_failover: 'none',
       },
       session_affinity_ttl: 1800,
-      steering_policy: 'dynamic_latency',
+      steering_policy: 'off',
       ttl: 30,
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.list({ zone_id: '699d98642c564d2e855e9661899b7252' });
+    const responsePromise = client.loadBalancers.list({ zone_id: '699d98642c564d2e855e9661899b7252' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -489,11 +271,11 @@ describe('resource loadBalancers', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.list({ zone_id: '699d98642c564d2e855e9661899b7252' });
+    const response = await client.loadBalancers.list({ zone_id: '699d98642c564d2e855e9661899b7252' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.delete('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.loadBalancers.delete('699d98642c564d2e855e9661899b7252', {
       zone_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -506,13 +288,13 @@ describe('resource loadBalancers', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.delete('699d98642c564d2e855e9661899b7252', {
+    const response = await client.loadBalancers.delete('699d98642c564d2e855e9661899b7252', {
       zone_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.edit('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.loadBalancers.edit('699d98642c564d2e855e9661899b7252', {
       zone_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -525,7 +307,7 @@ describe('resource loadBalancers', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.edit('699d98642c564d2e855e9661899b7252', {
+    const response = await client.loadBalancers.edit('699d98642c564d2e855e9661899b7252', {
       zone_id: '699d98642c564d2e855e9661899b7252',
       adaptive_routing: { failover_across_pools: true },
       country_pools: {
@@ -539,8 +321,8 @@ describe('resource loadBalancers', () => {
       ],
       description: 'Load Balancer for www.example.com',
       enabled: true,
-      fallback_pool: {},
-      location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
+      fallback_pool: 'fallback_pool',
+      location_strategy: { mode: 'pop', prefer_ecs: 'always' },
       name: 'www.example.com',
       pop_pools: {
         LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
@@ -578,118 +360,8 @@ describe('resource loadBalancers', () => {
               '9290f38c5d07c2e2f4df57b1f61d4196',
               '00920f38ce07c2e2f4df50b1f61d4194',
             ],
-            fallback_pool: {},
-            location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
-            pop_pools: {
-              LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-              LHR: ['abd90f38ced07c2e2f4df50b1f61d4194', 'f9138c5d07c2e2f4df57b1f61d4196'],
-              SJC: ['00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            random_steering: {
-              default_weight: 0.2,
-              pool_weights: {
-                '9290f38c5d07c2e2f4df57b1f61d4196': 0.5,
-                de90f38ced07c2e2f4df50b1f61d4194: 0.3,
-              },
-            },
-            region_pools: {
-              ENAM: ['00920f38ce07c2e2f4df50b1f61d4194'],
-              WNAM: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-            },
-            session_affinity: 'cookie',
-            session_affinity_attributes: {
-              drain_duration: 100,
-              headers: ['x'],
-              require_all_headers: true,
-              samesite: 'Auto',
-              secure: 'Auto',
-              zero_downtime_failover: 'sticky',
-            },
-            session_affinity_ttl: 1800,
-            steering_policy: 'dynamic_latency',
-            ttl: 30,
-          },
-          priority: 0,
-          terminates: true,
-        },
-        {
-          condition: 'http.request.uri.path contains "/testing"',
-          disabled: true,
-          fixed_response: {
-            content_type: 'application/json',
-            location: 'www.example.com',
-            message_body: 'Testing Hello',
-            status_code: 0,
-          },
-          name: 'route the path /testing to testing datacenter.',
-          overrides: {
-            adaptive_routing: { failover_across_pools: true },
-            country_pools: {
-              GB: ['abd90f38ced07c2e2f4df50b1f61d4194'],
-              US: ['de90f38ced07c2e2f4df50b1f61d4194', '00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            default_pools: [
-              '17b5962d775c646f3f9725cbc7a53df4',
-              '9290f38c5d07c2e2f4df57b1f61d4196',
-              '00920f38ce07c2e2f4df50b1f61d4194',
-            ],
-            fallback_pool: {},
-            location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
-            pop_pools: {
-              LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-              LHR: ['abd90f38ced07c2e2f4df50b1f61d4194', 'f9138c5d07c2e2f4df57b1f61d4196'],
-              SJC: ['00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            random_steering: {
-              default_weight: 0.2,
-              pool_weights: {
-                '9290f38c5d07c2e2f4df57b1f61d4196': 0.5,
-                de90f38ced07c2e2f4df50b1f61d4194: 0.3,
-              },
-            },
-            region_pools: {
-              ENAM: ['00920f38ce07c2e2f4df50b1f61d4194'],
-              WNAM: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
-            },
-            session_affinity: 'cookie',
-            session_affinity_attributes: {
-              drain_duration: 100,
-              headers: ['x'],
-              require_all_headers: true,
-              samesite: 'Auto',
-              secure: 'Auto',
-              zero_downtime_failover: 'sticky',
-            },
-            session_affinity_ttl: 1800,
-            steering_policy: 'dynamic_latency',
-            ttl: 30,
-          },
-          priority: 0,
-          terminates: true,
-        },
-        {
-          condition: 'http.request.uri.path contains "/testing"',
-          disabled: true,
-          fixed_response: {
-            content_type: 'application/json',
-            location: 'www.example.com',
-            message_body: 'Testing Hello',
-            status_code: 0,
-          },
-          name: 'route the path /testing to testing datacenter.',
-          overrides: {
-            adaptive_routing: { failover_across_pools: true },
-            country_pools: {
-              GB: ['abd90f38ced07c2e2f4df50b1f61d4194'],
-              US: ['de90f38ced07c2e2f4df50b1f61d4194', '00920f38ce07c2e2f4df50b1f61d4194'],
-            },
-            default_pools: [
-              '17b5962d775c646f3f9725cbc7a53df4',
-              '9290f38c5d07c2e2f4df57b1f61d4196',
-              '00920f38ce07c2e2f4df50b1f61d4194',
-            ],
-            fallback_pool: {},
-            location_strategy: { mode: 'resolver_ip', prefer_ecs: 'always' },
+            fallback_pool: 'fallback_pool',
+            location_strategy: { mode: 'pop', prefer_ecs: 'always' },
             pop_pools: {
               LAX: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
               LHR: ['abd90f38ced07c2e2f4df50b1f61d4194', 'f9138c5d07c2e2f4df57b1f61d4196'],
@@ -706,40 +378,40 @@ describe('resource loadBalancers', () => {
               ENAM: ['00920f38ce07c2e2f4df50b1f61d4194'],
               WNAM: ['de90f38ced07c2e2f4df50b1f61d4194', '9290f38c5d07c2e2f4df57b1f61d4196'],
             },
-            session_affinity: 'cookie',
+            session_affinity: 'none',
             session_affinity_attributes: {
               drain_duration: 100,
               headers: ['x'],
               require_all_headers: true,
               samesite: 'Auto',
               secure: 'Auto',
-              zero_downtime_failover: 'sticky',
+              zero_downtime_failover: 'none',
             },
             session_affinity_ttl: 1800,
-            steering_policy: 'dynamic_latency',
+            steering_policy: 'off',
             ttl: 30,
           },
           priority: 0,
           terminates: true,
         },
       ],
-      session_affinity: 'cookie',
+      session_affinity: 'none',
       session_affinity_attributes: {
         drain_duration: 100,
         headers: ['x'],
         require_all_headers: true,
         samesite: 'Auto',
         secure: 'Auto',
-        zero_downtime_failover: 'sticky',
+        zero_downtime_failover: 'none',
       },
       session_affinity_ttl: 1800,
-      steering_policy: 'dynamic_latency',
+      steering_policy: 'off',
       ttl: 30,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.get('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.loadBalancers.get('699d98642c564d2e855e9661899b7252', {
       zone_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -752,7 +424,7 @@ describe('resource loadBalancers', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.get('699d98642c564d2e855e9661899b7252', {
+    const response = await client.loadBalancers.get('699d98642c564d2e855e9661899b7252', {
       zone_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/load-balancers/monitors/monitors.test.ts b/tests/api-resources/load-balancers/monitors/monitors.test.ts
index d2aeb2fa6b..71e0a1a442 100644
--- a/tests/api-resources/load-balancers/monitors/monitors.test.ts
+++ b/tests/api-resources/load-balancers/monitors/monitors.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource monitors', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.monitors.create({
+    const responsePromise = client.loadBalancers.monitors.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      expected_codes: '2xx',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,14 +24,14 @@ describe('resource monitors', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.monitors.create({
+    const response = await client.loadBalancers.monitors.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      expected_codes: '2xx',
       allow_insecure: true,
       consecutive_down: 0,
       consecutive_up: 0,
       description: 'Login page monitor',
       expected_body: 'alive',
+      expected_codes: '2xx',
       follow_redirects: true,
       header: { Host: ['example.com'], 'X-App-ID': ['abc123'] },
       interval: 0,
@@ -42,14 +41,13 @@ describe('resource monitors', () => {
       probe_zone: 'example.com',
       retries: 0,
       timeout: 0,
-      type: 'https',
+      type: 'http',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.monitors.update('f1aba936b94213e5b8dca0c0dbf1f9cc', {
+    const responsePromise = client.loadBalancers.monitors.update('f1aba936b94213e5b8dca0c0dbf1f9cc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      expected_codes: '2xx',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -61,14 +59,14 @@ describe('resource monitors', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.monitors.update('f1aba936b94213e5b8dca0c0dbf1f9cc', {
+    const response = await client.loadBalancers.monitors.update('f1aba936b94213e5b8dca0c0dbf1f9cc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      expected_codes: '2xx',
       allow_insecure: true,
       consecutive_down: 0,
       consecutive_up: 0,
       description: 'Login page monitor',
       expected_body: 'alive',
+      expected_codes: '2xx',
       follow_redirects: true,
       header: { Host: ['example.com'], 'X-App-ID': ['abc123'] },
       interval: 0,
@@ -78,12 +76,12 @@ describe('resource monitors', () => {
       probe_zone: 'example.com',
       retries: 0,
       timeout: 0,
-      type: 'https',
+      type: 'http',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.monitors.list({
+    const responsePromise = client.loadBalancers.monitors.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -96,13 +94,13 @@ describe('resource monitors', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.monitors.list({
+    const response = await client.loadBalancers.monitors.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.monitors.delete('f1aba936b94213e5b8dca0c0dbf1f9cc', {
+    const responsePromise = client.loadBalancers.monitors.delete('f1aba936b94213e5b8dca0c0dbf1f9cc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -115,15 +113,14 @@ describe('resource monitors', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.monitors.delete('f1aba936b94213e5b8dca0c0dbf1f9cc', {
+    const response = await client.loadBalancers.monitors.delete('f1aba936b94213e5b8dca0c0dbf1f9cc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.monitors.edit('f1aba936b94213e5b8dca0c0dbf1f9cc', {
+    const responsePromise = client.loadBalancers.monitors.edit('f1aba936b94213e5b8dca0c0dbf1f9cc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      expected_codes: '2xx',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -135,14 +132,14 @@ describe('resource monitors', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.monitors.edit('f1aba936b94213e5b8dca0c0dbf1f9cc', {
+    const response = await client.loadBalancers.monitors.edit('f1aba936b94213e5b8dca0c0dbf1f9cc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      expected_codes: '2xx',
       allow_insecure: true,
       consecutive_down: 0,
       consecutive_up: 0,
       description: 'Login page monitor',
       expected_body: 'alive',
+      expected_codes: '2xx',
       follow_redirects: true,
       header: { Host: ['example.com'], 'X-App-ID': ['abc123'] },
       interval: 0,
@@ -152,12 +149,12 @@ describe('resource monitors', () => {
       probe_zone: 'example.com',
       retries: 0,
       timeout: 0,
-      type: 'https',
+      type: 'http',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.monitors.get('f1aba936b94213e5b8dca0c0dbf1f9cc', {
+    const responsePromise = client.loadBalancers.monitors.get('f1aba936b94213e5b8dca0c0dbf1f9cc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -170,7 +167,7 @@ describe('resource monitors', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.monitors.get('f1aba936b94213e5b8dca0c0dbf1f9cc', {
+    const response = await client.loadBalancers.monitors.get('f1aba936b94213e5b8dca0c0dbf1f9cc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/load-balancers/monitors/previews.test.ts b/tests/api-resources/load-balancers/monitors/previews.test.ts
index 55273afb67..e9c7c1cb79 100644
--- a/tests/api-resources/load-balancers/monitors/previews.test.ts
+++ b/tests/api-resources/load-balancers/monitors/previews.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource previews', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.monitors.previews.create(
+    const responsePromise = client.loadBalancers.monitors.previews.create(
       'f1aba936b94213e5b8dca0c0dbf1f9cc',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', expected_codes: '2xx' },
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,27 +25,24 @@ describe('resource previews', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.monitors.previews.create(
-      'f1aba936b94213e5b8dca0c0dbf1f9cc',
-      {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        expected_codes: '2xx',
-        allow_insecure: true,
-        consecutive_down: 0,
-        consecutive_up: 0,
-        description: 'Login page monitor',
-        expected_body: 'alive',
-        follow_redirects: true,
-        header: { Host: ['example.com'], 'X-App-ID': ['abc123'] },
-        interval: 0,
-        method: 'GET',
-        path: '/health',
-        port: 0,
-        probe_zone: 'example.com',
-        retries: 0,
-        timeout: 0,
-        type: 'https',
-      },
-    );
+    const response = await client.loadBalancers.monitors.previews.create('f1aba936b94213e5b8dca0c0dbf1f9cc', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      allow_insecure: true,
+      consecutive_down: 0,
+      consecutive_up: 0,
+      description: 'Login page monitor',
+      expected_body: 'alive',
+      expected_codes: '2xx',
+      follow_redirects: true,
+      header: { Host: ['example.com'], 'X-App-ID': ['abc123'] },
+      interval: 0,
+      method: 'GET',
+      path: '/health',
+      port: 0,
+      probe_zone: 'example.com',
+      retries: 0,
+      timeout: 0,
+      type: 'http',
+    });
   });
 });
diff --git a/tests/api-resources/load-balancers/monitors/references.test.ts b/tests/api-resources/load-balancers/monitors/references.test.ts
index 14753ba2de..69becc10a2 100644
--- a/tests/api-resources/load-balancers/monitors/references.test.ts
+++ b/tests/api-resources/load-balancers/monitors/references.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource references', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.monitors.references.get(
-      'f1aba936b94213e5b8dca0c0dbf1f9cc',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.loadBalancers.monitors.references.get('f1aba936b94213e5b8dca0c0dbf1f9cc', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -25,9 +24,8 @@ describe('resource references', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.monitors.references.get(
-      'f1aba936b94213e5b8dca0c0dbf1f9cc',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.loadBalancers.monitors.references.get('f1aba936b94213e5b8dca0c0dbf1f9cc', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/load-balancers/pools/health.test.ts b/tests/api-resources/load-balancers/pools/health.test.ts
index d30997119d..71151c6e9e 100644
--- a/tests/api-resources/load-balancers/pools/health.test.ts
+++ b/tests/api-resources/load-balancers/pools/health.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource health', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.pools.health.create('17b5962d775c646f3f9725cbc7a53df4', {
+    const responsePromise = client.loadBalancers.pools.health.create('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      expected_codes: '2xx',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,14 +24,14 @@ describe('resource health', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.pools.health.create('17b5962d775c646f3f9725cbc7a53df4', {
+    const response = await client.loadBalancers.pools.health.create('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      expected_codes: '2xx',
       allow_insecure: true,
       consecutive_down: 0,
       consecutive_up: 0,
       description: 'Login page monitor',
       expected_body: 'alive',
+      expected_codes: '2xx',
       follow_redirects: true,
       header: { Host: ['example.com'], 'X-App-ID': ['abc123'] },
       interval: 0,
@@ -42,12 +41,12 @@ describe('resource health', () => {
       probe_zone: 'example.com',
       retries: 0,
       timeout: 0,
-      type: 'https',
+      type: 'http',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.pools.health.get('17b5962d775c646f3f9725cbc7a53df4', {
+    const responsePromise = client.loadBalancers.pools.health.get('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -60,7 +59,7 @@ describe('resource health', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.pools.health.get('17b5962d775c646f3f9725cbc7a53df4', {
+    const response = await client.loadBalancers.pools.health.get('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/load-balancers/pools/pools.test.ts b/tests/api-resources/load-balancers/pools/pools.test.ts
index 5aeab2e078..5cc16677d4 100644
--- a/tests/api-resources/load-balancers/pools/pools.test.ts
+++ b/tests/api-resources/load-balancers/pools/pools.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource pools', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.pools.create({
+    const responsePromise = client.loadBalancers.pools.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'primary-dc-1',
-      origins: [{}, {}, {}],
+      origins: [{}],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,30 +26,14 @@ describe('resource pools', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.pools.create({
+    const response = await client.loadBalancers.pools.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'primary-dc-1',
       origins: [
         {
           address: '0.0.0.0',
           enabled: true,
-          header: { Host: ['example.com', 'example.com', 'example.com'] },
-          name: 'app-server-1',
-          virtual_network_id: 'a5624d4e-044a-4ff0-b3e1-e2465353d4b4',
-          weight: 0.6,
-        },
-        {
-          address: '0.0.0.0',
-          enabled: true,
-          header: { Host: ['example.com', 'example.com', 'example.com'] },
-          name: 'app-server-1',
-          virtual_network_id: 'a5624d4e-044a-4ff0-b3e1-e2465353d4b4',
-          weight: 0.6,
-        },
-        {
-          address: '0.0.0.0',
-          enabled: true,
-          header: { Host: ['example.com', 'example.com', 'example.com'] },
+          header: { Host: ['example.com'] },
           name: 'app-server-1',
           virtual_network_id: 'a5624d4e-044a-4ff0-b3e1-e2465353d4b4',
           weight: 0.6,
@@ -66,7 +50,7 @@ describe('resource pools', () => {
       },
       longitude: 0,
       minimum_origins: 0,
-      monitor: {},
+      monitor: 'monitor',
       notification_email: 'someone@example.com,sometwo@example.com',
       notification_filter: {
         origin: { disable: true, healthy: true },
@@ -77,10 +61,10 @@ describe('resource pools', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.pools.update('17b5962d775c646f3f9725cbc7a53df4', {
+    const responsePromise = client.loadBalancers.pools.update('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'primary-dc-1',
-      origins: [{}, {}, {}],
+      origins: [{}],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -92,36 +76,20 @@ describe('resource pools', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.pools.update('17b5962d775c646f3f9725cbc7a53df4', {
+    const response = await client.loadBalancers.pools.update('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'primary-dc-1',
       origins: [
         {
           address: '0.0.0.0',
           enabled: true,
-          header: { Host: ['example.com', 'example.com', 'example.com'] },
-          name: 'app-server-1',
-          virtual_network_id: 'a5624d4e-044a-4ff0-b3e1-e2465353d4b4',
-          weight: 0.6,
-        },
-        {
-          address: '0.0.0.0',
-          enabled: true,
-          header: { Host: ['example.com', 'example.com', 'example.com'] },
-          name: 'app-server-1',
-          virtual_network_id: 'a5624d4e-044a-4ff0-b3e1-e2465353d4b4',
-          weight: 0.6,
-        },
-        {
-          address: '0.0.0.0',
-          enabled: true,
-          header: { Host: ['example.com', 'example.com', 'example.com'] },
+          header: { Host: ['example.com'] },
           name: 'app-server-1',
           virtual_network_id: 'a5624d4e-044a-4ff0-b3e1-e2465353d4b4',
           weight: 0.6,
         },
       ],
-      check_regions: ['WEU', 'ENAM'],
+      check_regions: ['WNAM', 'ENAM'],
       description: 'Primary data center - Provider XYZ',
       enabled: false,
       latitude: 0,
@@ -133,7 +101,7 @@ describe('resource pools', () => {
       },
       longitude: 0,
       minimum_origins: 0,
-      monitor: {},
+      monitor: 'monitor',
       notification_email: 'someone@example.com,sometwo@example.com',
       notification_filter: {
         origin: { disable: true, healthy: true },
@@ -144,7 +112,7 @@ describe('resource pools', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.pools.list({
+    const responsePromise = client.loadBalancers.pools.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -157,14 +125,14 @@ describe('resource pools', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.pools.list({
+    const response = await client.loadBalancers.pools.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      monitor: {},
+      monitor: 'monitor',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.pools.delete('17b5962d775c646f3f9725cbc7a53df4', {
+    const responsePromise = client.loadBalancers.pools.delete('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -177,13 +145,33 @@ describe('resource pools', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.pools.delete('17b5962d775c646f3f9725cbc7a53df4', {
+    const response = await client.loadBalancers.pools.delete('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
+  test('bulkEdit: only required params', async () => {
+    const responsePromise = client.loadBalancers.pools.bulkEdit({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkEdit: required and optional params', async () => {
+    const response = await client.loadBalancers.pools.bulkEdit({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      notification_email: '',
+    });
+  });
+
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.pools.edit('17b5962d775c646f3f9725cbc7a53df4', {
+    const responsePromise = client.loadBalancers.pools.edit('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -196,9 +184,9 @@ describe('resource pools', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.pools.edit('17b5962d775c646f3f9725cbc7a53df4', {
+    const response = await client.loadBalancers.pools.edit('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      check_regions: ['WEU', 'ENAM'],
+      check_regions: ['WNAM', 'ENAM'],
       description: 'Primary data center - Provider XYZ',
       enabled: false,
       latitude: 0,
@@ -210,7 +198,7 @@ describe('resource pools', () => {
       },
       longitude: 0,
       minimum_origins: 0,
-      monitor: {},
+      monitor: 'monitor',
       name: 'primary-dc-1',
       notification_email: 'someone@example.com,sometwo@example.com',
       notification_filter: {
@@ -222,23 +210,7 @@ describe('resource pools', () => {
         {
           address: '0.0.0.0',
           enabled: true,
-          header: { Host: ['example.com', 'example.com', 'example.com'] },
-          name: 'app-server-1',
-          virtual_network_id: 'a5624d4e-044a-4ff0-b3e1-e2465353d4b4',
-          weight: 0.6,
-        },
-        {
-          address: '0.0.0.0',
-          enabled: true,
-          header: { Host: ['example.com', 'example.com', 'example.com'] },
-          name: 'app-server-1',
-          virtual_network_id: 'a5624d4e-044a-4ff0-b3e1-e2465353d4b4',
-          weight: 0.6,
-        },
-        {
-          address: '0.0.0.0',
-          enabled: true,
-          header: { Host: ['example.com', 'example.com', 'example.com'] },
+          header: { Host: ['example.com'] },
           name: 'app-server-1',
           virtual_network_id: 'a5624d4e-044a-4ff0-b3e1-e2465353d4b4',
           weight: 0.6,
@@ -248,7 +220,7 @@ describe('resource pools', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.pools.get('17b5962d775c646f3f9725cbc7a53df4', {
+    const responsePromise = client.loadBalancers.pools.get('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -261,7 +233,7 @@ describe('resource pools', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.pools.get('17b5962d775c646f3f9725cbc7a53df4', {
+    const response = await client.loadBalancers.pools.get('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/load-balancers/pools/references.test.ts b/tests/api-resources/load-balancers/pools/references.test.ts
index 17f9de40f1..46be6a7c04 100644
--- a/tests/api-resources/load-balancers/pools/references.test.ts
+++ b/tests/api-resources/load-balancers/pools/references.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource references', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.pools.references.get(
-      '17b5962d775c646f3f9725cbc7a53df4',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.loadBalancers.pools.references.get('17b5962d775c646f3f9725cbc7a53df4', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -25,7 +24,7 @@ describe('resource references', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.pools.references.get('17b5962d775c646f3f9725cbc7a53df4', {
+    const response = await client.loadBalancers.pools.references.get('17b5962d775c646f3f9725cbc7a53df4', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/load-balancers/previews.test.ts b/tests/api-resources/load-balancers/previews.test.ts
index 719e7093f8..635bf72ed0 100644
--- a/tests/api-resources/load-balancers/previews.test.ts
+++ b/tests/api-resources/load-balancers/previews.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource previews', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.previews.get('p1aba936b94213e5b8dca0c0dbf1f9cc', {
+    const responsePromise = client.loadBalancers.previews.get('p1aba936b94213e5b8dca0c0dbf1f9cc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource previews', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.previews.get('p1aba936b94213e5b8dca0c0dbf1f9cc', {
+    const response = await client.loadBalancers.previews.get('p1aba936b94213e5b8dca0c0dbf1f9cc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/load-balancers/regions.test.ts b/tests/api-resources/load-balancers/regions.test.ts
index 9c475c7728..18a49bae65 100644
--- a/tests/api-resources/load-balancers/regions.test.ts
+++ b/tests/api-resources/load-balancers/regions.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource regions', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.regions.list({
+    const responsePromise = client.loadBalancers.regions.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource regions', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.regions.list({
+    const response = await client.loadBalancers.regions.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       country_code_a2: 'US',
       subdivision_code: 'CA',
@@ -33,7 +33,7 @@ describe('resource regions', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.regions.get('WNAM', {
+    const responsePromise = client.loadBalancers.regions.get('WNAM', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -46,7 +46,7 @@ describe('resource regions', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.regions.get('WNAM', {
+    const response = await client.loadBalancers.regions.get('WNAM', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/load-balancers/searches.test.ts b/tests/api-resources/load-balancers/searches.test.ts
index f5cb21db67..ced815d5e2 100644
--- a/tests/api-resources/load-balancers/searches.test.ts
+++ b/tests/api-resources/load-balancers/searches.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource searches', () => {
   // TODO: investigate broken test
   test.skip('get: only required params', async () => {
-    const responsePromise = cloudflare.loadBalancers.searches.get({
+    const responsePromise = client.loadBalancers.searches.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -26,11 +26,11 @@ describe('resource searches', () => {
 
   // TODO: investigate broken test
   test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.loadBalancers.searches.get({
+    const response = await client.loadBalancers.searches.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      page: {},
-      per_page: {},
-      search_params: { query: 'primary', references: '*' },
+      page: 1,
+      per_page: 1,
+      search_params: { query: 'primary', references: '' },
     });
   });
 });
diff --git a/tests/api-resources/logpush/datasets/fields.test.ts b/tests/api-resources/logpush/datasets/fields.test.ts
index 3e057334fc..35de68de52 100644
--- a/tests/api-resources/logpush/datasets/fields.test.ts
+++ b/tests/api-resources/logpush/datasets/fields.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,9 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource fields', () => {
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.logpush.datasets.fields.get('http_requests', {
-      account_id: 'account_id',
-    });
+    const responsePromise = client.logpush.datasets.fields.get('gateway_dns', { account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
diff --git a/tests/api-resources/logpush/datasets/jobs.test.ts b/tests/api-resources/logpush/datasets/jobs.test.ts
index 41a6f2b46a..48023d9364 100644
--- a/tests/api-resources/logpush/datasets/jobs.test.ts
+++ b/tests/api-resources/logpush/datasets/jobs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,9 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource jobs', () => {
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.logpush.datasets.jobs.get('http_requests', {
-      account_id: 'account_id',
-    });
+    const responsePromise = client.logpush.datasets.jobs.get('gateway_dns', { account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
diff --git a/tests/api-resources/logpush/edge.test.ts b/tests/api-resources/logpush/edge.test.ts
index f1dd6d28fd..3a825fb5e4 100644
--- a/tests/api-resources/logpush/edge.test.ts
+++ b/tests/api-resources/logpush/edge.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource edge', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.logpush.edge.create({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.logpush.edge.create({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource edge', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.logpush.edge.create({
+    const response = await client.logpush.edge.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       fields:
         'ClientIP,ClientRequestHost,ClientRequestMethod,ClientRequestURI,EdgeEndTimestamp,EdgeResponseBytes,EdgeResponseStatus,EdgeStartTimestamp,RayID',
@@ -32,7 +32,7 @@ describe('resource edge', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.logpush.edge.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.logpush.edge.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -43,6 +43,6 @@ describe('resource edge', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.logpush.edge.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.logpush.edge.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/logpush/jobs.test.ts b/tests/api-resources/logpush/jobs.test.ts
index 3bdf1c16a3..ba382daa29 100644
--- a/tests/api-resources/logpush/jobs.test.ts
+++ b/tests/api-resources/logpush/jobs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource jobs', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.logpush.jobs.create({
+    const responsePromise = client.logpush.jobs.create({
       destination_conf: 's3://mybucket/logs?region=us-west-2',
       account_id: 'account_id',
     });
@@ -27,7 +27,7 @@ describe('resource jobs', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.logpush.jobs.create({
+    const response = await client.logpush.jobs.create({
       destination_conf: 's3://mybucket/logs?region=us-west-2',
       account_id: 'account_id',
       dataset: 'http_requests',
@@ -40,9 +40,9 @@ describe('resource jobs', () => {
       max_upload_records: 1000,
       name: 'example.com',
       output_options: {
-        'CVE-2021-4428': true,
         batch_prefix: 'batch_prefix',
         batch_suffix: 'batch_suffix',
+        'CVE-2021-4428': true,
         field_delimiter: 'field_delimiter',
         field_names: ['ClientIP', 'EdgeStartTimestamp', 'RayID'],
         output_type: 'ndjson',
@@ -59,7 +59,7 @@ describe('resource jobs', () => {
 
   // TODO: investigate broken test
   test.skip('update', async () => {
-    const responsePromise = cloudflare.logpush.jobs.update(1, { account_id: 'account_id' });
+    const responsePromise = client.logpush.jobs.update(1, { account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -71,7 +71,7 @@ describe('resource jobs', () => {
 
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.logpush.jobs.list({ account_id: 'account_id' });
+    const responsePromise = client.logpush.jobs.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -83,7 +83,7 @@ describe('resource jobs', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.logpush.jobs.delete(1, { account_id: 'account_id' });
+    const responsePromise = client.logpush.jobs.delete(1, { account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -95,7 +95,7 @@ describe('resource jobs', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.logpush.jobs.get(1, { account_id: 'account_id' });
+    const responsePromise = client.logpush.jobs.get(1, { account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
diff --git a/tests/api-resources/logpush/ownership.test.ts b/tests/api-resources/logpush/ownership.test.ts
index 975fc0eade..833c37e34b 100644
--- a/tests/api-resources/logpush/ownership.test.ts
+++ b/tests/api-resources/logpush/ownership.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource ownership', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.logpush.ownership.create({
+    const responsePromise = client.logpush.ownership.create({
       destination_conf: 's3://mybucket/logs?region=us-west-2',
       account_id: 'account_id',
     });
@@ -27,7 +27,7 @@ describe('resource ownership', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.logpush.ownership.create({
+    const response = await client.logpush.ownership.create({
       destination_conf: 's3://mybucket/logs?region=us-west-2',
       account_id: 'account_id',
     });
@@ -35,7 +35,7 @@ describe('resource ownership', () => {
 
   // TODO: investigate broken test
   test.skip('validate: only required params', async () => {
-    const responsePromise = cloudflare.logpush.ownership.validate({
+    const responsePromise = client.logpush.ownership.validate({
       destination_conf: 's3://mybucket/logs?region=us-west-2',
       ownership_challenge: '00000000000000000000',
       account_id: 'account_id',
@@ -51,7 +51,7 @@ describe('resource ownership', () => {
 
   // TODO: investigate broken test
   test.skip('validate: required and optional params', async () => {
-    const response = await cloudflare.logpush.ownership.validate({
+    const response = await client.logpush.ownership.validate({
       destination_conf: 's3://mybucket/logs?region=us-west-2',
       ownership_challenge: '00000000000000000000',
       account_id: 'account_id',
diff --git a/tests/api-resources/logpush/validate.test.ts b/tests/api-resources/logpush/validate.test.ts
index a3f15ae9ac..6c76da6142 100644
--- a/tests/api-resources/logpush/validate.test.ts
+++ b/tests/api-resources/logpush/validate.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource validate', () => {
   // TODO: investigate broken test
   test.skip('destination: only required params', async () => {
-    const responsePromise = cloudflare.logpush.validate.destination({
+    const responsePromise = client.logpush.validate.destination({
       destination_conf: 's3://mybucket/logs?region=us-west-2',
       account_id: 'account_id',
     });
@@ -27,7 +27,7 @@ describe('resource validate', () => {
 
   // TODO: investigate broken test
   test.skip('destination: required and optional params', async () => {
-    const response = await cloudflare.logpush.validate.destination({
+    const response = await client.logpush.validate.destination({
       destination_conf: 's3://mybucket/logs?region=us-west-2',
       account_id: 'account_id',
     });
@@ -35,7 +35,7 @@ describe('resource validate', () => {
 
   // TODO: investigate broken test
   test.skip('origin: only required params', async () => {
-    const responsePromise = cloudflare.logpush.validate.origin({
+    const responsePromise = client.logpush.validate.origin({
       logpull_options: 'fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339',
       account_id: 'account_id',
     });
@@ -50,7 +50,7 @@ describe('resource validate', () => {
 
   // TODO: investigate broken test
   test.skip('origin: required and optional params', async () => {
-    const response = await cloudflare.logpush.validate.origin({
+    const response = await client.logpush.validate.origin({
       logpull_options: 'fields=RayID,ClientIP,EdgeStartTimestamp&timestamps=rfc3339',
       account_id: 'account_id',
     });
diff --git a/tests/api-resources/logs/control/cmb/config.test.ts b/tests/api-resources/logs/control/cmb/config.test.ts
index 81d465efc1..2acb5dc49c 100644
--- a/tests/api-resources/logs/control/cmb/config.test.ts
+++ b/tests/api-resources/logs/control/cmb/config.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource config', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.logs.control.cmb.config.create({
+    const responsePromise = client.logs.control.cmb.config.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,14 +24,14 @@ describe('resource config', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.logs.control.cmb.config.create({
+    const response = await client.logs.control.cmb.config.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       regions: 'eu',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.logs.control.cmb.config.delete({
+    const responsePromise = client.logs.control.cmb.config.delete({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -44,13 +44,13 @@ describe('resource config', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.logs.control.cmb.config.delete({
+    const response = await client.logs.control.cmb.config.delete({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.logs.control.cmb.config.get({
+    const responsePromise = client.logs.control.cmb.config.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -63,7 +63,7 @@ describe('resource config', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.logs.control.cmb.config.get({
+    const response = await client.logs.control.cmb.config.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/logs/control/retention.test.ts b/tests/api-resources/logs/control/retention.test.ts
index 97094f9ca3..12d00d074b 100644
--- a/tests/api-resources/logs/control/retention.test.ts
+++ b/tests/api-resources/logs/control/retention.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,8 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource retention', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.logs.control.retention.create('023e105f4ecef8ad9ca31a8372d0c353', {
-      flag: true,
+    const responsePromise = client.logs.control.retention.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -24,13 +24,16 @@ describe('resource retention', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.logs.control.retention.create('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.logs.control.retention.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       flag: true,
     });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.logs.control.retention.get('023e105f4ecef8ad9ca31a8372d0c353');
+  test('get: only required params', async () => {
+    const responsePromise = client.logs.control.retention.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -40,12 +43,7 @@ describe('resource retention', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.logs.control.retention.get('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.logs.control.retention.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/logs/rayid.test.ts b/tests/api-resources/logs/rayid.test.ts
index 170a3678b8..92816a04c8 100644
--- a/tests/api-resources/logs/rayid.test.ts
+++ b/tests/api-resources/logs/rayid.test.ts
@@ -3,15 +3,17 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource RayID', () => {
-  test('get', async () => {
-    const responsePromise = cloudflare.logs.RayID.get('023e105f4ecef8ad9ca31a8372d0c353', '41ddf1740f67442d');
+  test('get: only required params', async () => {
+    const responsePromise = client.logs.RayID.get('41ddf1740f67442d', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,24 +23,11 @@ describe('resource RayID', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.logs.RayID.get('023e105f4ecef8ad9ca31a8372d0c353', '41ddf1740f67442d', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('get: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.logs.RayID.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '41ddf1740f67442d',
-        { fields: 'ClientIP,RayID,EdgeStartTimestamp', timestamps: 'unixnano' },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.logs.RayID.get('41ddf1740f67442d', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      fields: 'ClientIP,RayID,EdgeStartTimestamp',
+      timestamps: 'unix',
+    });
   });
 });
diff --git a/tests/api-resources/logs/received/fields.test.ts b/tests/api-resources/logs/received/fields.test.ts
index d1a5e5906d..1d1882bd46 100644
--- a/tests/api-resources/logs/received/fields.test.ts
+++ b/tests/api-resources/logs/received/fields.test.ts
@@ -3,15 +3,15 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource fields', () => {
-  test('get', async () => {
-    const responsePromise = cloudflare.logs.received.fields.get('023e105f4ecef8ad9ca31a8372d0c353');
+  test('get: only required params', async () => {
+    const responsePromise = client.logs.received.fields.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,12 +21,7 @@ describe('resource fields', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.logs.received.fields.get('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.logs.received.fields.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/logs/received/received.test.ts b/tests/api-resources/logs/received/received.test.ts
index 76171ad29d..16d1848200 100644
--- a/tests/api-resources/logs/received/received.test.ts
+++ b/tests/api-resources/logs/received/received.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource received', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.logs.received.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.logs.received.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       end: '2018-05-20T10:01:00Z',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,13 +25,14 @@ describe('resource received', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.logs.received.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.logs.received.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       end: '2018-05-20T10:01:00Z',
       count: 1,
       fields: 'ClientIP,RayID,EdgeStartTimestamp',
       sample: 0.1,
       start: '2018-05-20T10:00:00Z',
-      timestamps: 'unixnano',
+      timestamps: 'unix',
     });
   });
 });
diff --git a/tests/api-resources/magic-network-monitoring/configs/configs.test.ts b/tests/api-resources/magic-network-monitoring/configs/configs.test.ts
index 12038618ea..d8491914f4 100644
--- a/tests/api-resources/magic-network-monitoring/configs/configs.test.ts
+++ b/tests/api-resources/magic-network-monitoring/configs/configs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource configs', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.configs.create({
+    const responsePromise = client.magicNetworkMonitoring.configs.create({
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
+      default_sampling: 1,
+      name: "cloudflare user's account",
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,16 +26,22 @@ describe('resource configs', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.configs.create({
+    const response = await client.magicNetworkMonitoring.configs.create({
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
+      default_sampling: 1,
+      name: "cloudflare user's account",
+      router_ips: ['203.0.113.1'],
+      warp_devices: [
+        { id: '5360368d-b351-4791-abe1-93550dabd351', name: 'My warp device', router_ip: '203.0.113.1' },
+      ],
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.configs.update({
+    const responsePromise = client.magicNetworkMonitoring.configs.update({
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
+      default_sampling: 1,
+      name: "cloudflare user's account",
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -46,14 +53,19 @@ describe('resource configs', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.configs.update({
+    const response = await client.magicNetworkMonitoring.configs.update({
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
+      default_sampling: 1,
+      name: "cloudflare user's account",
+      router_ips: ['203.0.113.1'],
+      warp_devices: [
+        { id: '5360368d-b351-4791-abe1-93550dabd351', name: 'My warp device', router_ip: '203.0.113.1' },
+      ],
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.configs.delete({
+    const responsePromise = client.magicNetworkMonitoring.configs.delete({
       account_id: '6f91088a406011ed95aed352566e8d4c',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -66,15 +78,14 @@ describe('resource configs', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.configs.delete({
+    const response = await client.magicNetworkMonitoring.configs.delete({
       account_id: '6f91088a406011ed95aed352566e8d4c',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.configs.edit({
+    const responsePromise = client.magicNetworkMonitoring.configs.edit({
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -86,14 +97,19 @@ describe('resource configs', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.configs.edit({
+    const response = await client.magicNetworkMonitoring.configs.edit({
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
+      default_sampling: 1,
+      name: "cloudflare user's account",
+      router_ips: ['203.0.113.1'],
+      warp_devices: [
+        { id: '5360368d-b351-4791-abe1-93550dabd351', name: 'My warp device', router_ip: '203.0.113.1' },
+      ],
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.configs.get({
+    const responsePromise = client.magicNetworkMonitoring.configs.get({
       account_id: '6f91088a406011ed95aed352566e8d4c',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -106,7 +122,7 @@ describe('resource configs', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.configs.get({
+    const response = await client.magicNetworkMonitoring.configs.get({
       account_id: '6f91088a406011ed95aed352566e8d4c',
     });
   });
diff --git a/tests/api-resources/magic-network-monitoring/configs/full.test.ts b/tests/api-resources/magic-network-monitoring/configs/full.test.ts
index 9df312c5e1..b52c66180d 100644
--- a/tests/api-resources/magic-network-monitoring/configs/full.test.ts
+++ b/tests/api-resources/magic-network-monitoring/configs/full.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource full', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.configs.full.get({
+    const responsePromise = client.magicNetworkMonitoring.configs.full.get({
       account_id: '6f91088a406011ed95aed352566e8d4c',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource full', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.configs.full.get({
+    const response = await client.magicNetworkMonitoring.configs.full.get({
       account_id: '6f91088a406011ed95aed352566e8d4c',
     });
   });
diff --git a/tests/api-resources/magic-network-monitoring/rules/advertisements.test.ts b/tests/api-resources/magic-network-monitoring/rules/advertisements.test.ts
index 60bc735140..09ae871307 100644
--- a/tests/api-resources/magic-network-monitoring/rules/advertisements.test.ts
+++ b/tests/api-resources/magic-network-monitoring/rules/advertisements.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource advertisements', () => {
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.rules.advertisements.edit(
+    const responsePromise = client.magicNetworkMonitoring.rules.advertisements.edit(
       '2890e6fa406311ed9b5a23f70f6fb8cf',
       { account_id: '6f91088a406011ed95aed352566e8d4c', body: {} },
     );
@@ -25,7 +25,7 @@ describe('resource advertisements', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.rules.advertisements.edit(
+    const response = await client.magicNetworkMonitoring.rules.advertisements.edit(
       '2890e6fa406311ed9b5a23f70f6fb8cf',
       { account_id: '6f91088a406011ed95aed352566e8d4c', body: {} },
     );
diff --git a/tests/api-resources/magic-network-monitoring/rules/rules.test.ts b/tests/api-resources/magic-network-monitoring/rules/rules.test.ts
index 3ed1198884..efc2a830c0 100644
--- a/tests/api-resources/magic-network-monitoring/rules/rules.test.ts
+++ b/tests/api-resources/magic-network-monitoring/rules/rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource rules', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.rules.create({
+    const responsePromise = client.magicNetworkMonitoring.rules.create({
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
+      duration: '300s',
+      name: 'my_rule_1',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,16 +26,23 @@ describe('resource rules', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.rules.create({
+    const response = await client.magicNetworkMonitoring.rules.create({
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
+      duration: '300s',
+      name: 'my_rule_1',
+      automatic_advertisement: true,
+      bandwidth: 1000,
+      packet_threshold: 10000,
+      prefixes: ['203.0.113.1/32'],
     });
   });
 
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.rules.update({
+  // TODO: investigate auth errors on test suite
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.magicNetworkMonitoring.rules.update({
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
+      duration: '300s',
+      name: 'my_rule_1',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -45,15 +53,22 @@ describe('resource rules', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.rules.update({
+  // TODO: investigate auth errors on test suite
+  test.skip('update: required and optional params', async () => {
+    const response = await client.magicNetworkMonitoring.rules.update({
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
+      duration: '300s',
+      name: 'my_rule_1',
+      id: '2890e6fa406311ed9b5a23f70f6fb8cf',
+      automatic_advertisement: true,
+      bandwidth: 1000,
+      packet_threshold: 10000,
+      prefixes: ['203.0.113.1/32'],
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.rules.list({
+    const responsePromise = client.magicNetworkMonitoring.rules.list({
       account_id: '6f91088a406011ed95aed352566e8d4c',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -66,16 +81,15 @@ describe('resource rules', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.rules.list({
+    const response = await client.magicNetworkMonitoring.rules.list({
       account_id: '6f91088a406011ed95aed352566e8d4c',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.rules.delete(
-      '2890e6fa406311ed9b5a23f70f6fb8cf',
-      { account_id: '6f91088a406011ed95aed352566e8d4c' },
-    );
+    const responsePromise = client.magicNetworkMonitoring.rules.delete('2890e6fa406311ed9b5a23f70f6fb8cf', {
+      account_id: '6f91088a406011ed95aed352566e8d4c',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -86,16 +100,14 @@ describe('resource rules', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.rules.delete(
-      '2890e6fa406311ed9b5a23f70f6fb8cf',
-      { account_id: '6f91088a406011ed95aed352566e8d4c' },
-    );
+    const response = await client.magicNetworkMonitoring.rules.delete('2890e6fa406311ed9b5a23f70f6fb8cf', {
+      account_id: '6f91088a406011ed95aed352566e8d4c',
+    });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.rules.edit('2890e6fa406311ed9b5a23f70f6fb8cf', {
+    const responsePromise = client.magicNetworkMonitoring.rules.edit('2890e6fa406311ed9b5a23f70f6fb8cf', {
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -107,14 +119,19 @@ describe('resource rules', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.rules.edit('2890e6fa406311ed9b5a23f70f6fb8cf', {
+    const response = await client.magicNetworkMonitoring.rules.edit('2890e6fa406311ed9b5a23f70f6fb8cf', {
       account_id: '6f91088a406011ed95aed352566e8d4c',
-      body: {},
+      automatic_advertisement: true,
+      bandwidth: 1000,
+      duration: '300s',
+      name: 'my_rule_1',
+      packet_threshold: 10000,
+      prefixes: ['203.0.113.1/32'],
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicNetworkMonitoring.rules.get('2890e6fa406311ed9b5a23f70f6fb8cf', {
+    const responsePromise = client.magicNetworkMonitoring.rules.get('2890e6fa406311ed9b5a23f70f6fb8cf', {
       account_id: '6f91088a406011ed95aed352566e8d4c',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -127,7 +144,7 @@ describe('resource rules', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicNetworkMonitoring.rules.get('2890e6fa406311ed9b5a23f70f6fb8cf', {
+    const response = await client.magicNetworkMonitoring.rules.get('2890e6fa406311ed9b5a23f70f6fb8cf', {
       account_id: '6f91088a406011ed95aed352566e8d4c',
     });
   });
diff --git a/tests/api-resources/magic-transit/apps.test.ts b/tests/api-resources/magic-transit/apps.test.ts
index 3bb8780091..e0810d96a4 100644
--- a/tests/api-resources/magic-transit/apps.test.ts
+++ b/tests/api-resources/magic-transit/apps.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,9 +12,10 @@ const cloudflare = new Cloudflare({
 describe('resource apps', () => {
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.apps.create({
+    const responsePromise = client.magicTransit.apps.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: {},
+      name: 'Cloudflare Dashboard',
+      type: 'Development',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -27,17 +28,19 @@ describe('resource apps', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.apps.create({
+    const response = await client.magicTransit.apps.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: {},
+      name: 'Cloudflare Dashboard',
+      type: 'Development',
+      hostnames: ['auth.cloudflare.com'],
+      ip_subnets: ['192.0.2.0/24'],
     });
   });
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.apps.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.apps.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: {},
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -50,17 +53,18 @@ describe('resource apps', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.apps.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.apps.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: {},
+      hostnames: ['auth.cloudflare.com'],
+      ip_subnets: ['1.1.1.1/32'],
+      name: 'Cloudflare Dashboard',
+      type: 'Development',
     });
   });
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212
   test.skip('list: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.apps.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.magicTransit.apps.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -72,13 +76,11 @@ describe('resource apps', () => {
 
   // prism errors - https://github.com/cloudflare/cloudflare-python/actions/runs/9360388260/job/25765690361?pr=482#step:5:7212
   test.skip('list: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.apps.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.magicTransit.apps.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.apps.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.apps.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -91,7 +93,7 @@ describe('resource apps', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.apps.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.apps.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/magic-transit/cf-interconnects.test.ts b/tests/api-resources/magic-transit/cf-interconnects.test.ts
index ae709b87f7..8f1a7b68f2 100644
--- a/tests/api-resources/magic-transit/cf-interconnects.test.ts
+++ b/tests/api-resources/magic-transit/cf-interconnects.test.ts
@@ -3,18 +3,18 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource cfInterconnects', () => {
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.cfInterconnects.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.magicTransit.cfInterconnects.update('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,22 +24,21 @@ describe('resource cfInterconnects', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.cfInterconnects.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        description: 'Tunnel for Interconnect to ORD',
-        gre: { cloudflare_endpoint: '203.0.113.1' },
-        health_check: { enabled: true, rate: 'low', target: '203.0.113.1', type: 'request' },
-        interface_address: '192.0.2.0/31',
-        mtu: 0,
-      },
-    );
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.magicTransit.cfInterconnects.update('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      description: 'Tunnel for Interconnect to ORD',
+      gre: { cloudflare_endpoint: '203.0.113.1' },
+      health_check: { enabled: true, rate: 'low', target: { saved: '203.0.113.1' }, type: 'reply' },
+      interface_address: '192.0.2.0/31',
+      mtu: 0,
+      'x-magic-new-hc-target': true,
+    });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.cfInterconnects.list({
+    const responsePromise = client.magicTransit.cfInterconnects.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -52,13 +51,38 @@ describe('resource cfInterconnects', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.cfInterconnects.list({
+    const response = await client.magicTransit.cfInterconnects.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      'x-magic-new-hc-target': true,
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('bulkUpdate: only required params', async () => {
+    const responsePromise = client.magicTransit.cfInterconnects.bulkUpdate({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('bulkUpdate: required and optional params', async () => {
+    const response = await client.magicTransit.cfInterconnects.bulkUpdate({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+      'x-magic-new-hc-target': true,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.cfInterconnects.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.cfInterconnects.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -71,8 +95,9 @@ describe('resource cfInterconnects', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.cfInterconnects.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.cfInterconnects.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      'x-magic-new-hc-target': true,
     });
   });
 });
diff --git a/tests/api-resources/magic-transit/connectors.test.ts b/tests/api-resources/magic-transit/connectors.test.ts
index b1595e35d1..d4862c1c8d 100644
--- a/tests/api-resources/magic-transit/connectors.test.ts
+++ b/tests/api-resources/magic-transit/connectors.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource connectors', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.connectors.update('connector_id', {
+    const responsePromise = client.magicTransit.connectors.update('connector_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource connectors', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.connectors.update('connector_id', {
+    const response = await client.magicTransit.connectors.update('connector_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       activated: true,
       interrupt_window_duration_hours: 0,
@@ -35,7 +35,7 @@ describe('resource connectors', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.connectors.list({
+    const responsePromise = client.magicTransit.connectors.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -48,13 +48,13 @@ describe('resource connectors', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.connectors.list({
+    const response = await client.magicTransit.connectors.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.connectors.edit('connector_id', {
+    const responsePromise = client.magicTransit.connectors.edit('connector_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -67,7 +67,7 @@ describe('resource connectors', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.connectors.edit('connector_id', {
+    const response = await client.magicTransit.connectors.edit('connector_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       activated: true,
       interrupt_window_duration_hours: 0,
@@ -78,7 +78,7 @@ describe('resource connectors', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.connectors.get('connector_id', {
+    const responsePromise = client.magicTransit.connectors.get('connector_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -91,7 +91,7 @@ describe('resource connectors', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.connectors.get('connector_id', {
+    const response = await client.magicTransit.connectors.get('connector_id', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/magic-transit/gre-tunnels.test.ts b/tests/api-resources/magic-transit/gre-tunnels.test.ts
index 0d3726c461..fa4e8b7706 100644
--- a/tests/api-resources/magic-transit/gre-tunnels.test.ts
+++ b/tests/api-resources/magic-transit/gre-tunnels.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource greTunnels', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.greTunnels.create({
+    const responsePromise = client.magicTransit.greTunnels.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
     });
@@ -27,14 +27,16 @@ describe('resource greTunnels', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.greTunnels.create({
+    const response = await client.magicTransit.greTunnels.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
+      'x-magic-new-hc-target': true,
     });
   });
 
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.greTunnels.update('023e105f4ecef8ad9ca31a8372d0c353', {
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.magicTransit.greTunnels.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       cloudflare_gre_endpoint: '203.0.113.1',
       customer_gre_endpoint: '203.0.113.1',
@@ -50,8 +52,9 @@ describe('resource greTunnels', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.greTunnels.update('023e105f4ecef8ad9ca31a8372d0c353', {
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.magicTransit.greTunnels.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       cloudflare_gre_endpoint: '203.0.113.1',
       customer_gre_endpoint: '203.0.113.1',
@@ -59,19 +62,20 @@ describe('resource greTunnels', () => {
       name: 'GRE_1',
       description: 'Tunnel for ISP X',
       health_check: {
-        direction: 'bidirectional',
+        direction: 'unidirectional',
         enabled: true,
         rate: 'low',
-        target: '203.0.113.1',
-        type: 'request',
+        target: { saved: '203.0.113.1' },
+        type: 'reply',
       },
       mtu: 0,
       ttl: 0,
+      'x-magic-new-hc-target': true,
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.greTunnels.list({
+    const responsePromise = client.magicTransit.greTunnels.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -84,13 +88,14 @@ describe('resource greTunnels', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.greTunnels.list({
+    const response = await client.magicTransit.greTunnels.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      'x-magic-new-hc-target': true,
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.greTunnels.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.greTunnels.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -103,13 +108,38 @@ describe('resource greTunnels', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.greTunnels.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.greTunnels.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      'x-magic-new-hc-target': true,
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('bulkUpdate: only required params', async () => {
+    const responsePromise = client.magicTransit.greTunnels.bulkUpdate({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('bulkUpdate: required and optional params', async () => {
+    const response = await client.magicTransit.greTunnels.bulkUpdate({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+      'x-magic-new-hc-target': true,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.greTunnels.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.greTunnels.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -122,8 +152,9 @@ describe('resource greTunnels', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.greTunnels.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.greTunnels.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      'x-magic-new-hc-target': true,
     });
   });
 });
diff --git a/tests/api-resources/magic-transit/ipsec-tunnels.test.ts b/tests/api-resources/magic-transit/ipsec-tunnels.test.ts
index 0863b29f59..80344216c9 100644
--- a/tests/api-resources/magic-transit/ipsec-tunnels.test.ts
+++ b/tests/api-resources/magic-transit/ipsec-tunnels.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ipsecTunnels', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.ipsecTunnels.create({
+    const responsePromise = client.magicTransit.ipsecTunnels.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       cloudflare_endpoint: '203.0.113.1',
       interface_address: '192.0.2.0/31',
@@ -27,7 +27,7 @@ describe('resource ipsecTunnels', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.ipsecTunnels.create({
+    const response = await client.magicTransit.ipsecTunnels.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       cloudflare_endpoint: '203.0.113.1',
       interface_address: '192.0.2.0/31',
@@ -35,19 +35,21 @@ describe('resource ipsecTunnels', () => {
       customer_endpoint: '203.0.113.1',
       description: 'Tunnel for ISP X',
       health_check: {
-        direction: 'bidirectional',
+        direction: 'unidirectional',
         enabled: true,
         rate: 'low',
-        target: '203.0.113.1',
-        type: 'request',
+        target: { saved: '203.0.113.1' },
+        type: 'reply',
       },
       psk: 'O3bwKSjnaoCxDoUxjcq4Rk8ZKkezQUiy',
       replay_protection: false,
+      'x-magic-new-hc-target': true,
     });
   });
 
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.ipsecTunnels.update('023e105f4ecef8ad9ca31a8372d0c353', {
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.magicTransit.ipsecTunnels.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       cloudflare_endpoint: '203.0.113.1',
       interface_address: '192.0.2.0/31',
@@ -62,8 +64,9 @@ describe('resource ipsecTunnels', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.ipsecTunnels.update('023e105f4ecef8ad9ca31a8372d0c353', {
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.magicTransit.ipsecTunnels.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       cloudflare_endpoint: '203.0.113.1',
       interface_address: '192.0.2.0/31',
@@ -71,19 +74,20 @@ describe('resource ipsecTunnels', () => {
       customer_endpoint: '203.0.113.1',
       description: 'Tunnel for ISP X',
       health_check: {
-        direction: 'bidirectional',
+        direction: 'unidirectional',
         enabled: true,
         rate: 'low',
-        target: '203.0.113.1',
-        type: 'request',
+        target: { saved: '203.0.113.1' },
+        type: 'reply',
       },
       psk: 'O3bwKSjnaoCxDoUxjcq4Rk8ZKkezQUiy',
       replay_protection: false,
+      'x-magic-new-hc-target': true,
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.ipsecTunnels.list({
+    const responsePromise = client.magicTransit.ipsecTunnels.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -96,13 +100,14 @@ describe('resource ipsecTunnels', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.ipsecTunnels.list({
+    const response = await client.magicTransit.ipsecTunnels.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      'x-magic-new-hc-target': true,
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.ipsecTunnels.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.ipsecTunnels.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -115,13 +120,38 @@ describe('resource ipsecTunnels', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.ipsecTunnels.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.ipsecTunnels.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      'x-magic-new-hc-target': true,
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('bulkUpdate: only required params', async () => {
+    const responsePromise = client.magicTransit.ipsecTunnels.bulkUpdate({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('bulkUpdate: required and optional params', async () => {
+    const response = await client.magicTransit.ipsecTunnels.bulkUpdate({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+      'x-magic-new-hc-target': true,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.ipsecTunnels.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.ipsecTunnels.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -134,16 +164,17 @@ describe('resource ipsecTunnels', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.ipsecTunnels.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.ipsecTunnels.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      'x-magic-new-hc-target': true,
     });
   });
 
   test('pskGenerate: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.ipsecTunnels.pskGenerate(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
-    );
+    const responsePromise = client.magicTransit.ipsecTunnels.pskGenerate('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -154,9 +185,9 @@ describe('resource ipsecTunnels', () => {
   });
 
   test('pskGenerate: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.ipsecTunnels.pskGenerate(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
-    );
+    const response = await client.magicTransit.ipsecTunnels.pskGenerate('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: {},
+    });
   });
 });
diff --git a/tests/api-resources/pcaps/download.test.ts b/tests/api-resources/magic-transit/pcaps/download.test.ts
similarity index 78%
rename from tests/api-resources/pcaps/download.test.ts
rename to tests/api-resources/magic-transit/pcaps/download.test.ts
index 72a5f7e119..d72f3d7922 100644
--- a/tests/api-resources/pcaps/download.test.ts
+++ b/tests/api-resources/magic-transit/pcaps/download.test.ts
@@ -2,7 +2,7 @@
 
 import Cloudflare from 'cloudflare';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 describe('resource download', () => {
   // TODO: investigate broken test
   test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.pcaps.download.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.pcaps.download.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/pcaps/ownership.test.ts b/tests/api-resources/magic-transit/pcaps/ownership.test.ts
similarity index 81%
rename from tests/api-resources/pcaps/ownership.test.ts
rename to tests/api-resources/magic-transit/pcaps/ownership.test.ts
index c3cbf9b450..f50d98f7d4 100644
--- a/tests/api-resources/pcaps/ownership.test.ts
+++ b/tests/api-resources/magic-transit/pcaps/ownership.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ownership', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.pcaps.ownership.create({
+    const responsePromise = client.magicTransit.pcaps.ownership.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       destination_conf: 's3://pcaps-bucket?region=us-east-1',
     });
@@ -25,14 +25,14 @@ describe('resource ownership', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.pcaps.ownership.create({
+    const response = await client.magicTransit.pcaps.ownership.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       destination_conf: 's3://pcaps-bucket?region=us-east-1',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.pcaps.ownership.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.pcaps.ownership.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,13 +45,13 @@ describe('resource ownership', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.pcaps.ownership.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.pcaps.ownership.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pcaps.ownership.get({
+    const responsePromise = client.magicTransit.pcaps.ownership.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -64,11 +64,13 @@ describe('resource ownership', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pcaps.ownership.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.magicTransit.pcaps.ownership.get({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
   test('validate: only required params', async () => {
-    const responsePromise = cloudflare.pcaps.ownership.validate({
+    const responsePromise = client.magicTransit.pcaps.ownership.validate({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       destination_conf: 's3://pcaps-bucket?region=us-east-1',
       ownership_challenge: 'ownership-challenge-9883874ecac311ec8475433579a6bf5f.txt',
@@ -83,7 +85,7 @@ describe('resource ownership', () => {
   });
 
   test('validate: required and optional params', async () => {
-    const response = await cloudflare.pcaps.ownership.validate({
+    const response = await client.magicTransit.pcaps.ownership.validate({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       destination_conf: 's3://pcaps-bucket?region=us-east-1',
       ownership_challenge: 'ownership-challenge-9883874ecac311ec8475433579a6bf5f.txt',
diff --git a/tests/api-resources/pcaps/pcaps.test.ts b/tests/api-resources/magic-transit/pcaps/pcaps.test.ts
similarity index 81%
rename from tests/api-resources/pcaps/pcaps.test.ts
rename to tests/api-resources/magic-transit/pcaps/pcaps.test.ts
index b5bbfeb6dd..44f152e736 100644
--- a/tests/api-resources/pcaps/pcaps.test.ts
+++ b/tests/api-resources/magic-transit/pcaps/pcaps.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource pcaps', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.pcaps.create({
+    const responsePromise = client.magicTransit.pcaps.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       packet_limit: 10000,
       system: 'magic-transit',
@@ -28,7 +28,7 @@ describe('resource pcaps', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.pcaps.create({
+    const response = await client.magicTransit.pcaps.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       packet_limit: 10000,
       system: 'magic-transit',
@@ -45,7 +45,9 @@ describe('resource pcaps', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.pcaps.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.magicTransit.pcaps.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -56,11 +58,11 @@ describe('resource pcaps', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.pcaps.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.magicTransit.pcaps.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pcaps.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.pcaps.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -73,7 +75,7 @@ describe('resource pcaps', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pcaps.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.pcaps.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/magic-transit/routes.test.ts b/tests/api-resources/magic-transit/routes.test.ts
index de4174e6c0..566f5efabd 100644
--- a/tests/api-resources/magic-transit/routes.test.ts
+++ b/tests/api-resources/magic-transit/routes.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource routes', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.routes.create({
+    const responsePromise = client.magicTransit.routes.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
     });
@@ -27,14 +27,14 @@ describe('resource routes', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.routes.create({
+    const response = await client.magicTransit.routes.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.routes.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.routes.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       nexthop: '203.0.113.1',
       prefix: '192.0.2.0/24',
@@ -50,19 +50,19 @@ describe('resource routes', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.routes.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.routes.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       nexthop: '203.0.113.1',
       prefix: '192.0.2.0/24',
       priority: 0,
       description: 'New route for new prefix 203.0.113.1',
-      scope: { colo_names: ['den01', 'den01', 'den01'], colo_regions: ['APAC', 'APAC', 'APAC'] },
+      scope: { colo_names: ['den01'], colo_regions: ['APAC'] },
       weight: 0,
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.routes.list({
+    const responsePromise = client.magicTransit.routes.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -75,13 +75,13 @@ describe('resource routes', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.routes.list({
+    const response = await client.magicTransit.routes.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.routes.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.routes.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -94,13 +94,51 @@ describe('resource routes', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.routes.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.routes.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
+  test('bulkUpdate: only required params', async () => {
+    const responsePromise = client.magicTransit.routes.bulkUpdate({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      routes: [
+        {
+          id: '023e105f4ecef8ad9ca31a8372d0c353',
+          nexthop: '203.0.113.1',
+          prefix: '192.0.2.0/24',
+          priority: 0,
+        },
+      ],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkUpdate: required and optional params', async () => {
+    const response = await client.magicTransit.routes.bulkUpdate({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      routes: [
+        {
+          id: '023e105f4ecef8ad9ca31a8372d0c353',
+          nexthop: '203.0.113.1',
+          prefix: '192.0.2.0/24',
+          priority: 0,
+          description: 'New route for new prefix 203.0.113.1',
+          scope: { colo_names: ['den01'], colo_regions: ['APAC'] },
+          weight: 0,
+        },
+      ],
+    });
+  });
+
   test('empty: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.routes.empty({
+    const responsePromise = client.magicTransit.routes.empty({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -113,13 +151,13 @@ describe('resource routes', () => {
   });
 
   test('empty: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.routes.empty({
+    const response = await client.magicTransit.routes.empty({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.routes.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.routes.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -132,7 +170,7 @@ describe('resource routes', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.routes.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.routes.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/magic-transit/sites/acls.test.ts b/tests/api-resources/magic-transit/sites/acls.test.ts
index 8573e9ce26..a5e70b9f8e 100644
--- a/tests/api-resources/magic-transit/sites/acls.test.ts
+++ b/tests/api-resources/magic-transit/sites/acls.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource acls', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.acls.create('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.sites.acls.create('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       lan_1: { lan_id: 'lan_id' },
       lan_2: { lan_id: 'lan_id' },
@@ -27,29 +27,19 @@ describe('resource acls', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.acls.create('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.sites.acls.create('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      lan_1: {
-        lan_id: 'lan_id',
-        lan_name: 'lan_name',
-        ports: [1, 1, 1],
-        subnets: ['192.0.2.1', '192.0.2.1', '192.0.2.1'],
-      },
-      lan_2: {
-        lan_id: 'lan_id',
-        lan_name: 'lan_name',
-        ports: [1, 1, 1],
-        subnets: ['192.0.2.1', '192.0.2.1', '192.0.2.1'],
-      },
+      lan_1: { lan_id: 'lan_id', lan_name: 'lan_name', ports: [1], subnets: ['192.0.2.1'] },
+      lan_2: { lan_id: 'lan_id', lan_name: 'lan_name', ports: [1], subnets: ['192.0.2.1'] },
       name: 'PIN Pad - Cash Register',
       description: 'Allows local traffic between PIN pads and cash register.',
       forward_locally: true,
-      protocols: ['tcp', 'udp', 'icmp'],
+      protocols: ['tcp'],
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.acls.update(
+    const responsePromise = client.magicTransit.sites.acls.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -64,33 +54,23 @@ describe('resource acls', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.acls.update(
+    const response = await client.magicTransit.sites.acls.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
         description: 'Allows local traffic between PIN pads and cash register.',
         forward_locally: true,
-        lan_1: {
-          lan_id: 'lan_id',
-          lan_name: 'lan_name',
-          ports: [1, 1, 1],
-          subnets: ['192.0.2.1', '192.0.2.1', '192.0.2.1'],
-        },
-        lan_2: {
-          lan_id: 'lan_id',
-          lan_name: 'lan_name',
-          ports: [1, 1, 1],
-          subnets: ['192.0.2.1', '192.0.2.1', '192.0.2.1'],
-        },
+        lan_1: { lan_id: 'lan_id', lan_name: 'lan_name', ports: [1], subnets: ['192.0.2.1'] },
+        lan_2: { lan_id: 'lan_id', lan_name: 'lan_name', ports: [1], subnets: ['192.0.2.1'] },
         name: 'PIN Pad - Cash Register',
-        protocols: ['tcp', 'udp', 'icmp'],
+        protocols: ['tcp'],
       },
     );
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.acls.list('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.sites.acls.list('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -103,13 +83,13 @@ describe('resource acls', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.acls.list('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.sites.acls.list('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.acls.delete(
+    const responsePromise = client.magicTransit.sites.acls.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -124,7 +104,7 @@ describe('resource acls', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.acls.delete(
+    const response = await client.magicTransit.sites.acls.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -132,7 +112,7 @@ describe('resource acls', () => {
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.acls.edit(
+    const responsePromise = client.magicTransit.sites.acls.edit(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -147,33 +127,23 @@ describe('resource acls', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.acls.edit(
+    const response = await client.magicTransit.sites.acls.edit(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
         description: 'Allows local traffic between PIN pads and cash register.',
         forward_locally: true,
-        lan_1: {
-          lan_id: 'lan_id',
-          lan_name: 'lan_name',
-          ports: [1, 1, 1],
-          subnets: ['192.0.2.1', '192.0.2.1', '192.0.2.1'],
-        },
-        lan_2: {
-          lan_id: 'lan_id',
-          lan_name: 'lan_name',
-          ports: [1, 1, 1],
-          subnets: ['192.0.2.1', '192.0.2.1', '192.0.2.1'],
-        },
+        lan_1: { lan_id: 'lan_id', lan_name: 'lan_name', ports: [1], subnets: ['192.0.2.1'] },
+        lan_2: { lan_id: 'lan_id', lan_name: 'lan_name', ports: [1], subnets: ['192.0.2.1'] },
         name: 'PIN Pad - Cash Register',
-        protocols: ['tcp', 'udp', 'icmp'],
+        protocols: ['tcp'],
       },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.acls.get(
+    const responsePromise = client.magicTransit.sites.acls.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -188,7 +158,7 @@ describe('resource acls', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.acls.get(
+    const response = await client.magicTransit.sites.acls.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/magic-transit/sites/lans.test.ts b/tests/api-resources/magic-transit/sites/lans.test.ts
index 44b3cdc221..0291c75139 100644
--- a/tests/api-resources/magic-transit/sites/lans.test.ts
+++ b/tests/api-resources/magic-transit/sites/lans.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource lans', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.lans.create('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.sites.lans.create('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       physport: 1,
       vlan_tag: 0,
@@ -26,7 +26,7 @@ describe('resource lans', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.lans.create('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.sites.lans.create('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       physport: 1,
       vlan_tag: 0,
@@ -34,13 +34,11 @@ describe('resource lans', () => {
       name: 'name',
       nat: { static_prefix: '192.0.2.0/24' },
       routed_subnets: [
-        { nat: { static_prefix: '192.0.2.0/24' }, next_hop: '192.0.2.1', prefix: '192.0.2.0/24' },
-        { nat: { static_prefix: '192.0.2.0/24' }, next_hop: '192.0.2.1', prefix: '192.0.2.0/24' },
-        { nat: { static_prefix: '192.0.2.0/24' }, next_hop: '192.0.2.1', prefix: '192.0.2.0/24' },
+        { next_hop: '192.0.2.1', prefix: '192.0.2.0/24', nat: { static_prefix: '192.0.2.0/24' } },
       ],
       static_addressing: {
         address: '192.0.2.0/24',
-        dhcp_relay: { server_addresses: ['192.0.2.1', '192.0.2.1', '192.0.2.1'] },
+        dhcp_relay: { server_addresses: ['192.0.2.1'] },
         dhcp_server: {
           dhcp_pool_end: '192.0.2.1',
           dhcp_pool_start: '192.0.2.1',
@@ -54,7 +52,7 @@ describe('resource lans', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.lans.update(
+    const responsePromise = client.magicTransit.sites.lans.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -69,7 +67,7 @@ describe('resource lans', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.lans.update(
+    const response = await client.magicTransit.sites.lans.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       {
@@ -78,13 +76,11 @@ describe('resource lans', () => {
         nat: { static_prefix: '192.0.2.0/24' },
         physport: 1,
         routed_subnets: [
-          { nat: { static_prefix: '192.0.2.0/24' }, next_hop: '192.0.2.1', prefix: '192.0.2.0/24' },
-          { nat: { static_prefix: '192.0.2.0/24' }, next_hop: '192.0.2.1', prefix: '192.0.2.0/24' },
-          { nat: { static_prefix: '192.0.2.0/24' }, next_hop: '192.0.2.1', prefix: '192.0.2.0/24' },
+          { next_hop: '192.0.2.1', prefix: '192.0.2.0/24', nat: { static_prefix: '192.0.2.0/24' } },
         ],
         static_addressing: {
           address: '192.0.2.0/24',
-          dhcp_relay: { server_addresses: ['192.0.2.1', '192.0.2.1', '192.0.2.1'] },
+          dhcp_relay: { server_addresses: ['192.0.2.1'] },
           dhcp_server: {
             dhcp_pool_end: '192.0.2.1',
             dhcp_pool_start: '192.0.2.1',
@@ -100,7 +96,7 @@ describe('resource lans', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.lans.list('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.sites.lans.list('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -113,13 +109,13 @@ describe('resource lans', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.lans.list('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.sites.lans.list('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.lans.delete(
+    const responsePromise = client.magicTransit.sites.lans.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -134,7 +130,7 @@ describe('resource lans', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.lans.delete(
+    const response = await client.magicTransit.sites.lans.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -142,7 +138,7 @@ describe('resource lans', () => {
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.lans.edit(
+    const responsePromise = client.magicTransit.sites.lans.edit(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -157,7 +153,7 @@ describe('resource lans', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.lans.edit(
+    const response = await client.magicTransit.sites.lans.edit(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       {
@@ -166,13 +162,11 @@ describe('resource lans', () => {
         nat: { static_prefix: '192.0.2.0/24' },
         physport: 1,
         routed_subnets: [
-          { nat: { static_prefix: '192.0.2.0/24' }, next_hop: '192.0.2.1', prefix: '192.0.2.0/24' },
-          { nat: { static_prefix: '192.0.2.0/24' }, next_hop: '192.0.2.1', prefix: '192.0.2.0/24' },
-          { nat: { static_prefix: '192.0.2.0/24' }, next_hop: '192.0.2.1', prefix: '192.0.2.0/24' },
+          { next_hop: '192.0.2.1', prefix: '192.0.2.0/24', nat: { static_prefix: '192.0.2.0/24' } },
         ],
         static_addressing: {
           address: '192.0.2.0/24',
-          dhcp_relay: { server_addresses: ['192.0.2.1', '192.0.2.1', '192.0.2.1'] },
+          dhcp_relay: { server_addresses: ['192.0.2.1'] },
           dhcp_server: {
             dhcp_pool_end: '192.0.2.1',
             dhcp_pool_start: '192.0.2.1',
@@ -188,7 +182,7 @@ describe('resource lans', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.lans.get(
+    const responsePromise = client.magicTransit.sites.lans.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -203,7 +197,7 @@ describe('resource lans', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.lans.get(
+    const response = await client.magicTransit.sites.lans.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/magic-transit/sites/sites.test.ts b/tests/api-resources/magic-transit/sites/sites.test.ts
index 47066ebfd9..5f91028981 100644
--- a/tests/api-resources/magic-transit/sites/sites.test.ts
+++ b/tests/api-resources/magic-transit/sites/sites.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource sites', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.create({
+    const responsePromise = client.magicTransit.sites.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'site_1',
     });
@@ -25,7 +25,7 @@ describe('resource sites', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.create({
+    const response = await client.magicTransit.sites.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'site_1',
       connector_id: 'ac60d3d0435248289d446cedd870bcf4',
@@ -37,7 +37,7 @@ describe('resource sites', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.sites.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -50,7 +50,7 @@ describe('resource sites', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.sites.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       connector_id: 'ac60d3d0435248289d446cedd870bcf4',
       description: 'description',
@@ -61,7 +61,7 @@ describe('resource sites', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.list({
+    const responsePromise = client.magicTransit.sites.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -74,14 +74,14 @@ describe('resource sites', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.list({
+    const response = await client.magicTransit.sites.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       connector_identifier: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.sites.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -94,13 +94,13 @@ describe('resource sites', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.sites.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.sites.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -113,7 +113,7 @@ describe('resource sites', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.sites.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       connector_id: 'ac60d3d0435248289d446cedd870bcf4',
       description: 'description',
@@ -124,7 +124,7 @@ describe('resource sites', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.sites.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -137,8 +137,9 @@ describe('resource sites', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.sites.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      'x-magic-new-hc-target': true,
     });
   });
 });
diff --git a/tests/api-resources/magic-transit/sites/wans.test.ts b/tests/api-resources/magic-transit/sites/wans.test.ts
index 38c31dd9b7..08584530ec 100644
--- a/tests/api-resources/magic-transit/sites/wans.test.ts
+++ b/tests/api-resources/magic-transit/sites/wans.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource wans', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.wans.create('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.sites.wans.create('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       physport: 1,
       vlan_tag: 0,
@@ -26,7 +26,7 @@ describe('resource wans', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.wans.create('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.sites.wans.create('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       physport: 1,
       vlan_tag: 0,
@@ -41,7 +41,7 @@ describe('resource wans', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.wans.update(
+    const responsePromise = client.magicTransit.sites.wans.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -56,7 +56,7 @@ describe('resource wans', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.wans.update(
+    const response = await client.magicTransit.sites.wans.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       {
@@ -75,7 +75,7 @@ describe('resource wans', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.wans.list('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.magicTransit.sites.wans.list('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -88,13 +88,13 @@ describe('resource wans', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.wans.list('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.magicTransit.sites.wans.list('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.wans.delete(
+    const responsePromise = client.magicTransit.sites.wans.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -109,7 +109,7 @@ describe('resource wans', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.wans.delete(
+    const response = await client.magicTransit.sites.wans.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -117,7 +117,7 @@ describe('resource wans', () => {
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.wans.edit(
+    const responsePromise = client.magicTransit.sites.wans.edit(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -132,7 +132,7 @@ describe('resource wans', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.wans.edit(
+    const response = await client.magicTransit.sites.wans.edit(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       {
@@ -151,7 +151,7 @@ describe('resource wans', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.magicTransit.sites.wans.get(
+    const responsePromise = client.magicTransit.sites.wans.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -166,7 +166,7 @@ describe('resource wans', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.magicTransit.sites.wans.get(
+    const response = await client.magicTransit.sites.wans.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/managed-transforms.test.ts b/tests/api-resources/managed-transforms.test.ts
new file mode 100644
index 0000000000..ba0e248f52
--- /dev/null
+++ b/tests/api-resources/managed-transforms.test.ts
@@ -0,0 +1,71 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource managedTransforms', () => {
+  // TODO: investigate unauthorized HTTP response
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.managedTransforms.list({ zone_id: '9f1839b6152d298aca64c4e906b6d074' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate unauthorized HTTP response
+  test.skip('list: required and optional params', async () => {
+    const response = await client.managedTransforms.list({ zone_id: '9f1839b6152d298aca64c4e906b6d074' });
+  });
+
+  // TODO: investigate unauthorized HTTP response
+  test.skip('delete: only required params', async () => {
+    const responsePromise = client.managedTransforms.delete({ zone_id: '9f1839b6152d298aca64c4e906b6d074' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate unauthorized HTTP response
+  test.skip('delete: required and optional params', async () => {
+    const response = await client.managedTransforms.delete({ zone_id: '9f1839b6152d298aca64c4e906b6d074' });
+  });
+
+  // TODO: investigate unauthorized HTTP response
+  test.skip('edit: only required params', async () => {
+    const responsePromise = client.managedTransforms.edit({
+      zone_id: '9f1839b6152d298aca64c4e906b6d074',
+      managed_request_headers: [{ id: 'add_bot_protection_headers', enabled: true }],
+      managed_response_headers: [{ id: 'add_security_headers', enabled: true }],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate unauthorized HTTP response
+  test.skip('edit: required and optional params', async () => {
+    const response = await client.managedTransforms.edit({
+      zone_id: '9f1839b6152d298aca64c4e906b6d074',
+      managed_request_headers: [{ id: 'add_bot_protection_headers', enabled: true }],
+      managed_response_headers: [{ id: 'add_security_headers', enabled: true }],
+    });
+  });
+});
diff --git a/tests/api-resources/memberships.test.ts b/tests/api-resources/memberships.test.ts
index 53b25cb0ca..dcb8f60117 100644
--- a/tests/api-resources/memberships.test.ts
+++ b/tests/api-resources/memberships.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource memberships', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.memberships.update('4536bcfad5faccb111b47003c79917fa', {
+    const responsePromise = client.memberships.update('4536bcfad5faccb111b47003c79917fa', {
       status: 'accepted',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,13 +24,13 @@ describe('resource memberships', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.memberships.update('4536bcfad5faccb111b47003c79917fa', {
+    const response = await client.memberships.update('4536bcfad5faccb111b47003c79917fa', {
       status: 'accepted',
     });
   });
 
   test('list', async () => {
-    const responsePromise = cloudflare.memberships.list();
+    const responsePromise = client.memberships.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -42,7 +42,7 @@ describe('resource memberships', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.memberships.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.memberships.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -50,12 +50,12 @@ describe('resource memberships', () => {
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.memberships.list(
+      client.memberships.list(
         {
           account: { name: 'Demo Account' },
-          direction: 'desc',
+          direction: 'asc',
           name: 'Demo Account',
-          order: 'status',
+          order: 'id',
           page: 1,
           per_page: 5,
           status: 'accepted',
@@ -66,7 +66,7 @@ describe('resource memberships', () => {
   });
 
   test('delete', async () => {
-    const responsePromise = cloudflare.memberships.delete('4536bcfad5faccb111b47003c79917fa');
+    const responsePromise = client.memberships.delete('4536bcfad5faccb111b47003c79917fa');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -79,12 +79,12 @@ describe('resource memberships', () => {
   test('delete: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.memberships.delete('4536bcfad5faccb111b47003c79917fa', { path: '/_stainless_unknown_path' }),
+      client.memberships.delete('4536bcfad5faccb111b47003c79917fa', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.memberships.get('4536bcfad5faccb111b47003c79917fa');
+    const responsePromise = client.memberships.get('4536bcfad5faccb111b47003c79917fa');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -97,7 +97,7 @@ describe('resource memberships', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.memberships.get('4536bcfad5faccb111b47003c79917fa', { path: '/_stainless_unknown_path' }),
+      client.memberships.get('4536bcfad5faccb111b47003c79917fa', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 });
diff --git a/tests/api-resources/mtls-certificates/associations.test.ts b/tests/api-resources/mtls-certificates/associations.test.ts
index 05c9d83493..6271ecf1bf 100644
--- a/tests/api-resources/mtls-certificates/associations.test.ts
+++ b/tests/api-resources/mtls-certificates/associations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource associations', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.mtlsCertificates.associations.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.mtlsCertificates.associations.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource associations', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.mtlsCertificates.associations.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.mtlsCertificates.associations.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/mtls-certificates/mtls-certificates.test.ts b/tests/api-resources/mtls-certificates/mtls-certificates.test.ts
index f03a3d8b00..fa5ae98367 100644
--- a/tests/api-resources/mtls-certificates/mtls-certificates.test.ts
+++ b/tests/api-resources/mtls-certificates/mtls-certificates.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource mtlsCertificates', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.mtlsCertificates.create({
+    const responsePromise = client.mtlsCertificates.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       ca: true,
       certificates:
@@ -27,7 +27,7 @@ describe('resource mtlsCertificates', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.mtlsCertificates.create({
+    const response = await client.mtlsCertificates.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       ca: true,
       certificates:
@@ -39,9 +39,7 @@ describe('resource mtlsCertificates', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.mtlsCertificates.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.mtlsCertificates.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -52,13 +50,11 @@ describe('resource mtlsCertificates', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.mtlsCertificates.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.mtlsCertificates.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.mtlsCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.mtlsCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -71,13 +67,13 @@ describe('resource mtlsCertificates', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.mtlsCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.mtlsCertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.mtlsCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.mtlsCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -90,7 +86,7 @@ describe('resource mtlsCertificates', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.mtlsCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.mtlsCertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/origin-ca-certificates.test.ts b/tests/api-resources/origin-ca-certificates.test.ts
index 7244cb3541..72ae07b213 100644
--- a/tests/api-resources/origin-ca-certificates.test.ts
+++ b/tests/api-resources/origin-ca-certificates.test.ts
@@ -3,15 +3,16 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource originCACertificates', () => {
-  test('create', async () => {
-    const responsePromise = cloudflare.originCACertificates.create({});
+  // TODO: investigate auth errors on test suite
+  test.skip('create', async () => {
+    const responsePromise = client.originCACertificates.create({});
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,8 +22,9 @@ describe('resource originCACertificates', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.originCACertificates.list();
+  // TODO: investigate auth errors on test suite
+  test.skip('list', async () => {
+    const responsePromise = client.originCACertificates.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -32,25 +34,28 @@ describe('resource originCACertificates', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
+  // TODO: investigate auth errors on test suite
+  test.skip('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.originCACertificates.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.originCACertificates.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
 
-  test('list: request options and params are passed correctly', async () => {
+  // TODO: investigate auth errors on test suite
+  test.skip('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.originCACertificates.list(
+      client.originCACertificates.list(
         { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
         { path: '/_stainless_unknown_path' },
       ),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
-  test('delete', async () => {
-    const responsePromise = cloudflare.originCACertificates.delete('023e105f4ecef8ad9ca31a8372d0c353');
+  // TODO: investigate auth errors on test suite
+  test.skip('delete', async () => {
+    const responsePromise = client.originCACertificates.delete('023e105f4ecef8ad9ca31a8372d0c353');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -60,17 +65,19 @@ describe('resource originCACertificates', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
+  // TODO: investigate auth errors on test suite
+  test.skip('delete: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.originCACertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      client.originCACertificates.delete('023e105f4ecef8ad9ca31a8372d0c353', {
         path: '/_stainless_unknown_path',
       }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.originCACertificates.get('023e105f4ecef8ad9ca31a8372d0c353');
+  // TODO: investigate auth errors on test suite
+  test.skip('get', async () => {
+    const responsePromise = client.originCACertificates.get('023e105f4ecef8ad9ca31a8372d0c353');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -80,10 +87,11 @@ describe('resource originCACertificates', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
+  // TODO: investigate auth errors on test suite
+  test.skip('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.originCACertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      client.originCACertificates.get('023e105f4ecef8ad9ca31a8372d0c353', {
         path: '/_stainless_unknown_path',
       }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
diff --git a/tests/api-resources/origin-post-quantum-encryption.test.ts b/tests/api-resources/origin-post-quantum-encryption.test.ts
index 2df93fa6ad..7e3ff7df6b 100644
--- a/tests/api-resources/origin-post-quantum-encryption.test.ts
+++ b/tests/api-resources/origin-post-quantum-encryption.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource originPostQuantumEncryption', () => {
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.originPostQuantumEncryption.update({
+    const responsePromise = client.originPostQuantumEncryption.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'preferred',
     });
@@ -27,7 +27,7 @@ describe('resource originPostQuantumEncryption', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.originPostQuantumEncryption.update({
+    const response = await client.originPostQuantumEncryption.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       value: 'preferred',
     });
@@ -35,7 +35,7 @@ describe('resource originPostQuantumEncryption', () => {
 
   // TODO: investigate broken test
   test.skip('get: only required params', async () => {
-    const responsePromise = cloudflare.originPostQuantumEncryption.get({
+    const responsePromise = client.originPostQuantumEncryption.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -49,7 +49,7 @@ describe('resource originPostQuantumEncryption', () => {
 
   // TODO: investigate broken test
   test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.originPostQuantumEncryption.get({
+    const response = await client.originPostQuantumEncryption.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/origin-tls-client-auth/hostnames/certificates.test.ts b/tests/api-resources/origin-tls-client-auth/hostnames/certificates.test.ts
index 305a0b5d5c..bb97d30459 100644
--- a/tests/api-resources/origin-tls-client-auth/hostnames/certificates.test.ts
+++ b/tests/api-resources/origin-tls-client-auth/hostnames/certificates.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource certificates', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.hostnames.certificates.create({
+    const responsePromise = client.originTLSClientAuth.hostnames.certificates.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       certificate:
         '-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n',
@@ -28,7 +28,7 @@ describe('resource certificates', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.hostnames.certificates.create({
+    const response = await client.originTLSClientAuth.hostnames.certificates.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       certificate:
         '-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n',
@@ -38,7 +38,7 @@ describe('resource certificates', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.hostnames.certificates.list({
+    const responsePromise = client.originTLSClientAuth.hostnames.certificates.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -51,13 +51,13 @@ describe('resource certificates', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.hostnames.certificates.list({
+    const response = await client.originTLSClientAuth.hostnames.certificates.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.hostnames.certificates.delete(
+    const responsePromise = client.originTLSClientAuth.hostnames.certificates.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -71,14 +71,14 @@ describe('resource certificates', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.hostnames.certificates.delete(
+    const response = await client.originTLSClientAuth.hostnames.certificates.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.hostnames.certificates.get(
+    const responsePromise = client.originTLSClientAuth.hostnames.certificates.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -92,7 +92,7 @@ describe('resource certificates', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.hostnames.certificates.get(
+    const response = await client.originTLSClientAuth.hostnames.certificates.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
diff --git a/tests/api-resources/origin-tls-client-auth/hostnames/hostnames.test.ts b/tests/api-resources/origin-tls-client-auth/hostnames/hostnames.test.ts
index fcab3cc192..b62511e00b 100644
--- a/tests/api-resources/origin-tls-client-auth/hostnames/hostnames.test.ts
+++ b/tests/api-resources/origin-tls-client-auth/hostnames/hostnames.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource hostnames', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.hostnames.update({
+    const responsePromise = client.originTLSClientAuth.hostnames.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      config: [{}, {}, {}],
+      config: [{}],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,18 +25,16 @@ describe('resource hostnames', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.hostnames.update({
+    const response = await client.originTLSClientAuth.hostnames.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       config: [
         { cert_id: '2458ce5a-0c35-4c7f-82c7-8e9487d3ff60', enabled: true, hostname: 'app.example.com' },
-        { cert_id: '2458ce5a-0c35-4c7f-82c7-8e9487d3ff60', enabled: true, hostname: 'app.example.com' },
-        { cert_id: '2458ce5a-0c35-4c7f-82c7-8e9487d3ff60', enabled: true, hostname: 'app.example.com' },
       ],
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.hostnames.get('app.example.com', {
+    const responsePromise = client.originTLSClientAuth.hostnames.get('app.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -49,7 +47,7 @@ describe('resource hostnames', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.hostnames.get('app.example.com', {
+    const response = await client.originTLSClientAuth.hostnames.get('app.example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/origin-tls-client-auth/origin-tls-client-auth.test.ts b/tests/api-resources/origin-tls-client-auth/origin-tls-client-auth.test.ts
index f85a2a1bf1..e3ab10b107 100644
--- a/tests/api-resources/origin-tls-client-auth/origin-tls-client-auth.test.ts
+++ b/tests/api-resources/origin-tls-client-auth/origin-tls-client-auth.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource originTLSClientAuth', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.create({
+    const responsePromise = client.originTLSClientAuth.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       certificate:
         '-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n',
@@ -28,7 +28,7 @@ describe('resource originTLSClientAuth', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.create({
+    const response = await client.originTLSClientAuth.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       certificate:
         '-----BEGIN CERTIFICATE-----\nMIIDtTCCAp2gAwIBAgIJAMHAwfXZ5/PWMA0GCSqGSIb3DQEBCwUAMEUxCzAJBgNV\nBAYTAkFVMRMwEQYDVQQIEwpTb21lLVN0YXRlMSEwHwYDVQQKExhJbnRlcm5ldCBX\naWRnaXRzIFB0eSBMdGQwHhcNMTYwODI0MTY0MzAxWhcNMTYxMTIyMTY0MzAxWjBF\nMQswCQYDVQQGEwJBVTETMBEGA1UECBMKU29tZS1TdGF0ZTEhMB8GA1UEChMYSW50\nZXJuZXQgV2lkZ2l0cyBQdHkgTHRkMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB\nCgKCAQEAwQHoetcl9+5ikGzV6cMzWtWPJHqXT3wpbEkRU9Yz7lgvddmGdtcGbg/1\nCGZu0jJGkMoppoUo4c3dts3iwqRYmBikUP77wwY2QGmDZw2FvkJCJlKnabIRuGvB\nKwzESIXgKk2016aTP6/dAjEHyo6SeoK8lkIySUvK0fyOVlsiEsCmOpidtnKX/a+5\n0GjB79CJH4ER2lLVZnhePFR/zUOyPxZQQ4naHf7yu/b5jhO0f8fwt+pyFxIXjbEI\ndZliWRkRMtzrHOJIhrmJ2A1J7iOrirbbwillwjjNVUWPf3IJ3M12S9pEewooaeO2\nizNTERcG9HzAacbVRn2Y2SWIyT/18QIDAQABo4GnMIGkMB0GA1UdDgQWBBT/LbE4\n9rWf288N6sJA5BRb6FJIGDB1BgNVHSMEbjBsgBT/LbE49rWf288N6sJA5BRb6FJI\nGKFJpEcwRTELMAkGA1UEBhMCQVUxEzARBgNVBAgTClNvbWUtU3RhdGUxITAfBgNV\nBAoTGEludGVybmV0IFdpZGdpdHMgUHR5IEx0ZIIJAMHAwfXZ5/PWMAwGA1UdEwQF\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAHHFwl0tH0quUYZYO0dZYt4R7SJ0pCm2\n2satiyzHl4OnXcHDpekAo7/a09c6Lz6AU83cKy/+x3/djYHXWba7HpEu0dR3ugQP\nMlr4zrhd9xKZ0KZKiYmtJH+ak4OM4L3FbT0owUZPyjLSlhMtJVcoRp5CJsjAMBUG\nSvD8RX+T01wzox/Qb+lnnNnOlaWpqu8eoOenybxKp1a9ULzIVvN/LAcc+14vioFq\n2swRWtmocBAs8QR9n4uvbpiYvS8eYueDCWMM4fvFfBhaDZ3N9IbtySh3SpFdQDhw\nYbjM2rxXiyLGxB4Bol7QTv4zHif7Zt89FReT/NBy4rzaskDJY5L6xmY=\n-----END CERTIFICATE-----\n',
@@ -38,9 +38,7 @@ describe('resource originTLSClientAuth', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.originTLSClientAuth.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -51,13 +49,11 @@ describe('resource originTLSClientAuth', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.originTLSClientAuth.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.originTLSClientAuth.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -70,13 +66,13 @@ describe('resource originTLSClientAuth', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.originTLSClientAuth.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.originTLSClientAuth.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -89,7 +85,7 @@ describe('resource originTLSClientAuth', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.originTLSClientAuth.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/origin-tls-client-auth/settings.test.ts b/tests/api-resources/origin-tls-client-auth/settings.test.ts
index d83993e9d4..143fe1ea40 100644
--- a/tests/api-resources/origin-tls-client-auth/settings.test.ts
+++ b/tests/api-resources/origin-tls-client-auth/settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource settings', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.settings.update({
+    const responsePromise = client.originTLSClientAuth.settings.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       enabled: true,
     });
@@ -25,14 +25,14 @@ describe('resource settings', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.settings.update({
+    const response = await client.originTLSClientAuth.settings.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       enabled: true,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.originTLSClientAuth.settings.get({
+    const responsePromise = client.originTLSClientAuth.settings.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,7 +45,7 @@ describe('resource settings', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.originTLSClientAuth.settings.get({
+    const response = await client.originTLSClientAuth.settings.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/pagerules/pagerules.test.ts b/tests/api-resources/page-rules.test.ts
similarity index 55%
rename from tests/api-resources/pagerules/pagerules.test.ts
rename to tests/api-resources/page-rules.test.ts
index 3669ec6e55..f37479340f 100644
--- a/tests/api-resources/pagerules/pagerules.test.ts
+++ b/tests/api-resources/page-rules.test.ts
@@ -3,18 +3,19 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource pagerules', () => {
-  test('create: only required params', async () => {
-    const responsePromise = cloudflare.pagerules.create({
+describe('resource pageRules', () => {
+  // generated params are incorrect
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.pageRules.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      actions: [{}, {}, {}],
-      targets: [{ constraint: { operator: 'matches', value: '*example.com/images/*' }, target: 'url' }],
+      actions: [{}],
+      targets: [{}],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,43 +26,23 @@ describe('resource pagerules', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('create: required and optional params', async () => {
-    const response = await cloudflare.pagerules.create({
+  // generated params are incorrect
+  test.skip('create: required and optional params', async () => {
+    const response = await client.pageRules.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      actions: [
-        {
-          name: 'forward_url',
-          value: {
-            type: 'temporary',
-            url: 'http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3',
-          },
-        },
-        {
-          name: 'forward_url',
-          value: {
-            type: 'temporary',
-            url: 'http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3',
-          },
-        },
-        {
-          name: 'forward_url',
-          value: {
-            type: 'temporary',
-            url: 'http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3',
-          },
-        },
-      ],
+      actions: [{ id: 'browser_check', value: 'on' }],
       targets: [{ constraint: { operator: 'matches', value: '*example.com/images/*' }, target: 'url' }],
       priority: 0,
       status: 'active',
     });
   });
 
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.pagerules.update('023e105f4ecef8ad9ca31a8372d0c353', {
+  // generated params are incorrect
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.pageRules.update('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      actions: [{}, {}, {}],
-      targets: [{ constraint: { operator: 'matches', value: '*example.com/images/*' }, target: 'url' }],
+      actions: [{}],
+      targets: [{}],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -72,32 +53,11 @@ describe('resource pagerules', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.pagerules.update('023e105f4ecef8ad9ca31a8372d0c353', {
+  // generated params are incorrect
+  test.skip('update: required and optional params', async () => {
+    const response = await client.pageRules.update('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      actions: [
-        {
-          name: 'forward_url',
-          value: {
-            type: 'temporary',
-            url: 'http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3',
-          },
-        },
-        {
-          name: 'forward_url',
-          value: {
-            type: 'temporary',
-            url: 'http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3',
-          },
-        },
-        {
-          name: 'forward_url',
-          value: {
-            type: 'temporary',
-            url: 'http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3',
-          },
-        },
-      ],
+      actions: [{ id: 'browser_check', value: 'on' }],
       targets: [{ constraint: { operator: 'matches', value: '*example.com/images/*' }, target: 'url' }],
       priority: 0,
       status: 'active',
@@ -105,7 +65,7 @@ describe('resource pagerules', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.pagerules.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.pageRules.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -116,9 +76,9 @@ describe('resource pagerules', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.pagerules.list({
+    const response = await client.pageRules.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      direction: 'desc',
+      direction: 'asc',
       match: 'any',
       order: 'status',
       status: 'active',
@@ -126,7 +86,7 @@ describe('resource pagerules', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.pagerules.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.pageRules.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -139,13 +99,13 @@ describe('resource pagerules', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.pagerules.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.pageRules.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.pagerules.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.pageRules.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -158,31 +118,9 @@ describe('resource pagerules', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.pagerules.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.pageRules.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      actions: [
-        {
-          name: 'forward_url',
-          value: {
-            type: 'temporary',
-            url: 'http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3',
-          },
-        },
-        {
-          name: 'forward_url',
-          value: {
-            type: 'temporary',
-            url: 'http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3',
-          },
-        },
-        {
-          name: 'forward_url',
-          value: {
-            type: 'temporary',
-            url: 'http://www.example.com/somewhere/$1/astring/$2/anotherstring/$3',
-          },
-        },
-      ],
+      actions: [{ id: 'browser_check', value: 'on' }],
       priority: 0,
       status: 'active',
       targets: [{ constraint: { operator: 'matches', value: '*example.com/images/*' }, target: 'url' }],
@@ -190,7 +128,7 @@ describe('resource pagerules', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pagerules.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.pageRules.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -203,7 +141,7 @@ describe('resource pagerules', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pagerules.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.pageRules.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/page-shield/connections.test.ts b/tests/api-resources/page-shield/connections.test.ts
index 2274641b91..d18b23787e 100644
--- a/tests/api-resources/page-shield/connections.test.ts
+++ b/tests/api-resources/page-shield/connections.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource connections', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.connections.list({
+    const responsePromise = client.pageShield.connections.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource connections', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.pageShield.connections.list({
+    const response = await client.pageShield.connections.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       direction: 'asc',
       exclude_cdn_cgi: true,
@@ -42,7 +42,7 @@ describe('resource connections', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.connections.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.pageShield.connections.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -55,7 +55,7 @@ describe('resource connections', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pageShield.connections.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.pageShield.connections.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/page-shield/cookies.test.ts b/tests/api-resources/page-shield/cookies.test.ts
index df7919fc88..a9b2f5f87f 100644
--- a/tests/api-resources/page-shield/cookies.test.ts
+++ b/tests/api-resources/page-shield/cookies.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource cookies', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.cookies.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.pageShield.cookies.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,7 +22,7 @@ describe('resource cookies', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.pageShield.cookies.list({
+    const response = await client.pageShield.cookies.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       direction: 'asc',
       domain: 'example.com',
@@ -37,14 +35,14 @@ describe('resource cookies', () => {
       page_url: 'example.com/page,*/checkout,example.com/*,*checkout*',
       path: '/',
       per_page: 100,
-      same_site: 'strict',
+      same_site: 'lax',
       secure: true,
       type: 'first_party',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.cookies.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.pageShield.cookies.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -57,7 +55,7 @@ describe('resource cookies', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pageShield.cookies.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.pageShield.cookies.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/page-shield/page-shield.test.ts b/tests/api-resources/page-shield/page-shield.test.ts
index fda0aaa0f4..320725a367 100644
--- a/tests/api-resources/page-shield/page-shield.test.ts
+++ b/tests/api-resources/page-shield/page-shield.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource pageShield', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.update({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.pageShield.update({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource pageShield', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.pageShield.update({
+    const response = await client.pageShield.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       enabled: true,
       use_cloudflare_reporting_endpoint: true,
@@ -31,7 +31,7 @@ describe('resource pageShield', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.pageShield.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -42,6 +42,6 @@ describe('resource pageShield', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pageShield.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.pageShield.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/page-shield/policies.test.ts b/tests/api-resources/page-shield/policies.test.ts
index be6c9ebf34..28ebc38ff8 100644
--- a/tests/api-resources/page-shield/policies.test.ts
+++ b/tests/api-resources/page-shield/policies.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource policies', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.policies.create({
+    const responsePromise = client.pageShield.policies.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       action: 'allow',
       description: 'Checkout page CSP policy',
@@ -29,7 +29,7 @@ describe('resource policies', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.pageShield.policies.create({
+    const response = await client.pageShield.policies.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       action: 'allow',
       description: 'Checkout page CSP policy',
@@ -40,7 +40,7 @@ describe('resource policies', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.policies.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.pageShield.policies.update('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -53,7 +53,7 @@ describe('resource policies', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.pageShield.policies.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.pageShield.policies.update('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       action: 'allow',
       description: 'Checkout page CSP policy',
@@ -64,9 +64,7 @@ describe('resource policies', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.policies.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.pageShield.policies.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -77,13 +75,11 @@ describe('resource policies', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.pageShield.policies.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.pageShield.policies.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.policies.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.pageShield.policies.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -96,13 +92,13 @@ describe('resource policies', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.pageShield.policies.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.pageShield.policies.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.policies.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.pageShield.policies.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -115,7 +111,7 @@ describe('resource policies', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pageShield.policies.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.pageShield.policies.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/page-shield/scripts.test.ts b/tests/api-resources/page-shield/scripts.test.ts
index 450a031a90..94a7b8b14b 100644
--- a/tests/api-resources/page-shield/scripts.test.ts
+++ b/tests/api-resources/page-shield/scripts.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource scripts', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.scripts.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.pageShield.scripts.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,7 +22,7 @@ describe('resource scripts', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.pageShield.scripts.list({
+    const response = await client.pageShield.scripts.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       direction: 'asc',
       exclude_cdn_cgi: true,
@@ -43,7 +41,7 @@ describe('resource scripts', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pageShield.scripts.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.pageShield.scripts.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -56,7 +54,7 @@ describe('resource scripts', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pageShield.scripts.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.pageShield.scripts.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/pages/projects/deployments/deployments.test.ts b/tests/api-resources/pages/projects/deployments/deployments.test.ts
index b4c2a9381c..9d01b60b82 100644
--- a/tests/api-resources/pages/projects/deployments/deployments.test.ts
+++ b/tests/api-resources/pages/projects/deployments/deployments.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource deployments', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.deployments.create('this-is-my-project-01', {
+    const responsePromise = client.pages.projects.deployments.create('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -26,14 +26,14 @@ describe('resource deployments', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.deployments.create('this-is-my-project-01', {
+    const response = await client.pages.projects.deployments.create('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       branch: 'staging',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.deployments.list('this-is-my-project-01', {
+    const responsePromise = client.pages.projects.deployments.list('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -46,14 +46,14 @@ describe('resource deployments', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.deployments.list('this-is-my-project-01', {
+    const response = await client.pages.projects.deployments.list('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      env: 'preview',
+      env: 'production',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.deployments.delete(
+    const responsePromise = client.pages.projects.deployments.delete(
       'this-is-my-project-01',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -68,7 +68,7 @@ describe('resource deployments', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.deployments.delete(
+    const response = await client.pages.projects.deployments.delete(
       'this-is-my-project-01',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -76,7 +76,7 @@ describe('resource deployments', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.deployments.get(
+    const responsePromise = client.pages.projects.deployments.get(
       'this-is-my-project-01',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -91,7 +91,7 @@ describe('resource deployments', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.deployments.get(
+    const response = await client.pages.projects.deployments.get(
       'this-is-my-project-01',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -99,7 +99,7 @@ describe('resource deployments', () => {
   });
 
   test('retry: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.deployments.retry(
+    const responsePromise = client.pages.projects.deployments.retry(
       'this-is-my-project-01',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
@@ -114,7 +114,7 @@ describe('resource deployments', () => {
   });
 
   test('retry: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.deployments.retry(
+    const response = await client.pages.projects.deployments.retry(
       'this-is-my-project-01',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
@@ -122,7 +122,7 @@ describe('resource deployments', () => {
   });
 
   test('rollback: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.deployments.rollback(
+    const responsePromise = client.pages.projects.deployments.rollback(
       'this-is-my-project-01',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
@@ -137,7 +137,7 @@ describe('resource deployments', () => {
   });
 
   test('rollback: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.deployments.rollback(
+    const response = await client.pages.projects.deployments.rollback(
       'this-is-my-project-01',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
diff --git a/tests/api-resources/pages/projects/deployments/history/logs.test.ts b/tests/api-resources/pages/projects/deployments/history/logs.test.ts
index 144ee767df..51033fd86f 100644
--- a/tests/api-resources/pages/projects/deployments/history/logs.test.ts
+++ b/tests/api-resources/pages/projects/deployments/history/logs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource logs', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.deployments.history.logs.get(
+    const responsePromise = client.pages.projects.deployments.history.logs.get(
       'this-is-my-project-01',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -26,7 +26,7 @@ describe('resource logs', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.deployments.history.logs.get(
+    const response = await client.pages.projects.deployments.history.logs.get(
       'this-is-my-project-01',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/pages/projects/domains.test.ts b/tests/api-resources/pages/projects/domains.test.ts
index 39c560e523..4cda20fd3f 100644
--- a/tests/api-resources/pages/projects/domains.test.ts
+++ b/tests/api-resources/pages/projects/domains.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource domains', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.domains.create('this-is-my-project-01', {
+    const responsePromise = client.pages.projects.domains.create('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: { name: 'example.com' },
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,14 +24,14 @@ describe('resource domains', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.domains.create('this-is-my-project-01', {
+    const response = await client.pages.projects.domains.create('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: { name: 'example.com' },
+      name: 'example.com',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.domains.list('this-is-my-project-01', {
+    const responsePromise = client.pages.projects.domains.list('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,13 +44,13 @@ describe('resource domains', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.domains.list('this-is-my-project-01', {
+    const response = await client.pages.projects.domains.list('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.domains.delete(
+    const responsePromise = client.pages.projects.domains.delete(
       'this-is-my-project-01',
       'this-is-my-domain-01.com',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -66,7 +65,7 @@ describe('resource domains', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.domains.delete(
+    const response = await client.pages.projects.domains.delete(
       'this-is-my-project-01',
       'this-is-my-domain-01.com',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -74,7 +73,7 @@ describe('resource domains', () => {
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.domains.edit(
+    const responsePromise = client.pages.projects.domains.edit(
       'this-is-my-project-01',
       'this-is-my-domain-01.com',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
@@ -89,7 +88,7 @@ describe('resource domains', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.domains.edit(
+    const response = await client.pages.projects.domains.edit(
       'this-is-my-project-01',
       'this-is-my-domain-01.com',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: {} },
@@ -97,7 +96,7 @@ describe('resource domains', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.domains.get(
+    const responsePromise = client.pages.projects.domains.get(
       'this-is-my-project-01',
       'this-is-my-domain-01.com',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -112,7 +111,7 @@ describe('resource domains', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.domains.get(
+    const response = await client.pages.projects.domains.get(
       'this-is-my-project-01',
       'this-is-my-domain-01.com',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/pages/projects/projects.test.ts b/tests/api-resources/pages/projects/projects.test.ts
index fddeda4c67..25e4aa99ff 100644
--- a/tests/api-resources/pages/projects/projects.test.ts
+++ b/tests/api-resources/pages/projects/projects.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource projects', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.create({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.pages.projects.create({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,7 +22,7 @@ describe('resource projects', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.create({
+    const response = await client.pages.projects.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       build_config: {
         build_caching: true,
@@ -34,17 +32,16 @@ describe('resource projects', () => {
         web_analytics_tag: 'cee1c73f6e4743d0b5e6bb1a0bcaabcc',
         web_analytics_token: '021e1057c18547eca7b79f2516f06o7x',
       },
-      canonical_deployment: {},
       deployment_configs: {
         preview: {
-          ai_bindings: { AI_BINDING: { project_id: {} } },
+          ai_bindings: { AI_BINDING: { project_id: 'some-project-id' } },
           analytics_engine_datasets: { ANALYTICS_ENGINE_BINDING: { dataset: 'api_analytics' } },
           browsers: { BROWSER: {} },
           compatibility_date: '2022-01-01',
           compatibility_flags: ['url_standard'],
           d1_databases: { D1_BINDING: { id: '445e2955-951a-43f8-a35b-a4d0c8138f63' } },
           durable_object_namespaces: { DO_BINDING: { namespace_id: '5eb63bbbe01eeed093cb22bb8f5acdc3' } },
-          env_vars: { ENVIRONMENT_VARIABLE: { type: 'plain_text', value: 'hello world' } },
+          env_vars: { foo: { value: 'hello world', type: 'plain_text' } },
           hyperdrive_bindings: { HYPERDRIVE: { id: 'a76a99bc342644deb02c38d66082262a' } },
           kv_namespaces: { KV_BINDING: { namespace_id: '5eb63bbbe01eeed093cb22bb8f5acdc3' } },
           mtls_certificates: { MTLS: { certificate_id: 'd7cdd17c-916f-4cb7-aabe-585eb382ec4e' } },
@@ -61,14 +58,14 @@ describe('resource projects', () => {
           vectorize_bindings: { VECTORIZE: { index_name: 'my_index' } },
         },
         production: {
-          ai_bindings: { AI_BINDING: { project_id: {} } },
+          ai_bindings: { AI_BINDING: { project_id: 'some-project-id' } },
           analytics_engine_datasets: { ANALYTICS_ENGINE_BINDING: { dataset: 'api_analytics' } },
           browsers: { BROWSER: {} },
           compatibility_date: '2022-01-01',
           compatibility_flags: ['url_standard'],
           d1_databases: { D1_BINDING: { id: '445e2955-951a-43f8-a35b-a4d0c8138f63' } },
           durable_object_namespaces: { DO_BINDING: { namespace_id: '5eb63bbbe01eeed093cb22bb8f5acdc3' } },
-          env_vars: { ENVIRONMENT_VARIABLE: { type: 'plain_text', value: 'hello world' } },
+          env_vars: { foo: { value: 'hello world', type: 'plain_text' } },
           hyperdrive_bindings: { HYPERDRIVE: { id: 'a76a99bc342644deb02c38d66082262a' } },
           kv_namespaces: { KV_BINDING: { namespace_id: '5eb63bbbe01eeed093cb22bb8f5acdc3' } },
           mtls_certificates: { MTLS: { certificate_id: 'd7cdd17c-916f-4cb7-aabe-585eb382ec4e' } },
@@ -85,16 +82,13 @@ describe('resource projects', () => {
           vectorize_bindings: { VECTORIZE: { index_name: 'my_index' } },
         },
       },
-      latest_deployment: {},
       name: 'NextJS Blog',
       production_branch: 'main',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.pages.projects.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -105,11 +99,11 @@ describe('resource projects', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.pages.projects.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.delete('this-is-my-project-01', {
+    const responsePromise = client.pages.projects.delete('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -122,27 +116,14 @@ describe('resource projects', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.delete('this-is-my-project-01', {
+    const response = await client.pages.projects.delete('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.edit('this-is-my-project-01', {
+    const responsePromise = client.pages.projects.edit('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: {
-        deployment_configs: {
-          production: {
-            compatibility_date: '2022-01-01',
-            compatibility_flags: ['url_standard'],
-            env_vars: {
-              BUILD_VERSION: { value: '3.3' },
-              delete_this_env_var: null,
-              secret_var: { type: 'secret_text', value: 'A_CMS_API_TOKEN' },
-            },
-          },
-        },
-      },
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -154,26 +135,73 @@ describe('resource projects', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.edit('this-is-my-project-01', {
+    const response = await client.pages.projects.edit('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: {
-        deployment_configs: {
-          production: {
-            compatibility_date: '2022-01-01',
-            compatibility_flags: ['url_standard'],
-            env_vars: {
-              BUILD_VERSION: { value: '3.3' },
-              delete_this_env_var: null,
-              secret_var: { type: 'secret_text', value: 'A_CMS_API_TOKEN' },
+      build_config: {
+        build_caching: true,
+        build_command: 'npm run build',
+        destination_dir: 'build',
+        root_dir: '/',
+        web_analytics_tag: 'cee1c73f6e4743d0b5e6bb1a0bcaabcc',
+        web_analytics_token: '021e1057c18547eca7b79f2516f06o7x',
+      },
+      deployment_configs: {
+        preview: {
+          ai_bindings: { AI_BINDING: { project_id: 'some-project-id' } },
+          analytics_engine_datasets: { ANALYTICS_ENGINE_BINDING: { dataset: 'api_analytics' } },
+          browsers: { BROWSER: {} },
+          compatibility_date: '2022-01-01',
+          compatibility_flags: ['url_standard'],
+          d1_databases: { D1_BINDING: { id: '445e2955-951a-43f8-a35b-a4d0c8138f63' } },
+          durable_object_namespaces: { DO_BINDING: { namespace_id: '5eb63bbbe01eeed093cb22bb8f5acdc3' } },
+          env_vars: { foo: { value: 'hello world', type: 'plain_text' } },
+          hyperdrive_bindings: { HYPERDRIVE: { id: 'a76a99bc342644deb02c38d66082262a' } },
+          kv_namespaces: { KV_BINDING: { namespace_id: '5eb63bbbe01eeed093cb22bb8f5acdc3' } },
+          mtls_certificates: { MTLS: { certificate_id: 'd7cdd17c-916f-4cb7-aabe-585eb382ec4e' } },
+          placement: { mode: 'smart' },
+          queue_producers: { QUEUE_PRODUCER_BINDING: { name: 'some-queue' } },
+          r2_buckets: { R2_BINDING: { jurisdiction: 'eu', name: 'some-bucket' } },
+          services: {
+            SERVICE_BINDING: {
+              entrypoint: 'MyHandler',
+              environment: 'production',
+              service: 'example-worker',
+            },
+          },
+          vectorize_bindings: { VECTORIZE: { index_name: 'my_index' } },
+        },
+        production: {
+          ai_bindings: { AI_BINDING: { project_id: 'some-project-id' } },
+          analytics_engine_datasets: { ANALYTICS_ENGINE_BINDING: { dataset: 'api_analytics' } },
+          browsers: { BROWSER: {} },
+          compatibility_date: '2022-01-01',
+          compatibility_flags: ['url_standard'],
+          d1_databases: { D1_BINDING: { id: '445e2955-951a-43f8-a35b-a4d0c8138f63' } },
+          durable_object_namespaces: { DO_BINDING: { namespace_id: '5eb63bbbe01eeed093cb22bb8f5acdc3' } },
+          env_vars: { foo: { value: 'hello world', type: 'plain_text' } },
+          hyperdrive_bindings: { HYPERDRIVE: { id: 'a76a99bc342644deb02c38d66082262a' } },
+          kv_namespaces: { KV_BINDING: { namespace_id: '5eb63bbbe01eeed093cb22bb8f5acdc3' } },
+          mtls_certificates: { MTLS: { certificate_id: 'd7cdd17c-916f-4cb7-aabe-585eb382ec4e' } },
+          placement: { mode: 'smart' },
+          queue_producers: { QUEUE_PRODUCER_BINDING: { name: 'some-queue' } },
+          r2_buckets: { R2_BINDING: { jurisdiction: 'eu', name: 'some-bucket' } },
+          services: {
+            SERVICE_BINDING: {
+              entrypoint: 'MyHandler',
+              environment: 'production',
+              service: 'example-worker',
             },
           },
+          vectorize_bindings: { VECTORIZE: { index_name: 'my_index' } },
         },
       },
+      name: 'NextJS Blog',
+      production_branch: 'main',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.get('this-is-my-project-01', {
+    const responsePromise = client.pages.projects.get('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -186,13 +214,13 @@ describe('resource projects', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.get('this-is-my-project-01', {
+    const response = await client.pages.projects.get('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('purgeBuildCache: only required params', async () => {
-    const responsePromise = cloudflare.pages.projects.purgeBuildCache('this-is-my-project-01', {
+    const responsePromise = client.pages.projects.purgeBuildCache('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -205,7 +233,7 @@ describe('resource projects', () => {
   });
 
   test('purgeBuildCache: required and optional params', async () => {
-    const response = await cloudflare.pages.projects.purgeBuildCache('this-is-my-project-01', {
+    const response = await client.pages.projects.purgeBuildCache('this-is-my-project-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/queues/consumers.test.ts b/tests/api-resources/queues/consumers.test.ts
index 8066d674ac..8bc8cf6a3a 100644
--- a/tests/api-resources/queues/consumers.test.ts
+++ b/tests/api-resources/queues/consumers.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,15 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource consumers', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.queues.consumers.create('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.queues.consumers.create('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: {
-        dead_letter_queue: 'example-dlq',
-        environment: 'production',
-        script_name: 'example-consumer',
-        settings: { batch_size: 10, max_retries: 3, max_wait_time_ms: 5000 },
-        type: 'worker',
-      },
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -31,31 +24,26 @@ describe('resource consumers', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.queues.consumers.create('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.queues.consumers.create('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: {
-        dead_letter_queue: 'example-dlq',
-        environment: 'production',
-        script_name: 'example-consumer',
-        settings: { batch_size: 10, max_retries: 3, max_wait_time_ms: 5000 },
-        type: 'worker',
+      dead_letter_queue: 'example-queue',
+      script_name: 'my-consumer-worker',
+      settings: {
+        batch_size: 50,
+        max_concurrency: 10,
+        max_retries: 3,
+        max_wait_time_ms: 5000,
+        retry_delay: 10,
       },
+      type: 'worker',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.queues.consumers.update(
+    const responsePromise = client.queues.consumers.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
-      {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        body: {
-          dead_letter_queue: 'updated-example-dlq',
-          environment: 'production',
-          script_name: 'example-consumer',
-          settings: { batch_size: 100 },
-        },
-      },
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -67,23 +55,27 @@ describe('resource consumers', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.queues.consumers.update(
+    const response = await client.queues.consumers.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        body: {
-          dead_letter_queue: 'updated-example-dlq',
-          environment: 'production',
-          script_name: 'example-consumer',
-          settings: { batch_size: 100 },
+        dead_letter_queue: 'example-queue',
+        script_name: 'my-consumer-worker',
+        settings: {
+          batch_size: 50,
+          max_concurrency: 10,
+          max_retries: 3,
+          max_wait_time_ms: 5000,
+          retry_delay: 10,
         },
+        type: 'worker',
       },
     );
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.queues.consumers.delete(
+    const responsePromise = client.queues.consumers.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -98,7 +90,7 @@ describe('resource consumers', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.queues.consumers.delete(
+    const response = await client.queues.consumers.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -106,7 +98,7 @@ describe('resource consumers', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.queues.consumers.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.queues.consumers.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -119,7 +111,7 @@ describe('resource consumers', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.queues.consumers.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.queues.consumers.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/queues/messages.test.ts b/tests/api-resources/queues/messages.test.ts
index d43310916a..681ca31693 100644
--- a/tests/api-resources/queues/messages.test.ts
+++ b/tests/api-resources/queues/messages.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource messages', () => {
   test('ack: only required params', async () => {
-    const responsePromise = cloudflare.queues.messages.ack('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.queues.messages.ack('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,21 +24,13 @@ describe('resource messages', () => {
   });
 
   test('ack: required and optional params', async () => {
-    const response = await cloudflare.queues.messages.ack('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.queues.messages.ack('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       acks: [
         {
           lease_id:
             'eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0',
         },
-        {
-          lease_id:
-            'eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0',
-        },
-        {
-          lease_id:
-            'eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0',
-        },
       ],
       retries: [
         {
@@ -46,22 +38,12 @@ describe('resource messages', () => {
           lease_id:
             'eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0',
         },
-        {
-          delay_seconds: 10,
-          lease_id:
-            'eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0',
-        },
-        {
-          delay_seconds: 10,
-          lease_id:
-            'eyJhbGciOiJkaXIiLCJlbmMiOiJBMjU2Q0JDLUhTNTEyIn0..Q8p21d7dceR6vUfwftONdQ.JVqZgAS-Zk7MqmqccYtTHeeMElNHaOMigeWdb8LyMOg.T2_HV99CYzGaQuhTyW8RsgbnpTRZHRM6N7UoSaAKeK0',
-        },
       ],
     });
   });
 
   test('pull: only required params', async () => {
-    const responsePromise = cloudflare.queues.messages.pull('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.queues.messages.pull('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -74,10 +56,10 @@ describe('resource messages', () => {
   });
 
   test('pull: required and optional params', async () => {
-    const response = await cloudflare.queues.messages.pull('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.queues.messages.pull('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      batch_size: 10,
-      visibility_timeout_ms: 1000,
+      batch_size: 50,
+      visibility_timeout_ms: 6000,
     });
   });
 });
diff --git a/tests/api-resources/queues/queues.test.ts b/tests/api-resources/queues/queues.test.ts
index 306255ccd7..3a24ff3fbd 100644
--- a/tests/api-resources/queues/queues.test.ts
+++ b/tests/api-resources/queues/queues.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource queues', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.queues.create({
+    const responsePromise = client.queues.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: { queue_name: 'example-queue' },
+      queue_name: 'example-queue',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,16 +25,15 @@ describe('resource queues', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.queues.create({
+    const response = await client.queues.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: { queue_name: 'example-queue' },
+      queue_name: 'example-queue',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.queues.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.queues.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: { queue_name: 'renamed-example-queue' },
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -46,14 +45,15 @@ describe('resource queues', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.queues.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.queues.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: { queue_name: 'renamed-example-queue' },
+      queue_name: 'example-queue',
+      settings: { delivery_delay: 5, message_retention_period: 345600 },
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.queues.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.queues.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -64,11 +64,11 @@ describe('resource queues', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.queues.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.queues.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.queues.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.queues.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -81,13 +81,13 @@ describe('resource queues', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.queues.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.queues.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.queues.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.queues.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -100,7 +100,7 @@ describe('resource queues', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.queues.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.queues.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/r2/buckets/buckets.test.ts b/tests/api-resources/r2/buckets/buckets.test.ts
new file mode 100644
index 0000000000..b0baf78fc7
--- /dev/null
+++ b/tests/api-resources/r2/buckets/buckets.test.ts
@@ -0,0 +1,108 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource buckets', () => {
+  // TODO: investigate broken test
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.r2.buckets.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'example-bucket',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('create: required and optional params', async () => {
+    const response = await client.r2.buckets.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'example-bucket',
+      locationHint: 'apac',
+      storageClass: 'Standard',
+      jurisdiction: 'default',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.r2.buckets.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('list: required and optional params', async () => {
+    const response = await client.r2.buckets.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      cursor: 'cursor',
+      direction: 'asc',
+      name_contains: 'my-bucket',
+      order: 'name',
+      per_page: 1,
+      start_after: 'my-bucket',
+      jurisdiction: 'default',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('delete: only required params', async () => {
+    const responsePromise = client.r2.buckets.delete('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('delete: required and optional params', async () => {
+    const response = await client.r2.buckets.delete('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      jurisdiction: 'default',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.r2.buckets.get('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: required and optional params', async () => {
+    const response = await client.r2.buckets.get('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      jurisdiction: 'default',
+    });
+  });
+});
diff --git a/tests/api-resources/r2/buckets/cors.test.ts b/tests/api-resources/r2/buckets/cors.test.ts
new file mode 100644
index 0000000000..89d09e9d8e
--- /dev/null
+++ b/tests/api-resources/r2/buckets/cors.test.ts
@@ -0,0 +1,86 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource cors', () => {
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.r2.buckets.cors.update('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.r2.buckets.cors.update('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      rules: [
+        {
+          allowed: { methods: ['GET'], origins: ['http://localhost:3000'], headers: ['x-requested-by'] },
+          id: 'Allow Local Development',
+          exposeHeaders: ['Content-Encoding'],
+          maxAgeSeconds: 3600,
+        },
+      ],
+      jurisdiction: 'default',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('delete: only required params', async () => {
+    const responsePromise = client.r2.buckets.cors.delete('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('delete: required and optional params', async () => {
+    const response = await client.r2.buckets.cors.delete('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      jurisdiction: 'default',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.r2.buckets.cors.get('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: required and optional params', async () => {
+    const response = await client.r2.buckets.cors.get('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      jurisdiction: 'default',
+    });
+  });
+});
diff --git a/tests/api-resources/r2/buckets/domains/custom.test.ts b/tests/api-resources/r2/buckets/domains/custom.test.ts
new file mode 100644
index 0000000000..3483661ac4
--- /dev/null
+++ b/tests/api-resources/r2/buckets/domains/custom.test.ts
@@ -0,0 +1,143 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource custom', () => {
+  // TODO: investigate broken test
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.r2.buckets.domains.custom.create('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      domain: 'prefix.example-domain.com',
+      enabled: true,
+      zoneId: '36ca64a6d92827b8a6b90be344bb1bfd',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('create: required and optional params', async () => {
+    const response = await client.r2.buckets.domains.custom.create('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      domain: 'prefix.example-domain.com',
+      enabled: true,
+      zoneId: '36ca64a6d92827b8a6b90be344bb1bfd',
+      minTLS: '1.0',
+      jurisdiction: 'default',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.r2.buckets.domains.custom.update(
+      'example-bucket',
+      'example-domain/custom-domain.com',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.r2.buckets.domains.custom.update(
+      'example-bucket',
+      'example-domain/custom-domain.com',
+      {
+        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+        enabled: true,
+        minTLS: '1.0',
+        jurisdiction: 'default',
+      },
+    );
+  });
+
+  // TODO: investigate broken test
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.r2.buckets.domains.custom.list('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('list: required and optional params', async () => {
+    const response = await client.r2.buckets.domains.custom.list('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      jurisdiction: 'default',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('delete: only required params', async () => {
+    const responsePromise = client.r2.buckets.domains.custom.delete(
+      'example-bucket',
+      'example-domain/custom-domain.com',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('delete: required and optional params', async () => {
+    const response = await client.r2.buckets.domains.custom.delete(
+      'example-bucket',
+      'example-domain/custom-domain.com',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', jurisdiction: 'default' },
+    );
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.r2.buckets.domains.custom.get(
+      'example-bucket',
+      'example-domain/custom-domain.com',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: required and optional params', async () => {
+    const response = await client.r2.buckets.domains.custom.get(
+      'example-bucket',
+      'example-domain/custom-domain.com',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', jurisdiction: 'default' },
+    );
+  });
+});
diff --git a/tests/api-resources/r2/buckets/domains/managed.test.ts b/tests/api-resources/r2/buckets/domains/managed.test.ts
new file mode 100644
index 0000000000..1849363ea7
--- /dev/null
+++ b/tests/api-resources/r2/buckets/domains/managed.test.ts
@@ -0,0 +1,58 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource managed', () => {
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.r2.buckets.domains.managed.update('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      enabled: true,
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.r2.buckets.domains.managed.update('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      enabled: true,
+      jurisdiction: 'default',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.r2.buckets.domains.managed.list('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('list: required and optional params', async () => {
+    const response = await client.r2.buckets.domains.managed.list('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      jurisdiction: 'default',
+    });
+  });
+});
diff --git a/tests/api-resources/r2/buckets/event-notifications/configuration/configuration.test.ts b/tests/api-resources/r2/buckets/event-notifications/configuration/configuration.test.ts
new file mode 100644
index 0000000000..3a1a7eb0dc
--- /dev/null
+++ b/tests/api-resources/r2/buckets/event-notifications/configuration/configuration.test.ts
@@ -0,0 +1,34 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource configuration', () => {
+  // TODO: investigate auth errors on test suite
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.r2.buckets.eventNotifications.configuration.get('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('get: required and optional params', async () => {
+    const response = await client.r2.buckets.eventNotifications.configuration.get('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      jurisdiction: 'default',
+    });
+  });
+});
diff --git a/tests/api-resources/event-notifications/r2/configuration/queues.test.ts b/tests/api-resources/r2/buckets/event-notifications/configuration/queues.test.ts
similarity index 50%
rename from tests/api-resources/event-notifications/r2/configuration/queues.test.ts
rename to tests/api-resources/r2/buckets/event-notifications/configuration/queues.test.ts
index 34b1fdc2c2..7e247fb229 100644
--- a/tests/api-resources/event-notifications/r2/configuration/queues.test.ts
+++ b/tests/api-resources/r2/buckets/event-notifications/configuration/queues.test.ts
@@ -3,17 +3,18 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource queues', () => {
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.eventNotifications.r2.configuration.queues.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
+  // TODO: investigate auth errors on test suite
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.r2.buckets.eventNotifications.configuration.queues.update(
+      'example-bucket',
+      'queue_id',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
@@ -25,25 +26,31 @@ describe('resource queues', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.eventNotifications.r2.configuration.queues.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
+  // TODO: investigate auth errors on test suite
+  test.skip('update: required and optional params', async () => {
+    const response = await client.r2.buckets.eventNotifications.configuration.queues.update(
+      'example-bucket',
+      'queue_id',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
         rules: [
-          { actions: ['PutObject', 'CopyObject'], prefix: 'img/', suffix: '.jpeg' },
-          { actions: ['PutObject', 'CopyObject'], prefix: 'img/', suffix: '.jpeg' },
-          { actions: ['PutObject', 'CopyObject'], prefix: 'img/', suffix: '.jpeg' },
+          {
+            actions: ['PutObject', 'CopyObject'],
+            description: 'Notifications from source bucket to queue',
+            prefix: 'img/',
+            suffix: '.jpeg',
+          },
         ],
+        jurisdiction: 'default',
       },
     );
   });
 
-  test('delete: only required params', async () => {
-    const responsePromise = cloudflare.eventNotifications.r2.configuration.queues.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
+  // TODO: investigate auth errors on test suite
+  test.skip('delete: only required params', async () => {
+    const responsePromise = client.r2.buckets.eventNotifications.configuration.queues.delete(
+      'example-bucket',
+      'queue_id',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
@@ -55,11 +62,12 @@ describe('resource queues', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: required and optional params', async () => {
-    const response = await cloudflare.eventNotifications.r2.configuration.queues.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+  // TODO: investigate auth errors on test suite
+  test.skip('delete: required and optional params', async () => {
+    const response = await client.r2.buckets.eventNotifications.configuration.queues.delete(
+      'example-bucket',
+      'queue_id',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', jurisdiction: 'default' },
     );
   });
 });
diff --git a/tests/api-resources/r2/buckets/lifecycle.test.ts b/tests/api-resources/r2/buckets/lifecycle.test.ts
new file mode 100644
index 0000000000..5f6392a496
--- /dev/null
+++ b/tests/api-resources/r2/buckets/lifecycle.test.ts
@@ -0,0 +1,68 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource lifecycle', () => {
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.r2.buckets.lifecycle.update('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.r2.buckets.lifecycle.update('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      rules: [
+        {
+          id: 'Expire all objects older than 24 hours',
+          conditions: { prefix: 'prefix' },
+          enabled: true,
+          abortMultipartUploadsTransition: { condition: { maxAge: 0, type: 'Age' } },
+          deleteObjectsTransition: { condition: { maxAge: 0, type: 'Age' } },
+          storageClassTransitions: [
+            { condition: { maxAge: 0, type: 'Age' }, storageClass: 'InfrequentAccess' },
+          ],
+        },
+      ],
+      jurisdiction: 'default',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.r2.buckets.lifecycle.get('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: required and optional params', async () => {
+    const response = await client.r2.buckets.lifecycle.get('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      jurisdiction: 'default',
+    });
+  });
+});
diff --git a/tests/api-resources/r2/buckets/sippy.test.ts b/tests/api-resources/r2/buckets/sippy.test.ts
new file mode 100644
index 0000000000..0b9a8df818
--- /dev/null
+++ b/tests/api-resources/r2/buckets/sippy.test.ts
@@ -0,0 +1,86 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource sippy', () => {
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.r2.buckets.sippy.update('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.r2.buckets.sippy.update('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      destination: { accessKeyId: 'accessKeyId', provider: 'r2', secretAccessKey: 'secretAccessKey' },
+      source: {
+        accessKeyId: 'accessKeyId',
+        bucket: 'bucket',
+        provider: 'aws',
+        region: 'region',
+        secretAccessKey: 'secretAccessKey',
+      },
+      jurisdiction: 'default',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('delete: only required params', async () => {
+    const responsePromise = client.r2.buckets.sippy.delete('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('delete: required and optional params', async () => {
+    const response = await client.r2.buckets.sippy.delete('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      jurisdiction: 'default',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.r2.buckets.sippy.get('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: required and optional params', async () => {
+    const response = await client.r2.buckets.sippy.get('example-bucket', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      jurisdiction: 'default',
+    });
+  });
+});
diff --git a/tests/api-resources/r2/temporary-credentials.test.ts b/tests/api-resources/r2/temporary-credentials.test.ts
index 0128865754..ead58de69f 100644
--- a/tests/api-resources/r2/temporary-credentials.test.ts
+++ b/tests/api-resources/r2/temporary-credentials.test.ts
@@ -3,19 +3,20 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource temporaryCredentials', () => {
-  test('create: only required params', async () => {
-    const responsePromise = cloudflare.r2.temporaryCredentials.create({
+  // TODO: investigate broken test
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.r2.temporaryCredentials.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       bucket: 'example-bucket',
       parentAccessKeyId: 'example-access-key-id',
-      permission: 'object-read-write',
+      permission: 'admin-read-write',
       ttlSeconds: 3600,
     });
     const rawResponse = await responsePromise.asResponse();
@@ -27,12 +28,13 @@ describe('resource temporaryCredentials', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('create: required and optional params', async () => {
-    const response = await cloudflare.r2.temporaryCredentials.create({
+  // TODO: investigate broken test
+  test.skip('create: required and optional params', async () => {
+    const response = await client.r2.temporaryCredentials.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       bucket: 'example-bucket',
       parentAccessKeyId: 'example-access-key-id',
-      permission: 'object-read-write',
+      permission: 'admin-read-write',
       ttlSeconds: 3600,
       objects: ['example-object'],
       prefixes: ['example-prefix/'],
diff --git a/tests/api-resources/url-scanner/url-scanner.test.ts b/tests/api-resources/radar/ai/bots/summary.test.ts
similarity index 50%
rename from tests/api-resources/url-scanner/url-scanner.test.ts
rename to tests/api-resources/radar/ai/bots/summary.test.ts
index 6ed95d79b5..3ea96ec3a9 100644
--- a/tests/api-resources/url-scanner/url-scanner.test.ts
+++ b/tests/api-resources/radar/ai/bots/summary.test.ts
@@ -3,15 +3,15 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource urlScanner', () => {
-  test('scan', async () => {
-    const responsePromise = cloudflare.urlScanner.scan('accountId');
+describe('resource summary', () => {
+  test('userAgent', async () => {
+    const responsePromise = client.radar.ai.bots.summary.userAgent();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,37 +21,27 @@ describe('resource urlScanner', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('scan: request options instead of params are passed correctly', async () => {
+  test('userAgent: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.urlScanner.scan('accountId', { path: '/_stainless_unknown_path' }),
+      client.radar.ai.bots.summary.userAgent({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
-  test('scan: request options and params are passed correctly', async () => {
+  test('userAgent: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.urlScanner.scan(
-        'accountId',
+      client.radar.ai.bots.summary.userAgent(
         {
-          account_scans: true,
-          asn: '13335',
-          date_end: '2019-12-27T18:11:19.117Z',
-          date_start: '2019-12-27T18:11:19.117Z',
-          hash: 'hash',
-          hostname: 'example.com',
-          ip: '1.1.1.1',
-          is_malicious: true,
-          limit: 100,
-          next_cursor: 'next_cursor',
-          page_asn: 'page_asn',
-          page_hostname: 'page_hostname',
-          page_ip: 'page_ip',
-          page_path: 'page_path',
-          page_url: 'page_url',
-          path: '/samples/subresource-integrity/',
-          scanId: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
-          url: 'https://example.com/?hello',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          format: 'JSON',
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/ai/timeseries-groups.test.ts b/tests/api-resources/radar/ai/timeseries-groups.test.ts
new file mode 100644
index 0000000000..3f0123c540
--- /dev/null
+++ b/tests/api-resources/radar/ai/timeseries-groups.test.ts
@@ -0,0 +1,51 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource timeseriesGroups', () => {
+  test('userAgent', async () => {
+    const responsePromise = client.radar.ai.timeseriesGroups.userAgent();
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('userAgent: request options instead of params are passed correctly', async () => {
+    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
+    await expect(
+      client.radar.ai.timeseriesGroups.userAgent({ path: '/_stainless_unknown_path' }),
+    ).rejects.toThrow(Cloudflare.NotFoundError);
+  });
+
+  test('userAgent: request options and params are passed correctly', async () => {
+    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
+    await expect(
+      client.radar.ai.timeseriesGroups.userAgent(
+        {
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          format: 'JSON',
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
+        },
+        { path: '/_stainless_unknown_path' },
+      ),
+    ).rejects.toThrow(Cloudflare.NotFoundError);
+  });
+});
diff --git a/tests/api-resources/plans.test.ts b/tests/api-resources/radar/annotations/annotations.test.ts
similarity index 50%
rename from tests/api-resources/plans.test.ts
rename to tests/api-resources/radar/annotations/annotations.test.ts
index 2f351e3003..b084ebd82f 100644
--- a/tests/api-resources/plans.test.ts
+++ b/tests/api-resources/radar/annotations/annotations.test.ts
@@ -3,15 +3,15 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource plans', () => {
+describe('resource annotations', () => {
   test('list', async () => {
-    const responsePromise = cloudflare.plans.list('023e105f4ecef8ad9ca31a8372d0c353');
+    const responsePromise = client.radar.annotations.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,31 +23,27 @@ describe('resource plans', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.plans.list('023e105f4ecef8ad9ca31a8372d0c353', { path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('get', async () => {
-    const responsePromise = cloudflare.plans.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    await expect(client.radar.annotations.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
     );
-    const rawResponse = await responsePromise.asResponse();
-    expect(rawResponse).toBeInstanceOf(Response);
-    const response = await responsePromise;
-    expect(response).not.toBeInstanceOf(Response);
-    const dataAndResponse = await responsePromise.withResponse();
-    expect(dataAndResponse.data).toBe(response);
-    expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
+  test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.plans.get('023e105f4ecef8ad9ca31a8372d0c353', '023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
+      client.radar.annotations.list(
+        {
+          asn: 174,
+          dateEnd: '2023-09-01T11:41:33.782Z',
+          dateRange: '7d',
+          dateStart: '2023-09-01T11:41:33.782Z',
+          format: 'JSON',
+          limit: 5,
+          location: 'US',
+          offset: 0,
+        },
+        { path: '/_stainless_unknown_path' },
+      ),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 });
diff --git a/tests/api-resources/radar/annotations/outages.test.ts b/tests/api-resources/radar/annotations/outages.test.ts
index 1020782a90..fd00a708b5 100644
--- a/tests/api-resources/radar/annotations/outages.test.ts
+++ b/tests/api-resources/radar/annotations/outages.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource outages', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.annotations.outages.get();
+    const responsePromise = client.radar.annotations.outages.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,15 +23,15 @@ describe('resource outages', () => {
 
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.annotations.outages.get({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.annotations.outages.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.annotations.outages.get(
+      client.radar.annotations.outages.get(
         {
           asn: 174,
           dateEnd: '2023-09-01T11:41:33.782Z',
@@ -48,7 +48,7 @@ describe('resource outages', () => {
   });
 
   test('locations', async () => {
-    const responsePromise = cloudflare.radar.annotations.outages.locations();
+    const responsePromise = client.radar.annotations.outages.locations();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -61,14 +61,14 @@ describe('resource outages', () => {
   test('locations: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.annotations.outages.locations({ path: '/_stainless_unknown_path' }),
+      client.radar.annotations.outages.locations({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('locations: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.annotations.outages.locations(
+      client.radar.annotations.outages.locations(
         {
           dateEnd: '2023-09-01T11:41:33.782Z',
           dateRange: '7d',
diff --git a/tests/api-resources/radar/as112/as112.test.ts b/tests/api-resources/radar/as112/as112.test.ts
index 1c71540bce..a91dbf951a 100644
--- a/tests/api-resources/radar/as112/as112.test.ts
+++ b/tests/api-resources/radar/as112/as112.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource as112', () => {
   test('timeseries', async () => {
-    const responsePromise = cloudflare.radar.as112.timeseries();
+    const responsePromise = client.radar.as112.timeseries();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource as112', () => {
 
   test('timeseries: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.as112.timeseries({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.as112.timeseries({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,17 +31,17 @@ describe('resource as112', () => {
   test('timeseries: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseries(
+      client.radar.as112.timeseries(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/as112/summary.test.ts b/tests/api-resources/radar/as112/summary.test.ts
index dfc8f8eae7..a78c8d241b 100644
--- a/tests/api-resources/radar/as112/summary.test.ts
+++ b/tests/api-resources/radar/as112/summary.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource summary', () => {
   test('dnssec', async () => {
-    const responsePromise = cloudflare.radar.as112.summary.dnssec();
+    const responsePromise = client.radar.as112.summary.dnssec();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource summary', () => {
 
   test('dnssec: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.as112.summary.dnssec({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.as112.summary.dnssec({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,16 +31,16 @@ describe('resource summary', () => {
   test('dnssec: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.summary.dnssec(
+      client.radar.as112.summary.dnssec(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -48,7 +48,7 @@ describe('resource summary', () => {
   });
 
   test('edns', async () => {
-    const responsePromise = cloudflare.radar.as112.summary.edns();
+    const responsePromise = client.radar.as112.summary.edns();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -60,7 +60,7 @@ describe('resource summary', () => {
 
   test('edns: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.as112.summary.edns({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.as112.summary.edns({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -68,16 +68,16 @@ describe('resource summary', () => {
   test('edns: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.summary.edns(
+      client.radar.as112.summary.edns(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -85,7 +85,7 @@ describe('resource summary', () => {
   });
 
   test('ipVersion', async () => {
-    const responsePromise = cloudflare.radar.as112.summary.ipVersion();
+    const responsePromise = client.radar.as112.summary.ipVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -97,24 +97,24 @@ describe('resource summary', () => {
 
   test('ipVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.as112.summary.ipVersion({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.as112.summary.ipVersion({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('ipVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.summary.ipVersion(
+      client.radar.as112.summary.ipVersion(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -122,7 +122,7 @@ describe('resource summary', () => {
   });
 
   test('protocol', async () => {
-    const responsePromise = cloudflare.radar.as112.summary.protocol();
+    const responsePromise = client.radar.as112.summary.protocol();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -134,24 +134,24 @@ describe('resource summary', () => {
 
   test('protocol: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.as112.summary.protocol({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.as112.summary.protocol({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('protocol: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.summary.protocol(
+      client.radar.as112.summary.protocol(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -159,7 +159,7 @@ describe('resource summary', () => {
   });
 
   test('queryType', async () => {
-    const responsePromise = cloudflare.radar.as112.summary.queryType();
+    const responsePromise = client.radar.as112.summary.queryType();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -171,24 +171,25 @@ describe('resource summary', () => {
 
   test('queryType: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.as112.summary.queryType({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.as112.summary.queryType({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('queryType: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.summary.queryType(
+      client.radar.as112.summary.queryType(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -196,7 +197,7 @@ describe('resource summary', () => {
   });
 
   test('responseCodes', async () => {
-    const responsePromise = cloudflare.radar.as112.summary.responseCodes();
+    const responsePromise = client.radar.as112.summary.responseCodes();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -209,23 +210,24 @@ describe('resource summary', () => {
   test('responseCodes: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.summary.responseCodes({ path: '/_stainless_unknown_path' }),
+      client.radar.as112.summary.responseCodes({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('responseCodes: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.summary.responseCodes(
+      client.radar.as112.summary.responseCodes(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/as112/timeseries-groups.test.ts b/tests/api-resources/radar/as112/timeseries-groups.test.ts
index 3f4aab54e0..72939b5f98 100644
--- a/tests/api-resources/radar/as112/timeseries-groups.test.ts
+++ b/tests/api-resources/radar/as112/timeseries-groups.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource timeseriesGroups', () => {
   test('dnssec', async () => {
-    const responsePromise = cloudflare.radar.as112.timeseriesGroups.dnssec();
+    const responsePromise = client.radar.as112.timeseriesGroups.dnssec();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,24 +24,24 @@ describe('resource timeseriesGroups', () => {
   test('dnssec: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.dnssec({ path: '/_stainless_unknown_path' }),
+      client.radar.as112.timeseriesGroups.dnssec({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('dnssec: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.dnssec(
+      client.radar.as112.timeseriesGroups.dnssec(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -49,7 +49,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('edns', async () => {
-    const responsePromise = cloudflare.radar.as112.timeseriesGroups.edns();
+    const responsePromise = client.radar.as112.timeseriesGroups.edns();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -62,24 +62,24 @@ describe('resource timeseriesGroups', () => {
   test('edns: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.edns({ path: '/_stainless_unknown_path' }),
+      client.radar.as112.timeseriesGroups.edns({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('edns: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.edns(
+      client.radar.as112.timeseriesGroups.edns(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -87,7 +87,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('ipVersion', async () => {
-    const responsePromise = cloudflare.radar.as112.timeseriesGroups.ipVersion();
+    const responsePromise = client.radar.as112.timeseriesGroups.ipVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -100,24 +100,24 @@ describe('resource timeseriesGroups', () => {
   test('ipVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.ipVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.as112.timeseriesGroups.ipVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('ipVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.ipVersion(
+      client.radar.as112.timeseriesGroups.ipVersion(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -125,7 +125,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('protocol', async () => {
-    const responsePromise = cloudflare.radar.as112.timeseriesGroups.protocol();
+    const responsePromise = client.radar.as112.timeseriesGroups.protocol();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -138,24 +138,24 @@ describe('resource timeseriesGroups', () => {
   test('protocol: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.protocol({ path: '/_stainless_unknown_path' }),
+      client.radar.as112.timeseriesGroups.protocol({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('protocol: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.protocol(
+      client.radar.as112.timeseriesGroups.protocol(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -163,7 +163,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('queryType', async () => {
-    const responsePromise = cloudflare.radar.as112.timeseriesGroups.queryType();
+    const responsePromise = client.radar.as112.timeseriesGroups.queryType();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -176,24 +176,25 @@ describe('resource timeseriesGroups', () => {
   test('queryType: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.queryType({ path: '/_stainless_unknown_path' }),
+      client.radar.as112.timeseriesGroups.queryType({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('queryType: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.queryType(
+      client.radar.as112.timeseriesGroups.queryType(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -201,7 +202,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('responseCodes', async () => {
-    const responsePromise = cloudflare.radar.as112.timeseriesGroups.responseCodes();
+    const responsePromise = client.radar.as112.timeseriesGroups.responseCodes();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -214,24 +215,25 @@ describe('resource timeseriesGroups', () => {
   test('responseCodes: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.responseCodes({ path: '/_stainless_unknown_path' }),
+      client.radar.as112.timeseriesGroups.responseCodes({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('responseCodes: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.timeseriesGroups.responseCodes(
+      client.radar.as112.timeseriesGroups.responseCodes(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/as112/top.test.ts b/tests/api-resources/radar/as112/top.test.ts
index 2d289501c7..1a853b164f 100644
--- a/tests/api-resources/radar/as112/top.test.ts
+++ b/tests/api-resources/radar/as112/top.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource top', () => {
   test('dnssec', async () => {
-    const responsePromise = cloudflare.radar.as112.top.dnssec('SUPPORTED');
+    const responsePromise = client.radar.as112.top.dnssec('SUPPORTED');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,25 +24,25 @@ describe('resource top', () => {
   test('dnssec: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.top.dnssec('SUPPORTED', { path: '/_stainless_unknown_path' }),
+      client.radar.as112.top.dnssec('SUPPORTED', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('dnssec: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.top.dnssec(
+      client.radar.as112.top.dnssec(
         'SUPPORTED',
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -50,7 +50,7 @@ describe('resource top', () => {
   });
 
   test('edns', async () => {
-    const responsePromise = cloudflare.radar.as112.top.edns('SUPPORTED');
+    const responsePromise = client.radar.as112.top.edns('SUPPORTED');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,25 +63,25 @@ describe('resource top', () => {
   test('edns: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.top.edns('SUPPORTED', { path: '/_stainless_unknown_path' }),
+      client.radar.as112.top.edns('SUPPORTED', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('edns: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.top.edns(
+      client.radar.as112.top.edns(
         'SUPPORTED',
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -89,7 +89,7 @@ describe('resource top', () => {
   });
 
   test('ipVersion', async () => {
-    const responsePromise = cloudflare.radar.as112.top.ipVersion('IPv4');
+    const responsePromise = client.radar.as112.top.ipVersion('IPv4');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -102,25 +102,25 @@ describe('resource top', () => {
   test('ipVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.top.ipVersion('IPv4', { path: '/_stainless_unknown_path' }),
+      client.radar.as112.top.ipVersion('IPv4', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('ipVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.top.ipVersion(
+      client.radar.as112.top.ipVersion(
         'IPv4',
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -128,7 +128,7 @@ describe('resource top', () => {
   });
 
   test('locations', async () => {
-    const responsePromise = cloudflare.radar.as112.top.locations();
+    const responsePromise = client.radar.as112.top.locations();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -140,7 +140,7 @@ describe('resource top', () => {
 
   test('locations: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.as112.top.locations({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.as112.top.locations({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -148,17 +148,17 @@ describe('resource top', () => {
   test('locations: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.as112.top.locations(
+      client.radar.as112.top.locations(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/attacks/layer3/layer3.test.ts b/tests/api-resources/radar/attacks/layer3/layer3.test.ts
index 4d51b3e6a3..4ee00abab7 100644
--- a/tests/api-resources/radar/attacks/layer3/layer3.test.ts
+++ b/tests/api-resources/radar/attacks/layer3/layer3.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource layer3', () => {
   test('timeseries', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.timeseries();
+    const responsePromise = client.radar.attacks.layer3.timeseries();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,29 +24,29 @@ describe('resource layer3', () => {
   test('timeseries: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseries({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.timeseries({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('timeseries: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseries(
+      client.radar.attacks.layer3.timeseries(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
           metric: 'BYTES',
-          name: ['string', 'string', 'string'],
-          normalization: 'MIN0_MAX',
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          name: ['string'],
+          normalization: 'PERCENTAGE_CHANGE',
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/attacks/layer3/summary.test.ts b/tests/api-resources/radar/attacks/layer3/summary.test.ts
index 52430f6823..708821a12b 100644
--- a/tests/api-resources/radar/attacks/layer3/summary.test.ts
+++ b/tests/api-resources/radar/attacks/layer3/summary.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource summary', () => {
   test('bitrate', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.summary.bitrate();
+    const responsePromise = client.radar.attacks.layer3.summary.bitrate();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,25 +24,25 @@ describe('resource summary', () => {
   test('bitrate: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.bitrate({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.summary.bitrate({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('bitrate: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.bitrate(
+      client.radar.attacks.layer3.summary.bitrate(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -50,7 +50,7 @@ describe('resource summary', () => {
   });
 
   test('duration', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.summary.duration();
+    const responsePromise = client.radar.attacks.layer3.summary.duration();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,25 +63,25 @@ describe('resource summary', () => {
   test('duration: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.duration({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.summary.duration({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('duration: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.duration(
+      client.radar.attacks.layer3.summary.duration(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -89,7 +89,7 @@ describe('resource summary', () => {
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.summary.get();
+    const responsePromise = client.radar.attacks.layer3.summary.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -102,23 +102,23 @@ describe('resource summary', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.get({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.summary.get({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.get(
+      client.radar.attacks.layer3.summary.get(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -126,7 +126,7 @@ describe('resource summary', () => {
   });
 
   test('ipVersion', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.summary.ipVersion();
+    const responsePromise = client.radar.attacks.layer3.summary.ipVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -139,24 +139,24 @@ describe('resource summary', () => {
   test('ipVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.ipVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.summary.ipVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('ipVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.ipVersion(
+      client.radar.attacks.layer3.summary.ipVersion(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          location: ['string'],
+          name: ['string'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -164,7 +164,7 @@ describe('resource summary', () => {
   });
 
   test('protocol', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.summary.protocol();
+    const responsePromise = client.radar.attacks.layer3.summary.protocol();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -177,24 +177,24 @@ describe('resource summary', () => {
   test('protocol: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.protocol({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.summary.protocol({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('protocol: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.protocol(
+      client.radar.attacks.layer3.summary.protocol(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -202,7 +202,7 @@ describe('resource summary', () => {
   });
 
   test('vector', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.summary.vector();
+    const responsePromise = client.radar.attacks.layer3.summary.vector();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -215,25 +215,26 @@ describe('resource summary', () => {
   test('vector: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.vector({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.summary.vector({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('vector: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.summary.vector(
+      client.radar.attacks.layer3.summary.vector(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/attacks/layer3/timeseries-groups.test.ts b/tests/api-resources/radar/attacks/layer3/timeseries-groups.test.ts
index 303a976d4b..4a87d20cae 100644
--- a/tests/api-resources/radar/attacks/layer3/timeseries-groups.test.ts
+++ b/tests/api-resources/radar/attacks/layer3/timeseries-groups.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource timeseriesGroups', () => {
   test('bitrate', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.timeseriesGroups.bitrate();
+    const responsePromise = client.radar.attacks.layer3.timeseriesGroups.bitrate();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,27 +24,27 @@ describe('resource timeseriesGroups', () => {
   test('bitrate: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.bitrate({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.timeseriesGroups.bitrate({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('bitrate: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.bitrate(
+      client.radar.attacks.layer3.timeseriesGroups.bitrate(
         {
-          aggInterval: '1h',
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -52,7 +52,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('duration', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.timeseriesGroups.duration();
+    const responsePromise = client.radar.attacks.layer3.timeseriesGroups.duration();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -65,27 +65,27 @@ describe('resource timeseriesGroups', () => {
   test('duration: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.duration({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.timeseriesGroups.duration({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('duration: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.duration(
+      client.radar.attacks.layer3.timeseriesGroups.duration(
         {
-          aggInterval: '1h',
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -93,7 +93,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.timeseriesGroups.get();
+    const responsePromise = client.radar.attacks.layer3.timeseriesGroups.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -106,24 +106,24 @@ describe('resource timeseriesGroups', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.get({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.timeseriesGroups.get({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.get(
+      client.radar.attacks.layer3.timeseriesGroups.get(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -131,7 +131,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('industry', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.timeseriesGroups.industry();
+    const responsePromise = client.radar.attacks.layer3.timeseriesGroups.industry();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -144,28 +144,28 @@ describe('resource timeseriesGroups', () => {
   test('industry: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.industry({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.timeseriesGroups.industry({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('industry: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.industry(
+      client.radar.attacks.layer3.timeseriesGroups.industry(
         {
-          aggInterval: '1h',
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          limitPerGroup: 4,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -173,7 +173,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('ipVersion', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.timeseriesGroups.ipVersion();
+    const responsePromise = client.radar.attacks.layer3.timeseriesGroups.ipVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -186,26 +186,26 @@ describe('resource timeseriesGroups', () => {
   test('ipVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.ipVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.timeseriesGroups.ipVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('ipVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.ipVersion(
+      client.radar.attacks.layer3.timeseriesGroups.ipVersion(
         {
-          aggInterval: '1h',
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -213,7 +213,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('protocol', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.timeseriesGroups.protocol();
+    const responsePromise = client.radar.attacks.layer3.timeseriesGroups.protocol();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -226,25 +226,25 @@ describe('resource timeseriesGroups', () => {
   test('protocol: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.protocol({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.timeseriesGroups.protocol({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('protocol: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.protocol(
+      client.radar.attacks.layer3.timeseriesGroups.protocol(
         {
-          aggInterval: '1h',
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
         },
         { path: '/_stainless_unknown_path' },
@@ -253,7 +253,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('vector', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.timeseriesGroups.vector();
+    const responsePromise = client.radar.attacks.layer3.timeseriesGroups.vector();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -266,28 +266,28 @@ describe('resource timeseriesGroups', () => {
   test('vector: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.vector({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.timeseriesGroups.vector({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('vector: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.vector(
+      client.radar.attacks.layer3.timeseriesGroups.vector(
         {
-          aggInterval: '1h',
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          limitPerGroup: 4,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -295,7 +295,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('vertical', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.timeseriesGroups.vertical();
+    const responsePromise = client.radar.attacks.layer3.timeseriesGroups.vertical();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -308,28 +308,28 @@ describe('resource timeseriesGroups', () => {
   test('vertical: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.vertical({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.timeseriesGroups.vertical({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('vertical: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.timeseriesGroups.vertical(
+      client.radar.attacks.layer3.timeseriesGroups.vertical(
         {
-          aggInterval: '1h',
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           direction: 'ORIGIN',
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          limitPerGroup: 4,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/attacks/layer3/top/locations.test.ts b/tests/api-resources/radar/attacks/layer3/top/locations.test.ts
index 6e6679818d..bcce4ff6aa 100644
--- a/tests/api-resources/radar/attacks/layer3/top/locations.test.ts
+++ b/tests/api-resources/radar/attacks/layer3/top/locations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource locations', () => {
   test('origin', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.top.locations.origin();
+    const responsePromise = client.radar.attacks.layer3.top.locations.origin();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,25 +24,25 @@ describe('resource locations', () => {
   test('origin: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.top.locations.origin({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.top.locations.origin({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('origin: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.top.locations.origin(
+      client.radar.attacks.layer3.top.locations.origin(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          location: ['string'],
+          name: ['string'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -50,7 +50,7 @@ describe('resource locations', () => {
   });
 
   test('target', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.top.locations.target();
+    const responsePromise = client.radar.attacks.layer3.top.locations.target();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,25 +63,25 @@ describe('resource locations', () => {
   test('target: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.top.locations.target({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.top.locations.target({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('target: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.top.locations.target(
+      client.radar.attacks.layer3.top.locations.target(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          location: ['string'],
+          name: ['string'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/attacks/layer3/top/top.test.ts b/tests/api-resources/radar/attacks/layer3/top/top.test.ts
index bd240778f1..7e6b021875 100644
--- a/tests/api-resources/radar/attacks/layer3/top/top.test.ts
+++ b/tests/api-resources/radar/attacks/layer3/top/top.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource top', () => {
   test('attacks', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.top.attacks();
+    const responsePromise = client.radar.attacks.layer3.top.attacks();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,28 +24,28 @@ describe('resource top', () => {
   test('attacks: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.top.attacks({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.top.attacks({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('attacks: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.top.attacks(
+      client.radar.attacks.layer3.top.attacks(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
+          ipVersion: ['IPv4'],
           limit: 5,
           limitDirection: 'ORIGIN',
           limitPerLocation: 10,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -53,7 +53,7 @@ describe('resource top', () => {
   });
 
   test('industry', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.top.industry();
+    const responsePromise = client.radar.attacks.layer3.top.industry();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -66,25 +66,25 @@ describe('resource top', () => {
   test('industry: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.top.industry({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.top.industry({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('industry: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.top.industry(
+      client.radar.attacks.layer3.top.industry(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          location: ['string'],
+          name: ['string'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -92,7 +92,7 @@ describe('resource top', () => {
   });
 
   test('vertical', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer3.top.vertical();
+    const responsePromise = client.radar.attacks.layer3.top.vertical();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -105,25 +105,25 @@ describe('resource top', () => {
   test('vertical: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.top.vertical({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer3.top.vertical({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('vertical: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer3.top.vertical(
+      client.radar.attacks.layer3.top.vertical(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          protocol: ['UDP', 'TCP', 'ICMP'],
+          location: ['string'],
+          name: ['string'],
+          protocol: ['UDP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/attacks/layer7/layer7.test.ts b/tests/api-resources/radar/attacks/layer7/layer7.test.ts
index ff81734d93..dfcc657e8e 100644
--- a/tests/api-resources/radar/attacks/layer7/layer7.test.ts
+++ b/tests/api-resources/radar/attacks/layer7/layer7.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource layer7', () => {
   test('timeseries', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.timeseries();
+    const responsePromise = client.radar.attacks.layer7.timeseries();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,30 +24,30 @@ describe('resource layer7', () => {
   test('timeseries: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseries({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.timeseries({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('timeseries: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseries(
+      client.radar.attacks.layer7.timeseries(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          attack: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          attack: ['DDOS'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
-          normalization: 'MIN0_MAX',
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
+          normalization: 'PERCENTAGE_CHANGE',
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/attacks/layer7/summary.test.ts b/tests/api-resources/radar/attacks/layer7/summary.test.ts
index 34be5b2850..099d191e14 100644
--- a/tests/api-resources/radar/attacks/layer7/summary.test.ts
+++ b/tests/api-resources/radar/attacks/layer7/summary.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource summary', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.summary.get();
+    const responsePromise = client.radar.attacks.layer7.summary.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,23 +24,23 @@ describe('resource summary', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.get({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.summary.get({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.get(
+      client.radar.attacks.layer7.summary.get(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -48,7 +48,7 @@ describe('resource summary', () => {
   });
 
   test('httpMethod', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.summary.httpMethod();
+    const responsePromise = client.radar.attacks.layer7.summary.httpMethod();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -61,26 +61,27 @@ describe('resource summary', () => {
   test('httpMethod: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.httpMethod({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.summary.httpMethod({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('httpMethod: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.httpMethod(
+      client.radar.attacks.layer7.summary.httpMethod(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -88,7 +89,7 @@ describe('resource summary', () => {
   });
 
   test('httpVersion', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.summary.httpVersion();
+    const responsePromise = client.radar.attacks.layer7.summary.httpVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -101,26 +102,26 @@ describe('resource summary', () => {
   test('httpVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.httpVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.summary.httpVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('httpVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.httpVersion(
+      client.radar.attacks.layer7.summary.httpVersion(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          httpMethod: ['GET'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -128,7 +129,7 @@ describe('resource summary', () => {
   });
 
   test('ipVersion', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.summary.ipVersion();
+    const responsePromise = client.radar.attacks.layer7.summary.ipVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -141,26 +142,26 @@ describe('resource summary', () => {
   test('ipVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.ipVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.summary.ipVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('ipVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.ipVersion(
+      client.radar.attacks.layer7.summary.ipVersion(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -168,7 +169,7 @@ describe('resource summary', () => {
   });
 
   test('managedRules', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.summary.managedRules();
+    const responsePromise = client.radar.attacks.layer7.summary.managedRules();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -181,27 +182,28 @@ describe('resource summary', () => {
   test('managedRules: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.managedRules({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.summary.managedRules({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('managedRules: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.managedRules(
+      client.radar.attacks.layer7.summary.managedRules(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -209,7 +211,7 @@ describe('resource summary', () => {
   });
 
   test('mitigationProduct', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.summary.mitigationProduct();
+    const responsePromise = client.radar.attacks.layer7.summary.mitigationProduct();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -222,26 +224,27 @@ describe('resource summary', () => {
   test('mitigationProduct: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.mitigationProduct({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.summary.mitigationProduct({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('mitigationProduct: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.summary.mitigationProduct(
+      client.radar.attacks.layer7.summary.mitigationProduct(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/attacks/layer7/timeseries-groups.test.ts b/tests/api-resources/radar/attacks/layer7/timeseries-groups.test.ts
index 6593c5a7cb..ed72dab638 100644
--- a/tests/api-resources/radar/attacks/layer7/timeseries-groups.test.ts
+++ b/tests/api-resources/radar/attacks/layer7/timeseries-groups.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource timeseriesGroups', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.timeseriesGroups.get();
+    const responsePromise = client.radar.attacks.layer7.timeseriesGroups.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,24 +24,24 @@ describe('resource timeseriesGroups', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.get({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.timeseriesGroups.get({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.get(
+      client.radar.attacks.layer7.timeseriesGroups.get(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -49,7 +49,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('httpMethod', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.timeseriesGroups.httpMethod();
+    const responsePromise = client.radar.attacks.layer7.timeseriesGroups.httpMethod();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -62,27 +62,28 @@ describe('resource timeseriesGroups', () => {
   test('httpMethod: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.httpMethod({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.timeseriesGroups.httpMethod({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('httpMethod: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.httpMethod(
+      client.radar.attacks.layer7.timeseriesGroups.httpMethod(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
         },
         { path: '/_stainless_unknown_path' },
@@ -91,7 +92,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('httpVersion', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.timeseriesGroups.httpVersion();
+    const responsePromise = client.radar.attacks.layer7.timeseriesGroups.httpVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -104,27 +105,27 @@ describe('resource timeseriesGroups', () => {
   test('httpVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.httpVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.timeseriesGroups.httpVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('httpVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.httpVersion(
+      client.radar.attacks.layer7.timeseriesGroups.httpVersion(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          httpMethod: ['GET'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
         },
         { path: '/_stainless_unknown_path' },
@@ -133,7 +134,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('industry', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.timeseriesGroups.industry();
+    const responsePromise = client.radar.attacks.layer7.timeseriesGroups.industry();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -146,29 +147,29 @@ describe('resource timeseriesGroups', () => {
   test('industry: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.industry({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.timeseriesGroups.industry({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('industry: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.industry(
+      client.radar.attacks.layer7.timeseriesGroups.industry(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          limitPerGroup: 4,
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
         },
         { path: '/_stainless_unknown_path' },
@@ -177,7 +178,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('ipVersion', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.timeseriesGroups.ipVersion();
+    const responsePromise = client.radar.attacks.layer7.timeseriesGroups.ipVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -190,27 +191,27 @@ describe('resource timeseriesGroups', () => {
   test('ipVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.ipVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.timeseriesGroups.ipVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('ipVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.ipVersion(
+      client.radar.attacks.layer7.timeseriesGroups.ipVersion(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
         },
         { path: '/_stainless_unknown_path' },
@@ -219,7 +220,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('managedRules', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.timeseriesGroups.managedRules();
+    const responsePromise = client.radar.attacks.layer7.timeseriesGroups.managedRules();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -232,28 +233,29 @@ describe('resource timeseriesGroups', () => {
   test('managedRules: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.managedRules({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.timeseriesGroups.managedRules({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('managedRules: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.managedRules(
+      client.radar.attacks.layer7.timeseriesGroups.managedRules(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
         },
         { path: '/_stainless_unknown_path' },
@@ -262,7 +264,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('mitigationProduct', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.timeseriesGroups.mitigationProduct();
+    const responsePromise = client.radar.attacks.layer7.timeseriesGroups.mitigationProduct();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -275,29 +277,28 @@ describe('resource timeseriesGroups', () => {
   test('mitigationProduct: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.mitigationProduct({
-        path: '/_stainless_unknown_path',
-      }),
+      client.radar.attacks.layer7.timeseriesGroups.mitigationProduct({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('mitigationProduct: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.mitigationProduct(
+      client.radar.attacks.layer7.timeseriesGroups.mitigationProduct(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
         },
         { path: '/_stainless_unknown_path' },
@@ -306,7 +307,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('vertical', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.timeseriesGroups.vertical();
+    const responsePromise = client.radar.attacks.layer7.timeseriesGroups.vertical();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -319,29 +320,29 @@ describe('resource timeseriesGroups', () => {
   test('vertical: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.vertical({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.timeseriesGroups.vertical({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('vertical: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.timeseriesGroups.vertical(
+      client.radar.attacks.layer7.timeseriesGroups.vertical(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          limitPerGroup: 4,
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
         },
         { path: '/_stainless_unknown_path' },
diff --git a/tests/api-resources/radar/attacks/layer7/top/ases.test.ts b/tests/api-resources/radar/attacks/layer7/top/ases.test.ts
index ea3cae0dd0..5286289e56 100644
--- a/tests/api-resources/radar/attacks/layer7/top/ases.test.ts
+++ b/tests/api-resources/radar/attacks/layer7/top/ases.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ases', () => {
   test('origin', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.top.ases.origin();
+    const responsePromise = client.radar.attacks.layer7.top.ases.origin();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,27 +24,27 @@ describe('resource ases', () => {
   test('origin: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.ases.origin({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.top.ases.origin({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('origin: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.ases.origin(
+      client.radar.attacks.layer7.top.ases.origin(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/attacks/layer7/top/locations.test.ts b/tests/api-resources/radar/attacks/layer7/top/locations.test.ts
index d27e863f67..bcbb805970 100644
--- a/tests/api-resources/radar/attacks/layer7/top/locations.test.ts
+++ b/tests/api-resources/radar/attacks/layer7/top/locations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource locations', () => {
   test('origin', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.top.locations.origin();
+    const responsePromise = client.radar.attacks.layer7.top.locations.origin();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,27 +24,27 @@ describe('resource locations', () => {
   test('origin: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.locations.origin({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.top.locations.origin({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('origin: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.locations.origin(
+      client.radar.attacks.layer7.top.locations.origin(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -52,7 +52,7 @@ describe('resource locations', () => {
   });
 
   test('target', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.top.locations.target();
+    const responsePromise = client.radar.attacks.layer7.top.locations.target();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -65,26 +65,26 @@ describe('resource locations', () => {
   test('target: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.locations.target({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.top.locations.target({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('target: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.locations.target(
+      client.radar.attacks.layer7.top.locations.target(
         {
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/attacks/layer7/top/top.test.ts b/tests/api-resources/radar/attacks/layer7/top/top.test.ts
index e2dd75b8f3..8c84672d65 100644
--- a/tests/api-resources/radar/attacks/layer7/top/top.test.ts
+++ b/tests/api-resources/radar/attacks/layer7/top/top.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource top', () => {
   test('attacks', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.top.attacks();
+    const responsePromise = client.radar.attacks.layer7.top.attacks();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,31 +24,31 @@ describe('resource top', () => {
   test('attacks: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.attacks({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.top.attacks({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('attacks: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.attacks(
+      client.radar.attacks.layer7.top.attacks(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
           limitDirection: 'ORIGIN',
           limitPerLocation: 10,
-          location: ['string', 'string', 'string'],
-          magnitude: 'MITIGATED_REQUESTS',
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          magnitude: 'AFFECTED_ZONES',
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
           normalization: 'PERCENTAGE',
         },
         { path: '/_stainless_unknown_path' },
@@ -57,7 +57,7 @@ describe('resource top', () => {
   });
 
   test('industry', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.top.industry();
+    const responsePromise = client.radar.attacks.layer7.top.industry();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -70,28 +70,28 @@ describe('resource top', () => {
   test('industry: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.industry({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.top.industry({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('industry: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.industry(
+      client.radar.attacks.layer7.top.industry(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -99,7 +99,7 @@ describe('resource top', () => {
   });
 
   test('vertical', async () => {
-    const responsePromise = cloudflare.radar.attacks.layer7.top.vertical();
+    const responsePromise = client.radar.attacks.layer7.top.vertical();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -112,28 +112,28 @@ describe('resource top', () => {
   test('vertical: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.vertical({ path: '/_stainless_unknown_path' }),
+      client.radar.attacks.layer7.top.vertical({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('vertical: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.attacks.layer7.top.vertical(
+      client.radar.attacks.layer7.top.vertical(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpMethod: ['GET', 'POST', 'DELETE'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpMethod: ['GET'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          mitigationProduct: ['DDOS', 'WAF', 'BOT_MANAGEMENT'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          mitigationProduct: ['DDOS'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/bgp/bgp.test.ts b/tests/api-resources/radar/bgp/bgp.test.ts
index a2b1df6377..6e97506767 100644
--- a/tests/api-resources/radar/bgp/bgp.test.ts
+++ b/tests/api-resources/radar/bgp/bgp.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource bgp', () => {
   test('timeseries', async () => {
-    const responsePromise = cloudflare.radar.bgp.timeseries();
+    const responsePromise = client.radar.bgp.timeseries();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource bgp', () => {
 
   test('timeseries: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.bgp.timeseries({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.bgp.timeseries({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,21 +31,17 @@ describe('resource bgp', () => {
   test('timeseries: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.bgp.timeseries(
+      client.radar.bgp.timeseries(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          prefix: [
-            { in: 'query', name: 'prefix', test: 12, type: '1.1.1.0/24' },
-            { in: 'query', name: 'prefix', test: 12, type: '1.1.1.0/24' },
-            { in: 'query', name: 'prefix', test: 12, type: '1.1.1.0/24' },
-          ],
-          updateType: ['ANNOUNCEMENT', 'WITHDRAWAL'],
+          name: ['string'],
+          prefix: ['1.1.1.0/24'],
+          updateType: ['ANNOUNCEMENT'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/bgp/hijacks/events.test.ts b/tests/api-resources/radar/bgp/hijacks/events.test.ts
index c0db184277..ff90e3e4bd 100644
--- a/tests/api-resources/radar/bgp/hijacks/events.test.ts
+++ b/tests/api-resources/radar/bgp/hijacks/events.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource events', () => {
   test('list', async () => {
-    const responsePromise = cloudflare.radar.bgp.hijacks.events.list();
+    const responsePromise = client.radar.bgp.hijacks.events.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,15 +23,15 @@ describe('resource events', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.bgp.hijacks.events.list({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.bgp.hijacks.events.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.bgp.hijacks.events.list(
+      client.radar.bgp.hijacks.events.list(
         {
           dateEnd: '2023-09-01T11:41:33.782Z',
           dateRange: '7d',
@@ -46,8 +46,8 @@ describe('resource events', () => {
           page: 0,
           per_page: 0,
           prefix: '1.1.1.0/24',
-          sortBy: 'TIME',
-          sortOrder: 'DESC',
+          sortBy: 'ID',
+          sortOrder: 'ASC',
           victimAsn: 0,
         },
         { path: '/_stainless_unknown_path' },
diff --git a/tests/api-resources/radar/bgp/ips.test.ts b/tests/api-resources/radar/bgp/ips.test.ts
index 28dab69c29..8a1563e4b0 100644
--- a/tests/api-resources/radar/bgp/ips.test.ts
+++ b/tests/api-resources/radar/bgp/ips.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ips', () => {
   test('timeseries', async () => {
-    const responsePromise = cloudflare.radar.bgp.ips.timeseries();
+    const responsePromise = client.radar.bgp.ips.timeseries();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource ips', () => {
 
   test('timeseries: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.bgp.ips.timeseries({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.bgp.ips.timeseries({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,16 +31,17 @@ describe('resource ips', () => {
   test('timeseries: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.bgp.ips.timeseries(
+      client.radar.bgp.ips.timeseries(
         {
-          asn: '174,7922',
-          dateEnd: '2023-09-01T11:41:33.782Z',
-          dateRange: '7d',
-          dateStart: '2023-09-01T11:41:33.782Z',
+          asn: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           includeDelay: true,
-          location: 'US,CA',
-          name: ['string', 'string', 'string'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/bgp/leaks/events.test.ts b/tests/api-resources/radar/bgp/leaks/events.test.ts
index 6182e931b8..ff3edab344 100644
--- a/tests/api-resources/radar/bgp/leaks/events.test.ts
+++ b/tests/api-resources/radar/bgp/leaks/events.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource events', () => {
   test('list', async () => {
-    const responsePromise = cloudflare.radar.bgp.leaks.events.list();
+    const responsePromise = client.radar.bgp.leaks.events.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,15 +23,15 @@ describe('resource events', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.bgp.leaks.events.list({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.bgp.leaks.events.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.bgp.leaks.events.list(
+      client.radar.bgp.leaks.events.list(
         {
           dateEnd: '2023-09-01T11:41:33.782Z',
           dateRange: '7d',
@@ -43,8 +43,8 @@ describe('resource events', () => {
           leakAsn: 0,
           page: 0,
           per_page: 0,
-          sortBy: 'TIME',
-          sortOrder: 'DESC',
+          sortBy: 'ID',
+          sortOrder: 'ASC',
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/bgp/routes.test.ts b/tests/api-resources/radar/bgp/routes.test.ts
index 0d5241dd3f..fd8c534fc5 100644
--- a/tests/api-resources/radar/bgp/routes.test.ts
+++ b/tests/api-resources/radar/bgp/routes.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource routes', () => {
   test('ases', async () => {
-    const responsePromise = cloudflare.radar.bgp.routes.ases();
+    const responsePromise = client.radar.bgp.routes.ases();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource routes', () => {
 
   test('ases: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.bgp.routes.ases({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.bgp.routes.ases({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,15 +31,15 @@ describe('resource routes', () => {
   test('ases: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.bgp.routes.ases(
-        { format: 'JSON', limit: 5, location: 'US', sortBy: 'ipv4', sortOrder: 'desc' },
+      client.radar.bgp.routes.ases(
+        { format: 'JSON', limit: 5, location: 'US', sortBy: 'cone', sortOrder: 'asc' },
         { path: '/_stainless_unknown_path' },
       ),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('moas', async () => {
-    const responsePromise = cloudflare.radar.bgp.routes.moas();
+    const responsePromise = client.radar.bgp.routes.moas();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -51,7 +51,7 @@ describe('resource routes', () => {
 
   test('moas: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.bgp.routes.moas({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.bgp.routes.moas({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -59,7 +59,7 @@ describe('resource routes', () => {
   test('moas: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.bgp.routes.moas(
+      client.radar.bgp.routes.moas(
         { format: 'JSON', invalid_only: true, origin: 0, prefix: '1.1.1.0/24' },
         { path: '/_stainless_unknown_path' },
       ),
@@ -67,7 +67,7 @@ describe('resource routes', () => {
   });
 
   test('pfx2as', async () => {
-    const responsePromise = cloudflare.radar.bgp.routes.pfx2as();
+    const responsePromise = client.radar.bgp.routes.pfx2as();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -79,7 +79,7 @@ describe('resource routes', () => {
 
   test('pfx2as: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.bgp.routes.pfx2as({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.bgp.routes.pfx2as({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -87,15 +87,15 @@ describe('resource routes', () => {
   test('pfx2as: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.bgp.routes.pfx2as(
-        { format: 'JSON', longestPrefixMatch: true, origin: 0, prefix: '1.1.1.0/24', rpkiStatus: 'INVALID' },
+      client.radar.bgp.routes.pfx2as(
+        { format: 'JSON', longestPrefixMatch: true, origin: 0, prefix: '1.1.1.0/24', rpkiStatus: 'VALID' },
         { path: '/_stainless_unknown_path' },
       ),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('stats', async () => {
-    const responsePromise = cloudflare.radar.bgp.routes.stats();
+    const responsePromise = client.radar.bgp.routes.stats();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -107,7 +107,7 @@ describe('resource routes', () => {
 
   test('stats: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.bgp.routes.stats({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.bgp.routes.stats({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -115,7 +115,7 @@ describe('resource routes', () => {
   test('stats: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.bgp.routes.stats(
+      client.radar.bgp.routes.stats(
         { asn: 174, format: 'JSON', location: 'US' },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/bgp/top/ases.test.ts b/tests/api-resources/radar/bgp/top/ases.test.ts
index 7be951872a..f8351d2b93 100644
--- a/tests/api-resources/radar/bgp/top/ases.test.ts
+++ b/tests/api-resources/radar/bgp/top/ases.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ases', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.bgp.top.ases.get();
+    const responsePromise = client.radar.bgp.top.ases.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource ases', () => {
 
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.bgp.top.ases.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.bgp.top.ases.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,21 +31,17 @@ describe('resource ases', () => {
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.bgp.top.ases.get(
+      client.radar.bgp.top.ases.get(
         {
-          asn: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          name: ['string', 'string', 'string'],
-          prefix: [
-            { in: 'query', name: 'prefix', test: 12, type: '1.1.1.0/24' },
-            { in: 'query', name: 'prefix', test: 12, type: '1.1.1.0/24' },
-            { in: 'query', name: 'prefix', test: 12, type: '1.1.1.0/24' },
-          ],
-          updateType: ['ANNOUNCEMENT', 'WITHDRAWAL'],
+          name: ['string'],
+          prefix: ['1.1.1.0/24'],
+          updateType: ['ANNOUNCEMENT'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -53,7 +49,7 @@ describe('resource ases', () => {
   });
 
   test('prefixes', async () => {
-    const responsePromise = cloudflare.radar.bgp.top.ases.prefixes();
+    const responsePromise = client.radar.bgp.top.ases.prefixes();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -65,15 +61,15 @@ describe('resource ases', () => {
 
   test('prefixes: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.bgp.top.ases.prefixes({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.bgp.top.ases.prefixes({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('prefixes: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.bgp.top.ases.prefixes(
+      client.radar.bgp.top.ases.prefixes(
         { country: 'NZ', format: 'JSON', limit: 10 },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/bgp/top/top.test.ts b/tests/api-resources/radar/bgp/top/top.test.ts
index 4a09d2f9d0..71e3471da3 100644
--- a/tests/api-resources/radar/bgp/top/top.test.ts
+++ b/tests/api-resources/radar/bgp/top/top.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource top', () => {
   test('prefixes', async () => {
-    const responsePromise = cloudflare.radar.bgp.top.prefixes();
+    const responsePromise = client.radar.bgp.top.prefixes();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource top', () => {
 
   test('prefixes: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.bgp.top.prefixes({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.bgp.top.prefixes({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,16 +31,16 @@ describe('resource top', () => {
   test('prefixes: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.bgp.top.prefixes(
+      client.radar.bgp.top.prefixes(
         {
-          asn: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          name: ['string', 'string', 'string'],
-          updateType: ['ANNOUNCEMENT', 'WITHDRAWAL'],
+          name: ['string'],
+          updateType: ['ANNOUNCEMENT'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/datasets.test.ts b/tests/api-resources/radar/datasets.test.ts
index e4b6e3e5a7..b5792444b7 100644
--- a/tests/api-resources/radar/datasets.test.ts
+++ b/tests/api-resources/radar/datasets.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource datasets', () => {
   test('list', async () => {
-    const responsePromise = cloudflare.radar.datasets.list();
+    const responsePromise = client.radar.datasets.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource datasets', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.datasets.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.datasets.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,7 +31,7 @@ describe('resource datasets', () => {
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.datasets.list(
+      client.radar.datasets.list(
         { datasetType: 'RANKING_BUCKET', format: 'JSON', limit: 5, offset: 0 },
         { path: '/_stainless_unknown_path' },
       ),
@@ -39,7 +39,7 @@ describe('resource datasets', () => {
   });
 
   test('download: only required params', async () => {
-    const responsePromise = cloudflare.radar.datasets.download({ datasetId: 3 });
+    const responsePromise = client.radar.datasets.download({ datasetId: 3 });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -50,11 +50,11 @@ describe('resource datasets', () => {
   });
 
   test('download: required and optional params', async () => {
-    const response = await cloudflare.radar.datasets.download({ datasetId: 3, format: 'JSON' });
+    const response = await client.radar.datasets.download({ datasetId: 3, format: 'JSON' });
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.radar.datasets.get('ranking_top_1000');
+    const responsePromise = client.radar.datasets.get('ranking_top_1000');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -67,7 +67,7 @@ describe('resource datasets', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.datasets.get('ranking_top_1000', { path: '/_stainless_unknown_path' }),
+      client.radar.datasets.get('ranking_top_1000', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 });
diff --git a/tests/api-resources/radar/dns/top.test.ts b/tests/api-resources/radar/dns/top.test.ts
index bc00aa2734..5b03dc6773 100644
--- a/tests/api-resources/radar/dns/top.test.ts
+++ b/tests/api-resources/radar/dns/top.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource top', () => {
   test('ases: only required params', async () => {
-    const responsePromise = cloudflare.radar.dns.top.ases({ domain: ['string', 'string', 'string'] });
+    const responsePromise = client.radar.dns.top.ases({ domain: ['string'] });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,22 +22,22 @@ describe('resource top', () => {
   });
 
   test('ases: required and optional params', async () => {
-    const response = await cloudflare.radar.dns.top.ases({
-      domain: ['string', 'string', 'string'],
-      asn: ['string', 'string', 'string'],
-      continent: ['string', 'string', 'string'],
-      dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-      dateRange: ['7d', '7d', '7d'],
-      dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+    const response = await client.radar.dns.top.ases({
+      domain: ['string'],
+      asn: ['string'],
+      continent: ['string'],
+      dateEnd: ['2019-12-27T18:11:19.117Z'],
+      dateRange: ['7d'],
+      dateStart: ['2019-12-27T18:11:19.117Z'],
       format: 'JSON',
       limit: 5,
-      location: ['string', 'string', 'string'],
-      name: ['string', 'string', 'string'],
+      location: ['string'],
+      name: ['string'],
     });
   });
 
   test('locations: only required params', async () => {
-    const responsePromise = cloudflare.radar.dns.top.locations({ domain: ['string', 'string', 'string'] });
+    const responsePromise = client.radar.dns.top.locations({ domain: ['string'] });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -48,17 +48,17 @@ describe('resource top', () => {
   });
 
   test('locations: required and optional params', async () => {
-    const response = await cloudflare.radar.dns.top.locations({
-      domain: ['string', 'string', 'string'],
-      asn: ['string', 'string', 'string'],
-      continent: ['string', 'string', 'string'],
-      dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-      dateRange: ['7d', '7d', '7d'],
-      dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+    const response = await client.radar.dns.top.locations({
+      domain: ['string'],
+      asn: ['string'],
+      continent: ['string'],
+      dateEnd: ['2019-12-27T18:11:19.117Z'],
+      dateRange: ['7d'],
+      dateStart: ['2019-12-27T18:11:19.117Z'],
       format: 'JSON',
       limit: 5,
-      location: ['string', 'string', 'string'],
-      name: ['string', 'string', 'string'],
+      location: ['string'],
+      name: ['string'],
     });
   });
 });
diff --git a/tests/api-resources/radar/email/routing/summary.test.ts b/tests/api-resources/radar/email/routing/summary.test.ts
index c6e1337430..142b62d10f 100644
--- a/tests/api-resources/radar/email/routing/summary.test.ts
+++ b/tests/api-resources/radar/email/routing/summary.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource summary', () => {
   test('arc', async () => {
-    const responsePromise = cloudflare.radar.email.routing.summary.arc();
+    const responsePromise = client.radar.email.routing.summary.arc();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,25 +24,25 @@ describe('resource summary', () => {
   test('arc: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.arc({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.summary.arc({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('arc: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.arc(
+      client.radar.email.routing.summary.arc(
         {
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
-          encrypted: ['ENCRYPTED', 'NOT_ENCRYPTED'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
+          encrypted: ['ENCRYPTED'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          ipVersion: ['IPv4'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -50,7 +50,7 @@ describe('resource summary', () => {
   });
 
   test('dkim', async () => {
-    const responsePromise = cloudflare.radar.email.routing.summary.dkim();
+    const responsePromise = client.radar.email.routing.summary.dkim();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,25 +63,25 @@ describe('resource summary', () => {
   test('dkim: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.dkim({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.summary.dkim({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('dkim: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.dkim(
+      client.radar.email.routing.summary.dkim(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
-          encrypted: ['ENCRYPTED', 'NOT_ENCRYPTED'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dmarc: ['PASS'],
+          encrypted: ['ENCRYPTED'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          ipVersion: ['IPv4'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -89,7 +89,7 @@ describe('resource summary', () => {
   });
 
   test('dmarc', async () => {
-    const responsePromise = cloudflare.radar.email.routing.summary.dmarc();
+    const responsePromise = client.radar.email.routing.summary.dmarc();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -102,25 +102,25 @@ describe('resource summary', () => {
   test('dmarc: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.dmarc({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.summary.dmarc({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('dmarc: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.dmarc(
+      client.radar.email.routing.summary.dmarc(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          encrypted: ['ENCRYPTED', 'NOT_ENCRYPTED'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          encrypted: ['ENCRYPTED'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          ipVersion: ['IPv4'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -128,7 +128,7 @@ describe('resource summary', () => {
   });
 
   test('encrypted', async () => {
-    const responsePromise = cloudflare.radar.email.routing.summary.encrypted();
+    const responsePromise = client.radar.email.routing.summary.encrypted();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -141,25 +141,25 @@ describe('resource summary', () => {
   test('encrypted: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.encrypted({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.summary.encrypted({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('encrypted: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.encrypted(
+      client.radar.email.routing.summary.encrypted(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          ipVersion: ['IPv4'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -167,7 +167,7 @@ describe('resource summary', () => {
   });
 
   test('ipVersion', async () => {
-    const responsePromise = cloudflare.radar.email.routing.summary.ipVersion();
+    const responsePromise = client.radar.email.routing.summary.ipVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -180,25 +180,25 @@ describe('resource summary', () => {
   test('ipVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.ipVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.summary.ipVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('ipVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.ipVersion(
+      client.radar.email.routing.summary.ipVersion(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
-          encrypted: ['ENCRYPTED', 'NOT_ENCRYPTED'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
+          encrypted: ['ENCRYPTED'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -206,7 +206,7 @@ describe('resource summary', () => {
   });
 
   test('spf', async () => {
-    const responsePromise = cloudflare.radar.email.routing.summary.spf();
+    const responsePromise = client.radar.email.routing.summary.spf();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -219,25 +219,25 @@ describe('resource summary', () => {
   test('spf: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.spf({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.summary.spf({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('spf: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.summary.spf(
+      client.radar.email.routing.summary.spf(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
-          encrypted: ['ENCRYPTED', 'NOT_ENCRYPTED'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
+          encrypted: ['ENCRYPTED'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          name: ['string', 'string', 'string'],
+          ipVersion: ['IPv4'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/email/routing/timeseries-groups.test.ts b/tests/api-resources/radar/email/routing/timeseries-groups.test.ts
index bad4f3c482..c7e6c95f65 100644
--- a/tests/api-resources/radar/email/routing/timeseries-groups.test.ts
+++ b/tests/api-resources/radar/email/routing/timeseries-groups.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource timeseriesGroups', () => {
   test('arc', async () => {
-    const responsePromise = cloudflare.radar.email.routing.timeseriesGroups.arc();
+    const responsePromise = client.radar.email.routing.timeseriesGroups.arc();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,26 +24,26 @@ describe('resource timeseriesGroups', () => {
   test('arc: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.arc({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.timeseriesGroups.arc({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('arc: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.arc(
+      client.radar.email.routing.timeseriesGroups.arc(
         {
-          aggInterval: '1h',
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
-          encrypted: ['ENCRYPTED', 'NOT_ENCRYPTED'],
+          aggInterval: '15m',
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
+          encrypted: ['ENCRYPTED'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          ipVersion: ['IPv4'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -51,7 +51,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('dkim', async () => {
-    const responsePromise = cloudflare.radar.email.routing.timeseriesGroups.dkim();
+    const responsePromise = client.radar.email.routing.timeseriesGroups.dkim();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -64,26 +64,26 @@ describe('resource timeseriesGroups', () => {
   test('dkim: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.dkim({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.timeseriesGroups.dkim({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('dkim: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.dkim(
+      client.radar.email.routing.timeseriesGroups.dkim(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
-          encrypted: ['ENCRYPTED', 'NOT_ENCRYPTED'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dmarc: ['PASS'],
+          encrypted: ['ENCRYPTED'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          ipVersion: ['IPv4'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -91,7 +91,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('dmarc', async () => {
-    const responsePromise = cloudflare.radar.email.routing.timeseriesGroups.dmarc();
+    const responsePromise = client.radar.email.routing.timeseriesGroups.dmarc();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -104,26 +104,26 @@ describe('resource timeseriesGroups', () => {
   test('dmarc: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.dmarc({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.timeseriesGroups.dmarc({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('dmarc: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.dmarc(
+      client.radar.email.routing.timeseriesGroups.dmarc(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          encrypted: ['ENCRYPTED', 'NOT_ENCRYPTED'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          encrypted: ['ENCRYPTED'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          ipVersion: ['IPv4'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -131,7 +131,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('encrypted', async () => {
-    const responsePromise = cloudflare.radar.email.routing.timeseriesGroups.encrypted();
+    const responsePromise = client.radar.email.routing.timeseriesGroups.encrypted();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -144,26 +144,26 @@ describe('resource timeseriesGroups', () => {
   test('encrypted: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.encrypted({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.timeseriesGroups.encrypted({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('encrypted: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.encrypted(
+      client.radar.email.routing.timeseriesGroups.encrypted(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          ipVersion: ['IPv4'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -171,7 +171,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('ipVersion', async () => {
-    const responsePromise = cloudflare.radar.email.routing.timeseriesGroups.ipVersion();
+    const responsePromise = client.radar.email.routing.timeseriesGroups.ipVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -184,26 +184,26 @@ describe('resource timeseriesGroups', () => {
   test('ipVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.ipVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.timeseriesGroups.ipVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('ipVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.ipVersion(
+      client.radar.email.routing.timeseriesGroups.ipVersion(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
-          encrypted: ['ENCRYPTED', 'NOT_ENCRYPTED'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
+          encrypted: ['ENCRYPTED'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -211,7 +211,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('spf', async () => {
-    const responsePromise = cloudflare.radar.email.routing.timeseriesGroups.spf();
+    const responsePromise = client.radar.email.routing.timeseriesGroups.spf();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -224,26 +224,26 @@ describe('resource timeseriesGroups', () => {
   test('spf: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.spf({ path: '/_stainless_unknown_path' }),
+      client.radar.email.routing.timeseriesGroups.spf({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('spf: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.routing.timeseriesGroups.spf(
+      client.radar.email.routing.timeseriesGroups.spf(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
-          encrypted: ['ENCRYPTED', 'NOT_ENCRYPTED'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
+          encrypted: ['ENCRYPTED'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
-          name: ['string', 'string', 'string'],
+          ipVersion: ['IPv4'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/email/security/summary.test.ts b/tests/api-resources/radar/email/security/summary.test.ts
index a3f8cb0eaa..373d91eb4e 100644
--- a/tests/api-resources/radar/email/security/summary.test.ts
+++ b/tests/api-resources/radar/email/security/summary.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource summary', () => {
   test('arc', async () => {
-    const responsePromise = cloudflare.radar.email.security.summary.arc();
+    const responsePromise = client.radar.email.security.summary.arc();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,24 +24,24 @@ describe('resource summary', () => {
   test('arc: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.arc({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.summary.arc({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('arc: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.arc(
+      client.radar.email.security.summary.arc(
         {
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -49,7 +49,7 @@ describe('resource summary', () => {
   });
 
   test('dkim', async () => {
-    const responsePromise = cloudflare.radar.email.security.summary.dkim();
+    const responsePromise = client.radar.email.security.summary.dkim();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -62,24 +62,24 @@ describe('resource summary', () => {
   test('dkim: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.dkim({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.summary.dkim({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('dkim: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.dkim(
+      client.radar.email.security.summary.dkim(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -87,7 +87,7 @@ describe('resource summary', () => {
   });
 
   test('dmarc', async () => {
-    const responsePromise = cloudflare.radar.email.security.summary.dmarc();
+    const responsePromise = client.radar.email.security.summary.dmarc();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -100,24 +100,24 @@ describe('resource summary', () => {
   test('dmarc: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.dmarc({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.summary.dmarc({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('dmarc: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.dmarc(
+      client.radar.email.security.summary.dmarc(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -125,7 +125,7 @@ describe('resource summary', () => {
   });
 
   test('malicious', async () => {
-    const responsePromise = cloudflare.radar.email.security.summary.malicious();
+    const responsePromise = client.radar.email.security.summary.malicious();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -138,25 +138,25 @@ describe('resource summary', () => {
   test('malicious: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.malicious({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.summary.malicious({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('malicious: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.malicious(
+      client.radar.email.security.summary.malicious(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -164,7 +164,7 @@ describe('resource summary', () => {
   });
 
   test('spam', async () => {
-    const responsePromise = cloudflare.radar.email.security.summary.spam();
+    const responsePromise = client.radar.email.security.summary.spam();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -177,25 +177,25 @@ describe('resource summary', () => {
   test('spam: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.spam({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.summary.spam({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('spam: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.spam(
+      client.radar.email.security.summary.spam(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -203,7 +203,7 @@ describe('resource summary', () => {
   });
 
   test('spf', async () => {
-    const responsePromise = cloudflare.radar.email.security.summary.spf();
+    const responsePromise = client.radar.email.security.summary.spf();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -216,24 +216,24 @@ describe('resource summary', () => {
   test('spf: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.spf({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.summary.spf({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('spf: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.spf(
+      client.radar.email.security.summary.spf(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -241,7 +241,7 @@ describe('resource summary', () => {
   });
 
   test('spoof', async () => {
-    const responsePromise = cloudflare.radar.email.security.summary.spoof();
+    const responsePromise = client.radar.email.security.summary.spoof();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -254,25 +254,25 @@ describe('resource summary', () => {
   test('spoof: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.spoof({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.summary.spoof({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('spoof: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.spoof(
+      client.radar.email.security.summary.spoof(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -280,7 +280,7 @@ describe('resource summary', () => {
   });
 
   test('threatCategory', async () => {
-    const responsePromise = cloudflare.radar.email.security.summary.threatCategory();
+    const responsePromise = client.radar.email.security.summary.threatCategory();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -293,25 +293,25 @@ describe('resource summary', () => {
   test('threatCategory: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.threatCategory({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.summary.threatCategory({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('threatCategory: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.threatCategory(
+      client.radar.email.security.summary.threatCategory(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -319,7 +319,7 @@ describe('resource summary', () => {
   });
 
   test('tlsVersion', async () => {
-    const responsePromise = cloudflare.radar.email.security.summary.tlsVersion();
+    const responsePromise = client.radar.email.security.summary.tlsVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -332,24 +332,24 @@ describe('resource summary', () => {
   test('tlsVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.tlsVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.summary.tlsVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('tlsVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.summary.tlsVersion(
+      client.radar.email.security.summary.tlsVersion(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/email/security/timeseries-groups.test.ts b/tests/api-resources/radar/email/security/timeseries-groups.test.ts
index 0d750d73e4..d9758d1939 100644
--- a/tests/api-resources/radar/email/security/timeseries-groups.test.ts
+++ b/tests/api-resources/radar/email/security/timeseries-groups.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource timeseriesGroups', () => {
   test('arc', async () => {
-    const responsePromise = cloudflare.radar.email.security.timeseriesGroups.arc();
+    const responsePromise = client.radar.email.security.timeseriesGroups.arc();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,25 +24,25 @@ describe('resource timeseriesGroups', () => {
   test('arc: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.arc({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.timeseriesGroups.arc({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('arc: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.arc(
+      client.radar.email.security.timeseriesGroups.arc(
         {
-          aggInterval: '1h',
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          aggInterval: '15m',
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -50,7 +50,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('dkim', async () => {
-    const responsePromise = cloudflare.radar.email.security.timeseriesGroups.dkim();
+    const responsePromise = client.radar.email.security.timeseriesGroups.dkim();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,25 +63,25 @@ describe('resource timeseriesGroups', () => {
   test('dkim: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.dkim({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.timeseriesGroups.dkim({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('dkim: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.dkim(
+      client.radar.email.security.timeseriesGroups.dkim(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -89,7 +89,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('dmarc', async () => {
-    const responsePromise = cloudflare.radar.email.security.timeseriesGroups.dmarc();
+    const responsePromise = client.radar.email.security.timeseriesGroups.dmarc();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -102,25 +102,25 @@ describe('resource timeseriesGroups', () => {
   test('dmarc: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.dmarc({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.timeseriesGroups.dmarc({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('dmarc: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.dmarc(
+      client.radar.email.security.timeseriesGroups.dmarc(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -128,7 +128,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('malicious', async () => {
-    const responsePromise = cloudflare.radar.email.security.timeseriesGroups.malicious();
+    const responsePromise = client.radar.email.security.timeseriesGroups.malicious();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -141,26 +141,26 @@ describe('resource timeseriesGroups', () => {
   test('malicious: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.malicious({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.timeseriesGroups.malicious({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('malicious: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.malicious(
+      client.radar.email.security.timeseriesGroups.malicious(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -168,7 +168,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('spam', async () => {
-    const responsePromise = cloudflare.radar.email.security.timeseriesGroups.spam();
+    const responsePromise = client.radar.email.security.timeseriesGroups.spam();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -181,26 +181,26 @@ describe('resource timeseriesGroups', () => {
   test('spam: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.spam({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.timeseriesGroups.spam({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('spam: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.spam(
+      client.radar.email.security.timeseriesGroups.spam(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -208,7 +208,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('spf', async () => {
-    const responsePromise = cloudflare.radar.email.security.timeseriesGroups.spf();
+    const responsePromise = client.radar.email.security.timeseriesGroups.spf();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -221,25 +221,25 @@ describe('resource timeseriesGroups', () => {
   test('spf: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.spf({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.timeseriesGroups.spf({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('spf: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.spf(
+      client.radar.email.security.timeseriesGroups.spf(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -247,7 +247,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('spoof', async () => {
-    const responsePromise = cloudflare.radar.email.security.timeseriesGroups.spoof();
+    const responsePromise = client.radar.email.security.timeseriesGroups.spoof();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -260,26 +260,26 @@ describe('resource timeseriesGroups', () => {
   test('spoof: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.spoof({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.timeseriesGroups.spoof({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('spoof: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.spoof(
+      client.radar.email.security.timeseriesGroups.spoof(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -287,7 +287,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('threatCategory', async () => {
-    const responsePromise = cloudflare.radar.email.security.timeseriesGroups.threatCategory();
+    const responsePromise = client.radar.email.security.timeseriesGroups.threatCategory();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -300,26 +300,26 @@ describe('resource timeseriesGroups', () => {
   test('threatCategory: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.threatCategory({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.timeseriesGroups.threatCategory({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('threatCategory: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.threatCategory(
+      client.radar.email.security.timeseriesGroups.threatCategory(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          name: ['string'],
+          spf: ['PASS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -327,7 +327,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('tlsVersion', async () => {
-    const responsePromise = cloudflare.radar.email.security.timeseriesGroups.tlsVersion();
+    const responsePromise = client.radar.email.security.timeseriesGroups.tlsVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -340,25 +340,25 @@ describe('resource timeseriesGroups', () => {
   test('tlsVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.tlsVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.timeseriesGroups.tlsVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('tlsVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.timeseriesGroups.tlsVersion(
+      client.radar.email.security.timeseriesGroups.tlsVersion(
         {
-          aggInterval: '1h',
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          aggInterval: '15m',
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          name: ['string'],
+          spf: ['PASS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/email/security/top/tlds/malicious.test.ts b/tests/api-resources/radar/email/security/top/tlds/malicious.test.ts
index 703ab5de20..38caef0bd6 100644
--- a/tests/api-resources/radar/email/security/top/tlds/malicious.test.ts
+++ b/tests/api-resources/radar/email/security/top/tlds/malicious.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource malicious', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.email.security.top.tlds.malicious.get('MALICIOUS');
+    const responsePromise = client.radar.email.security.top.tlds.malicious.get('MALICIOUS');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,30 +24,28 @@ describe('resource malicious', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.top.tlds.malicious.get('MALICIOUS', {
-        path: '/_stainless_unknown_path',
-      }),
+      client.radar.email.security.top.tlds.malicious.get('MALICIOUS', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.top.tlds.malicious.get(
+      client.radar.email.security.top.tlds.malicious.get(
         'MALICIOUS',
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
           limit: 5,
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          name: ['string'],
+          spf: ['PASS'],
           tldCategory: 'CLASSIC',
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/email/security/top/tlds/spam.test.ts b/tests/api-resources/radar/email/security/top/tlds/spam.test.ts
index 4071b306be..e466d65bc3 100644
--- a/tests/api-resources/radar/email/security/top/tlds/spam.test.ts
+++ b/tests/api-resources/radar/email/security/top/tlds/spam.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource spam', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.email.security.top.tlds.spam.get('SPAM');
+    const responsePromise = client.radar.email.security.top.tlds.spam.get('SPAM');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,28 +24,28 @@ describe('resource spam', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.top.tlds.spam.get('SPAM', { path: '/_stainless_unknown_path' }),
+      client.radar.email.security.top.tlds.spam.get('SPAM', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.top.tlds.spam.get(
+      client.radar.email.security.top.tlds.spam.get(
         'SPAM',
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
           limit: 5,
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          name: ['string'],
+          spf: ['PASS'],
           tldCategory: 'CLASSIC',
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/email/security/top/tlds/spoof.test.ts b/tests/api-resources/radar/email/security/top/tlds/spoof.test.ts
index 81b45a98f6..53749ed460 100644
--- a/tests/api-resources/radar/email/security/top/tlds/spoof.test.ts
+++ b/tests/api-resources/radar/email/security/top/tlds/spoof.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource spoof', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.email.security.top.tlds.spoof.get('SPOOF');
+    const responsePromise = client.radar.email.security.top.tlds.spoof.get('SPOOF');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,28 +24,28 @@ describe('resource spoof', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.top.tlds.spoof.get('SPOOF', { path: '/_stainless_unknown_path' }),
+      client.radar.email.security.top.tlds.spoof.get('SPOOF', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.top.tlds.spoof.get(
+      client.radar.email.security.top.tlds.spoof.get(
         'SPOOF',
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
           limit: 5,
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          name: ['string'],
+          spf: ['PASS'],
           tldCategory: 'CLASSIC',
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/email/security/top/tlds/tlds.test.ts b/tests/api-resources/radar/email/security/top/tlds/tlds.test.ts
index ff0a70e4f8..96b29dad64 100644
--- a/tests/api-resources/radar/email/security/top/tlds/tlds.test.ts
+++ b/tests/api-resources/radar/email/security/top/tlds/tlds.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource tlds', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.email.security.top.tlds.get();
+    const responsePromise = client.radar.email.security.top.tlds.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,27 +24,27 @@ describe('resource tlds', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.top.tlds.get({ path: '/_stainless_unknown_path' }),
+      client.radar.email.security.top.tlds.get({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.email.security.top.tlds.get(
+      client.radar.email.security.top.tlds.get(
         {
-          arc: ['PASS', 'NONE', 'FAIL'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dkim: ['PASS', 'NONE', 'FAIL'],
-          dmarc: ['PASS', 'NONE', 'FAIL'],
+          arc: ['PASS'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          dkim: ['PASS'],
+          dmarc: ['PASS'],
           format: 'JSON',
           limit: 5,
-          name: ['string', 'string', 'string'],
-          spf: ['PASS', 'NONE', 'FAIL'],
+          name: ['string'],
+          spf: ['PASS'],
           tldCategory: 'CLASSIC',
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/entities/asns.test.ts b/tests/api-resources/radar/entities/asns.test.ts
index 36c77c02a3..ad199581c1 100644
--- a/tests/api-resources/radar/entities/asns.test.ts
+++ b/tests/api-resources/radar/entities/asns.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource asns', () => {
   test('list', async () => {
-    const responsePromise = cloudflare.radar.entities.asns.list();
+    const responsePromise = client.radar.entities.asns.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource asns', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.entities.asns.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.entities.asns.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,7 +31,7 @@ describe('resource asns', () => {
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.entities.asns.list(
+      client.radar.entities.asns.list(
         { asn: '174,7922', format: 'JSON', limit: 5, location: 'US', offset: 0, orderBy: 'ASN' },
         { path: '/_stainless_unknown_path' },
       ),
@@ -39,7 +39,7 @@ describe('resource asns', () => {
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.radar.entities.asns.get(3);
+    const responsePromise = client.radar.entities.asns.get(3);
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -51,7 +51,7 @@ describe('resource asns', () => {
 
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.entities.asns.get(3, { path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.entities.asns.get(3, { path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -59,12 +59,12 @@ describe('resource asns', () => {
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.entities.asns.get(3, { format: 'JSON' }, { path: '/_stainless_unknown_path' }),
+      client.radar.entities.asns.get(3, { format: 'JSON' }, { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('ip: only required params', async () => {
-    const responsePromise = cloudflare.radar.entities.asns.ip({ ip: '8.8.8.8' });
+    const responsePromise = client.radar.entities.asns.ip({ ip: '8.8.8.8' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -75,11 +75,11 @@ describe('resource asns', () => {
   });
 
   test('ip: required and optional params', async () => {
-    const response = await cloudflare.radar.entities.asns.ip({ ip: '8.8.8.8', format: 'JSON' });
+    const response = await client.radar.entities.asns.ip({ ip: '8.8.8.8', format: 'JSON' });
   });
 
   test('rel', async () => {
-    const responsePromise = cloudflare.radar.entities.asns.rel(3);
+    const responsePromise = client.radar.entities.asns.rel(3);
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -91,7 +91,7 @@ describe('resource asns', () => {
 
   test('rel: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.entities.asns.rel(3, { path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.entities.asns.rel(3, { path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -99,11 +99,7 @@ describe('resource asns', () => {
   test('rel: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.entities.asns.rel(
-        3,
-        { asn2: 0, format: 'JSON' },
-        { path: '/_stainless_unknown_path' },
-      ),
+      client.radar.entities.asns.rel(3, { asn2: 0, format: 'JSON' }, { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 });
diff --git a/tests/api-resources/radar/entities/entities.test.ts b/tests/api-resources/radar/entities/entities.test.ts
index c1a3573993..677de61675 100644
--- a/tests/api-resources/radar/entities/entities.test.ts
+++ b/tests/api-resources/radar/entities/entities.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource entities', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.radar.entities.get({ ip: '8.8.8.8' });
+    const responsePromise = client.radar.entities.get({ ip: '8.8.8.8' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,6 +22,6 @@ describe('resource entities', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.radar.entities.get({ ip: '8.8.8.8', format: 'JSON' });
+    const response = await client.radar.entities.get({ ip: '8.8.8.8', format: 'JSON' });
   });
 });
diff --git a/tests/api-resources/radar/entities/locations.test.ts b/tests/api-resources/radar/entities/locations.test.ts
index 88d171c559..6da8c13e88 100644
--- a/tests/api-resources/radar/entities/locations.test.ts
+++ b/tests/api-resources/radar/entities/locations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource locations', () => {
   test('list', async () => {
-    const responsePromise = cloudflare.radar.entities.locations.list();
+    const responsePromise = client.radar.entities.locations.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,15 +23,15 @@ describe('resource locations', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.entities.locations.list({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.entities.locations.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.entities.locations.list(
+      client.radar.entities.locations.list(
         { format: 'JSON', limit: 5, location: 'US,CA', offset: 0 },
         { path: '/_stainless_unknown_path' },
       ),
@@ -39,7 +39,7 @@ describe('resource locations', () => {
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.radar.entities.locations.get('US');
+    const responsePromise = client.radar.entities.locations.get('US');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -52,14 +52,14 @@ describe('resource locations', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.entities.locations.get('US', { path: '/_stainless_unknown_path' }),
+      client.radar.entities.locations.get('US', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.entities.locations.get('US', { format: 'JSON' }, { path: '/_stainless_unknown_path' }),
+      client.radar.entities.locations.get('US', { format: 'JSON' }, { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 });
diff --git a/tests/api-resources/radar/http/ases/ases.test.ts b/tests/api-resources/radar/http/ases/ases.test.ts
index 2b207e88fb..2e6b3acc9b 100644
--- a/tests/api-resources/radar/http/ases/ases.test.ts
+++ b/tests/api-resources/radar/http/ases/ases.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ases', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.ases.get();
+    const responsePromise = client.radar.http.ases.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource ases', () => {
 
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.http.ases.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.http.ases.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,25 +31,25 @@ describe('resource ases', () => {
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.get(
+      client.radar.http.ases.get(
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/ases/bot-class.test.ts b/tests/api-resources/radar/http/ases/bot-class.test.ts
index 40998a7582..008c2ca49c 100644
--- a/tests/api-resources/radar/http/ases/bot-class.test.ts
+++ b/tests/api-resources/radar/http/ases/bot-class.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource botClass', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.ases.botClass.get('LIKELY_AUTOMATED');
+    const responsePromise = client.radar.http.ases.botClass.get('LIKELY_AUTOMATED');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource botClass', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.botClass.get('LIKELY_AUTOMATED', { path: '/_stainless_unknown_path' }),
+      client.radar.http.ases.botClass.get('LIKELY_AUTOMATED', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.botClass.get(
+      client.radar.http.ases.botClass.get(
         'LIKELY_AUTOMATED',
         {
-          asn: ['string', 'string', 'string'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/ases/browser-family.test.ts b/tests/api-resources/radar/http/ases/browser-family.test.ts
index e9d53288d0..14b3a513f2 100644
--- a/tests/api-resources/radar/http/ases/browser-family.test.ts
+++ b/tests/api-resources/radar/http/ases/browser-family.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource browserFamily', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.ases.browserFamily.get('CHROME');
+    const responsePromise = client.radar.http.ases.browserFamily.get('CHROME');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource browserFamily', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.browserFamily.get('CHROME', { path: '/_stainless_unknown_path' }),
+      client.radar.http.ases.browserFamily.get('CHROME', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.browserFamily.get(
+      client.radar.http.ases.browserFamily.get(
         'CHROME',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/ases/device-type.test.ts b/tests/api-resources/radar/http/ases/device-type.test.ts
index 5bf7f7ac01..1981eae34a 100644
--- a/tests/api-resources/radar/http/ases/device-type.test.ts
+++ b/tests/api-resources/radar/http/ases/device-type.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource deviceType', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.ases.deviceType.get('DESKTOP');
+    const responsePromise = client.radar.http.ases.deviceType.get('DESKTOP');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource deviceType', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.deviceType.get('DESKTOP', { path: '/_stainless_unknown_path' }),
+      client.radar.http.ases.deviceType.get('DESKTOP', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.deviceType.get(
+      client.radar.http.ases.deviceType.get(
         'DESKTOP',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/ases/http-method.test.ts b/tests/api-resources/radar/http/ases/http-method.test.ts
index 5a0dee749e..9ee9b91f9c 100644
--- a/tests/api-resources/radar/http/ases/http-method.test.ts
+++ b/tests/api-resources/radar/http/ases/http-method.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource httpMethod', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.ases.httpMethod.get('HTTPv1');
+    const responsePromise = client.radar.http.ases.httpMethod.get('HTTPv1');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource httpMethod', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.httpMethod.get('HTTPv1', { path: '/_stainless_unknown_path' }),
+      client.radar.http.ases.httpMethod.get('HTTPv1', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.httpMethod.get(
+      client.radar.http.ases.httpMethod.get(
         'HTTPv1',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/ases/http-protocol.test.ts b/tests/api-resources/radar/http/ases/http-protocol.test.ts
index 0d9ca582af..ae88a33ed5 100644
--- a/tests/api-resources/radar/http/ases/http-protocol.test.ts
+++ b/tests/api-resources/radar/http/ases/http-protocol.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource httpProtocol', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.ases.httpProtocol.get('HTTP');
+    const responsePromise = client.radar.http.ases.httpProtocol.get('HTTP');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,31 +24,31 @@ describe('resource httpProtocol', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.httpProtocol.get('HTTP', { path: '/_stainless_unknown_path' }),
+      client.radar.http.ases.httpProtocol.get('HTTP', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.httpProtocol.get(
+      client.radar.http.ases.httpProtocol.get(
         'HTTP',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/ases/ip-version.test.ts b/tests/api-resources/radar/http/ases/ip-version.test.ts
index dde0bd1c64..2e8aaceef0 100644
--- a/tests/api-resources/radar/http/ases/ip-version.test.ts
+++ b/tests/api-resources/radar/http/ases/ip-version.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ipVersion', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.ases.ipVersion.get('IPv4');
+    const responsePromise = client.radar.http.ases.ipVersion.get('IPv4');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource ipVersion', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.ipVersion.get('IPv4', { path: '/_stainless_unknown_path' }),
+      client.radar.http.ases.ipVersion.get('IPv4', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.ipVersion.get(
+      client.radar.http.ases.ipVersion.get(
         'IPv4',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/ases/os.test.ts b/tests/api-resources/radar/http/ases/os.test.ts
index a00f7f2d36..4c3980d344 100644
--- a/tests/api-resources/radar/http/ases/os.test.ts
+++ b/tests/api-resources/radar/http/ases/os.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource os', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.ases.os.get('WINDOWS');
+    const responsePromise = client.radar.http.ases.os.get('WINDOWS');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource os', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.os.get('WINDOWS', { path: '/_stainless_unknown_path' }),
+      client.radar.http.ases.os.get('WINDOWS', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.os.get(
+      client.radar.http.ases.os.get(
         'WINDOWS',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/ases/tls-version.test.ts b/tests/api-resources/radar/http/ases/tls-version.test.ts
index 19dbb6cd04..fa9e1e8787 100644
--- a/tests/api-resources/radar/http/ases/tls-version.test.ts
+++ b/tests/api-resources/radar/http/ases/tls-version.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource tlsVersion', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.ases.tlsVersion.get('TLSv1_0');
+    const responsePromise = client.radar.http.ases.tlsVersion.get('TLSv1_0');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource tlsVersion', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.tlsVersion.get('TLSv1_0', { path: '/_stainless_unknown_path' }),
+      client.radar.http.ases.tlsVersion.get('TLSv1_0', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.ases.tlsVersion.get(
+      client.radar.http.ases.tlsVersion.get(
         'TLSv1_0',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/http.test.ts b/tests/api-resources/radar/http/http.test.ts
index 4175cf5ab2..3b7751067c 100644
--- a/tests/api-resources/radar/http/http.test.ts
+++ b/tests/api-resources/radar/http/http.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource http', () => {
   test('timeseries', async () => {
-    const responsePromise = cloudflare.radar.http.timeseries();
+    const responsePromise = client.radar.http.timeseries();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource http', () => {
 
   test('timeseries: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.http.timeseries({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.http.timeseries({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,17 +31,25 @@ describe('resource http', () => {
   test('timeseries: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseries(
+      client.radar.http.timeseries(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          normalization: 'PERCENTAGE_CHANGE',
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/locations/bot-class.test.ts b/tests/api-resources/radar/http/locations/bot-class.test.ts
index 60ad001bb5..b6a0cc8bd0 100644
--- a/tests/api-resources/radar/http/locations/bot-class.test.ts
+++ b/tests/api-resources/radar/http/locations/bot-class.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource botClass', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.locations.botClass.get('LIKELY_AUTOMATED');
+    const responsePromise = client.radar.http.locations.botClass.get('LIKELY_AUTOMATED');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource botClass', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.botClass.get('LIKELY_AUTOMATED', { path: '/_stainless_unknown_path' }),
+      client.radar.http.locations.botClass.get('LIKELY_AUTOMATED', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.botClass.get(
+      client.radar.http.locations.botClass.get(
         'LIKELY_AUTOMATED',
         {
-          asn: ['string', 'string', 'string'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/locations/browser-family.test.ts b/tests/api-resources/radar/http/locations/browser-family.test.ts
index 858f9ee4f1..d20be14e43 100644
--- a/tests/api-resources/radar/http/locations/browser-family.test.ts
+++ b/tests/api-resources/radar/http/locations/browser-family.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource browserFamily', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.locations.browserFamily.get('CHROME');
+    const responsePromise = client.radar.http.locations.browserFamily.get('CHROME');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource browserFamily', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.browserFamily.get('CHROME', { path: '/_stainless_unknown_path' }),
+      client.radar.http.locations.browserFamily.get('CHROME', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.browserFamily.get(
+      client.radar.http.locations.browserFamily.get(
         'CHROME',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/locations/device-type.test.ts b/tests/api-resources/radar/http/locations/device-type.test.ts
index 8777f1346e..02965b2efd 100644
--- a/tests/api-resources/radar/http/locations/device-type.test.ts
+++ b/tests/api-resources/radar/http/locations/device-type.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource deviceType', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.locations.deviceType.get('DESKTOP');
+    const responsePromise = client.radar.http.locations.deviceType.get('DESKTOP');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource deviceType', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.deviceType.get('DESKTOP', { path: '/_stainless_unknown_path' }),
+      client.radar.http.locations.deviceType.get('DESKTOP', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.deviceType.get(
+      client.radar.http.locations.deviceType.get(
         'DESKTOP',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/locations/http-method.test.ts b/tests/api-resources/radar/http/locations/http-method.test.ts
index e097550dec..fa83072b5a 100644
--- a/tests/api-resources/radar/http/locations/http-method.test.ts
+++ b/tests/api-resources/radar/http/locations/http-method.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource httpMethod', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.locations.httpMethod.get('HTTPv1');
+    const responsePromise = client.radar.http.locations.httpMethod.get('HTTPv1');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource httpMethod', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.httpMethod.get('HTTPv1', { path: '/_stainless_unknown_path' }),
+      client.radar.http.locations.httpMethod.get('HTTPv1', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.httpMethod.get(
+      client.radar.http.locations.httpMethod.get(
         'HTTPv1',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/locations/http-protocol.test.ts b/tests/api-resources/radar/http/locations/http-protocol.test.ts
index b2802be347..2d18466079 100644
--- a/tests/api-resources/radar/http/locations/http-protocol.test.ts
+++ b/tests/api-resources/radar/http/locations/http-protocol.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource httpProtocol', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.locations.httpProtocol.get('HTTP');
+    const responsePromise = client.radar.http.locations.httpProtocol.get('HTTP');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,31 +24,31 @@ describe('resource httpProtocol', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.httpProtocol.get('HTTP', { path: '/_stainless_unknown_path' }),
+      client.radar.http.locations.httpProtocol.get('HTTP', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.httpProtocol.get(
+      client.radar.http.locations.httpProtocol.get(
         'HTTP',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          ipVersion: ['IPv4', 'IPv6'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/locations/ip-version.test.ts b/tests/api-resources/radar/http/locations/ip-version.test.ts
index e79879daf9..f31e4b6af4 100644
--- a/tests/api-resources/radar/http/locations/ip-version.test.ts
+++ b/tests/api-resources/radar/http/locations/ip-version.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ipVersion', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.locations.ipVersion.get('IPv4');
+    const responsePromise = client.radar.http.locations.ipVersion.get('IPv4');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource ipVersion', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.ipVersion.get('IPv4', { path: '/_stainless_unknown_path' }),
+      client.radar.http.locations.ipVersion.get('IPv4', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.ipVersion.get(
+      client.radar.http.locations.ipVersion.get(
         'IPv4',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/locations/locations.test.ts b/tests/api-resources/radar/http/locations/locations.test.ts
index 2556e1d33f..2502c31975 100644
--- a/tests/api-resources/radar/http/locations/locations.test.ts
+++ b/tests/api-resources/radar/http/locations/locations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource locations', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.locations.get();
+    const responsePromise = client.radar.http.locations.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource locations', () => {
 
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.http.locations.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.http.locations.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,25 +31,25 @@ describe('resource locations', () => {
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.get(
+      client.radar.http.locations.get(
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/locations/os.test.ts b/tests/api-resources/radar/http/locations/os.test.ts
index 6816f409ea..2b83de821b 100644
--- a/tests/api-resources/radar/http/locations/os.test.ts
+++ b/tests/api-resources/radar/http/locations/os.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource os', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.locations.os.get('WINDOWS');
+    const responsePromise = client.radar.http.locations.os.get('WINDOWS');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource os', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.os.get('WINDOWS', { path: '/_stainless_unknown_path' }),
+      client.radar.http.locations.os.get('WINDOWS', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.os.get(
+      client.radar.http.locations.os.get(
         'WINDOWS',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/locations/tls-version.test.ts b/tests/api-resources/radar/http/locations/tls-version.test.ts
index 92783ec837..66738f3e29 100644
--- a/tests/api-resources/radar/http/locations/tls-version.test.ts
+++ b/tests/api-resources/radar/http/locations/tls-version.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource tlsVersion', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.http.locations.tlsVersion.get('TLSv1_0');
+    const responsePromise = client.radar.http.locations.tlsVersion.get('TLSv1_0');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,32 +24,32 @@ describe('resource tlsVersion', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.tlsVersion.get('TLSv1_0', { path: '/_stainless_unknown_path' }),
+      client.radar.http.locations.tlsVersion.get('TLSv1_0', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.locations.tlsVersion.get(
+      client.radar.http.locations.tlsVersion.get(
         'TLSv1_0',
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/summary.test.ts b/tests/api-resources/radar/http/summary.test.ts
index e56e45707a..cfd45f565f 100644
--- a/tests/api-resources/radar/http/summary.test.ts
+++ b/tests/api-resources/radar/http/summary.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource summary', () => {
   test('botClass', async () => {
-    const responsePromise = cloudflare.radar.http.summary.botClass();
+    const responsePromise = client.radar.http.summary.botClass();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,30 +23,30 @@ describe('resource summary', () => {
 
   test('botClass: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.http.summary.botClass({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.http.summary.botClass({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('botClass: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.summary.botClass(
+      client.radar.http.summary.botClass(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -54,7 +54,7 @@ describe('resource summary', () => {
   });
 
   test('deviceType', async () => {
-    const responsePromise = cloudflare.radar.http.summary.deviceType();
+    const responsePromise = client.radar.http.summary.deviceType();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -66,30 +66,30 @@ describe('resource summary', () => {
 
   test('deviceType: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.http.summary.deviceType({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.http.summary.deviceType({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('deviceType: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.summary.deviceType(
+      client.radar.http.summary.deviceType(
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -97,7 +97,7 @@ describe('resource summary', () => {
   });
 
   test('httpProtocol', async () => {
-    const responsePromise = cloudflare.radar.http.summary.httpProtocol();
+    const responsePromise = client.radar.http.summary.httpProtocol();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -110,29 +110,29 @@ describe('resource summary', () => {
   test('httpProtocol: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.summary.httpProtocol({ path: '/_stainless_unknown_path' }),
+      client.radar.http.summary.httpProtocol({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('httpProtocol: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.summary.httpProtocol(
+      client.radar.http.summary.httpProtocol(
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -140,7 +140,7 @@ describe('resource summary', () => {
   });
 
   test('httpVersion', async () => {
-    const responsePromise = cloudflare.radar.http.summary.httpVersion();
+    const responsePromise = client.radar.http.summary.httpVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -152,30 +152,30 @@ describe('resource summary', () => {
 
   test('httpVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.http.summary.httpVersion({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.http.summary.httpVersion({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('httpVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.summary.httpVersion(
+      client.radar.http.summary.httpVersion(
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -183,7 +183,7 @@ describe('resource summary', () => {
   });
 
   test('ipVersion', async () => {
-    const responsePromise = cloudflare.radar.http.summary.ipVersion();
+    const responsePromise = client.radar.http.summary.ipVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -195,30 +195,30 @@ describe('resource summary', () => {
 
   test('ipVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.http.summary.ipVersion({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.http.summary.ipVersion({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('ipVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.summary.ipVersion(
+      client.radar.http.summary.ipVersion(
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -226,7 +226,7 @@ describe('resource summary', () => {
   });
 
   test('os', async () => {
-    const responsePromise = cloudflare.radar.http.summary.os();
+    const responsePromise = client.radar.http.summary.os();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -238,7 +238,7 @@ describe('resource summary', () => {
 
   test('os: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.http.summary.os({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.http.summary.os({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -246,22 +246,22 @@ describe('resource summary', () => {
   test('os: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.summary.os(
+      client.radar.http.summary.os(
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -269,7 +269,7 @@ describe('resource summary', () => {
   });
 
   test('postQuantum', async () => {
-    const responsePromise = cloudflare.radar.http.summary.postQuantum();
+    const responsePromise = client.radar.http.summary.postQuantum();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -281,31 +281,31 @@ describe('resource summary', () => {
 
   test('postQuantum: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.http.summary.postQuantum({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.http.summary.postQuantum({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('postQuantum: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.summary.postQuantum(
+      client.radar.http.summary.postQuantum(
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -313,7 +313,7 @@ describe('resource summary', () => {
   });
 
   test('tlsVersion', async () => {
-    const responsePromise = cloudflare.radar.http.summary.tlsVersion();
+    const responsePromise = client.radar.http.summary.tlsVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -325,30 +325,30 @@ describe('resource summary', () => {
 
   test('tlsVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.http.summary.tlsVersion({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.http.summary.tlsVersion({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('tlsVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.summary.tlsVersion(
+      client.radar.http.summary.tlsVersion(
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/timeseries-groups.test.ts b/tests/api-resources/radar/http/timeseries-groups.test.ts
index 21d0449d4d..f485a08088 100644
--- a/tests/api-resources/radar/http/timeseries-groups.test.ts
+++ b/tests/api-resources/radar/http/timeseries-groups.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource timeseriesGroups', () => {
   test('botClass', async () => {
-    const responsePromise = cloudflare.radar.http.timeseriesGroups.botClass();
+    const responsePromise = client.radar.http.timeseriesGroups.botClass();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,30 +24,30 @@ describe('resource timeseriesGroups', () => {
   test('botClass: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.botClass({ path: '/_stainless_unknown_path' }),
+      client.radar.http.timeseriesGroups.botClass({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('botClass: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.botClass(
+      client.radar.http.timeseriesGroups.botClass(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -55,7 +55,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('browser', async () => {
-    const responsePromise = cloudflare.radar.http.timeseriesGroups.browser();
+    const responsePromise = client.radar.http.timeseriesGroups.browser();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -68,32 +68,32 @@ describe('resource timeseriesGroups', () => {
   test('browser: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.browser({ path: '/_stainless_unknown_path' }),
+      client.radar.http.timeseriesGroups.browser({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('browser: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.browser(
+      client.radar.http.timeseriesGroups.browser(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          aggInterval: '15m',
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          limitPerGroup: 4,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -101,7 +101,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('browserFamily', async () => {
-    const responsePromise = cloudflare.radar.http.timeseriesGroups.browserFamily();
+    const responsePromise = client.radar.http.timeseriesGroups.browserFamily();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -114,31 +114,32 @@ describe('resource timeseriesGroups', () => {
   test('browserFamily: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.browserFamily({ path: '/_stainless_unknown_path' }),
+      client.radar.http.timeseriesGroups.browserFamily({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('browserFamily: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.browserFamily(
+      client.radar.http.timeseriesGroups.browserFamily(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          aggInterval: '15m',
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          limitPerGroup: 10,
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -146,7 +147,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('deviceType', async () => {
-    const responsePromise = cloudflare.radar.http.timeseriesGroups.deviceType();
+    const responsePromise = client.radar.http.timeseriesGroups.deviceType();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -159,30 +160,30 @@ describe('resource timeseriesGroups', () => {
   test('deviceType: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.deviceType({ path: '/_stainless_unknown_path' }),
+      client.radar.http.timeseriesGroups.deviceType({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('deviceType: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.deviceType(
+      client.radar.http.timeseriesGroups.deviceType(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -190,7 +191,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('httpProtocol', async () => {
-    const responsePromise = cloudflare.radar.http.timeseriesGroups.httpProtocol();
+    const responsePromise = client.radar.http.timeseriesGroups.httpProtocol();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -203,30 +204,30 @@ describe('resource timeseriesGroups', () => {
   test('httpProtocol: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.httpProtocol({ path: '/_stainless_unknown_path' }),
+      client.radar.http.timeseriesGroups.httpProtocol({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('httpProtocol: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.httpProtocol(
+      client.radar.http.timeseriesGroups.httpProtocol(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          aggInterval: '15m',
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -234,7 +235,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('httpVersion', async () => {
-    const responsePromise = cloudflare.radar.http.timeseriesGroups.httpVersion();
+    const responsePromise = client.radar.http.timeseriesGroups.httpVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -247,30 +248,30 @@ describe('resource timeseriesGroups', () => {
   test('httpVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.httpVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.http.timeseriesGroups.httpVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('httpVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.httpVersion(
+      client.radar.http.timeseriesGroups.httpVersion(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          aggInterval: '15m',
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -278,7 +279,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('ipVersion', async () => {
-    const responsePromise = cloudflare.radar.http.timeseriesGroups.ipVersion();
+    const responsePromise = client.radar.http.timeseriesGroups.ipVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -291,30 +292,30 @@ describe('resource timeseriesGroups', () => {
   test('ipVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.ipVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.http.timeseriesGroups.ipVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('ipVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.ipVersion(
+      client.radar.http.timeseriesGroups.ipVersion(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          aggInterval: '15m',
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -322,7 +323,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('os', async () => {
-    const responsePromise = cloudflare.radar.http.timeseriesGroups.os();
+    const responsePromise = client.radar.http.timeseriesGroups.os();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -334,31 +335,31 @@ describe('resource timeseriesGroups', () => {
 
   test('os: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.http.timeseriesGroups.os({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.http.timeseriesGroups.os({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('os: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.os(
+      client.radar.http.timeseriesGroups.os(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          aggInterval: '15m',
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -366,7 +367,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('postQuantum', async () => {
-    const responsePromise = cloudflare.radar.http.timeseriesGroups.postQuantum();
+    const responsePromise = client.radar.http.timeseriesGroups.postQuantum();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -379,31 +380,31 @@ describe('resource timeseriesGroups', () => {
   test('postQuantum: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.postQuantum({ path: '/_stainless_unknown_path' }),
+      client.radar.http.timeseriesGroups.postQuantum({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('postQuantum: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.postQuantum(
+      client.radar.http.timeseriesGroups.postQuantum(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          aggInterval: '15m',
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -411,7 +412,7 @@ describe('resource timeseriesGroups', () => {
   });
 
   test('tlsVersion', async () => {
-    const responsePromise = cloudflare.radar.http.timeseriesGroups.tlsVersion();
+    const responsePromise = client.radar.http.timeseriesGroups.tlsVersion();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -424,30 +425,30 @@ describe('resource timeseriesGroups', () => {
   test('tlsVersion: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.tlsVersion({ path: '/_stainless_unknown_path' }),
+      client.radar.http.timeseriesGroups.tlsVersion({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('tlsVersion: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.timeseriesGroups.tlsVersion(
+      client.radar.http.timeseriesGroups.tlsVersion(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          aggInterval: '15m',
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/http/top.test.ts b/tests/api-resources/radar/http/top.test.ts
index e0e029219f..14cb77b141 100644
--- a/tests/api-resources/radar/http/top.test.ts
+++ b/tests/api-resources/radar/http/top.test.ts
@@ -3,15 +3,15 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource top', () => {
-  test('browserFamilies', async () => {
-    const responsePromise = cloudflare.radar.http.top.browserFamilies();
+  test('browser', async () => {
+    const responsePromise = client.radar.http.top.browser();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,43 +21,43 @@ describe('resource top', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('browserFamilies: request options instead of params are passed correctly', async () => {
+  test('browser: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.http.top.browserFamilies({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.http.top.browser({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
-  test('browserFamilies: request options and params are passed correctly', async () => {
+  test('browser: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.top.browserFamilies(
+      client.radar.http.top.browser(
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
-  test('browsers', async () => {
-    const responsePromise = cloudflare.radar.http.top.browsers();
+  test('browserFamily', async () => {
+    const responsePromise = client.radar.http.top.browserFamily();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -67,35 +67,35 @@ describe('resource top', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('browsers: request options instead of params are passed correctly', async () => {
+  test('browserFamily: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.http.top.browsers({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.http.top.browserFamily({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
 
-  test('browsers: request options and params are passed correctly', async () => {
+  test('browserFamily: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.http.top.browsers(
+      client.radar.http.top.browserFamily(
         {
-          asn: ['string', 'string', 'string'],
-          botClass: ['LIKELY_AUTOMATED', 'LIKELY_HUMAN'],
-          browserFamily: ['CHROME', 'EDGE', 'FIREFOX'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          deviceType: ['DESKTOP', 'MOBILE', 'OTHER'],
+          asn: ['string'],
+          botClass: ['LIKELY_AUTOMATED'],
+          browserFamily: ['CHROME'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          deviceType: ['DESKTOP'],
           format: 'JSON',
-          httpProtocol: ['HTTP', 'HTTPS'],
-          httpVersion: ['HTTPv1', 'HTTPv2', 'HTTPv3'],
-          ipVersion: ['IPv4', 'IPv6'],
+          httpProtocol: ['HTTP'],
+          httpVersion: ['HTTPv1'],
+          ipVersion: ['IPv4'],
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          os: ['WINDOWS', 'MACOSX', 'IOS'],
-          tlsVersion: ['TLSv1_0', 'TLSv1_1', 'TLSv1_2'],
+          location: ['string'],
+          name: ['string'],
+          os: ['WINDOWS'],
+          tlsVersion: ['TLSv1_0'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/netflows/netflows.test.ts b/tests/api-resources/radar/netflows/netflows.test.ts
index b430bbae26..1629792d8d 100644
--- a/tests/api-resources/radar/netflows/netflows.test.ts
+++ b/tests/api-resources/radar/netflows/netflows.test.ts
@@ -3,15 +3,52 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource netflows', () => {
+  test('summary', async () => {
+    const responsePromise = client.radar.netflows.summary();
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('summary: request options instead of params are passed correctly', async () => {
+    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
+    await expect(client.radar.netflows.summary({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
+  });
+
+  test('summary: request options and params are passed correctly', async () => {
+    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
+    await expect(
+      client.radar.netflows.summary(
+        {
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          format: 'JSON',
+          location: ['string'],
+          name: ['string'],
+        },
+        { path: '/_stainless_unknown_path' },
+      ),
+    ).rejects.toThrow(Cloudflare.NotFoundError);
+  });
+
   test('timeseries', async () => {
-    const responsePromise = cloudflare.radar.netflows.timeseries();
+    const responsePromise = client.radar.netflows.timeseries();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +60,7 @@ describe('resource netflows', () => {
 
   test('timeseries: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.netflows.timeseries({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.netflows.timeseries({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,19 +68,19 @@ describe('resource netflows', () => {
   test('timeseries: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.netflows.timeseries(
+      client.radar.netflows.timeseries(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
-          normalization: 'MIN0_MAX',
-          product: ['HTTP', 'ALL'],
+          location: ['string'],
+          name: ['string'],
+          normalization: 'PERCENTAGE_CHANGE',
+          product: ['HTTP'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/netflows/top.test.ts b/tests/api-resources/radar/netflows/top.test.ts
index fe20cc6688..74386ef920 100644
--- a/tests/api-resources/radar/netflows/top.test.ts
+++ b/tests/api-resources/radar/netflows/top.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource top', () => {
   test('ases', async () => {
-    const responsePromise = cloudflare.radar.netflows.top.ases();
+    const responsePromise = client.radar.netflows.top.ases();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource top', () => {
 
   test('ases: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.netflows.top.ases({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.netflows.top.ases({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,17 +31,17 @@ describe('resource top', () => {
   test('ases: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.netflows.top.ases(
+      client.radar.netflows.top.ases(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -49,7 +49,7 @@ describe('resource top', () => {
   });
 
   test('locations', async () => {
-    const responsePromise = cloudflare.radar.netflows.top.locations();
+    const responsePromise = client.radar.netflows.top.locations();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -61,25 +61,25 @@ describe('resource top', () => {
 
   test('locations: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.netflows.top.locations({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.netflows.top.locations({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('locations: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.netflows.top.locations(
+      client.radar.netflows.top.locations(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/quality/iqi.test.ts b/tests/api-resources/radar/quality/iqi.test.ts
index 9fb6908d24..ceb694eb57 100644
--- a/tests/api-resources/radar/quality/iqi.test.ts
+++ b/tests/api-resources/radar/quality/iqi.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource iqi', () => {
   test('summary: only required params', async () => {
-    const responsePromise = cloudflare.radar.quality.iqi.summary({ metric: 'BANDWIDTH' });
+    const responsePromise = client.radar.quality.iqi.summary({ metric: 'BANDWIDTH' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,21 +22,21 @@ describe('resource iqi', () => {
   });
 
   test('summary: required and optional params', async () => {
-    const response = await cloudflare.radar.quality.iqi.summary({
+    const response = await client.radar.quality.iqi.summary({
       metric: 'BANDWIDTH',
-      asn: ['string', 'string', 'string'],
-      continent: ['string', 'string', 'string'],
-      dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-      dateRange: ['7d', '7d', '7d'],
-      dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+      asn: ['string'],
+      continent: ['string'],
+      dateEnd: ['2019-12-27T18:11:19.117Z'],
+      dateRange: ['7d'],
+      dateStart: ['2019-12-27T18:11:19.117Z'],
       format: 'JSON',
-      location: ['string', 'string', 'string'],
-      name: ['string', 'string', 'string'],
+      location: ['string'],
+      name: ['string'],
     });
   });
 
   test('timeseriesGroups: only required params', async () => {
-    const responsePromise = cloudflare.radar.quality.iqi.timeseriesGroups({ metric: 'BANDWIDTH' });
+    const responsePromise = client.radar.quality.iqi.timeseriesGroups({ metric: 'BANDWIDTH' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -47,18 +47,18 @@ describe('resource iqi', () => {
   });
 
   test('timeseriesGroups: required and optional params', async () => {
-    const response = await cloudflare.radar.quality.iqi.timeseriesGroups({
+    const response = await client.radar.quality.iqi.timeseriesGroups({
       metric: 'BANDWIDTH',
-      aggInterval: '1h',
-      asn: ['string', 'string', 'string'],
-      continent: ['string', 'string', 'string'],
-      dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-      dateRange: ['7d', '7d', '7d'],
-      dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+      aggInterval: '15m',
+      asn: ['string'],
+      continent: ['string'],
+      dateEnd: ['2019-12-27T18:11:19.117Z'],
+      dateRange: ['7d'],
+      dateStart: ['2019-12-27T18:11:19.117Z'],
       format: 'JSON',
       interpolation: true,
-      location: ['string', 'string', 'string'],
-      name: ['string', 'string', 'string'],
+      location: ['string'],
+      name: ['string'],
     });
   });
 });
diff --git a/tests/api-resources/radar/quality/speed/speed.test.ts b/tests/api-resources/radar/quality/speed/speed.test.ts
index 858dd5d262..cf4cc159dd 100644
--- a/tests/api-resources/radar/quality/speed/speed.test.ts
+++ b/tests/api-resources/radar/quality/speed/speed.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource speed', () => {
   test('histogram', async () => {
-    const responsePromise = cloudflare.radar.quality.speed.histogram();
+    const responsePromise = client.radar.quality.speed.histogram();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,24 +23,24 @@ describe('resource speed', () => {
 
   test('histogram: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.quality.speed.histogram({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.quality.speed.histogram({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('histogram: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.quality.speed.histogram(
+      client.radar.quality.speed.histogram(
         {
-          asn: ['string', 'string', 'string'],
+          asn: ['string'],
           bucketSize: 0,
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
+          location: ['string'],
           metricGroup: 'BANDWIDTH',
-          name: ['string', 'string', 'string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -48,7 +48,7 @@ describe('resource speed', () => {
   });
 
   test('summary', async () => {
-    const responsePromise = cloudflare.radar.quality.speed.summary();
+    const responsePromise = client.radar.quality.speed.summary();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -60,22 +60,22 @@ describe('resource speed', () => {
 
   test('summary: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.quality.speed.summary({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.quality.speed.summary({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('summary: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.quality.speed.summary(
+      client.radar.quality.speed.summary(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/quality/speed/top.test.ts b/tests/api-resources/radar/quality/speed/top.test.ts
index abb5f4453d..bc2ce5b69b 100644
--- a/tests/api-resources/radar/quality/speed/top.test.ts
+++ b/tests/api-resources/radar/quality/speed/top.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource top', () => {
   test('ases', async () => {
-    const responsePromise = cloudflare.radar.quality.speed.top.ases();
+    const responsePromise = client.radar.quality.speed.top.ases();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,23 +23,23 @@ describe('resource top', () => {
 
   test('ases: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.quality.speed.top.ases({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.quality.speed.top.ases({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('ases: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.quality.speed.top.ases(
+      client.radar.quality.speed.top.ases(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
           orderBy: 'BANDWIDTH_DOWNLOAD',
           reverse: true,
         },
@@ -49,7 +49,7 @@ describe('resource top', () => {
   });
 
   test('locations', async () => {
-    const responsePromise = cloudflare.radar.quality.speed.top.locations();
+    const responsePromise = client.radar.quality.speed.top.locations();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -62,22 +62,22 @@ describe('resource top', () => {
   test('locations: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.quality.speed.top.locations({ path: '/_stainless_unknown_path' }),
+      client.radar.quality.speed.top.locations({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('locations: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.quality.speed.top.locations(
+      client.radar.quality.speed.top.locations(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
           orderBy: 'BANDWIDTH_DOWNLOAD',
           reverse: true,
         },
diff --git a/tests/api-resources/radar/ranking/domain.test.ts b/tests/api-resources/radar/ranking/domain.test.ts
index 38f8918bb5..9fbe5edd1b 100644
--- a/tests/api-resources/radar/ranking/domain.test.ts
+++ b/tests/api-resources/radar/ranking/domain.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource domain', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.ranking.domain.get('google.com');
+    const responsePromise = client.radar.ranking.domain.get('google.com');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,20 +24,21 @@ describe('resource domain', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.ranking.domain.get('google.com', { path: '/_stainless_unknown_path' }),
+      client.radar.ranking.domain.get('google.com', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.ranking.domain.get(
+      client.radar.ranking.domain.get(
         'google.com',
         {
-          date: ['string', 'string', 'string'],
+          date: ['2019-12-27'],
           format: 'JSON',
+          includeTopLocations: true,
           limit: 5,
-          name: ['string', 'string', 'string'],
+          name: ['string'],
           rankingType: 'POPULAR',
         },
         { path: '/_stainless_unknown_path' },
diff --git a/tests/api-resources/radar/ranking/ranking.test.ts b/tests/api-resources/radar/ranking/ranking.test.ts
index 186d0b41f1..5fecedad09 100644
--- a/tests/api-resources/radar/ranking/ranking.test.ts
+++ b/tests/api-resources/radar/ranking/ranking.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ranking', () => {
   test('timeseriesGroups', async () => {
-    const responsePromise = cloudflare.radar.ranking.timeseriesGroups();
+    const responsePromise = client.radar.ranking.timeseriesGroups();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,24 +23,24 @@ describe('resource ranking', () => {
 
   test('timeseriesGroups: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.ranking.timeseriesGroups({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.ranking.timeseriesGroups({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('timeseriesGroups: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.ranking.timeseriesGroups(
+      client.radar.ranking.timeseriesGroups(
         {
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          domains: ['string', 'string', 'string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
+          domains: ['string'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
           rankingType: 'POPULAR',
         },
         { path: '/_stainless_unknown_path' },
@@ -49,7 +49,7 @@ describe('resource ranking', () => {
   });
 
   test('top', async () => {
-    const responsePromise = cloudflare.radar.ranking.top();
+    const responsePromise = client.radar.ranking.top();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -61,7 +61,7 @@ describe('resource ranking', () => {
 
   test('top: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.ranking.top({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.ranking.top({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -69,13 +69,13 @@ describe('resource ranking', () => {
   test('top: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.ranking.top(
+      client.radar.ranking.top(
         {
-          date: ['string', 'string', 'string'],
+          date: ['2019-12-27'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
           rankingType: 'POPULAR',
         },
         { path: '/_stainless_unknown_path' },
diff --git a/tests/api-resources/radar/search.test.ts b/tests/api-resources/radar/search.test.ts
index 52d2867df7..95446cb17f 100644
--- a/tests/api-resources/radar/search.test.ts
+++ b/tests/api-resources/radar/search.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource search', () => {
   test('global: only required params', async () => {
-    const responsePromise = cloudflare.radar.search.global({ query: 'United' });
+    const responsePromise = client.radar.search.global({ query: 'United' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,11 +22,11 @@ describe('resource search', () => {
   });
 
   test('global: required and optional params', async () => {
-    const response = await cloudflare.radar.search.global({
+    const response = await client.radar.search.global({
       query: 'United',
-      exclude: ['SPECIAL_EVENTS', 'NOTEBOOKS', 'LOCATIONS'],
+      exclude: ['SPECIAL_EVENTS'],
       format: 'JSON',
-      include: ['SPECIAL_EVENTS', 'NOTEBOOKS', 'LOCATIONS'],
+      include: ['SPECIAL_EVENTS'],
       limit: 5,
       limitPerGroup: 0,
     });
diff --git a/tests/api-resources/radar/tcp-resets-timeouts.test.ts b/tests/api-resources/radar/tcp-resets-timeouts.test.ts
index 14d61612b1..e4519b158c 100644
--- a/tests/api-resources/radar/tcp-resets-timeouts.test.ts
+++ b/tests/api-resources/radar/tcp-resets-timeouts.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource tcpResetsTimeouts', () => {
   test('summary', async () => {
-    const responsePromise = cloudflare.radar.tcpResetsTimeouts.summary();
+    const responsePromise = client.radar.tcpResetsTimeouts.summary();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,23 +24,23 @@ describe('resource tcpResetsTimeouts', () => {
   test('summary: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.tcpResetsTimeouts.summary({ path: '/_stainless_unknown_path' }),
+      client.radar.tcpResetsTimeouts.summary({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('summary: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.tcpResetsTimeouts.summary(
+      client.radar.tcpResetsTimeouts.summary(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -48,7 +48,7 @@ describe('resource tcpResetsTimeouts', () => {
   });
 
   test('timeseriesGroups', async () => {
-    const responsePromise = cloudflare.radar.tcpResetsTimeouts.timeseriesGroups();
+    const responsePromise = client.radar.tcpResetsTimeouts.timeseriesGroups();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -61,24 +61,24 @@ describe('resource tcpResetsTimeouts', () => {
   test('timeseriesGroups: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.tcpResetsTimeouts.timeseriesGroups({ path: '/_stainless_unknown_path' }),
+      client.radar.tcpResetsTimeouts.timeseriesGroups({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('timeseriesGroups: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.tcpResetsTimeouts.timeseriesGroups(
+      client.radar.tcpResetsTimeouts.timeseriesGroups(
         {
-          aggInterval: '1h',
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          aggInterval: '15m',
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/radar/traffic-anomalies/locations.test.ts b/tests/api-resources/radar/traffic-anomalies/locations.test.ts
index 34699ad6cd..7f01365a97 100644
--- a/tests/api-resources/radar/traffic-anomalies/locations.test.ts
+++ b/tests/api-resources/radar/traffic-anomalies/locations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource locations', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.trafficAnomalies.locations.get();
+    const responsePromise = client.radar.trafficAnomalies.locations.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,14 +24,14 @@ describe('resource locations', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.trafficAnomalies.locations.get({ path: '/_stainless_unknown_path' }),
+      client.radar.trafficAnomalies.locations.get({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.trafficAnomalies.locations.get(
+      client.radar.trafficAnomalies.locations.get(
         {
           dateEnd: '2023-09-01T11:41:33.782Z',
           dateRange: '7d',
diff --git a/tests/api-resources/radar/traffic-anomalies/traffic-anomalies.test.ts b/tests/api-resources/radar/traffic-anomalies/traffic-anomalies.test.ts
index e05bf0d885..fef0b3e109 100644
--- a/tests/api-resources/radar/traffic-anomalies/traffic-anomalies.test.ts
+++ b/tests/api-resources/radar/traffic-anomalies/traffic-anomalies.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource trafficAnomalies', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.radar.trafficAnomalies.get();
+    const responsePromise = client.radar.trafficAnomalies.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource trafficAnomalies', () => {
 
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.radar.trafficAnomalies.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.radar.trafficAnomalies.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,7 +31,7 @@ describe('resource trafficAnomalies', () => {
   test('get: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.trafficAnomalies.get(
+      client.radar.trafficAnomalies.get(
         {
           asn: 174,
           dateEnd: '2023-09-01T11:41:33.782Z',
diff --git a/tests/api-resources/radar/verified-bots/top.test.ts b/tests/api-resources/radar/verified-bots/top.test.ts
index ce937bdc93..32f632e77e 100644
--- a/tests/api-resources/radar/verified-bots/top.test.ts
+++ b/tests/api-resources/radar/verified-bots/top.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource top', () => {
   test('bots', async () => {
-    const responsePromise = cloudflare.radar.verifiedBots.top.bots();
+    const responsePromise = client.radar.verifiedBots.top.bots();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,25 +23,25 @@ describe('resource top', () => {
 
   test('bots: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.radar.verifiedBots.top.bots({ path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+    await expect(client.radar.verifiedBots.top.bots({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+      Cloudflare.NotFoundError,
+    );
   });
 
   test('bots: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.verifiedBots.top.bots(
+      client.radar.verifiedBots.top.bots(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
@@ -49,7 +49,7 @@ describe('resource top', () => {
   });
 
   test('categories', async () => {
-    const responsePromise = cloudflare.radar.verifiedBots.top.categories();
+    const responsePromise = client.radar.verifiedBots.top.categories();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -62,24 +62,24 @@ describe('resource top', () => {
   test('categories: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.verifiedBots.top.categories({ path: '/_stainless_unknown_path' }),
+      client.radar.verifiedBots.top.categories({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('categories: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.radar.verifiedBots.top.categories(
+      client.radar.verifiedBots.top.categories(
         {
-          asn: ['string', 'string', 'string'],
-          continent: ['string', 'string', 'string'],
-          dateEnd: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
-          dateRange: ['7d', '7d', '7d'],
-          dateStart: ['2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z', '2019-12-27T18:11:19.117Z'],
+          asn: ['string'],
+          continent: ['string'],
+          dateEnd: ['2019-12-27T18:11:19.117Z'],
+          dateRange: ['7d'],
+          dateStart: ['2019-12-27T18:11:19.117Z'],
           format: 'JSON',
           limit: 5,
-          location: ['string', 'string', 'string'],
-          name: ['string', 'string', 'string'],
+          location: ['string'],
+          name: ['string'],
         },
         { path: '/_stainless_unknown_path' },
       ),
diff --git a/tests/api-resources/rate-limits.test.ts b/tests/api-resources/rate-limits.test.ts
index a9f92eafda..fcf4677a5a 100644
--- a/tests/api-resources/rate-limits.test.ts
+++ b/tests/api-resources/rate-limits.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,13 @@ const cloudflare = new Cloudflare({
 describe('resource rateLimits', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.rateLimits.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const responsePromise = client.rateLimits.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      action: {},
+      match: {},
+      period: 900,
+      threshold: 60,
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,11 +30,25 @@ describe('resource rateLimits', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.rateLimits.create('023e105f4ecef8ad9ca31a8372d0c353', {});
+    const response = await client.rateLimits.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      action: {
+        mode: 'simulate',
+        response: { body: '<error>This request has been rate-limited.</error>', content_type: 'text/xml' },
+        timeout: 86400,
+      },
+      match: {
+        headers: [{ name: 'Cf-Cache-Status', op: 'eq', value: 'HIT' }],
+        request: { methods: ['GET', 'POST'], schemes: ['HTTP', 'HTTPS'], url: '*.example.org/path*' },
+        response: { origin_traffic: true },
+      },
+      period: 900,
+      threshold: 60,
+    });
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.rateLimits.list('023e105f4ecef8ad9ca31a8372d0c353');
+  test('list: only required params', async () => {
+    const responsePromise = client.rateLimits.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -38,29 +58,18 @@ describe('resource rateLimits', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.rateLimits.list('023e105f4ecef8ad9ca31a8372d0c353', { path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('list: required and optional params', async () => {
+    const response = await client.rateLimits.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      page: 1,
+      per_page: 1,
+    });
   });
 
-  test('list: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.rateLimits.list(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { page: 1, per_page: 1 },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('delete', async () => {
-    const responsePromise = cloudflare.rateLimits.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-    );
+  test('delete: only required params', async () => {
+    const responsePromise = client.rateLimits.delete('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -70,22 +79,21 @@ describe('resource rateLimits', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.rateLimits.delete('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('delete: required and optional params', async () => {
+    const response = await client.rateLimits.delete('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
   // TODO: investigate broken test
   test.skip('edit: only required params', async () => {
-    const responsePromise = cloudflare.rateLimits.edit(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-      {},
-    );
+    const responsePromise = client.rateLimits.edit('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      action: {},
+      match: {},
+      period: 900,
+      threshold: 60,
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -97,18 +105,27 @@ describe('resource rateLimits', () => {
 
   // TODO: investigate broken test
   test.skip('edit: required and optional params', async () => {
-    const response = await cloudflare.rateLimits.edit(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-      {},
-    );
+    const response = await client.rateLimits.edit('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      action: {
+        mode: 'simulate',
+        response: { body: '<error>This request has been rate-limited.</error>', content_type: 'text/xml' },
+        timeout: 86400,
+      },
+      match: {
+        headers: [{ name: 'Cf-Cache-Status', op: 'eq', value: 'HIT' }],
+        request: { methods: ['GET', 'POST'], schemes: ['HTTP', 'HTTPS'], url: '*.example.org/path*' },
+        response: { origin_traffic: true },
+      },
+      period: 900,
+      threshold: 60,
+    });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.rateLimits.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '372e67954025e0ba6aaa6d586b9e0b59',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.rateLimits.get('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -118,12 +135,9 @@ describe('resource rateLimits', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.rateLimits.get('023e105f4ecef8ad9ca31a8372d0c353', '372e67954025e0ba6aaa6d586b9e0b59', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.rateLimits.get('372e67954025e0ba6aaa6d586b9e0b59', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/registrar/domains.test.ts b/tests/api-resources/registrar/domains.test.ts
index d602ca7bd7..dc450fddba 100644
--- a/tests/api-resources/registrar/domains.test.ts
+++ b/tests/api-resources/registrar/domains.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource domains', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.registrar.domains.update('cloudflare.com', {
+    const responsePromise = client.registrar.domains.update('cloudflare.com', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource domains', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.registrar.domains.update('cloudflare.com', {
+    const response = await client.registrar.domains.update('cloudflare.com', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       auto_renew: true,
       locked: false,
@@ -33,9 +33,7 @@ describe('resource domains', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.registrar.domains.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.registrar.domains.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -46,13 +44,11 @@ describe('resource domains', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.registrar.domains.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.registrar.domains.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.registrar.domains.get('cloudflare.com', {
+    const responsePromise = client.registrar.domains.get('cloudflare.com', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -65,7 +61,7 @@ describe('resource domains', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.registrar.domains.get('cloudflare.com', {
+    const response = await client.registrar.domains.get('cloudflare.com', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/request-tracers/traces.test.ts b/tests/api-resources/request-tracers/traces.test.ts
index 4f402793b8..7737f43dd3 100644
--- a/tests/api-resources/request-tracers/traces.test.ts
+++ b/tests/api-resources/request-tracers/traces.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource traces', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.requestTracers.traces.create({
+    const responsePromise = client.requestTracers.traces.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       method: 'PUT',
       url: 'https://some.zone/some_path',
@@ -26,7 +26,7 @@ describe('resource traces', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.requestTracers.traces.create({
+    const response = await client.requestTracers.traces.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       method: 'PUT',
       url: 'https://some.zone/some_path',
diff --git a/tests/api-resources/addressing/prefixes/bgp/bindings.test.ts b/tests/api-resources/resource-sharing/recipients.test.ts
similarity index 62%
rename from tests/api-resources/addressing/prefixes/bgp/bindings.test.ts
rename to tests/api-resources/resource-sharing/recipients.test.ts
index fa662d1326..3868812bd1 100644
--- a/tests/api-resources/addressing/prefixes/bgp/bindings.test.ts
+++ b/tests/api-resources/resource-sharing/recipients.test.ts
@@ -3,18 +3,17 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource bindings', () => {
+describe('resource recipients', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.bgp.bindings.create(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.resourceSharing.recipients.create('3fd85f74b32742f1bff64a85009dda07', {
+      path_account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -25,21 +24,17 @@ describe('resource bindings', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.bgp.bindings.create(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        cidr: '192.0.2.0/24',
-        service_id: '2db684ee7ca04e159946fd05b99e1bcd',
-      },
-    );
+    const response = await client.resourceSharing.recipients.create('3fd85f74b32742f1bff64a85009dda07', {
+      path_account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body_account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      organization_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.bgp.bindings.list(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.resourceSharing.recipients.list('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -50,16 +45,17 @@ describe('resource bindings', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.bgp.bindings.list(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.resourceSharing.recipients.list('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      page: 2,
+      per_page: 20,
+    });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.bgp.bindings.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.resourceSharing.recipients.delete(
+      '3fd85f74b32742f1bff64a85009dda07',
+      '3fd85f74b32742f1bff64a85009dda07',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
@@ -72,17 +68,17 @@ describe('resource bindings', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.bgp.bindings.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.resourceSharing.recipients.delete(
+      '3fd85f74b32742f1bff64a85009dda07',
+      '3fd85f74b32742f1bff64a85009dda07',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.bgp.bindings.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.resourceSharing.recipients.get(
+      '3fd85f74b32742f1bff64a85009dda07',
+      '3fd85f74b32742f1bff64a85009dda07',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
@@ -95,9 +91,9 @@ describe('resource bindings', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.bgp.bindings.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.resourceSharing.recipients.get(
+      '3fd85f74b32742f1bff64a85009dda07',
+      '3fd85f74b32742f1bff64a85009dda07',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
   });
diff --git a/tests/api-resources/resource-sharing/resource-sharing.test.ts b/tests/api-resources/resource-sharing/resource-sharing.test.ts
new file mode 100644
index 0000000000..b84a87821d
--- /dev/null
+++ b/tests/api-resources/resource-sharing/resource-sharing.test.ts
@@ -0,0 +1,139 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource resourceSharing', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.resourceSharing.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'My Shared WAF Managed Rule',
+      recipients: [{}],
+      resources: [
+        {
+          meta: {},
+          resource_account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+          resource_id: '023e105f4ecef8ad9ca31a8372d0c353',
+          resource_type: 'custom-ruleset',
+        },
+      ],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.resourceSharing.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'My Shared WAF Managed Rule',
+      recipients: [
+        {
+          account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+          organization_id: '023e105f4ecef8ad9ca31a8372d0c353',
+        },
+      ],
+      resources: [
+        {
+          meta: {},
+          resource_account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+          resource_id: '023e105f4ecef8ad9ca31a8372d0c353',
+          resource_type: 'custom-ruleset',
+        },
+      ],
+    });
+  });
+
+  test('update: only required params', async () => {
+    const responsePromise = client.resourceSharing.update('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'My Shared WAF Managed Rule',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.resourceSharing.update('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'My Shared WAF Managed Rule',
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.resourceSharing.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.resourceSharing.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      direction: 'asc',
+      kind: 'sent',
+      order: 'name',
+      page: 2,
+      per_page: 20,
+      status: 'active',
+      target_type: 'account',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.resourceSharing.delete('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.resourceSharing.delete('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.resourceSharing.get('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.resourceSharing.get('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/resource-sharing/resources.test.ts b/tests/api-resources/resource-sharing/resources.test.ts
new file mode 100644
index 0000000000..615c5d60ec
--- /dev/null
+++ b/tests/api-resources/resource-sharing/resources.test.ts
@@ -0,0 +1,131 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource resources', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.resourceSharing.resources.create('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      meta: {},
+      resource_account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      resource_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      resource_type: 'custom-ruleset',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.resourceSharing.resources.create('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      meta: {},
+      resource_account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      resource_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      resource_type: 'custom-ruleset',
+    });
+  });
+
+  test('update: only required params', async () => {
+    const responsePromise = client.resourceSharing.resources.update(
+      '3fd85f74b32742f1bff64a85009dda07',
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', meta: {} },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.resourceSharing.resources.update(
+      '3fd85f74b32742f1bff64a85009dda07',
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', meta: {} },
+    );
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.resourceSharing.resources.list('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.resourceSharing.resources.list('3fd85f74b32742f1bff64a85009dda07', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      page: 2,
+      per_page: 20,
+      resource_type: 'custom-ruleset',
+      status: 'active',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.resourceSharing.resources.delete(
+      '3fd85f74b32742f1bff64a85009dda07',
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.resourceSharing.resources.delete(
+      '3fd85f74b32742f1bff64a85009dda07',
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.resourceSharing.resources.get(
+      '3fd85f74b32742f1bff64a85009dda07',
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.resourceSharing.resources.get(
+      '3fd85f74b32742f1bff64a85009dda07',
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+  });
+});
diff --git a/tests/api-resources/rules/lists/bulk-operations.test.ts b/tests/api-resources/rules/lists/bulk-operations.test.ts
index 242fd50d91..a98726ee60 100644
--- a/tests/api-resources/rules/lists/bulk-operations.test.ts
+++ b/tests/api-resources/rules/lists/bulk-operations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource bulkOperations', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.rules.lists.bulkOperations.get(
+    const responsePromise = client.rules.lists.bulkOperations.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '4da8780eeb215e6cb7f48dd981c4ea02',
     );
@@ -27,7 +27,7 @@ describe('resource bulkOperations', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.rules.lists.bulkOperations.get(
+      client.rules.lists.bulkOperations.get(
         '023e105f4ecef8ad9ca31a8372d0c353',
         '4da8780eeb215e6cb7f48dd981c4ea02',
         { path: '/_stainless_unknown_path' },
diff --git a/tests/api-resources/rules/lists/items.test.ts b/tests/api-resources/rules/lists/items.test.ts
index 7139dd7eaf..d02222753a 100644
--- a/tests/api-resources/rules/lists/items.test.ts
+++ b/tests/api-resources/rules/lists/items.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource items', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.rules.lists.items.create('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const responsePromise = client.rules.lists.items.create('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: [{}, {}, {}],
+      body: [{}],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,7 +25,7 @@ describe('resource items', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.rules.lists.items.create('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const response = await client.rules.lists.items.create('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: [
         {
@@ -34,43 +34,13 @@ describe('resource items', () => {
           hostname: { url_hostname: 'example.com' },
           ip: '10.0.0.1',
           redirect: {
-            include_subdomains: true,
-            preserve_path_suffix: true,
-            preserve_query_string: true,
-            source_url: 'example.com/arch',
-            status_code: 301,
-            subpath_matching: true,
-            target_url: 'https://archlinux.org/',
-          },
-        },
-        {
-          asn: 5567,
-          comment: 'Private IP address',
-          hostname: { url_hostname: 'example.com' },
-          ip: '10.0.0.1',
-          redirect: {
-            include_subdomains: true,
-            preserve_path_suffix: true,
-            preserve_query_string: true,
             source_url: 'example.com/arch',
-            status_code: 301,
-            subpath_matching: true,
             target_url: 'https://archlinux.org/',
-          },
-        },
-        {
-          asn: 5567,
-          comment: 'Private IP address',
-          hostname: { url_hostname: 'example.com' },
-          ip: '10.0.0.1',
-          redirect: {
             include_subdomains: true,
             preserve_path_suffix: true,
             preserve_query_string: true,
-            source_url: 'example.com/arch',
             status_code: 301,
             subpath_matching: true,
-            target_url: 'https://archlinux.org/',
           },
         },
       ],
@@ -78,9 +48,9 @@ describe('resource items', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.rules.lists.items.update('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const responsePromise = client.rules.lists.items.update('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: [{}, {}, {}],
+      body: [{}],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -92,7 +62,7 @@ describe('resource items', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.rules.lists.items.update('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const response = await client.rules.lists.items.update('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: [
         {
@@ -101,43 +71,13 @@ describe('resource items', () => {
           hostname: { url_hostname: 'example.com' },
           ip: '10.0.0.1',
           redirect: {
-            include_subdomains: true,
-            preserve_path_suffix: true,
-            preserve_query_string: true,
-            source_url: 'example.com/arch',
-            status_code: 301,
-            subpath_matching: true,
-            target_url: 'https://archlinux.org/',
-          },
-        },
-        {
-          asn: 5567,
-          comment: 'Private IP address',
-          hostname: { url_hostname: 'example.com' },
-          ip: '10.0.0.1',
-          redirect: {
-            include_subdomains: true,
-            preserve_path_suffix: true,
-            preserve_query_string: true,
             source_url: 'example.com/arch',
-            status_code: 301,
-            subpath_matching: true,
             target_url: 'https://archlinux.org/',
-          },
-        },
-        {
-          asn: 5567,
-          comment: 'Private IP address',
-          hostname: { url_hostname: 'example.com' },
-          ip: '10.0.0.1',
-          redirect: {
             include_subdomains: true,
             preserve_path_suffix: true,
             preserve_query_string: true,
-            source_url: 'example.com/arch',
             status_code: 301,
             subpath_matching: true,
-            target_url: 'https://archlinux.org/',
           },
         },
       ],
@@ -145,7 +85,7 @@ describe('resource items', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.rules.lists.items.list('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const responsePromise = client.rules.lists.items.list('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -158,7 +98,7 @@ describe('resource items', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.rules.lists.items.list('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const response = await client.rules.lists.items.list('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       cursor: 'zzz',
       per_page: 1,
@@ -167,7 +107,7 @@ describe('resource items', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.rules.lists.items.delete('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const responsePromise = client.rules.lists.items.delete('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -180,13 +120,13 @@ describe('resource items', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.rules.lists.items.delete('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const response = await client.rules.lists.items.delete('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.rules.lists.items.get(
+    const responsePromise = client.rules.lists.items.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '2c0fc9fa937b11eaa1b71c4d701ab86e',
       '34b12448945f11eaa1b71c4d701ab86e',
@@ -203,7 +143,7 @@ describe('resource items', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.rules.lists.items.get(
+      client.rules.lists.items.get(
         '023e105f4ecef8ad9ca31a8372d0c353',
         '2c0fc9fa937b11eaa1b71c4d701ab86e',
         '34b12448945f11eaa1b71c4d701ab86e',
diff --git a/tests/api-resources/rules/lists/lists.test.ts b/tests/api-resources/rules/lists/lists.test.ts
index f3c9124448..f8555cae2f 100644
--- a/tests/api-resources/rules/lists/lists.test.ts
+++ b/tests/api-resources/rules/lists/lists.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource lists', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.rules.lists.create({
+    const responsePromise = client.rules.lists.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       kind: 'ip',
       name: 'list1',
@@ -28,7 +28,7 @@ describe('resource lists', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.rules.lists.create({
+    const response = await client.rules.lists.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       kind: 'ip',
       name: 'list1',
@@ -38,7 +38,7 @@ describe('resource lists', () => {
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.rules.lists.update('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const responsePromise = client.rules.lists.update('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -52,14 +52,14 @@ describe('resource lists', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.rules.lists.update('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const response = await client.rules.lists.update('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       description: 'This is a note',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.rules.lists.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.rules.lists.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -70,11 +70,11 @@ describe('resource lists', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.rules.lists.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.rules.lists.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.rules.lists.delete('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const responsePromise = client.rules.lists.delete('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -87,14 +87,14 @@ describe('resource lists', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.rules.lists.delete('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const response = await client.rules.lists.delete('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   // TODO: investigate broken test
   test.skip('get: only required params', async () => {
-    const responsePromise = cloudflare.rules.lists.get('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const responsePromise = client.rules.lists.get('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -108,7 +108,7 @@ describe('resource lists', () => {
 
   // TODO: investigate broken test
   test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.rules.lists.get('2c0fc9fa937b11eaa1b71c4d701ab86e', {
+    const response = await client.rules.lists.get('2c0fc9fa937b11eaa1b71c4d701ab86e', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/rulesets/phases/phases.test.ts b/tests/api-resources/rulesets/phases/phases.test.ts
index 8728a5a7b4..d8b1e725ba 100644
--- a/tests/api-resources/rulesets/phases/phases.test.ts
+++ b/tests/api-resources/rulesets/phases/phases.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,8 +12,8 @@ const cloudflare = new Cloudflare({
 describe('resource phases', () => {
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.rulesets.phases.update('http_request_firewall_custom', {
-      rules: [{}, {}, {}],
+    const responsePromise = client.rulesets.phases.update('ddos_l4', {
+      rules: [{}],
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -27,25 +27,10 @@ describe('resource phases', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.rulesets.phases.update('http_request_firewall_custom', {
+    const response = await client.rulesets.phases.update('ddos_l4', {
       rules: [
         {
-          action: 'block',
-          action_parameters: {
-            response: {
-              content: '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-              content_type: 'application/json',
-              status_code: 400,
-            },
-          },
-          description: 'Block when the IP address is not 1.1.1.1',
-          enabled: true,
-          expression: 'ip.src ne 1.1.1.1',
           id: '3a03d665bac047339bb530ecb439a90d',
-          logging: { enabled: true },
-          ref: 'my_ref',
-        },
-        {
           action: 'block',
           action_parameters: {
             response: {
@@ -56,25 +41,22 @@ describe('resource phases', () => {
           },
           description: 'Block when the IP address is not 1.1.1.1',
           enabled: true,
-          expression: 'ip.src ne 1.1.1.1',
-          id: '3a03d665bac047339bb530ecb439a90d',
-          logging: { enabled: true },
-          ref: 'my_ref',
-        },
-        {
-          action: 'block',
-          action_parameters: {
-            response: {
-              content: '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-              content_type: 'application/json',
-              status_code: 400,
-            },
+          exposed_credential_check: {
+            password_expression: 'url_decode(http.request.body.form[\\"password\\"][0])',
+            username_expression: 'url_decode(http.request.body.form[\\"username\\"][0])',
           },
-          description: 'Block when the IP address is not 1.1.1.1',
-          enabled: true,
           expression: 'ip.src ne 1.1.1.1',
-          id: '3a03d665bac047339bb530ecb439a90d',
           logging: { enabled: true },
+          ratelimit: {
+            characteristics: ['ip.src'],
+            period: 10,
+            counting_expression: 'http.request.body.raw eq "abcd"',
+            mitigation_timeout: 600,
+            requests_per_period: 1000,
+            requests_to_origin: true,
+            score_per_period: 400,
+            score_response_header_name: 'my-score',
+          },
           ref: 'my_ref',
         },
       ],
@@ -86,9 +68,7 @@ describe('resource phases', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.rulesets.phases.get('http_request_firewall_custom', {
-      account_id: 'account_id',
-    });
+    const responsePromise = client.rulesets.phases.get('ddos_l4', { account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
diff --git a/tests/api-resources/rulesets/phases/versions.test.ts b/tests/api-resources/rulesets/phases/versions.test.ts
index 5855189d37..d82e8b7f02 100644
--- a/tests/api-resources/rulesets/phases/versions.test.ts
+++ b/tests/api-resources/rulesets/phases/versions.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,9 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource versions', () => {
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.rulesets.phases.versions.list('http_request_firewall_custom', {
-      account_id: 'account_id',
-    });
+    const responsePromise = client.rulesets.phases.versions.list('ddos_l4', { account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -26,9 +24,7 @@ describe('resource versions', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.rulesets.phases.versions.get('http_request_firewall_custom', '1', {
-      account_id: 'account_id',
-    });
+    const responsePromise = client.rulesets.phases.versions.get('ddos_l4', '1', { account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
diff --git a/tests/api-resources/rulesets/rules.test.ts b/tests/api-resources/rulesets/rules.test.ts
index dab3219aeb..f242171443 100644
--- a/tests/api-resources/rulesets/rules.test.ts
+++ b/tests/api-resources/rulesets/rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource rules', () => {
   // TODO: investigate broken test
   test.skip('create', async () => {
-    const responsePromise = cloudflare.rulesets.rules.create('2f2feab2026849078ba485f918791bdc', {
+    const responsePromise = client.rulesets.rules.create('2f2feab2026849078ba485f918791bdc', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -26,7 +26,7 @@ describe('resource rules', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.rulesets.rules.delete(
+    const responsePromise = client.rulesets.rules.delete(
       '2f2feab2026849078ba485f918791bdc',
       '3a03d665bac047339bb530ecb439a90d',
       { account_id: 'account_id' },
@@ -42,7 +42,7 @@ describe('resource rules', () => {
 
   // TODO: investigate broken test
   test.skip('edit', async () => {
-    const responsePromise = cloudflare.rulesets.rules.edit(
+    const responsePromise = client.rulesets.rules.edit(
       '2f2feab2026849078ba485f918791bdc',
       '3a03d665bac047339bb530ecb439a90d',
       { account_id: 'account_id' },
diff --git a/tests/api-resources/rulesets/rulesets.test.ts b/tests/api-resources/rulesets/rulesets.test.ts
index eaaf7109c4..e46e26bdd3 100644
--- a/tests/api-resources/rulesets/rulesets.test.ts
+++ b/tests/api-resources/rulesets/rulesets.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,11 +12,11 @@ const cloudflare = new Cloudflare({
 describe('resource rulesets', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.rulesets.create({
-      kind: 'root',
+    const responsePromise = client.rulesets.create({
+      kind: 'managed',
       name: 'My ruleset',
-      phase: 'http_request_firewall_custom',
-      rules: [{}, {}, {}],
+      phase: 'ddos_l4',
+      rules: [{}],
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -30,28 +30,13 @@ describe('resource rulesets', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.rulesets.create({
-      kind: 'root',
+    const response = await client.rulesets.create({
+      kind: 'managed',
       name: 'My ruleset',
-      phase: 'http_request_firewall_custom',
+      phase: 'ddos_l4',
       rules: [
         {
-          action: 'block',
-          action_parameters: {
-            response: {
-              content: '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-              content_type: 'application/json',
-              status_code: 400,
-            },
-          },
-          description: 'Block when the IP address is not 1.1.1.1',
-          enabled: true,
-          expression: 'ip.src ne 1.1.1.1',
           id: '3a03d665bac047339bb530ecb439a90d',
-          logging: { enabled: true },
-          ref: 'my_ref',
-        },
-        {
           action: 'block',
           action_parameters: {
             response: {
@@ -62,25 +47,22 @@ describe('resource rulesets', () => {
           },
           description: 'Block when the IP address is not 1.1.1.1',
           enabled: true,
-          expression: 'ip.src ne 1.1.1.1',
-          id: '3a03d665bac047339bb530ecb439a90d',
-          logging: { enabled: true },
-          ref: 'my_ref',
-        },
-        {
-          action: 'block',
-          action_parameters: {
-            response: {
-              content: '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-              content_type: 'application/json',
-              status_code: 400,
-            },
+          exposed_credential_check: {
+            password_expression: 'url_decode(http.request.body.form[\\"password\\"][0])',
+            username_expression: 'url_decode(http.request.body.form[\\"username\\"][0])',
           },
-          description: 'Block when the IP address is not 1.1.1.1',
-          enabled: true,
           expression: 'ip.src ne 1.1.1.1',
-          id: '3a03d665bac047339bb530ecb439a90d',
           logging: { enabled: true },
+          ratelimit: {
+            characteristics: ['ip.src'],
+            period: 10,
+            counting_expression: 'http.request.body.raw eq "abcd"',
+            mitigation_timeout: 600,
+            requests_per_period: 1000,
+            requests_to_origin: true,
+            score_per_period: 400,
+            score_response_header_name: 'my-score',
+          },
           ref: 'my_ref',
         },
       ],
@@ -91,8 +73,8 @@ describe('resource rulesets', () => {
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.rulesets.update('2f2feab2026849078ba485f918791bdc', {
-      rules: [{}, {}, {}],
+    const responsePromise = client.rulesets.update('2f2feab2026849078ba485f918791bdc', {
+      rules: [{}],
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -106,25 +88,10 @@ describe('resource rulesets', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.rulesets.update('2f2feab2026849078ba485f918791bdc', {
+    const response = await client.rulesets.update('2f2feab2026849078ba485f918791bdc', {
       rules: [
         {
-          action: 'block',
-          action_parameters: {
-            response: {
-              content: '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-              content_type: 'application/json',
-              status_code: 400,
-            },
-          },
-          description: 'Block when the IP address is not 1.1.1.1',
-          enabled: true,
-          expression: 'ip.src ne 1.1.1.1',
           id: '3a03d665bac047339bb530ecb439a90d',
-          logging: { enabled: true },
-          ref: 'my_ref',
-        },
-        {
           action: 'block',
           action_parameters: {
             response: {
@@ -135,39 +102,36 @@ describe('resource rulesets', () => {
           },
           description: 'Block when the IP address is not 1.1.1.1',
           enabled: true,
-          expression: 'ip.src ne 1.1.1.1',
-          id: '3a03d665bac047339bb530ecb439a90d',
-          logging: { enabled: true },
-          ref: 'my_ref',
-        },
-        {
-          action: 'block',
-          action_parameters: {
-            response: {
-              content: '{\n  "success": false,\n  "error": "you have been blocked"\n}',
-              content_type: 'application/json',
-              status_code: 400,
-            },
+          exposed_credential_check: {
+            password_expression: 'url_decode(http.request.body.form[\\"password\\"][0])',
+            username_expression: 'url_decode(http.request.body.form[\\"username\\"][0])',
           },
-          description: 'Block when the IP address is not 1.1.1.1',
-          enabled: true,
           expression: 'ip.src ne 1.1.1.1',
-          id: '3a03d665bac047339bb530ecb439a90d',
           logging: { enabled: true },
+          ratelimit: {
+            characteristics: ['ip.src'],
+            period: 10,
+            counting_expression: 'http.request.body.raw eq "abcd"',
+            mitigation_timeout: 600,
+            requests_per_period: 1000,
+            requests_to_origin: true,
+            score_per_period: 400,
+            score_response_header_name: 'my-score',
+          },
           ref: 'my_ref',
         },
       ],
       account_id: 'account_id',
       description: 'My ruleset to execute managed rulesets',
-      kind: 'root',
+      kind: 'managed',
       name: 'My ruleset',
-      phase: 'http_request_firewall_custom',
+      phase: 'ddos_l4',
     });
   });
 
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.rulesets.list({ account_id: 'account_id' });
+    const responsePromise = client.rulesets.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -179,7 +143,7 @@ describe('resource rulesets', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.rulesets.delete('2f2feab2026849078ba485f918791bdc', {
+    const responsePromise = client.rulesets.delete('2f2feab2026849078ba485f918791bdc', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -193,7 +157,7 @@ describe('resource rulesets', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.rulesets.get('2f2feab2026849078ba485f918791bdc', {
+    const responsePromise = client.rulesets.get('2f2feab2026849078ba485f918791bdc', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
diff --git a/tests/api-resources/rulesets/versions/versions.test.ts b/tests/api-resources/rulesets/versions.test.ts
similarity index 84%
rename from tests/api-resources/rulesets/versions/versions.test.ts
rename to tests/api-resources/rulesets/versions.test.ts
index a1243218c4..8e40ffa8f0 100644
--- a/tests/api-resources/rulesets/versions/versions.test.ts
+++ b/tests/api-resources/rulesets/versions.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource versions', () => {
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.rulesets.versions.list('2f2feab2026849078ba485f918791bdc', {
+    const responsePromise = client.rulesets.versions.list('2f2feab2026849078ba485f918791bdc', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -26,7 +26,7 @@ describe('resource versions', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.rulesets.versions.delete('2f2feab2026849078ba485f918791bdc', '1', {
+    const responsePromise = client.rulesets.versions.delete('2f2feab2026849078ba485f918791bdc', '1', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -40,7 +40,7 @@ describe('resource versions', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.rulesets.versions.get('2f2feab2026849078ba485f918791bdc', '1', {
+    const responsePromise = client.rulesets.versions.get('2f2feab2026849078ba485f918791bdc', '1', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
diff --git a/tests/api-resources/rum/rules.test.ts b/tests/api-resources/rum/rules.test.ts
index f9d5a89afc..332691a5c5 100644
--- a/tests/api-resources/rum/rules.test.ts
+++ b/tests/api-resources/rum/rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource rules', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.rum.rules.create('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.rum.rules.create('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource rules', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.rum.rules.create('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.rum.rules.create('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       host: 'example.com',
       inclusive: true,
@@ -34,7 +34,7 @@ describe('resource rules', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.rum.rules.update(
+    const responsePromise = client.rum.rules.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -49,7 +49,7 @@ describe('resource rules', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.rum.rules.update(
+    const response = await client.rum.rules.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
@@ -63,7 +63,7 @@ describe('resource rules', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.rum.rules.list('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.rum.rules.list('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -76,13 +76,13 @@ describe('resource rules', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.rum.rules.list('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.rum.rules.list('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.rum.rules.delete(
+    const responsePromise = client.rum.rules.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -97,10 +97,39 @@ describe('resource rules', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.rum.rules.delete(
+    const response = await client.rum.rules.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
   });
+
+  test('bulkCreate: only required params', async () => {
+    const responsePromise = client.rum.rules.bulkCreate('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkCreate: required and optional params', async () => {
+    const response = await client.rum.rules.bulkCreate('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      delete_rules: ['f174e90a-fafe-4643-bbbc-4a0ed4fc8415'],
+      rules: [
+        {
+          id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+          host: 'example.com',
+          inclusive: true,
+          is_paused: false,
+          paths: ['*'],
+        },
+      ],
+    });
+  });
 });
diff --git a/tests/api-resources/rum/site-info.test.ts b/tests/api-resources/rum/site-info.test.ts
index 81e02482c8..572f890f64 100644
--- a/tests/api-resources/rum/site-info.test.ts
+++ b/tests/api-resources/rum/site-info.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource siteInfo', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.rum.siteInfo.create({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.rum.siteInfo.create({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,7 +22,7 @@ describe('resource siteInfo', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.rum.siteInfo.create({
+    const response = await client.rum.siteInfo.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       auto_install: true,
       host: 'example.com',
@@ -33,7 +31,7 @@ describe('resource siteInfo', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.rum.siteInfo.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.rum.siteInfo.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -46,7 +44,7 @@ describe('resource siteInfo', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.rum.siteInfo.update('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.rum.siteInfo.update('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       auto_install: true,
       host: 'example.com',
@@ -55,7 +53,7 @@ describe('resource siteInfo', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.rum.siteInfo.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.rum.siteInfo.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -66,7 +64,7 @@ describe('resource siteInfo', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.rum.siteInfo.list({
+    const response = await client.rum.siteInfo.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       order_by: 'host',
       page: 1,
@@ -75,7 +73,7 @@ describe('resource siteInfo', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.rum.siteInfo.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.rum.siteInfo.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -88,13 +86,13 @@ describe('resource siteInfo', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.rum.siteInfo.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.rum.siteInfo.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.rum.siteInfo.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.rum.siteInfo.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -107,7 +105,7 @@ describe('resource siteInfo', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.rum.siteInfo.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.rum.siteInfo.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/security-txt.test.ts b/tests/api-resources/security-txt.test.ts
new file mode 100644
index 0000000000..feeed5a9c0
--- /dev/null
+++ b/tests/api-resources/security-txt.test.ts
@@ -0,0 +1,76 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource securityTXT', () => {
+  test('update: only required params', async () => {
+    const responsePromise = client.securityTXT.update({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.securityTXT.update({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      acknowledgments: ['https://example.com/hall-of-fame.html'],
+      canonical: ['https://www.example.com/.well-known/security.txt'],
+      contact: [
+        'mailto:security@example.com',
+        'tel:+1-201-555-0123',
+        'https://example.com/security-contact.html',
+      ],
+      enabled: true,
+      encryption: [
+        'https://example.com/pgp-key.txt',
+        'dns:5d2d37ab76d47d36._openpgpkey.example.com?type=OPENPGPKEY',
+        'openpgp4fpr:5f2de5521c63a801ab59ccb603d49de44b29100f',
+      ],
+      expires: '2019-12-27T18:11:19.117Z',
+      hiring: ['https://example.com/jobs.html'],
+      policy: ['https://example.com/disclosure-policy.html'],
+      preferredLanguages: 'en, es, fr',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.securityTXT.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.securityTXT.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.securityTXT.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.securityTXT.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+});
diff --git a/tests/api-resources/snippets/content.test.ts b/tests/api-resources/snippets/content.test.ts
index a006604aa5..7342ace674 100644
--- a/tests/api-resources/snippets/content.test.ts
+++ b/tests/api-resources/snippets/content.test.ts
@@ -2,7 +2,7 @@
 
 import Cloudflare from 'cloudflare';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 describe('resource content', () => {
   // throwing HTTP 415
   test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.snippets.content.get('snippet_name_01', {
+    const response = await client.snippets.content.get('snippet_name_01', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/snippets/rules.test.ts b/tests/api-resources/snippets/rules.test.ts
index 6df715c44b..e36c30e5f4 100644
--- a/tests/api-resources/snippets/rules.test.ts
+++ b/tests/api-resources/snippets/rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource rules', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.snippets.rules.update({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.snippets.rules.update({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource rules', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.snippets.rules.update({
+    const response = await client.snippets.rules.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       rules: [
         {
@@ -31,24 +31,12 @@ describe('resource rules', () => {
           expression: 'http.cookie eq "a=b"',
           snippet_name: 'snippet_name_01',
         },
-        {
-          description: 'Rule description',
-          enabled: true,
-          expression: 'http.cookie eq "a=b"',
-          snippet_name: 'snippet_name_01',
-        },
-        {
-          description: 'Rule description',
-          enabled: true,
-          expression: 'http.cookie eq "a=b"',
-          snippet_name: 'snippet_name_01',
-        },
       ],
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.snippets.rules.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.snippets.rules.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -59,6 +47,21 @@ describe('resource rules', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.snippets.rules.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.snippets.rules.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.snippets.rules.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.snippets.rules.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/snippets/snippets.test.ts b/tests/api-resources/snippets/snippets.test.ts
index ce64c0a24d..4973e797db 100644
--- a/tests/api-resources/snippets/snippets.test.ts
+++ b/tests/api-resources/snippets/snippets.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource snippets', () => {
   // throwing HTTP 415
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.snippets.update('snippet_name_01', {
+    const responsePromise = client.snippets.update('snippet_name_01', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -26,7 +26,7 @@ describe('resource snippets', () => {
 
   // throwing HTTP 415
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.snippets.update('snippet_name_01', {
+    const response = await client.snippets.update('snippet_name_01', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       files: "export { async function fetch(request, env) {return new Response('some_response') } }",
       metadata: { main_module: 'main.js' },
@@ -34,7 +34,7 @@ describe('resource snippets', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.snippets.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.snippets.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -45,11 +45,11 @@ describe('resource snippets', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.snippets.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.snippets.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.snippets.delete('snippet_name_01', {
+    const responsePromise = client.snippets.delete('snippet_name_01', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -62,13 +62,13 @@ describe('resource snippets', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.snippets.delete('snippet_name_01', {
+    const response = await client.snippets.delete('snippet_name_01', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.snippets.get('snippet_name_01', {
+    const responsePromise = client.snippets.get('snippet_name_01', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -81,7 +81,7 @@ describe('resource snippets', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.snippets.get('snippet_name_01', {
+    const response = await client.snippets.get('snippet_name_01', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/spectrum/analytics/aggregates/currents.test.ts b/tests/api-resources/spectrum/analytics/aggregates/currents.test.ts
index bee95cdcdd..90b6447028 100644
--- a/tests/api-resources/spectrum/analytics/aggregates/currents.test.ts
+++ b/tests/api-resources/spectrum/analytics/aggregates/currents.test.ts
@@ -3,17 +3,17 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource currents', () => {
-  test('get', async () => {
-    const responsePromise = cloudflare.spectrum.analytics.aggregates.currents.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.spectrum.analytics.aggregates.currents.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,27 +23,11 @@ describe('resource currents', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.spectrum.analytics.aggregates.currents.get('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('get: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.spectrum.analytics.aggregates.currents.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        {
-          app_id_param: 'ea95132c15732412d22c1476fa83f27a,d122c5f4bb71e25cc9e86ab43b142e2f',
-          appID: 'ea95132c15732412d22c1476fa83f27a,d122c5f4bb71e25cc9e86ab43b142e2f',
-          colo_name: 'PDX',
-        },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.spectrum.analytics.aggregates.currents.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      appID: 'ea95132c15732412d22c1476fa83f27a,d122c5f4bb71e25cc9e86ab43b142e2f',
+      colo_name: 'PDX',
+    });
   });
 });
diff --git a/tests/api-resources/spectrum/analytics/events/bytimes.test.ts b/tests/api-resources/spectrum/analytics/events/bytimes.test.ts
index e085408021..3f630b9b5a 100644
--- a/tests/api-resources/spectrum/analytics/events/bytimes.test.ts
+++ b/tests/api-resources/spectrum/analytics/events/bytimes.test.ts
@@ -3,17 +3,18 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource bytimes', () => {
-  test('get', async () => {
-    const responsePromise = cloudflare.spectrum.analytics.events.bytimes.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.spectrum.analytics.events.bytimes.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      time_delta: 'year',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,31 +24,16 @@ describe('resource bytimes', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.spectrum.analytics.events.bytimes.get('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('get: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.spectrum.analytics.events.bytimes.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        {
-          dimensions: ['event', 'appID'],
-          filters: 'event==disconnect%20AND%20coloName!=SFO',
-          metrics: ['count', 'bytesIngress'],
-          since: '2014-01-02T02:20:00Z',
-          sort: ['+count', '-bytesIngress'],
-          time_delta: 'minute',
-          until: '2014-01-02T03:20:00Z',
-        },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.spectrum.analytics.events.bytimes.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      time_delta: 'year',
+      dimensions: ['event', 'appID'],
+      filters: 'event==disconnect%20AND%20coloName!=SFO',
+      metrics: ['count', 'bytesIngress'],
+      since: '2014-01-01T05:20:00.12345Z',
+      sort: ['+count', '-bytesIngress'],
+      until: '2014-01-01T05:20:00.12345Z',
+    });
   });
 });
diff --git a/tests/api-resources/spectrum/analytics/events/summaries.test.ts b/tests/api-resources/spectrum/analytics/events/summaries.test.ts
index 95fe4c4a7a..4f5876489a 100644
--- a/tests/api-resources/spectrum/analytics/events/summaries.test.ts
+++ b/tests/api-resources/spectrum/analytics/events/summaries.test.ts
@@ -3,17 +3,17 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource summaries', () => {
-  test('get', async () => {
-    const responsePromise = cloudflare.spectrum.analytics.events.summaries.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.spectrum.analytics.events.summaries.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,30 +23,15 @@ describe('resource summaries', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.spectrum.analytics.events.summaries.get('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('get: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.spectrum.analytics.events.summaries.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        {
-          dimensions: ['event', 'appID'],
-          filters: 'event==disconnect%20AND%20coloName!=SFO',
-          metrics: ['count', 'bytesIngress'],
-          since: '2014-01-02T02:20:00Z',
-          sort: ['+count', '-bytesIngress'],
-          until: '2014-01-02T03:20:00Z',
-        },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.spectrum.analytics.events.summaries.get({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      dimensions: ['event', 'appID'],
+      filters: 'event==disconnect%20AND%20coloName!=SFO',
+      metrics: ['count', 'bytesIngress'],
+      since: '2014-01-01T05:20:00.12345Z',
+      sort: ['+count', '-bytesIngress'],
+      until: '2014-01-01T05:20:00.12345Z',
+    });
   });
 });
diff --git a/tests/api-resources/spectrum/apps.test.ts b/tests/api-resources/spectrum/apps.test.ts
index b949f741a5..89691196f6 100644
--- a/tests/api-resources/spectrum/apps.test.ts
+++ b/tests/api-resources/spectrum/apps.test.ts
@@ -3,19 +3,23 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource apps', () => {
-  test('create: only required params', async () => {
-    const responsePromise = cloudflare.spectrum.apps.create('023e105f4ecef8ad9ca31a8372d0c353', {
+  // TODO: investigate auth errors on test suite
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.spectrum.apps.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       dns: {},
-      origin_dns: {},
-      origin_port: 22,
+      ip_firewall: true,
       protocol: 'tcp/22',
+      proxy_protocol: 'off',
+      tls: 'off',
+      traffic_type: 'direct',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,27 +30,35 @@ describe('resource apps', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('create: required and optional params', async () => {
-    const response = await cloudflare.spectrum.apps.create('023e105f4ecef8ad9ca31a8372d0c353', {
+  // TODO: investigate auth errors on test suite
+  test.skip('create: required and optional params', async () => {
+    const response = await client.spectrum.apps.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       dns: { name: 'ssh.example.com', type: 'CNAME' },
-      origin_dns: { name: 'origin.example.com', ttl: 600, type: '' },
-      origin_port: 22,
+      ip_firewall: true,
       protocol: 'tcp/22',
+      proxy_protocol: 'off',
+      tls: 'off',
+      traffic_type: 'direct',
       argo_smart_routing: true,
       edge_ips: { connectivity: 'all', type: 'dynamic' },
+      origin_direct: ['tcp://127.0.0.1:8080'],
+      origin_dns: { name: 'origin.example.com', ttl: 600, type: '' },
+      origin_port: 22,
+    });
+  });
+
+  // TODO: investigate auth errors on test suite
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.spectrum.apps.update('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      dns: {},
       ip_firewall: true,
+      protocol: 'tcp/22',
       proxy_protocol: 'off',
-      tls: 'full',
+      tls: 'off',
       traffic_type: 'direct',
     });
-  });
-
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.spectrum.apps.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'ea95132c15732412d22c1476fa83f27a',
-      { dns: {}, origin_dns: {}, origin_port: 22, protocol: 'tcp/22' },
-    );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -56,27 +68,27 @@ describe('resource apps', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.spectrum.apps.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'ea95132c15732412d22c1476fa83f27a',
-      {
-        dns: { name: 'ssh.example.com', type: 'CNAME' },
-        origin_dns: { name: 'origin.example.com', ttl: 600, type: '' },
-        origin_port: 22,
-        protocol: 'tcp/22',
-        argo_smart_routing: true,
-        edge_ips: { connectivity: 'all', type: 'dynamic' },
-        ip_firewall: true,
-        proxy_protocol: 'off',
-        tls: 'full',
-        traffic_type: 'direct',
-      },
-    );
+  // TODO: investigate auth errors on test suite
+  test.skip('update: required and optional params', async () => {
+    const response = await client.spectrum.apps.update('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      dns: { name: 'ssh.example.com', type: 'CNAME' },
+      ip_firewall: true,
+      protocol: 'tcp/22',
+      proxy_protocol: 'off',
+      tls: 'off',
+      traffic_type: 'direct',
+      argo_smart_routing: true,
+      edge_ips: { connectivity: 'all', type: 'dynamic' },
+      origin_direct: ['tcp://127.0.0.1:8080'],
+      origin_dns: { name: 'origin.example.com', ttl: 600, type: '' },
+      origin_port: 22,
+    });
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.spectrum.apps.list('023e105f4ecef8ad9ca31a8372d0c353');
+  // TODO: investigate HTTP 422 errors on test suite
+  test.skip('list: only required params', async () => {
+    const responsePromise = client.spectrum.apps.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -86,29 +98,21 @@ describe('resource apps', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.spectrum.apps.list('023e105f4ecef8ad9ca31a8372d0c353', { path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('list: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.spectrum.apps.list(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { direction: 'desc', order: 'protocol', page: 1, per_page: 1 },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  // TODO: investigate HTTP 422 errors on test suite
+  test.skip('list: required and optional params', async () => {
+    const response = await client.spectrum.apps.list({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      direction: 'asc',
+      order: 'protocol',
+      page: 1,
+      per_page: 1,
+    });
   });
 
-  test('delete', async () => {
-    const responsePromise = cloudflare.spectrum.apps.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'ea95132c15732412d22c1476fa83f27a',
-    );
+  test('delete: only required params', async () => {
+    const responsePromise = client.spectrum.apps.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -118,22 +122,16 @@ describe('resource apps', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.spectrum.apps.delete(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        'ea95132c15732412d22c1476fa83f27a',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('delete: required and optional params', async () => {
+    const response = await client.spectrum.apps.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.spectrum.apps.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'ea95132c15732412d22c1476fa83f27a',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.spectrum.apps.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -143,12 +141,9 @@ describe('resource apps', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.spectrum.apps.get('023e105f4ecef8ad9ca31a8372d0c353', 'ea95132c15732412d22c1476fa83f27a', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.spectrum.apps.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/speed/availabilities.test.ts b/tests/api-resources/speed/availabilities.test.ts
index 17d1c6342d..ff4f624389 100644
--- a/tests/api-resources/speed/availabilities.test.ts
+++ b/tests/api-resources/speed/availabilities.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource availabilities', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.speed.availabilities.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.speed.availabilities.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,8 +22,6 @@ describe('resource availabilities', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.speed.availabilities.list({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.speed.availabilities.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/speed/pages/pages.test.ts b/tests/api-resources/speed/pages/pages.test.ts
index e802c9d166..033f102cec 100644
--- a/tests/api-resources/speed/pages/pages.test.ts
+++ b/tests/api-resources/speed/pages/pages.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource pages', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.speed.pages.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.speed.pages.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,16 +22,16 @@ describe('resource pages', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.speed.pages.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.speed.pages.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   // TODO: investigate broken test
   test.skip('trend: only required params', async () => {
-    const responsePromise = cloudflare.speed.pages.trend('example.com', {
+    const responsePromise = client.speed.pages.trend('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       deviceType: 'DESKTOP',
       metrics: 'performanceScore,ttfb,fcp,si,lcp,tti,tbt,cls',
-      region: 'us-central1',
+      region: 'asia-east1',
       start: '2014-01-01T05:20:00.12345Z',
       tz: 'tz',
     });
@@ -46,11 +46,11 @@ describe('resource pages', () => {
 
   // TODO: investigate broken test
   test.skip('trend: required and optional params', async () => {
-    const response = await cloudflare.speed.pages.trend('example.com', {
+    const response = await client.speed.pages.trend('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       deviceType: 'DESKTOP',
       metrics: 'performanceScore,ttfb,fcp,si,lcp,tti,tbt,cls',
-      region: 'us-central1',
+      region: 'asia-east1',
       start: '2014-01-01T05:20:00.12345Z',
       tz: 'tz',
       end: '2014-01-01T05:20:00.12345Z',
diff --git a/tests/api-resources/speed/pages/tests.test.ts b/tests/api-resources/speed/pages/tests.test.ts
index 52e02bb55f..68803f1123 100644
--- a/tests/api-resources/speed/pages/tests.test.ts
+++ b/tests/api-resources/speed/pages/tests.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource tests', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.speed.pages.tests.create('example.com', {
+    const responsePromise = client.speed.pages.tests.create('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,14 +24,14 @@ describe('resource tests', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.speed.pages.tests.create('example.com', {
+    const response = await client.speed.pages.tests.create('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      region: 'us-central1',
+      region: 'asia-east1',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.speed.pages.tests.list('example.com', {
+    const responsePromise = client.speed.pages.tests.list('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -44,16 +44,16 @@ describe('resource tests', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.speed.pages.tests.list('example.com', {
+    const response = await client.speed.pages.tests.list('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      page: 1,
-      per_page: 20,
-      region: 'us-central1',
+      page: 0,
+      per_page: 5,
+      region: 'asia-east1',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.speed.pages.tests.delete('example.com', {
+    const responsePromise = client.speed.pages.tests.delete('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -66,14 +66,14 @@ describe('resource tests', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.speed.pages.tests.delete('example.com', {
+    const response = await client.speed.pages.tests.delete('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      region: 'us-central1',
+      region: 'asia-east1',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.speed.pages.tests.get('example.com', 'test_id', {
+    const responsePromise = client.speed.pages.tests.get('example.com', 'test_id', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -86,7 +86,7 @@ describe('resource tests', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.speed.pages.tests.get('example.com', 'test_id', {
+    const response = await client.speed.pages.tests.get('example.com', 'test_id', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/speed/schedule.test.ts b/tests/api-resources/speed/schedule.test.ts
index 8f9bc83e0b..9b8c169225 100644
--- a/tests/api-resources/speed/schedule.test.ts
+++ b/tests/api-resources/speed/schedule.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource schedule', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.speed.schedule.create('example.com', {
+    const responsePromise = client.speed.schedule.create('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,14 +24,14 @@ describe('resource schedule', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.speed.schedule.create('example.com', {
+    const response = await client.speed.schedule.create('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      region: 'us-central1',
+      region: 'asia-east1',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.speed.schedule.delete('example.com', {
+    const responsePromise = client.speed.schedule.delete('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -44,14 +44,14 @@ describe('resource schedule', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.speed.schedule.delete('example.com', {
+    const response = await client.speed.schedule.delete('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      region: 'us-central1',
+      region: 'asia-east1',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.speed.schedule.get('example.com', {
+    const responsePromise = client.speed.schedule.get('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -64,9 +64,9 @@ describe('resource schedule', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.speed.schedule.get('example.com', {
+    const response = await client.speed.schedule.get('example.com', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      region: 'us-central1',
+      region: 'asia-east1',
     });
   });
 });
diff --git a/tests/api-resources/ssl/analyze.test.ts b/tests/api-resources/ssl/analyze.test.ts
index 41478de958..8c61bf9ae8 100644
--- a/tests/api-resources/ssl/analyze.test.ts
+++ b/tests/api-resources/ssl/analyze.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource analyze', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.ssl.analyze.create({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.ssl.analyze.create({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource analyze', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.ssl.analyze.create({
+    const response = await client.ssl.analyze.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       bundle_method: 'ubiquitous',
       certificate:
diff --git a/tests/api-resources/ssl/certificate-packs/certificate-packs.test.ts b/tests/api-resources/ssl/certificate-packs/certificate-packs.test.ts
index 9d8173144d..7414ce0ffe 100644
--- a/tests/api-resources/ssl/certificate-packs/certificate-packs.test.ts
+++ b/tests/api-resources/ssl/certificate-packs/certificate-packs.test.ts
@@ -3,16 +3,21 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource certificatePacks', () => {
-  test('list: only required params', async () => {
-    const responsePromise = cloudflare.ssl.certificatePacks.list({
+  test('create: only required params', async () => {
+    const responsePromise = client.ssl.certificatePacks.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      certificate_authority: 'google',
+      hosts: ['example.com', '*.example.com', 'www.example.com'],
+      type: 'advanced',
+      validation_method: 'txt',
+      validity_days: 14,
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -23,15 +28,38 @@ describe('resource certificatePacks', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
+  test('create: required and optional params', async () => {
+    const response = await client.ssl.certificatePacks.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      certificate_authority: 'google',
+      hosts: ['example.com', '*.example.com', 'www.example.com'],
+      type: 'advanced',
+      validation_method: 'txt',
+      validity_days: 14,
+      cloudflare_branding: false,
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.ssl.certificatePacks.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
   test('list: required and optional params', async () => {
-    const response = await cloudflare.ssl.certificatePacks.list({
+    const response = await client.ssl.certificatePacks.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       status: 'all',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.ssl.certificatePacks.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.ssl.certificatePacks.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -44,15 +72,14 @@ describe('resource certificatePacks', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.ssl.certificatePacks.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.ssl.certificatePacks.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.ssl.certificatePacks.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.ssl.certificatePacks.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: {},
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -64,14 +91,14 @@ describe('resource certificatePacks', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.ssl.certificatePacks.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.ssl.certificatePacks.edit('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: {},
+      cloudflare_branding: false,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.ssl.certificatePacks.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.ssl.certificatePacks.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -84,7 +111,7 @@ describe('resource certificatePacks', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.ssl.certificatePacks.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.ssl.certificatePacks.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/ssl/certificate-packs/quota.test.ts b/tests/api-resources/ssl/certificate-packs/quota.test.ts
index 7f9bcab234..583631836e 100644
--- a/tests/api-resources/ssl/certificate-packs/quota.test.ts
+++ b/tests/api-resources/ssl/certificate-packs/quota.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource quota', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.ssl.certificatePacks.quota.get({
+    const responsePromise = client.ssl.certificatePacks.quota.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource quota', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.ssl.certificatePacks.quota.get({
+    const response = await client.ssl.certificatePacks.quota.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/ssl/recommendations.test.ts b/tests/api-resources/ssl/recommendations.test.ts
index f943ca9455..cea437f27b 100644
--- a/tests/api-resources/ssl/recommendations.test.ts
+++ b/tests/api-resources/ssl/recommendations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource recommendations', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.ssl.recommendations.get('023e105f4ecef8ad9ca31a8372d0c353');
+    const responsePromise = client.ssl.recommendations.get('023e105f4ecef8ad9ca31a8372d0c353');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,7 +24,7 @@ describe('resource recommendations', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.ssl.recommendations.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      client.ssl.recommendations.get('023e105f4ecef8ad9ca31a8372d0c353', {
         path: '/_stainless_unknown_path',
       }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
diff --git a/tests/api-resources/ssl/universal/settings.test.ts b/tests/api-resources/ssl/universal/settings.test.ts
index e144b7b820..7dd36c8121 100644
--- a/tests/api-resources/ssl/universal/settings.test.ts
+++ b/tests/api-resources/ssl/universal/settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource settings', () => {
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.ssl.universal.settings.edit({
+    const responsePromise = client.ssl.universal.settings.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,14 +24,14 @@ describe('resource settings', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.ssl.universal.settings.edit({
+    const response = await client.ssl.universal.settings.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       enabled: true,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.ssl.universal.settings.get({
+    const responsePromise = client.ssl.universal.settings.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -44,8 +44,6 @@ describe('resource settings', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.ssl.universal.settings.get({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.ssl.universal.settings.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/ssl/verification.test.ts b/tests/api-resources/ssl/verification.test.ts
index 9932aefbfc..a7681299b1 100644
--- a/tests/api-resources/ssl/verification.test.ts
+++ b/tests/api-resources/ssl/verification.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource verification', () => {
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.ssl.verification.edit('a77f8bd7-3b47-46b4-a6f1-75cf98109948', {
+    const responsePromise = client.ssl.verification.edit('a77f8bd7-3b47-46b4-a6f1-75cf98109948', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      validation_method: 'txt',
+      validation_method: 'http',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,14 +25,14 @@ describe('resource verification', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.ssl.verification.edit('a77f8bd7-3b47-46b4-a6f1-75cf98109948', {
+    const response = await client.ssl.verification.edit('a77f8bd7-3b47-46b4-a6f1-75cf98109948', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      validation_method: 'txt',
+      validation_method: 'http',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.ssl.verification.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.ssl.verification.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -43,7 +43,7 @@ describe('resource verification', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.ssl.verification.get({
+    const response = await client.ssl.verification.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       retry: true,
     });
diff --git a/tests/api-resources/stream/audio-tracks.test.ts b/tests/api-resources/stream/audio-tracks.test.ts
index e147cd064c..5d85ec55d4 100644
--- a/tests/api-resources/stream/audio-tracks.test.ts
+++ b/tests/api-resources/stream/audio-tracks.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource audioTracks', () => {
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.stream.audioTracks.delete(
+    const responsePromise = client.stream.audioTracks.delete(
       'ea95132c15732412d22c1476fa83f27a',
       'ea95132c15732412d22c1476fa83f27a',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -26,7 +26,7 @@ describe('resource audioTracks', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.stream.audioTracks.delete(
+    const response = await client.stream.audioTracks.delete(
       'ea95132c15732412d22c1476fa83f27a',
       'ea95132c15732412d22c1476fa83f27a',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -34,7 +34,7 @@ describe('resource audioTracks', () => {
   });
 
   test('copy: only required params', async () => {
-    const responsePromise = cloudflare.stream.audioTracks.copy('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.audioTracks.copy('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       label: 'director commentary',
     });
@@ -48,7 +48,7 @@ describe('resource audioTracks', () => {
   });
 
   test('copy: required and optional params', async () => {
-    const response = await cloudflare.stream.audioTracks.copy('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.audioTracks.copy('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       label: 'director commentary',
       url: 'https://www.examplestorage.com/audio_file.mp3',
@@ -56,7 +56,7 @@ describe('resource audioTracks', () => {
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.stream.audioTracks.edit(
+    const responsePromise = client.stream.audioTracks.edit(
       'ea95132c15732412d22c1476fa83f27a',
       'ea95132c15732412d22c1476fa83f27a',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -71,7 +71,7 @@ describe('resource audioTracks', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.stream.audioTracks.edit(
+    const response = await client.stream.audioTracks.edit(
       'ea95132c15732412d22c1476fa83f27a',
       'ea95132c15732412d22c1476fa83f27a',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353', default: true, label: 'director commentary' },
@@ -79,7 +79,7 @@ describe('resource audioTracks', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.stream.audioTracks.get('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.audioTracks.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -92,7 +92,7 @@ describe('resource audioTracks', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.stream.audioTracks.get('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.audioTracks.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/stream/captions/captions.test.ts b/tests/api-resources/stream/captions/captions.test.ts
index 4ec26efd69..3186f36592 100644
--- a/tests/api-resources/stream/captions/captions.test.ts
+++ b/tests/api-resources/stream/captions/captions.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource captions', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.stream.captions.get('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.captions.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource captions', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.stream.captions.get('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.captions.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/stream/captions/language/language.test.ts b/tests/api-resources/stream/captions/language/language.test.ts
index 91a89ea49c..6a61576b2f 100644
--- a/tests/api-resources/stream/captions/language/language.test.ts
+++ b/tests/api-resources/stream/captions/language/language.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,11 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource language', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.stream.captions.language.create(
-      'ea95132c15732412d22c1476fa83f27a',
-      'tr',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.stream.captions.language.create('ea95132c15732412d22c1476fa83f27a', 'tr', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -26,20 +24,17 @@ describe('resource language', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.stream.captions.language.create(
-      'ea95132c15732412d22c1476fa83f27a',
-      'tr',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.stream.captions.language.create('ea95132c15732412d22c1476fa83f27a', 'tr', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.stream.captions.language.update(
-      'ea95132c15732412d22c1476fa83f27a',
-      'tr',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', file: '@/Users/kyle/Desktop/tr.vtt' },
-    );
+    const responsePromise = client.stream.captions.language.update('ea95132c15732412d22c1476fa83f27a', 'tr', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      file: '@/Users/kyle/Desktop/tr.vtt',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -51,19 +46,16 @@ describe('resource language', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.stream.captions.language.update(
-      'ea95132c15732412d22c1476fa83f27a',
-      'tr',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', file: '@/Users/kyle/Desktop/tr.vtt' },
-    );
+    const response = await client.stream.captions.language.update('ea95132c15732412d22c1476fa83f27a', 'tr', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      file: '@/Users/kyle/Desktop/tr.vtt',
+    });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.stream.captions.language.delete(
-      'ea95132c15732412d22c1476fa83f27a',
-      'tr',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.stream.captions.language.delete('ea95132c15732412d22c1476fa83f27a', 'tr', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -74,19 +66,15 @@ describe('resource language', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.stream.captions.language.delete(
-      'ea95132c15732412d22c1476fa83f27a',
-      'tr',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.stream.captions.language.delete('ea95132c15732412d22c1476fa83f27a', 'tr', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.stream.captions.language.get(
-      'ea95132c15732412d22c1476fa83f27a',
-      'tr',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.stream.captions.language.get('ea95132c15732412d22c1476fa83f27a', 'tr', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -97,7 +85,7 @@ describe('resource language', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.stream.captions.language.get('ea95132c15732412d22c1476fa83f27a', 'tr', {
+    const response = await client.stream.captions.language.get('ea95132c15732412d22c1476fa83f27a', 'tr', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/stream/captions/language/vtt.test.ts b/tests/api-resources/stream/captions/language/vtt.test.ts
index f9db126db1..7e5e7389b2 100644
--- a/tests/api-resources/stream/captions/language/vtt.test.ts
+++ b/tests/api-resources/stream/captions/language/vtt.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource vtt', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.stream.captions.language.vtt.get(
+    const responsePromise = client.stream.captions.language.vtt.get(
       'ea95132c15732412d22c1476fa83f27a',
       'tr',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -26,10 +26,8 @@ describe('resource vtt', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.stream.captions.language.vtt.get(
-      'ea95132c15732412d22c1476fa83f27a',
-      'tr',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.stream.captions.language.vtt.get('ea95132c15732412d22c1476fa83f27a', 'tr', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/stream/clip.test.ts b/tests/api-resources/stream/clip.test.ts
index c9a0523649..80fbc8e8e0 100644
--- a/tests/api-resources/stream/clip.test.ts
+++ b/tests/api-resources/stream/clip.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource clip', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.stream.clip.create({
+    const responsePromise = client.stream.clip.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       clippedFromVideoUID: '023e105f4ecef8ad9ca31a8372d0c353',
       endTimeSeconds: 0,
@@ -27,7 +27,7 @@ describe('resource clip', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.stream.clip.create({
+    const response = await client.stream.clip.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       clippedFromVideoUID: '023e105f4ecef8ad9ca31a8372d0c353',
       endTimeSeconds: 0,
diff --git a/tests/api-resources/stream/copy.test.ts b/tests/api-resources/stream/copy.test.ts
index 6c4ec19638..077f2aefcd 100644
--- a/tests/api-resources/stream/copy.test.ts
+++ b/tests/api-resources/stream/copy.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource copy', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.stream.copy.create({
+    const responsePromise = client.stream.copy.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       url: 'https://example.com/myvideo.mp4',
     });
@@ -25,7 +25,7 @@ describe('resource copy', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.stream.copy.create({
+    const response = await client.stream.copy.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       url: 'https://example.com/myvideo.mp4',
       allowedOrigins: ['example.com'],
diff --git a/tests/api-resources/stream/direct-upload.test.ts b/tests/api-resources/stream/direct-upload.test.ts
index 51fd91b181..4c6b458237 100644
--- a/tests/api-resources/stream/direct-upload.test.ts
+++ b/tests/api-resources/stream/direct-upload.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource directUpload', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.stream.directUpload.create({
+    const responsePromise = client.stream.directUpload.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       maxDurationSeconds: 1,
     });
@@ -25,7 +25,7 @@ describe('resource directUpload', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.stream.directUpload.create({
+    const response = await client.stream.directUpload.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       maxDurationSeconds: 1,
       allowedOrigins: ['example.com'],
diff --git a/tests/api-resources/stream/downloads.test.ts b/tests/api-resources/stream/downloads.test.ts
index 2fd4648acf..366e4af679 100644
--- a/tests/api-resources/stream/downloads.test.ts
+++ b/tests/api-resources/stream/downloads.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource downloads', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.stream.downloads.create('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.downloads.create('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
     });
@@ -25,14 +25,14 @@ describe('resource downloads', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.stream.downloads.create('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.downloads.create('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.stream.downloads.delete('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.downloads.delete('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,13 +45,13 @@ describe('resource downloads', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.stream.downloads.delete('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.downloads.delete('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.stream.downloads.get('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.downloads.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -64,7 +64,7 @@ describe('resource downloads', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.stream.downloads.get('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.downloads.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/stream/embed.test.ts b/tests/api-resources/stream/embed.test.ts
index 292ba383a8..b3d61b4f4c 100644
--- a/tests/api-resources/stream/embed.test.ts
+++ b/tests/api-resources/stream/embed.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource embed', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.stream.embed.get('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.embed.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource embed', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.stream.embed.get('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.embed.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/stream/keys.test.ts b/tests/api-resources/stream/keys.test.ts
index fa8ec72aca..d0c45b8d4d 100644
--- a/tests/api-resources/stream/keys.test.ts
+++ b/tests/api-resources/stream/keys.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource keys', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.stream.keys.create({
+    const responsePromise = client.stream.keys.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
     });
@@ -25,14 +25,14 @@ describe('resource keys', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.stream.keys.create({
+    const response = await client.stream.keys.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.stream.keys.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.stream.keys.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,13 +45,13 @@ describe('resource keys', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.stream.keys.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+    const response = await client.stream.keys.delete('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.stream.keys.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.stream.keys.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -62,6 +62,6 @@ describe('resource keys', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.stream.keys.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.stream.keys.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/stream/live-inputs/live-inputs.test.ts b/tests/api-resources/stream/live-inputs/live-inputs.test.ts
index 0b4e6f5bf0..dd9d17e041 100644
--- a/tests/api-resources/stream/live-inputs/live-inputs.test.ts
+++ b/tests/api-resources/stream/live-inputs/live-inputs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource liveInputs', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.stream.liveInputs.create({
+    const responsePromise = client.stream.liveInputs.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,13 +24,14 @@ describe('resource liveInputs', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.stream.liveInputs.create({
+    const response = await client.stream.liveInputs.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       defaultCreator: 'defaultCreator',
       deleteRecordingAfterDays: 45,
       meta: { name: 'test stream 1' },
       recording: {
         allowedOrigins: ['example.com'],
+        hideLiveViewerCount: false,
         mode: 'off',
         requireSignedURLs: false,
         timeoutSeconds: 0,
@@ -39,7 +40,7 @@ describe('resource liveInputs', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.stream.liveInputs.update('66be4bf738797e01e1fca35a7bdecdcd', {
+    const responsePromise = client.stream.liveInputs.update('66be4bf738797e01e1fca35a7bdecdcd', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -52,13 +53,14 @@ describe('resource liveInputs', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.stream.liveInputs.update('66be4bf738797e01e1fca35a7bdecdcd', {
+    const response = await client.stream.liveInputs.update('66be4bf738797e01e1fca35a7bdecdcd', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       defaultCreator: 'defaultCreator',
       deleteRecordingAfterDays: 45,
       meta: { name: 'test stream 1' },
       recording: {
         allowedOrigins: ['example.com'],
+        hideLiveViewerCount: false,
         mode: 'off',
         requireSignedURLs: false,
         timeoutSeconds: 0,
@@ -67,9 +69,7 @@ describe('resource liveInputs', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.stream.liveInputs.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.stream.liveInputs.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -80,7 +80,7 @@ describe('resource liveInputs', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.stream.liveInputs.list({
+    const response = await client.stream.liveInputs.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       include_counts: true,
     });
@@ -88,7 +88,7 @@ describe('resource liveInputs', () => {
 
   // TODO: investigate broken test
   test.skip('delete: only required params', async () => {
-    const responsePromise = cloudflare.stream.liveInputs.delete('66be4bf738797e01e1fca35a7bdecdcd', {
+    const responsePromise = client.stream.liveInputs.delete('66be4bf738797e01e1fca35a7bdecdcd', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -102,13 +102,13 @@ describe('resource liveInputs', () => {
 
   // TODO: investigate broken test
   test.skip('delete: required and optional params', async () => {
-    const response = await cloudflare.stream.liveInputs.delete('66be4bf738797e01e1fca35a7bdecdcd', {
+    const response = await client.stream.liveInputs.delete('66be4bf738797e01e1fca35a7bdecdcd', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.stream.liveInputs.get('66be4bf738797e01e1fca35a7bdecdcd', {
+    const responsePromise = client.stream.liveInputs.get('66be4bf738797e01e1fca35a7bdecdcd', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -121,7 +121,7 @@ describe('resource liveInputs', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.stream.liveInputs.get('66be4bf738797e01e1fca35a7bdecdcd', {
+    const response = await client.stream.liveInputs.get('66be4bf738797e01e1fca35a7bdecdcd', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/stream/live-inputs/outputs.test.ts b/tests/api-resources/stream/live-inputs/outputs.test.ts
index 37cdbd9b46..6761690c58 100644
--- a/tests/api-resources/stream/live-inputs/outputs.test.ts
+++ b/tests/api-resources/stream/live-inputs/outputs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource outputs', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.stream.liveInputs.outputs.create('66be4bf738797e01e1fca35a7bdecdcd', {
+    const responsePromise = client.stream.liveInputs.outputs.create('66be4bf738797e01e1fca35a7bdecdcd', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       streamKey: 'uzya-f19y-g2g9-a2ee-51j2',
       url: 'rtmp://a.rtmp.youtube.com/live2',
@@ -26,7 +26,7 @@ describe('resource outputs', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.stream.liveInputs.outputs.create('66be4bf738797e01e1fca35a7bdecdcd', {
+    const response = await client.stream.liveInputs.outputs.create('66be4bf738797e01e1fca35a7bdecdcd', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       streamKey: 'uzya-f19y-g2g9-a2ee-51j2',
       url: 'rtmp://a.rtmp.youtube.com/live2',
@@ -35,7 +35,7 @@ describe('resource outputs', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.stream.liveInputs.outputs.update(
+    const responsePromise = client.stream.liveInputs.outputs.update(
       '66be4bf738797e01e1fca35a7bdecdcd',
       'baea4d9c515887b80289d5c33cf01145',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353', enabled: true },
@@ -50,7 +50,7 @@ describe('resource outputs', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.stream.liveInputs.outputs.update(
+    const response = await client.stream.liveInputs.outputs.update(
       '66be4bf738797e01e1fca35a7bdecdcd',
       'baea4d9c515887b80289d5c33cf01145',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353', enabled: true },
@@ -58,7 +58,7 @@ describe('resource outputs', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.stream.liveInputs.outputs.list('66be4bf738797e01e1fca35a7bdecdcd', {
+    const responsePromise = client.stream.liveInputs.outputs.list('66be4bf738797e01e1fca35a7bdecdcd', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -71,14 +71,14 @@ describe('resource outputs', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.stream.liveInputs.outputs.list('66be4bf738797e01e1fca35a7bdecdcd', {
+    const response = await client.stream.liveInputs.outputs.list('66be4bf738797e01e1fca35a7bdecdcd', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   // TODO: investigate broken test
   test.skip('delete: only required params', async () => {
-    const responsePromise = cloudflare.stream.liveInputs.outputs.delete(
+    const responsePromise = client.stream.liveInputs.outputs.delete(
       '66be4bf738797e01e1fca35a7bdecdcd',
       'baea4d9c515887b80289d5c33cf01145',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -94,7 +94,7 @@ describe('resource outputs', () => {
 
   // TODO: investigate broken test
   test.skip('delete: required and optional params', async () => {
-    const response = await cloudflare.stream.liveInputs.outputs.delete(
+    const response = await client.stream.liveInputs.outputs.delete(
       '66be4bf738797e01e1fca35a7bdecdcd',
       'baea4d9c515887b80289d5c33cf01145',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/stream/stream.test.ts b/tests/api-resources/stream/stream.test.ts
index 2073aca3c0..8f3b6b9cf5 100644
--- a/tests/api-resources/stream/stream.test.ts
+++ b/tests/api-resources/stream/stream.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource stream', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.stream.create({
+    const responsePromise = client.stream.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
       'Tus-Resumable': '1.0.0',
@@ -29,7 +29,7 @@ describe('resource stream', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.stream.create({
+    const response = await client.stream.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
       'Tus-Resumable': '1.0.0',
@@ -41,7 +41,7 @@ describe('resource stream', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.stream.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.stream.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -52,7 +52,7 @@ describe('resource stream', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.stream.list({
+    const response = await client.stream.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       asc: true,
       creator: 'creator-id_abcde12345',
@@ -60,14 +60,14 @@ describe('resource stream', () => {
       include_counts: true,
       search: 'puppy.mp4',
       start: '2014-01-02T02:20:00Z',
-      status: 'inprogress',
+      status: 'pendingupload',
       type: 'live',
     });
   });
 
   // TODO: investigate broken test
   test.skip('delete: only required params', async () => {
-    const responsePromise = cloudflare.stream.delete('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.delete('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -81,13 +81,40 @@ describe('resource stream', () => {
 
   // TODO: investigate broken test
   test.skip('delete: required and optional params', async () => {
-    const response = await cloudflare.stream.delete('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.delete('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
+  test('edit: only required params', async () => {
+    const responsePromise = client.stream.edit('ea95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.stream.edit('ea95132c15732412d22c1476fa83f27a', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      allowedOrigins: ['example.com'],
+      creator: 'creator-id_abcde12345',
+      maxDurationSeconds: 1,
+      meta: { name: 'video12345.mp4' },
+      requireSignedURLs: true,
+      scheduledDeletion: '2014-01-02T02:20:00Z',
+      thumbnailTimestampPct: 0.529241,
+      uploadExpiry: '2014-01-02T02:20:00Z',
+    });
+  });
+
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.stream.get('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -100,7 +127,7 @@ describe('resource stream', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.stream.get('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/stream/token.test.ts b/tests/api-resources/stream/token.test.ts
index f4111077b9..2eeb9d4b4d 100644
--- a/tests/api-resources/stream/token.test.ts
+++ b/tests/api-resources/stream/token.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource token', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.stream.token.create('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.token.create('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,28 +24,13 @@ describe('resource token', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.stream.token.create('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.token.create('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       id: 'ab0d4ef71g4425f8dcba9041231813000',
       accessRules: [
-        {
-          action: 'block',
-          country: ['US', 'MX'],
-          ip: ['string', 'string', 'string'],
-          type: 'ip.geoip.country',
-        },
-        {
-          action: 'allow',
-          country: ['string', 'string', 'string'],
-          ip: ['93.184.216.0/24', '2400:cb00::/32'],
-          type: 'ip.src',
-        },
-        {
-          action: 'block',
-          country: ['string', 'string', 'string'],
-          ip: ['string', 'string', 'string'],
-          type: 'any',
-        },
+        { action: 'allow', country: ['US', 'MX'], ip: ['string'], type: 'any' },
+        { action: 'allow', country: ['string'], ip: ['93.184.216.0/24', '2400:cb00::/32'], type: 'any' },
+        { action: 'allow', country: ['string'], ip: ['string'], type: 'any' },
       ],
       downloadable: true,
       exp: 0,
diff --git a/tests/api-resources/stream/videos.test.ts b/tests/api-resources/stream/videos.test.ts
index a6c7a0713e..fe145a13b9 100644
--- a/tests/api-resources/stream/videos.test.ts
+++ b/tests/api-resources/stream/videos.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource videos', () => {
   test('storageUsage: only required params', async () => {
-    const responsePromise = cloudflare.stream.videos.storageUsage({
+    const responsePromise = client.stream.videos.storageUsage({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource videos', () => {
   });
 
   test('storageUsage: required and optional params', async () => {
-    const response = await cloudflare.stream.videos.storageUsage({
+    const response = await client.stream.videos.storageUsage({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       creator: 'creator-id_abcde12345',
     });
diff --git a/tests/api-resources/stream/watermarks.test.ts b/tests/api-resources/stream/watermarks.test.ts
index c09c243060..10b064bef9 100644
--- a/tests/api-resources/stream/watermarks.test.ts
+++ b/tests/api-resources/stream/watermarks.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource watermarks', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.stream.watermarks.create({
+    const responsePromise = client.stream.watermarks.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       file: '@/Users/rchen/Downloads/watermark.png',
     });
@@ -27,7 +27,7 @@ describe('resource watermarks', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.stream.watermarks.create({
+    const response = await client.stream.watermarks.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       file: '@/Users/rchen/Downloads/watermark.png',
       name: 'Marketing Videos',
@@ -39,9 +39,7 @@ describe('resource watermarks', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.stream.watermarks.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.stream.watermarks.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -52,13 +50,11 @@ describe('resource watermarks', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.stream.watermarks.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.stream.watermarks.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.stream.watermarks.delete('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.watermarks.delete('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -71,13 +67,13 @@ describe('resource watermarks', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.stream.watermarks.delete('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.watermarks.delete('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.stream.watermarks.get('ea95132c15732412d22c1476fa83f27a', {
+    const responsePromise = client.stream.watermarks.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -90,7 +86,7 @@ describe('resource watermarks', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.stream.watermarks.get('ea95132c15732412d22c1476fa83f27a', {
+    const response = await client.stream.watermarks.get('ea95132c15732412d22c1476fa83f27a', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/stream/webhooks.test.ts b/tests/api-resources/stream/webhooks.test.ts
index 3bbd292601..68d5603bb2 100644
--- a/tests/api-resources/stream/webhooks.test.ts
+++ b/tests/api-resources/stream/webhooks.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource webhooks', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.stream.webhooks.update({
+    const responsePromise = client.stream.webhooks.update({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       notificationUrl: 'https://example.com',
     });
@@ -25,16 +25,14 @@ describe('resource webhooks', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.stream.webhooks.update({
+    const response = await client.stream.webhooks.update({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       notificationUrl: 'https://example.com',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.stream.webhooks.delete({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.stream.webhooks.delete({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -45,15 +43,11 @@ describe('resource webhooks', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.stream.webhooks.delete({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.stream.webhooks.delete({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.stream.webhooks.get({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.stream.webhooks.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -64,6 +58,6 @@ describe('resource webhooks', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.stream.webhooks.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.stream.webhooks.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/challenges/widgets.test.ts b/tests/api-resources/turnstile/widgets.test.ts
similarity index 79%
rename from tests/api-resources/challenges/widgets.test.ts
rename to tests/api-resources/turnstile/widgets.test.ts
index ab99d0d0c7..4956642d55 100644
--- a/tests/api-resources/challenges/widgets.test.ts
+++ b/tests/api-resources/turnstile/widgets.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource widgets', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.challenges.widgets.create({
+    const responsePromise = client.turnstile.widgets.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       domains: ['203.0.113.1', 'cloudflare.com', 'blog.example.com'],
-      mode: 'invisible',
+      mode: 'non-interactive',
       name: 'blog.cloudflare.com login form',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -27,27 +27,28 @@ describe('resource widgets', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.challenges.widgets.create({
+    const response = await client.turnstile.widgets.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       domains: ['203.0.113.1', 'cloudflare.com', 'blog.example.com'],
-      mode: 'invisible',
+      mode: 'non-interactive',
       name: 'blog.cloudflare.com login form',
       direction: 'asc',
       order: 'id',
       page: 1,
       per_page: 5,
       bot_fight_mode: false,
-      clearance_level: 'interactive',
+      clearance_level: 'no_clearance',
+      ephemeral_id: false,
       offlabel: false,
       region: 'world',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.challenges.widgets.update('0x4AAF00AAAABn0R22HWm-YUc', {
+    const responsePromise = client.turnstile.widgets.update('0x4AAF00AAAABn0R22HWm-YUc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       domains: ['203.0.113.1', 'cloudflare.com', 'blog.example.com'],
-      mode: 'invisible',
+      mode: 'non-interactive',
       name: 'blog.cloudflare.com login form',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -60,21 +61,20 @@ describe('resource widgets', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.challenges.widgets.update('0x4AAF00AAAABn0R22HWm-YUc', {
+    const response = await client.turnstile.widgets.update('0x4AAF00AAAABn0R22HWm-YUc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       domains: ['203.0.113.1', 'cloudflare.com', 'blog.example.com'],
-      mode: 'invisible',
+      mode: 'non-interactive',
       name: 'blog.cloudflare.com login form',
       bot_fight_mode: false,
-      clearance_level: 'interactive',
+      clearance_level: 'no_clearance',
+      ephemeral_id: false,
       offlabel: false,
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.challenges.widgets.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.turnstile.widgets.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -85,7 +85,7 @@ describe('resource widgets', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.challenges.widgets.list({
+    const response = await client.turnstile.widgets.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       direction: 'asc',
       order: 'id',
@@ -95,7 +95,7 @@ describe('resource widgets', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.challenges.widgets.delete('0x4AAF00AAAABn0R22HWm-YUc', {
+    const responsePromise = client.turnstile.widgets.delete('0x4AAF00AAAABn0R22HWm-YUc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -108,13 +108,13 @@ describe('resource widgets', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.challenges.widgets.delete('0x4AAF00AAAABn0R22HWm-YUc', {
+    const response = await client.turnstile.widgets.delete('0x4AAF00AAAABn0R22HWm-YUc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.challenges.widgets.get('0x4AAF00AAAABn0R22HWm-YUc', {
+    const responsePromise = client.turnstile.widgets.get('0x4AAF00AAAABn0R22HWm-YUc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -127,13 +127,13 @@ describe('resource widgets', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.challenges.widgets.get('0x4AAF00AAAABn0R22HWm-YUc', {
+    const response = await client.turnstile.widgets.get('0x4AAF00AAAABn0R22HWm-YUc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('rotateSecret: only required params', async () => {
-    const responsePromise = cloudflare.challenges.widgets.rotateSecret('0x4AAF00AAAABn0R22HWm-YUc', {
+    const responsePromise = client.turnstile.widgets.rotateSecret('0x4AAF00AAAABn0R22HWm-YUc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -146,7 +146,7 @@ describe('resource widgets', () => {
   });
 
   test('rotateSecret: required and optional params', async () => {
-    const response = await cloudflare.challenges.widgets.rotateSecret('0x4AAF00AAAABn0R22HWm-YUc', {
+    const response = await client.turnstile.widgets.rotateSecret('0x4AAF00AAAABn0R22HWm-YUc', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       invalidate_immediately: true,
     });
diff --git a/tests/api-resources/url-normalization.test.ts b/tests/api-resources/url-normalization.test.ts
index 7ba7a8e1e4..bc461f1399 100644
--- a/tests/api-resources/url-normalization.test.ts
+++ b/tests/api-resources/url-normalization.test.ts
@@ -3,16 +3,19 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource urlNormalization', () => {
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.urlNormalization.update({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+  // TODO: investigate unauthorized HTTP response
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.urlNormalization.update({
+      zone_id: '9f1839b6152d298aca64c4e906b6d074',
+      scope: 'incoming',
+      type: 'cloudflare',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -23,16 +26,35 @@ describe('resource urlNormalization', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.urlNormalization.update({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+  // TODO: investigate unauthorized HTTP response
+  test.skip('update: required and optional params', async () => {
+    const response = await client.urlNormalization.update({
+      zone_id: '9f1839b6152d298aca64c4e906b6d074',
       scope: 'incoming',
       type: 'cloudflare',
     });
   });
 
-  test('get: only required params', async () => {
-    const responsePromise = cloudflare.urlNormalization.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  // TODO: investigate unauthorized HTTP response
+  test.skip('delete: only required params', async () => {
+    const responsePromise = client.urlNormalization.delete({ zone_id: '9f1839b6152d298aca64c4e906b6d074' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate unauthorized HTTP response
+  test.skip('delete: required and optional params', async () => {
+    const response = await client.urlNormalization.delete({ zone_id: '9f1839b6152d298aca64c4e906b6d074' });
+  });
+
+  // TODO: investigate unauthorized HTTP response
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.urlNormalization.get({ zone_id: '9f1839b6152d298aca64c4e906b6d074' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -42,7 +64,8 @@ describe('resource urlNormalization', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: required and optional params', async () => {
-    const response = await cloudflare.urlNormalization.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  // TODO: investigate unauthorized HTTP response
+  test.skip('get: required and optional params', async () => {
+    const response = await client.urlNormalization.get({ zone_id: '9f1839b6152d298aca64c4e906b6d074' });
   });
 });
diff --git a/tests/api-resources/url-scanner/responses.test.ts b/tests/api-resources/url-scanner/responses.test.ts
new file mode 100644
index 0000000000..78ce8333a8
--- /dev/null
+++ b/tests/api-resources/url-scanner/responses.test.ts
@@ -0,0 +1,27 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource responses', () => {
+  test('get: only required params', async () => {
+    const responsePromise = client.urlScanner.responses.get('response_id', { account_id: 'account_id' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.urlScanner.responses.get('response_id', { account_id: 'account_id' });
+  });
+});
diff --git a/tests/api-resources/url-scanner/scans.test.ts b/tests/api-resources/url-scanner/scans.test.ts
index 902569126f..d40306274f 100644
--- a/tests/api-resources/url-scanner/scans.test.ts
+++ b/tests/api-resources/url-scanner/scans.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource scans', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.urlScanner.scans.create('accountId', {
+    const responsePromise = client.urlScanner.scans.create({
+      account_id: 'account_id',
       url: 'https://www.example.com',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,19 +25,19 @@ describe('resource scans', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.urlScanner.scans.create('accountId', {
+    const response = await client.urlScanner.scans.create({
+      account_id: 'account_id',
       url: 'https://www.example.com',
+      customagent: 'customagent',
       customHeaders: { foo: 'string' },
-      screenshotsResolutions: ['desktop', 'mobile', 'tablet'],
+      referer: 'referer',
+      screenshotsResolutions: ['desktop'],
       visibility: 'Public',
     });
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.urlScanner.scans.get(
-      'accountId',
-      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
-    );
+  test('list: only required params', async () => {
+    const responsePromise = client.urlScanner.scans.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -46,32 +47,64 @@ describe('resource scans', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.urlScanner.scans.get('accountId', '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('list: required and optional params', async () => {
+    const response = await client.urlScanner.scans.list({ account_id: 'account_id', q: 'q', size: 100 });
   });
 
-  test('get: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.urlScanner.scans.get(
-        'accountId',
-        '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
-        { full: true },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('bulkCreate: only required params', async () => {
+    const responsePromise = client.urlScanner.scans.bulkCreate({
+      account_id: 'account_id',
+      body: [{ url: 'https://www.example.com' }],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkCreate: required and optional params', async () => {
+    const response = await client.urlScanner.scans.bulkCreate({
+      account_id: 'account_id',
+      body: [
+        {
+          url: 'https://www.example.com',
+          customagent: 'customagent',
+          customHeaders: { foo: 'string' },
+          referer: 'referer',
+          screenshotsResolutions: ['desktop'],
+          visibility: 'Public',
+        },
+      ],
+    });
+  });
+
+  test('dom: only required params', async () => {
+    const responsePromise = client.urlScanner.scans.dom('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('dom: required and optional params', async () => {
+    const response = await client.urlScanner.scans.dom('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
   });
 
-  test('har', async () => {
-    const responsePromise = cloudflare.urlScanner.scans.har(
-      'accountId',
-      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
-    );
+  // TODO: investigate broken test
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.urlScanner.scans.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -81,33 +114,36 @@ describe('resource scans', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('har: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.urlScanner.scans.har('accountId', '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  // TODO: investigate broken test
+  test.skip('get: required and optional params', async () => {
+    const response = await client.urlScanner.scans.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
   });
 
-  test('screenshot: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.urlScanner.scans.screenshot('accountId', '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('har: only required params', async () => {
+    const responsePromise = client.urlScanner.scans.har('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('screenshot: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.urlScanner.scans.screenshot(
-        'accountId',
-        '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
-        { resolution: 'desktop' },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('har: required and optional params', async () => {
+    const response = await client.urlScanner.scans.har('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+  });
+
+  test('screenshot: required and optional params', async () => {
+    const response = await client.urlScanner.scans.screenshot('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+      resolution: 'desktop',
+    });
   });
 });
diff --git a/tests/api-resources/user/audit-logs.test.ts b/tests/api-resources/user/audit-logs.test.ts
index 73a6f5fdae..78f15a2b3e 100644
--- a/tests/api-resources/user/audit-logs.test.ts
+++ b/tests/api-resources/user/audit-logs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource auditLogs', () => {
   test('list', async () => {
-    const responsePromise = cloudflare.user.auditLogs.list();
+    const responsePromise = client.user.auditLogs.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource auditLogs', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.user.auditLogs.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.user.auditLogs.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,18 +31,18 @@ describe('resource auditLogs', () => {
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.user.auditLogs.list(
+      client.user.auditLogs.list(
         {
           id: 'f174be97-19b1-40d6-954d-70cd5fbd52db',
           action: { type: 'add' },
-          actor: { ip: '17.168.228.63', email: 'alice@example.com' },
-          before: '2019-04-30T01:12:20Z',
+          actor: { email: 'alice@example.com', ip: '17.168.228.63' },
+          before: '2019-04-30',
           direction: 'desc',
           export: true,
           hide_user_logs: true,
           page: 50,
           per_page: 25,
-          since: '2019-04-30T01:12:20Z',
+          since: '2019-04-30',
           zone: { name: 'example.com' },
         },
         { path: '/_stainless_unknown_path' },
diff --git a/tests/api-resources/user/billing/history.test.ts b/tests/api-resources/user/billing/history.test.ts
index 621c357e20..ca5ac5a635 100644
--- a/tests/api-resources/user/billing/history.test.ts
+++ b/tests/api-resources/user/billing/history.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource history', () => {
   test('list', async () => {
-    const responsePromise = cloudflare.user.billing.history.list();
+    const responsePromise = client.user.billing.history.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource history', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.user.billing.history.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.user.billing.history.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,12 +31,11 @@ describe('resource history', () => {
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.user.billing.history.list(
+      client.user.billing.history.list(
         {
           action: 'subscription',
-          occured_at: '2014-03-01T12:21:59.3456Z',
           occurred_at: '2014-03-01T12:21:59.3456Z',
-          order: 'occured_at',
+          order: 'type',
           page: 1,
           per_page: 5,
           type: 'charge',
diff --git a/tests/api-resources/user/billing/profile.test.ts b/tests/api-resources/user/billing/profile.test.ts
index b6aca931ef..1704f811df 100644
--- a/tests/api-resources/user/billing/profile.test.ts
+++ b/tests/api-resources/user/billing/profile.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource profile', () => {
   test('get', async () => {
-    const responsePromise = cloudflare.user.billing.profile.get();
+    const responsePromise = client.user.billing.profile.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource profile', () => {
 
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.user.billing.profile.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.user.billing.profile.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
diff --git a/tests/api-resources/user/invites.test.ts b/tests/api-resources/user/invites.test.ts
index 5c3208c72b..891becc825 100644
--- a/tests/api-resources/user/invites.test.ts
+++ b/tests/api-resources/user/invites.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource invites', () => {
   test('list', async () => {
-    const responsePromise = cloudflare.user.invites.list();
+    const responsePromise = client.user.invites.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,13 +23,13 @@ describe('resource invites', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.user.invites.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.user.invites.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.user.invites.edit('4f5f0c14a2a41d5063dd301b2f829f04', {
+    const responsePromise = client.user.invites.edit('4f5f0c14a2a41d5063dd301b2f829f04', {
       status: 'accepted',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -42,13 +42,13 @@ describe('resource invites', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.user.invites.edit('4f5f0c14a2a41d5063dd301b2f829f04', {
+    const response = await client.user.invites.edit('4f5f0c14a2a41d5063dd301b2f829f04', {
       status: 'accepted',
     });
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.user.invites.get('4f5f0c14a2a41d5063dd301b2f829f04');
+    const responsePromise = client.user.invites.get('4f5f0c14a2a41d5063dd301b2f829f04');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -61,7 +61,7 @@ describe('resource invites', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.user.invites.get('4f5f0c14a2a41d5063dd301b2f829f04', { path: '/_stainless_unknown_path' }),
+      client.user.invites.get('4f5f0c14a2a41d5063dd301b2f829f04', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 });
diff --git a/tests/api-resources/user/organizations.test.ts b/tests/api-resources/user/organizations.test.ts
index 8aa50d865c..01c9b6e9ee 100644
--- a/tests/api-resources/user/organizations.test.ts
+++ b/tests/api-resources/user/organizations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource organizations', () => {
   test('list', async () => {
-    const responsePromise = cloudflare.user.organizations.list();
+    const responsePromise = client.user.organizations.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -23,7 +23,7 @@ describe('resource organizations', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.user.organizations.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.user.organizations.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -31,12 +31,12 @@ describe('resource organizations', () => {
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.user.organizations.list(
+      client.user.organizations.list(
         {
-          direction: 'desc',
+          direction: 'asc',
           match: 'any',
           name: 'Cloudflare, Inc.',
-          order: 'status',
+          order: 'id',
           page: 1,
           per_page: 5,
           status: 'member',
@@ -47,7 +47,7 @@ describe('resource organizations', () => {
   });
 
   test('delete', async () => {
-    const responsePromise = cloudflare.user.organizations.delete('023e105f4ecef8ad9ca31a8372d0c353');
+    const responsePromise = client.user.organizations.delete('023e105f4ecef8ad9ca31a8372d0c353');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -60,14 +60,14 @@ describe('resource organizations', () => {
   test('delete: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.user.organizations.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      client.user.organizations.delete('023e105f4ecef8ad9ca31a8372d0c353', {
         path: '/_stainless_unknown_path',
       }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.user.organizations.get('023e105f4ecef8ad9ca31a8372d0c353');
+    const responsePromise = client.user.organizations.get('023e105f4ecef8ad9ca31a8372d0c353');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -80,9 +80,7 @@ describe('resource organizations', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.user.organizations.get('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
+      client.user.organizations.get('023e105f4ecef8ad9ca31a8372d0c353', { path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 });
diff --git a/tests/api-resources/user/subscriptions.test.ts b/tests/api-resources/user/subscriptions.test.ts
index 08ddcd0885..9642125771 100644
--- a/tests/api-resources/user/subscriptions.test.ts
+++ b/tests/api-resources/user/subscriptions.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource subscriptions', () => {
   test('update', async () => {
-    const responsePromise = cloudflare.user.subscriptions.update('506e3185e9c882d175a2d0cb0093d9f2', {});
+    const responsePromise = client.user.subscriptions.update('506e3185e9c882d175a2d0cb0093d9f2', {});
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource subscriptions', () => {
   });
 
   test('delete', async () => {
-    const responsePromise = cloudflare.user.subscriptions.delete('506e3185e9c882d175a2d0cb0093d9f2');
+    const responsePromise = client.user.subscriptions.delete('506e3185e9c882d175a2d0cb0093d9f2');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -35,25 +35,14 @@ describe('resource subscriptions', () => {
   test('delete: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.user.subscriptions.delete('506e3185e9c882d175a2d0cb0093d9f2', {
+      client.user.subscriptions.delete('506e3185e9c882d175a2d0cb0093d9f2', {
         path: '/_stainless_unknown_path',
       }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
-  test('edit', async () => {
-    const responsePromise = cloudflare.user.subscriptions.edit('506e3185e9c882d175a2d0cb0093d9f2', {});
-    const rawResponse = await responsePromise.asResponse();
-    expect(rawResponse).toBeInstanceOf(Response);
-    const response = await responsePromise;
-    expect(response).not.toBeInstanceOf(Response);
-    const dataAndResponse = await responsePromise.withResponse();
-    expect(dataAndResponse.data).toBe(response);
-    expect(dataAndResponse.response).toBe(rawResponse);
-  });
-
   test('get', async () => {
-    const responsePromise = cloudflare.user.subscriptions.get();
+    const responsePromise = client.user.subscriptions.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -65,7 +54,7 @@ describe('resource subscriptions', () => {
 
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.user.subscriptions.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.user.subscriptions.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
diff --git a/tests/api-resources/user/tokens/permission-groups.test.ts b/tests/api-resources/user/tokens/permission-groups.test.ts
index a2e2161452..4dcc445f6b 100644
--- a/tests/api-resources/user/tokens/permission-groups.test.ts
+++ b/tests/api-resources/user/tokens/permission-groups.test.ts
@@ -3,15 +3,16 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource permissionGroups', () => {
-  test('list', async () => {
-    const responsePromise = cloudflare.user.tokens.permissionGroups.list();
+  // TODO: investigate broken test
+  test.skip('list', async () => {
+    const responsePromise = client.user.tokens.permissionGroups.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,10 +22,11 @@ describe('resource permissionGroups', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
+  // TODO: investigate broken test
+  test.skip('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.user.tokens.permissionGroups.list({ path: '/_stainless_unknown_path' }),
+      client.user.tokens.permissionGroups.list({ path: '/_stainless_unknown_path' }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 });
diff --git a/tests/api-resources/user/tokens/tokens.test.ts b/tests/api-resources/user/tokens/tokens.test.ts
index 2e3480dce5..e76677e29d 100644
--- a/tests/api-resources/user/tokens/tokens.test.ts
+++ b/tests/api-resources/user/tokens/tokens.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource tokens', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.user.tokens.create({
+    const responsePromise = client.user.tokens.create({
       name: 'readonly token',
       policies: [
         {
@@ -23,22 +23,6 @@ describe('resource tokens', () => {
             'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
           },
         },
-        {
-          effect: 'allow',
-          permission_groups: [{}, {}],
-          resources: {
-            'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
-            'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
-          },
-        },
-        {
-          effect: 'allow',
-          permission_groups: [{}, {}],
-          resources: {
-            'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
-            'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
-          },
-        },
       ],
     });
     const rawResponse = await responsePromise.asResponse();
@@ -52,36 +36,14 @@ describe('resource tokens', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.user.tokens.create({
+    const response = await client.user.tokens.create({
       name: 'readonly token',
       policies: [
         {
           effect: 'allow',
           permission_groups: [
-            { meta: { label: 'load_balancer_admin', scopes: 'com.cloudflare.api.account' } },
-            { meta: { label: 'fbm_user', scopes: 'com.cloudflare.api.account' } },
-          ],
-          resources: {
-            'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
-            'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
-          },
-        },
-        {
-          effect: 'allow',
-          permission_groups: [
-            { meta: { label: 'load_balancer_admin', scopes: 'com.cloudflare.api.account' } },
-            { meta: { label: 'fbm_user', scopes: 'com.cloudflare.api.account' } },
-          ],
-          resources: {
-            'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
-            'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
-          },
-        },
-        {
-          effect: 'allow',
-          permission_groups: [
-            { meta: { label: 'load_balancer_admin', scopes: 'com.cloudflare.api.account' } },
-            { meta: { label: 'fbm_user', scopes: 'com.cloudflare.api.account' } },
+            { meta: { key: 'key', value: 'value' } },
+            { meta: { key: 'key', value: 'value' } },
           ],
           resources: {
             'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
@@ -101,40 +63,8 @@ describe('resource tokens', () => {
   });
 
   // TODO: investigate broken test
-  test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.user.tokens.update(
-      {},
-      {
-        name: 'readonly token',
-        policies: [
-          {
-            effect: 'allow',
-            permission_groups: [{}, {}],
-            resources: {
-              'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
-              'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
-            },
-          },
-          {
-            effect: 'allow',
-            permission_groups: [{}, {}],
-            resources: {
-              'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
-              'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
-            },
-          },
-          {
-            effect: 'allow',
-            permission_groups: [{}, {}],
-            resources: {
-              'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
-              'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
-            },
-          },
-        ],
-        status: 'active',
-      },
-    );
+  test.skip('update', async () => {
+    const responsePromise = client.user.tokens.update('ed17574386854bf78a67040be0a770b0', {});
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -145,61 +75,8 @@ describe('resource tokens', () => {
   });
 
   // TODO: investigate broken test
-  test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.user.tokens.update(
-      {},
-      {
-        name: 'readonly token',
-        policies: [
-          {
-            effect: 'allow',
-            permission_groups: [
-              { meta: { label: 'load_balancer_admin', scopes: 'com.cloudflare.api.account' } },
-              { meta: { label: 'fbm_user', scopes: 'com.cloudflare.api.account' } },
-            ],
-            resources: {
-              'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
-              'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
-            },
-          },
-          {
-            effect: 'allow',
-            permission_groups: [
-              { meta: { label: 'load_balancer_admin', scopes: 'com.cloudflare.api.account' } },
-              { meta: { label: 'fbm_user', scopes: 'com.cloudflare.api.account' } },
-            ],
-            resources: {
-              'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
-              'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
-            },
-          },
-          {
-            effect: 'allow',
-            permission_groups: [
-              { meta: { label: 'load_balancer_admin', scopes: 'com.cloudflare.api.account' } },
-              { meta: { label: 'fbm_user', scopes: 'com.cloudflare.api.account' } },
-            ],
-            resources: {
-              'com.cloudflare.api.account.zone.22b1de5f1c0e4b3ea97bb1e963b06a43': '*',
-              'com.cloudflare.api.account.zone.eb78d65290b24279ba6f44721b3ea3c4': '*',
-            },
-          },
-        ],
-        status: 'active',
-        condition: {
-          request_ip: {
-            in: ['123.123.123.0/24', '2606:4700::/32'],
-            not_in: ['123.123.123.100/24', '2606:4700:4700::/48'],
-          },
-        },
-        expires_on: '2020-01-01T00:00:00Z',
-        not_before: '2018-07-01T05:20:00Z',
-      },
-    );
-  });
-
-  test('list', async () => {
-    const responsePromise = cloudflare.user.tokens.list();
+  test.skip('list', async () => {
+    const responsePromise = client.user.tokens.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -209,25 +86,28 @@ describe('resource tokens', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
+  // TODO: investigate broken test
+  test.skip('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.user.tokens.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.user.tokens.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
 
-  test('list: request options and params are passed correctly', async () => {
+  // TODO: investigate broken test
+  test.skip('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.user.tokens.list(
-        { direction: 'desc', page: 1, per_page: 5 },
+      client.user.tokens.list(
+        { direction: 'asc', page: 1, per_page: 5 },
         { path: '/_stainless_unknown_path' },
       ),
     ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
-  test('delete', async () => {
-    const responsePromise = cloudflare.user.tokens.delete({});
+  // TODO: investigate broken test
+  test.skip('delete', async () => {
+    const responsePromise = client.user.tokens.delete('ed17574386854bf78a67040be0a770b0');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -237,15 +117,17 @@ describe('resource tokens', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
+  // TODO: investigate broken test
+  test.skip('delete: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.user.tokens.delete({}, { path: '/_stainless_unknown_path' })).rejects.toThrow(
-      Cloudflare.NotFoundError,
-    );
+    await expect(
+      client.user.tokens.delete('ed17574386854bf78a67040be0a770b0', { path: '/_stainless_unknown_path' }),
+    ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.user.tokens.get({});
+  // TODO: investigate broken test
+  test.skip('get', async () => {
+    const responsePromise = client.user.tokens.get('ed17574386854bf78a67040be0a770b0');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -255,15 +137,17 @@ describe('resource tokens', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
+  // TODO: investigate broken test
+  test.skip('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.user.tokens.get({}, { path: '/_stainless_unknown_path' })).rejects.toThrow(
-      Cloudflare.NotFoundError,
-    );
+    await expect(
+      client.user.tokens.get('ed17574386854bf78a67040be0a770b0', { path: '/_stainless_unknown_path' }),
+    ).rejects.toThrow(Cloudflare.NotFoundError);
   });
 
-  test('verify', async () => {
-    const responsePromise = cloudflare.user.tokens.verify();
+  // TODO: investigate broken test
+  test.skip('verify', async () => {
+    const responsePromise = client.user.tokens.verify();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -273,9 +157,10 @@ describe('resource tokens', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('verify: request options instead of params are passed correctly', async () => {
+  // TODO: investigate broken test
+  test.skip('verify: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.user.tokens.verify({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.user.tokens.verify({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
diff --git a/tests/api-resources/user/tokens/value.test.ts b/tests/api-resources/user/tokens/value.test.ts
index daddd5a0ac..134ff210e5 100644
--- a/tests/api-resources/user/tokens/value.test.ts
+++ b/tests/api-resources/user/tokens/value.test.ts
@@ -3,15 +3,16 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource value', () => {
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.user.tokens.value.update({}, {});
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.user.tokens.value.update('ed17574386854bf78a67040be0a770b0', {});
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,7 +22,8 @@ describe('resource value', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.user.tokens.value.update({}, {});
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.user.tokens.value.update('ed17574386854bf78a67040be0a770b0', {});
   });
 });
diff --git a/tests/api-resources/user/user.test.ts b/tests/api-resources/user/user.test.ts
index 69d64449f7..d667935501 100644
--- a/tests/api-resources/user/user.test.ts
+++ b/tests/api-resources/user/user.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource user', () => {
   test('edit', async () => {
-    const responsePromise = cloudflare.user.edit({});
+    const responsePromise = client.user.edit({});
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource user', () => {
   });
 
   test('get', async () => {
-    const responsePromise = cloudflare.user.get();
+    const responsePromise = client.user.get();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -34,7 +34,7 @@ describe('resource user', () => {
 
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.user.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.user.get({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
diff --git a/tests/api-resources/vectorize/indexes.test.ts b/tests/api-resources/vectorize/indexes/indexes.test.ts
similarity index 79%
rename from tests/api-resources/vectorize/indexes.test.ts
rename to tests/api-resources/vectorize/indexes/indexes.test.ts
index 3d08914333..1640654347 100644
--- a/tests/api-resources/vectorize/indexes.test.ts
+++ b/tests/api-resources/vectorize/indexes/indexes.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare, { toFile } from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource indexes', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.vectorize.indexes.create({
+    const responsePromise = client.vectorize.indexes.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       config: { dimensions: 768, metric: 'cosine' },
       name: 'example-index',
@@ -26,7 +26,7 @@ describe('resource indexes', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.vectorize.indexes.create({
+    const response = await client.vectorize.indexes.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       config: { dimensions: 768, metric: 'cosine' },
       name: 'example-index',
@@ -34,11 +34,8 @@ describe('resource indexes', () => {
     });
   });
 
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.vectorize.indexes.update('example-index', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      description: 'This is my example index.',
-    });
+  test('list: only required params', async () => {
+    const responsePromise = client.vectorize.indexes.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -48,15 +45,12 @@ describe('resource indexes', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.vectorize.indexes.update('example-index', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      description: 'This is my example index.',
-    });
+  test('list: required and optional params', async () => {
+    const response = await client.vectorize.indexes.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
-  test('list: only required params', async () => {
-    const responsePromise = cloudflare.vectorize.indexes.list({
+  test('delete: only required params', async () => {
+    const responsePromise = client.vectorize.indexes.delete('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -68,14 +62,14 @@ describe('resource indexes', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: required and optional params', async () => {
-    const response = await cloudflare.vectorize.indexes.list({
+  test('delete: required and optional params', async () => {
+    const response = await client.vectorize.indexes.delete('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
-  test('delete: only required params', async () => {
-    const responsePromise = cloudflare.vectorize.indexes.delete('example-index', {
+  test('deleteByIds: only required params', async () => {
+    const responsePromise = client.vectorize.indexes.deleteByIds('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -87,14 +81,15 @@ describe('resource indexes', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: required and optional params', async () => {
-    const response = await cloudflare.vectorize.indexes.delete('example-index', {
+  test('deleteByIds: required and optional params', async () => {
+    const response = await client.vectorize.indexes.deleteByIds('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      ids: ['5121db81354a40c6aedc3fe1ace51c59', 'f90eb49c2107486abdfd78c67e853430'],
     });
   });
 
-  test('deleteByIds: only required params', async () => {
-    const responsePromise = cloudflare.vectorize.indexes.deleteByIds('example-index', {
+  test('get: only required params', async () => {
+    const responsePromise = client.vectorize.indexes.get('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -106,15 +101,14 @@ describe('resource indexes', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('deleteByIds: required and optional params', async () => {
-    const response = await cloudflare.vectorize.indexes.deleteByIds('example-index', {
+  test('get: required and optional params', async () => {
+    const response = await client.vectorize.indexes.get('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      ids: ['5121db81354a40c6aedc3fe1ace51c59', 'f90eb49c2107486abdfd78c67e853430'],
     });
   });
 
-  test('get: only required params', async () => {
-    const responsePromise = cloudflare.vectorize.indexes.get('example-index', {
+  test('getByIds: only required params', async () => {
+    const responsePromise = client.vectorize.indexes.getByIds('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -126,14 +120,15 @@ describe('resource indexes', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: required and optional params', async () => {
-    const response = await cloudflare.vectorize.indexes.get('example-index', {
+  test('getByIds: required and optional params', async () => {
+    const response = await client.vectorize.indexes.getByIds('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      ids: ['5121db81354a40c6aedc3fe1ace51c59', 'f90eb49c2107486abdfd78c67e853430'],
     });
   });
 
-  test('getByIds: only required params', async () => {
-    const responsePromise = cloudflare.vectorize.indexes.getByIds('example-index', {
+  test('info: only required params', async () => {
+    const responsePromise = client.vectorize.indexes.info('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -145,16 +140,15 @@ describe('resource indexes', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('getByIds: required and optional params', async () => {
-    const response = await cloudflare.vectorize.indexes.getByIds('example-index', {
+  test('info: required and optional params', async () => {
+    const response = await client.vectorize.indexes.info('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      ids: ['5121db81354a40c6aedc3fe1ace51c59', 'f90eb49c2107486abdfd78c67e853430'],
     });
   });
 
   // TODO: investigate broken test
   test.skip('insert: only required params', async () => {
-    const responsePromise = cloudflare.vectorize.indexes.insert('example-index', {
+    const responsePromise = client.vectorize.indexes.insert('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: await toFile(Buffer.from('# my file contents'), 'README.md'),
     });
@@ -169,14 +163,15 @@ describe('resource indexes', () => {
 
   // TODO: investigate broken test
   test.skip('insert: required and optional params', async () => {
-    const response = await cloudflare.vectorize.indexes.insert('example-index', {
+    const response = await client.vectorize.indexes.insert('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: await toFile(Buffer.from('# my file contents'), 'README.md'),
+      'unparsable-behavior': 'error',
     });
   });
 
   test('query: only required params', async () => {
-    const responsePromise = cloudflare.vectorize.indexes.query('example-index', {
+    const responsePromise = client.vectorize.indexes.query('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       vector: [0.5, 0.5, 0.5],
     });
@@ -190,11 +185,11 @@ describe('resource indexes', () => {
   });
 
   test('query: required and optional params', async () => {
-    const response = await cloudflare.vectorize.indexes.query('example-index', {
+    const response = await client.vectorize.indexes.query('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       vector: [0.5, 0.5, 0.5],
       filter: { has_viewed: { $ne: true }, streaming_platform: 'netflix' },
-      returnMetadata: true,
+      returnMetadata: 'none',
       returnValues: true,
       topK: 5,
     });
@@ -202,7 +197,7 @@ describe('resource indexes', () => {
 
   // TODO: investigate broken test
   test.skip('upsert: only required params', async () => {
-    const responsePromise = cloudflare.vectorize.indexes.upsert('example-index', {
+    const responsePromise = client.vectorize.indexes.upsert('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: await toFile(Buffer.from('# my file contents'), 'README.md'),
     });
@@ -217,9 +212,10 @@ describe('resource indexes', () => {
 
   // TODO: investigate broken test
   test.skip('upsert: required and optional params', async () => {
-    const response = await cloudflare.vectorize.indexes.upsert('example-index', {
+    const response = await client.vectorize.indexes.upsert('example-index', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: await toFile(Buffer.from('# my file contents'), 'README.md'),
+      'unparsable-behavior': 'error',
     });
   });
 });
diff --git a/tests/api-resources/vectorize/indexes/metadata-index.test.ts b/tests/api-resources/vectorize/indexes/metadata-index.test.ts
new file mode 100644
index 0000000000..9b0f0dceb0
--- /dev/null
+++ b/tests/api-resources/vectorize/indexes/metadata-index.test.ts
@@ -0,0 +1,75 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource metadataIndex', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.vectorize.indexes.metadataIndex.create('example-index', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      indexType: 'string',
+      propertyName: 'random_metadata_property',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.vectorize.indexes.metadataIndex.create('example-index', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      indexType: 'string',
+      propertyName: 'random_metadata_property',
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.vectorize.indexes.metadataIndex.list('example-index', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.vectorize.indexes.metadataIndex.list('example-index', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.vectorize.indexes.metadataIndex.delete('example-index', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      propertyName: 'random_metadata_property',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.vectorize.indexes.metadataIndex.delete('example-index', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      propertyName: 'random_metadata_property',
+    });
+  });
+});
diff --git a/tests/api-resources/waiting-rooms/events/details.test.ts b/tests/api-resources/waiting-rooms/events/details.test.ts
index 4fd2f8377b..8791e911c3 100644
--- a/tests/api-resources/waiting-rooms/events/details.test.ts
+++ b/tests/api-resources/waiting-rooms/events/details.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource details', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.events.details.get(
+    const responsePromise = client.waitingRooms.events.details.get(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -26,7 +26,7 @@ describe('resource details', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.events.details.get(
+    const response = await client.waitingRooms.events.details.get(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/waiting-rooms/events/events.test.ts b/tests/api-resources/waiting-rooms/events/events.test.ts
index dfb34f66bc..3c018c8e2f 100644
--- a/tests/api-resources/waiting-rooms/events/events.test.ts
+++ b/tests/api-resources/waiting-rooms/events/events.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource events', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.events.create('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.waitingRooms.events.create('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       event_end_time: '2021-09-28T17:00:00.000Z',
       event_start_time: '2021-09-28T15:30:00.000Z',
@@ -27,7 +27,7 @@ describe('resource events', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.events.create('699d98642c564d2e855e9661899b7252', {
+    const response = await client.waitingRooms.events.create('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       event_end_time: '2021-09-28T17:00:00.000Z',
       event_start_time: '2021-09-28T15:30:00.000Z',
@@ -47,7 +47,7 @@ describe('resource events', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.events.update(
+    const responsePromise = client.waitingRooms.events.update(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       {
@@ -67,7 +67,7 @@ describe('resource events', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.events.update(
+    const response = await client.waitingRooms.events.update(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       {
@@ -91,7 +91,7 @@ describe('resource events', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.events.list('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.waitingRooms.events.list('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -104,15 +104,15 @@ describe('resource events', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.events.list('699d98642c564d2e855e9661899b7252', {
+    const response = await client.waitingRooms.events.list('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      page: {},
-      per_page: {},
+      page: 1,
+      per_page: 5,
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.events.delete(
+    const responsePromise = client.waitingRooms.events.delete(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -127,7 +127,7 @@ describe('resource events', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.events.delete(
+    const response = await client.waitingRooms.events.delete(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -135,7 +135,7 @@ describe('resource events', () => {
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.events.edit(
+    const responsePromise = client.waitingRooms.events.edit(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       {
@@ -155,7 +155,7 @@ describe('resource events', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.events.edit(
+    const response = await client.waitingRooms.events.edit(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       {
@@ -179,7 +179,7 @@ describe('resource events', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.events.get(
+    const responsePromise = client.waitingRooms.events.get(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -194,7 +194,7 @@ describe('resource events', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.events.get(
+    const response = await client.waitingRooms.events.get(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/waiting-rooms/page.test.ts b/tests/api-resources/waiting-rooms/page.test.ts
index d258f2894c..40f4ce2fbb 100644
--- a/tests/api-resources/waiting-rooms/page.test.ts
+++ b/tests/api-resources/waiting-rooms/page.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource page', () => {
   test('preview: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.page.preview({
+    const responsePromise = client.waitingRooms.page.preview({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       custom_html:
         '{{#waitTimeKnown}} {{waitTime}} mins {{/waitTimeKnown}} {{^waitTimeKnown}} Queue all enabled {{/waitTimeKnown}}',
@@ -26,7 +26,7 @@ describe('resource page', () => {
   });
 
   test('preview: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.page.preview({
+    const response = await client.waitingRooms.page.preview({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       custom_html:
         '{{#waitTimeKnown}} {{waitTime}} mins {{/waitTimeKnown}} {{^waitTimeKnown}} Queue all enabled {{/waitTimeKnown}}',
diff --git a/tests/api-resources/waiting-rooms/rules.test.ts b/tests/api-resources/waiting-rooms/rules.test.ts
index 6f11729e6d..9eccdc3353 100644
--- a/tests/api-resources/waiting-rooms/rules.test.ts
+++ b/tests/api-resources/waiting-rooms/rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource rules', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.rules.create('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.waitingRooms.rules.create('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      action: 'bypass_waiting_room',
-      expression: 'ip.src in {10.20.30.40}',
+      rules: { action: 'bypass_waiting_room', expression: 'ip.src in {10.20.30.40}' },
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,23 +25,21 @@ describe('resource rules', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.rules.create('699d98642c564d2e855e9661899b7252', {
+    const response = await client.waitingRooms.rules.create('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      action: 'bypass_waiting_room',
-      expression: 'ip.src in {10.20.30.40}',
-      description: 'allow all traffic from 10.20.30.40',
-      enabled: true,
+      rules: {
+        action: 'bypass_waiting_room',
+        expression: 'ip.src in {10.20.30.40}',
+        description: 'allow all traffic from 10.20.30.40',
+        enabled: true,
+      },
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.rules.update('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.waitingRooms.rules.update('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: [
-        { action: 'bypass_waiting_room', expression: 'ip.src in {10.20.30.40}' },
-        { action: 'bypass_waiting_room', expression: 'ip.src in {10.20.30.40}' },
-        { action: 'bypass_waiting_room', expression: 'ip.src in {10.20.30.40}' },
-      ],
+      rules: [{ action: 'bypass_waiting_room', expression: 'ip.src in {10.20.30.40}' }],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -54,52 +51,21 @@ describe('resource rules', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.rules.update('699d98642c564d2e855e9661899b7252', {
+    const response = await client.waitingRooms.rules.update('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: [
-        {
-          action: 'bypass_waiting_room',
-          description: 'allow all traffic from 10.20.30.40',
-          enabled: true,
-          expression: 'ip.src in {10.20.30.40}',
-        },
+      rules: [
         {
           action: 'bypass_waiting_room',
-          description: 'allow all traffic from 10.20.30.40',
-          enabled: true,
           expression: 'ip.src in {10.20.30.40}',
-        },
-        {
-          action: 'bypass_waiting_room',
           description: 'allow all traffic from 10.20.30.40',
           enabled: true,
-          expression: 'ip.src in {10.20.30.40}',
         },
       ],
     });
   });
 
-  test('list: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.rules.list('699d98642c564d2e855e9661899b7252', {
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
-    const rawResponse = await responsePromise.asResponse();
-    expect(rawResponse).toBeInstanceOf(Response);
-    const response = await responsePromise;
-    expect(response).not.toBeInstanceOf(Response);
-    const dataAndResponse = await responsePromise.withResponse();
-    expect(dataAndResponse.data).toBe(response);
-    expect(dataAndResponse.response).toBe(rawResponse);
-  });
-
-  test('list: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.rules.list('699d98642c564d2e855e9661899b7252', {
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
-  });
-
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.rules.delete(
+    const responsePromise = client.waitingRooms.rules.delete(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -114,7 +80,7 @@ describe('resource rules', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.rules.delete(
+    const response = await client.waitingRooms.rules.delete(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -122,7 +88,7 @@ describe('resource rules', () => {
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.rules.edit(
+    const responsePromise = client.waitingRooms.rules.edit(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       {
@@ -141,7 +107,7 @@ describe('resource rules', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.rules.edit(
+    const response = await client.waitingRooms.rules.edit(
       '699d98642c564d2e855e9661899b7252',
       '25756b2dfe6e378a06b033b670413757',
       {
@@ -154,4 +120,23 @@ describe('resource rules', () => {
       },
     );
   });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.waitingRooms.rules.get('699d98642c564d2e855e9661899b7252', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.waitingRooms.rules.get('699d98642c564d2e855e9661899b7252', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
 });
diff --git a/tests/api-resources/waiting-rooms/settings.test.ts b/tests/api-resources/waiting-rooms/settings.test.ts
index c305ba9029..c057dedf3f 100644
--- a/tests/api-resources/waiting-rooms/settings.test.ts
+++ b/tests/api-resources/waiting-rooms/settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource settings', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.settings.update({
+    const responsePromise = client.waitingRooms.settings.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,14 +24,14 @@ describe('resource settings', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.settings.update({
+    const response = await client.waitingRooms.settings.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       search_engine_crawler_bypass: true,
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.settings.edit({
+    const responsePromise = client.waitingRooms.settings.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -44,16 +44,14 @@ describe('resource settings', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.settings.edit({
+    const response = await client.waitingRooms.settings.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       search_engine_crawler_bypass: true,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.settings.get({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.waitingRooms.settings.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -64,8 +62,6 @@ describe('resource settings', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.settings.get({
-      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.waitingRooms.settings.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/waiting-rooms/statuses.test.ts b/tests/api-resources/waiting-rooms/statuses.test.ts
index 84fafda6c9..683351490e 100644
--- a/tests/api-resources/waiting-rooms/statuses.test.ts
+++ b/tests/api-resources/waiting-rooms/statuses.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource statuses', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.statuses.get('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.waitingRooms.statuses.get('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource statuses', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.statuses.get('699d98642c564d2e855e9661899b7252', {
+    const response = await client.waitingRooms.statuses.get('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/waiting-rooms/waiting-rooms.test.ts b/tests/api-resources/waiting-rooms/waiting-rooms.test.ts
index 59b8df3ddf..43f5603dbe 100644
--- a/tests/api-resources/waiting-rooms/waiting-rooms.test.ts
+++ b/tests/api-resources/waiting-rooms/waiting-rooms.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource waitingRooms', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.create({
+    const responsePromise = client.waitingRooms.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       host: 'shop.example.com',
       name: 'production_webinar',
@@ -28,36 +28,35 @@ describe('resource waitingRooms', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.create({
+    const response = await client.waitingRooms.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       host: 'shop.example.com',
       name: 'production_webinar',
       new_users_per_minute: 200,
       total_active_users: 200,
-      additional_routes: [
-        { host: 'shop2.example.com', path: '/shop2/checkout' },
-        { host: 'shop2.example.com', path: '/shop2/checkout' },
-        { host: 'shop2.example.com', path: '/shop2/checkout' },
-      ],
+      additional_routes: [{ host: 'shop2.example.com', path: '/shop2/checkout' }],
       cookie_attributes: { samesite: 'auto', secure: 'auto' },
       cookie_suffix: 'abcd',
       custom_page_html:
         '{{#waitTimeKnown}} {{waitTime}} mins {{/waitTimeKnown}} {{^waitTimeKnown}} Queue all enabled {{/waitTimeKnown}}',
-      default_template_language: 'es-ES',
+      default_template_language: 'en-US',
       description: 'Production - DO NOT MODIFY',
       disable_session_renewal: false,
+      enabled_origin_commands: ['revoke'],
       json_response_enabled: false,
       path: '/shop/checkout',
       queue_all: true,
       queueing_method: 'fifo',
-      queueing_status_code: 202,
+      queueing_status_code: 200,
       session_duration: 1,
       suspended: true,
+      turnstile_action: 'log',
+      turnstile_mode: 'off',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.update('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.waitingRooms.update('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       host: 'shop.example.com',
       name: 'production_webinar',
@@ -74,36 +73,35 @@ describe('resource waitingRooms', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.update('699d98642c564d2e855e9661899b7252', {
+    const response = await client.waitingRooms.update('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       host: 'shop.example.com',
       name: 'production_webinar',
       new_users_per_minute: 200,
       total_active_users: 200,
-      additional_routes: [
-        { host: 'shop2.example.com', path: '/shop2/checkout' },
-        { host: 'shop2.example.com', path: '/shop2/checkout' },
-        { host: 'shop2.example.com', path: '/shop2/checkout' },
-      ],
+      additional_routes: [{ host: 'shop2.example.com', path: '/shop2/checkout' }],
       cookie_attributes: { samesite: 'auto', secure: 'auto' },
       cookie_suffix: 'abcd',
       custom_page_html:
         '{{#waitTimeKnown}} {{waitTime}} mins {{/waitTimeKnown}} {{^waitTimeKnown}} Queue all enabled {{/waitTimeKnown}}',
-      default_template_language: 'es-ES',
+      default_template_language: 'en-US',
       description: 'Production - DO NOT MODIFY',
       disable_session_renewal: false,
+      enabled_origin_commands: ['revoke'],
       json_response_enabled: false,
       path: '/shop/checkout',
       queue_all: true,
       queueing_method: 'fifo',
-      queueing_status_code: 202,
+      queueing_status_code: 200,
       session_duration: 1,
       suspended: true,
+      turnstile_action: 'log',
+      turnstile_mode: 'off',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.waitingRooms.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -114,15 +112,15 @@ describe('resource waitingRooms', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.list({
+    const response = await client.waitingRooms.list({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      page: {},
-      per_page: {},
+      page: 1,
+      per_page: 5,
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.delete('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.waitingRooms.delete('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -135,13 +133,13 @@ describe('resource waitingRooms', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.delete('699d98642c564d2e855e9661899b7252', {
+    const response = await client.waitingRooms.delete('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.edit('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.waitingRooms.edit('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       host: 'shop.example.com',
       name: 'production_webinar',
@@ -158,36 +156,35 @@ describe('resource waitingRooms', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.edit('699d98642c564d2e855e9661899b7252', {
+    const response = await client.waitingRooms.edit('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       host: 'shop.example.com',
       name: 'production_webinar',
       new_users_per_minute: 200,
       total_active_users: 200,
-      additional_routes: [
-        { host: 'shop2.example.com', path: '/shop2/checkout' },
-        { host: 'shop2.example.com', path: '/shop2/checkout' },
-        { host: 'shop2.example.com', path: '/shop2/checkout' },
-      ],
+      additional_routes: [{ host: 'shop2.example.com', path: '/shop2/checkout' }],
       cookie_attributes: { samesite: 'auto', secure: 'auto' },
       cookie_suffix: 'abcd',
       custom_page_html:
         '{{#waitTimeKnown}} {{waitTime}} mins {{/waitTimeKnown}} {{^waitTimeKnown}} Queue all enabled {{/waitTimeKnown}}',
-      default_template_language: 'es-ES',
+      default_template_language: 'en-US',
       description: 'Production - DO NOT MODIFY',
       disable_session_renewal: false,
+      enabled_origin_commands: ['revoke'],
       json_response_enabled: false,
       path: '/shop/checkout',
       queue_all: true,
       queueing_method: 'fifo',
-      queueing_status_code: 202,
+      queueing_status_code: 200,
       session_duration: 1,
       suspended: true,
+      turnstile_action: 'log',
+      turnstile_mode: 'off',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.waitingRooms.get('699d98642c564d2e855e9661899b7252', {
+    const responsePromise = client.waitingRooms.get('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -200,7 +197,7 @@ describe('resource waitingRooms', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.waitingRooms.get('699d98642c564d2e855e9661899b7252', {
+    const response = await client.waitingRooms.get('699d98642c564d2e855e9661899b7252', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/web3/hostnames/hostnames.test.ts b/tests/api-resources/web3/hostnames/hostnames.test.ts
index 32f81f4f51..04f3b52be6 100644
--- a/tests/api-resources/web3/hostnames/hostnames.test.ts
+++ b/tests/api-resources/web3/hostnames/hostnames.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,8 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource hostnames', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.web3.hostnames.create('023e105f4ecef8ad9ca31a8372d0c353', {
-      target: 'ipfs',
+    const responsePromise = client.web3.hostnames.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'gateway.example.com',
+      target: 'ethereum',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -24,15 +26,17 @@ describe('resource hostnames', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.web3.hostnames.create('023e105f4ecef8ad9ca31a8372d0c353', {
-      target: 'ipfs',
+    const response = await client.web3.hostnames.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      name: 'gateway.example.com',
+      target: 'ethereum',
       description: 'This is my IPFS gateway.',
       dnslink: '/ipns/onboarding.ipfs.cloudflare.com',
     });
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.web3.hostnames.list('023e105f4ecef8ad9ca31a8372d0c353');
+  test('list: only required params', async () => {
+    const responsePromise = client.web3.hostnames.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -42,20 +46,14 @@ describe('resource hostnames', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.web3.hostnames.list('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('list: required and optional params', async () => {
+    const response = await client.web3.hostnames.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
-  test('delete', async () => {
-    const responsePromise = cloudflare.web3.hostnames.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-    );
+  test('delete: only required params', async () => {
+    const responsePromise = client.web3.hostnames.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -65,23 +63,16 @@ describe('resource hostnames', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.web3.hostnames.delete(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('delete: required and optional params', async () => {
+    const response = await client.web3.hostnames.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
-  test('edit', async () => {
-    const responsePromise = cloudflare.web3.hostnames.edit(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      {},
-    );
+  test('edit: only required params', async () => {
+    const responsePromise = client.web3.hostnames.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -91,11 +82,18 @@ describe('resource hostnames', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.web3.hostnames.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-    );
+  test('edit: required and optional params', async () => {
+    const response = await client.web3.hostnames.edit('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      description: 'This is my IPFS gateway.',
+      dnslink: '/ipns/onboarding.ipfs.cloudflare.com',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.web3.hostnames.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -105,12 +103,9 @@ describe('resource hostnames', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.web3.hostnames.get('023e105f4ecef8ad9ca31a8372d0c353', '023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.web3.hostnames.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.test.ts b/tests/api-resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.test.ts
index ae05ef9c0d..819581adec 100644
--- a/tests/api-resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.test.ts
+++ b/tests/api-resources/web3/hostnames/ipfs-universal-paths/content-lists/content-lists.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource contentLists', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.update(
+    const responsePromise = client.web3.hostnames.ipfsUniversalPaths.contentLists.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { action: 'block', entries: [{}, {}, {}] },
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353', action: 'block', entries: [{}] },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,10 +25,10 @@ describe('resource contentLists', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.web3.hostnames.ipfsUniversalPaths.contentLists.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       {
+        zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
         action: 'block',
         entries: [
           {
@@ -37,25 +36,15 @@ describe('resource contentLists', () => {
             description: 'this is my content list entry',
             type: 'cid',
           },
-          {
-            content: 'QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB',
-            description: 'this is my content list entry',
-            type: 'cid',
-          },
-          {
-            content: 'QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB',
-            description: 'this is my content list entry',
-            type: 'cid',
-          },
         ],
       },
     );
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+  test('get: only required params', async () => {
+    const responsePromise = client.web3.hostnames.ipfsUniversalPaths.contentLists.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -66,14 +55,10 @@ describe('resource contentLists', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.web3.hostnames.ipfsUniversalPaths.contentLists.get(
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
   });
 });
diff --git a/tests/api-resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.test.ts b/tests/api-resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.test.ts
index 3f6f1bd062..dcada77040 100644
--- a/tests/api-resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.test.ts
+++ b/tests/api-resources/web3/hostnames/ipfs-universal-paths/content-lists/entries.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,13 @@ const cloudflare = new Cloudflare({
 
 describe('resource entries', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.entries.create(
+    const responsePromise = client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.create(
       '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { content: 'QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB', type: 'cid' },
+      {
+        zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+        content: 'QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB',
+        type: 'cid',
+      },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,10 +29,10 @@ describe('resource entries', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.entries.create(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.create(
       '023e105f4ecef8ad9ca31a8372d0c353',
       {
+        zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
         content: 'QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB',
         type: 'cid',
         description: 'this is my content list entry',
@@ -38,11 +41,14 @@ describe('resource entries', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.entries.update(
+    const responsePromise = client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { content: 'QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB', type: 'cid' },
+      {
+        zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+        content: 'QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB',
+        type: 'cid',
+      },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -54,11 +60,11 @@ describe('resource entries', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.entries.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.update(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
       {
+        zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
         content: 'QmPZ9gcCEpqKTo6aq61g2nXGUhM4iCL3ewB6LDXZCtioEB',
         type: 'cid',
         description: 'this is my content list entry',
@@ -66,10 +72,10 @@ describe('resource entries', () => {
     );
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.entries.list(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+  test('list: only required params', async () => {
+    const responsePromise = client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.list(
       '023e105f4ecef8ad9ca31a8372d0c353',
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -80,22 +86,18 @@ describe('resource entries', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.entries.list(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('list: required and optional params', async () => {
+    const response = await client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.list(
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
   });
 
-  test('delete', async () => {
-    const responsePromise = cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.entries.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+  test('delete: only required params', async () => {
+    const responsePromise = client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.delete(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -106,23 +108,19 @@ describe('resource entries', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.entries.delete(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('delete: required and optional params', async () => {
+    const response = await client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.delete(
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.entries.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
+  test('get: only required params', async () => {
+    const responsePromise = client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.get(
       '023e105f4ecef8ad9ca31a8372d0c353',
       '023e105f4ecef8ad9ca31a8372d0c353',
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -133,15 +131,11 @@ describe('resource entries', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.web3.hostnames.ipfsUniversalPaths.contentLists.entries.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.web3.hostnames.ipfsUniversalPaths.contentLists.entries.get(
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      '023e105f4ecef8ad9ca31a8372d0c353',
+      { zone_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
   });
 });
diff --git a/tests/api-resources/workers-for-platforms/dispatch/namespaces/namespaces.test.ts b/tests/api-resources/workers-for-platforms/dispatch/namespaces/namespaces.test.ts
index 6073bd79a0..2c74deeb21 100644
--- a/tests/api-resources/workers-for-platforms/dispatch/namespaces/namespaces.test.ts
+++ b/tests/api-resources/workers-for-platforms/dispatch/namespaces/namespaces.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource namespaces', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.create({
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,14 +24,14 @@ describe('resource namespaces', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.create({
+    const response = await client.workersForPlatforms.dispatch.namespaces.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'my-dispatch-namespace',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.list({
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -44,16 +44,15 @@ describe('resource namespaces', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.list({
+    const response = await client.workersForPlatforms.dispatch.namespaces.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.delete(
-      'my-dispatch-namespace',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.delete('my-dispatch-namespace', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -64,14 +63,13 @@ describe('resource namespaces', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.delete(
-      'my-dispatch-namespace',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.workersForPlatforms.dispatch.namespaces.delete('my-dispatch-namespace', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.get('my-dispatch-namespace', {
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.get('my-dispatch-namespace', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -84,7 +82,7 @@ describe('resource namespaces', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.get('my-dispatch-namespace', {
+    const response = await client.workersForPlatforms.dispatch.namespaces.get('my-dispatch-namespace', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/asset-upload.test.ts b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/asset-upload.test.ts
new file mode 100644
index 0000000000..70f4aa3a10
--- /dev/null
+++ b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/asset-upload.test.ts
@@ -0,0 +1,35 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource assetUpload', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.assetUpload.create(
+      'my-dispatch-namespace',
+      'this-is_my_script-01',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.assetUpload.create(
+      'my-dispatch-namespace',
+      'this-is_my_script-01',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', manifest: { foo: { hash: 'hash', size: 0 } } },
+    );
+  });
+});
diff --git a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/bindings.test.ts b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/bindings.test.ts
index 5507363ed2..4083ce2786 100644
--- a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/bindings.test.ts
+++ b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/bindings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource bindings', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.bindings.get(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.bindings.get(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -26,7 +26,7 @@ describe('resource bindings', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.bindings.get(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.bindings.get(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/content.test.ts b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/content.test.ts
index e6de1d589f..9f46ab7ef2 100644
--- a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/content.test.ts
+++ b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/content.test.ts
@@ -1,9 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import Cloudflare, { toFile } from 'cloudflare';
+import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,10 +12,10 @@ const cloudflare = new Cloudflare({
 describe('resource content', () => {
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.content.update(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.content.update(
       'my-dispatch-namespace',
       'this-is_my_script-01',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', metadata: {} },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -28,16 +28,11 @@ describe('resource content', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.content.update(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.content.update(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        '<any part name>': [
-          await toFile(Buffer.from('# my file contents'), 'README.md'),
-          await toFile(Buffer.from('# my file contents'), 'README.md'),
-          await toFile(Buffer.from('# my file contents'), 'README.md'),
-        ],
         metadata: { body_part: 'worker.js', main_module: 'worker.js' },
         'CF-WORKER-BODY-PART': 'CF-WORKER-BODY-PART',
         'CF-WORKER-MAIN-MODULE-PART': 'CF-WORKER-MAIN-MODULE-PART',
@@ -46,7 +41,7 @@ describe('resource content', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.content.get(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.content.get(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.test.ts b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.test.ts
index 1b14414c5c..cbaf895eee 100644
--- a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.test.ts
+++ b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/scripts.test.ts
@@ -1,9 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import Cloudflare, { toFile } from 'cloudflare';
+import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,10 +12,10 @@ const cloudflare = new Cloudflare({
 describe('resource scripts', () => {
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.update(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.update(
       'my-dispatch-namespace',
       'this-is_my_script-01',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', metadata: {} },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -28,56 +28,51 @@ describe('resource scripts', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.update(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.update(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        '<any part name>': [
-          await toFile(Buffer.from('# my file contents'), 'README.md'),
-          await toFile(Buffer.from('# my file contents'), 'README.md'),
-          await toFile(Buffer.from('# my file contents'), 'README.md'),
-        ],
         metadata: {
-          bindings: [{ name: 'MY_ENV_VAR', text: 'my_data', type: 'plain_text' }],
+          assets: {
+            config: {
+              html_handling: 'auto-trailing-slash',
+              not_found_handling: 'none',
+              serve_directly: true,
+            },
+            jwt: 'jwt',
+          },
+          bindings: [{ name: 'MY_ENV_VAR', type: 'plain_text' }],
           body_part: 'worker.js',
-          compatibility_date: '2023-07-25',
-          compatibility_flags: ['string', 'string', 'string'],
-          keep_bindings: ['string', 'string', 'string'],
+          compatibility_date: '2021-01-01',
+          compatibility_flags: ['nodejs_compat'],
+          keep_assets: false,
+          keep_bindings: ['string'],
           logpush: false,
           main_module: 'worker.js',
           migrations: {
+            deleted_classes: ['string'],
+            new_classes: ['string'],
+            new_sqlite_classes: ['string'],
             new_tag: 'v2',
             old_tag: 'v1',
-            deleted_classes: ['string', 'string', 'string'],
-            new_classes: ['string', 'string', 'string'],
-            renamed_classes: [
-              { from: 'from', to: 'to' },
-              { from: 'from', to: 'to' },
-              { from: 'from', to: 'to' },
-            ],
-            transferred_classes: [
-              { from: 'from', from_script: 'from_script', to: 'to' },
-              { from: 'from', from_script: 'from_script', to: 'to' },
-              { from: 'from', from_script: 'from_script', to: 'to' },
-            ],
+            renamed_classes: [{ from: 'from', to: 'to' }],
+            transferred_classes: [{ from: 'from', from_script: 'from_script', to: 'to' }],
           },
+          observability: { enabled: true, head_sampling_rate: 0.1 },
           placement: { mode: 'smart' },
-          tags: ['string', 'string', 'string'],
+          tags: ['string'],
           tail_consumers: [
-            { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
-            { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
-            { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
+            { service: 'my-log-consumer', environment: 'production', namespace: 'my-namespace' },
           ],
-          usage_model: 'bundled',
-          version_tags: {},
+          usage_model: 'standard',
         },
       },
     );
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.delete(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.delete(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -92,7 +87,7 @@ describe('resource scripts', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.delete(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.delete(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353', force: true },
@@ -100,7 +95,7 @@ describe('resource scripts', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.get(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.get(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -115,7 +110,7 @@ describe('resource scripts', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.get(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.get(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.test.ts b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.test.ts
index b686a6ce8f..1a71a7e7c0 100644
--- a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.test.ts
+++ b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/secrets.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource secrets', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.secrets.update(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.secrets.update(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -26,7 +26,7 @@ describe('resource secrets', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.secrets.update(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.secrets.update(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       {
@@ -39,7 +39,7 @@ describe('resource secrets', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.secrets.list(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.secrets.list(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -54,10 +54,35 @@ describe('resource secrets', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.secrets.list(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.secrets.list(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
   });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.secrets.get(
+      'my-dispatch-namespace',
+      'this-is_my_script-01',
+      'mySecret',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.secrets.get(
+      'my-dispatch-namespace',
+      'this-is_my_script-01',
+      'mySecret',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+  });
 });
diff --git a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/settings.test.ts b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/settings.test.ts
index 6956b178d7..f44af08fa0 100644
--- a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/settings.test.ts
+++ b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource settings', () => {
   // TODO: investigate broken test
   test.skip('edit: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.settings.edit(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.settings.edit(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -28,52 +28,40 @@ describe('resource settings', () => {
 
   // TODO: investigate broken test
   test.skip('edit: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.settings.edit(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.settings.edit(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
         settings: {
-          bindings: [{ type: 'kv_namespace' }, { type: 'kv_namespace' }, { type: 'kv_namespace' }],
-          compatibility_date: '2022-04-05',
-          compatibility_flags: [
-            'formdata_parser_supports_files',
-            'formdata_parser_supports_files',
-            'formdata_parser_supports_files',
-          ],
+          bindings: [{ name: 'MY_ENV_VAR', type: 'plain_text' }],
+          compatibility_date: '2021-01-01',
+          compatibility_flags: ['nodejs_compat'],
           limits: { cpu_ms: 50 },
           logpush: false,
           migrations: {
+            deleted_classes: ['string'],
+            new_classes: ['string'],
+            new_sqlite_classes: ['string'],
             new_tag: 'v2',
             old_tag: 'v1',
-            deleted_classes: ['string', 'string', 'string'],
-            new_classes: ['string', 'string', 'string'],
-            renamed_classes: [
-              { from: 'from', to: 'to' },
-              { from: 'from', to: 'to' },
-              { from: 'from', to: 'to' },
-            ],
-            transferred_classes: [
-              { from: 'from', from_script: 'from_script', to: 'to' },
-              { from: 'from', from_script: 'from_script', to: 'to' },
-              { from: 'from', from_script: 'from_script', to: 'to' },
-            ],
+            renamed_classes: [{ from: 'from', to: 'to' }],
+            transferred_classes: [{ from: 'from', from_script: 'from_script', to: 'to' }],
           },
+          observability: { enabled: true, head_sampling_rate: 0.1 },
           placement: { mode: 'smart' },
-          tags: ['my-tag', 'my-tag', 'my-tag'],
+          tags: ['my-tag'],
           tail_consumers: [
-            { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
-            { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
-            { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
+            { service: 'my-log-consumer', environment: 'production', namespace: 'my-namespace' },
           ],
-          usage_model: 'unbound',
+          usage_model: 'standard',
         },
       },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.settings.get(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.settings.get(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -88,7 +76,7 @@ describe('resource settings', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.settings.get(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.settings.get(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/tags.test.ts b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/tags.test.ts
index 46c7ff726d..d99e7da380 100644
--- a/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/tags.test.ts
+++ b/tests/api-resources/workers-for-platforms/dispatch/namespaces/scripts/tags.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource tags', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.tags.update(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.tags.update(
       'my-dispatch-namespace',
       'this-is_my_script-01',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: ['my-tag', 'my-tag', 'my-tag'] },
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: ['my-tag'] },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,15 +26,15 @@ describe('resource tags', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.tags.update(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.tags.update(
       'my-dispatch-namespace',
       'this-is_my_script-01',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: ['my-tag', 'my-tag', 'my-tag'] },
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', body: ['my-tag'] },
     );
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.tags.list(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.tags.list(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -49,7 +49,7 @@ describe('resource tags', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.tags.list(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.tags.list(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -57,7 +57,7 @@ describe('resource tags', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.workersForPlatforms.dispatch.namespaces.scripts.tags.delete(
+    const responsePromise = client.workersForPlatforms.dispatch.namespaces.scripts.tags.delete(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       'my-tag',
@@ -73,7 +73,7 @@ describe('resource tags', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.workersForPlatforms.dispatch.namespaces.scripts.tags.delete(
+    const response = await client.workersForPlatforms.dispatch.namespaces.scripts.tags.delete(
       'my-dispatch-namespace',
       'this-is_my_script-01',
       'my-tag',
diff --git a/tests/api-resources/workers/account-settings.test.ts b/tests/api-resources/workers/account-settings.test.ts
index 6943b9235a..32cd5f8bf4 100644
--- a/tests/api-resources/workers/account-settings.test.ts
+++ b/tests/api-resources/workers/account-settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource accountSettings', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.workers.accountSettings.update({
+    const responsePromise = client.workers.accountSettings.update({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: "{'default_usage_model': 'unbound'}",
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,14 +24,15 @@ describe('resource accountSettings', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.workers.accountSettings.update({
+    const response = await client.workers.accountSettings.update({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: "{'default_usage_model': 'unbound'}",
+      default_usage_model: 'default_usage_model',
+      green_compute: true,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workers.accountSettings.get({
+    const responsePromise = client.workers.accountSettings.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,7 +45,7 @@ describe('resource accountSettings', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workers.accountSettings.get({
+    const response = await client.workers.accountSettings.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/addressing/loa-documents/loa-documents.test.ts b/tests/api-resources/workers/assets/upload.test.ts
similarity index 63%
rename from tests/api-resources/addressing/loa-documents/loa-documents.test.ts
rename to tests/api-resources/workers/assets/upload.test.ts
index b337ca4ac7..28a3ddd915 100644
--- a/tests/api-resources/addressing/loa-documents/loa-documents.test.ts
+++ b/tests/api-resources/workers/assets/upload.test.ts
@@ -3,18 +3,17 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource loaDocuments', () => {
-  // TODO: investigate broken test
-  test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.addressing.loaDocuments.create({
+describe('resource upload', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.workers.assets.upload.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      loa_document: '@document.pdf',
+      base64: true,
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,11 +24,11 @@ describe('resource loaDocuments', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  // TODO: investigate broken test
-  test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.addressing.loaDocuments.create({
+  test('create: required and optional params', async () => {
+    const response = await client.workers.assets.upload.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      loa_document: '@document.pdf',
+      base64: true,
+      '<any file hash>': ['string'],
     });
   });
 });
diff --git a/tests/api-resources/workers/domains.test.ts b/tests/api-resources/workers/domains.test.ts
index 13e8c085ad..2cd8e1cfa0 100644
--- a/tests/api-resources/workers/domains.test.ts
+++ b/tests/api-resources/workers/domains.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource domains', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.workers.domains.update({
+    const responsePromise = client.workers.domains.update({
       account_id: '9a7806061c88ada191ed06f989cc3dac',
       environment: 'production',
       hostname: 'foo.example.com',
@@ -28,7 +28,7 @@ describe('resource domains', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.workers.domains.update({
+    const response = await client.workers.domains.update({
       account_id: '9a7806061c88ada191ed06f989cc3dac',
       environment: 'production',
       hostname: 'foo.example.com',
@@ -38,9 +38,7 @@ describe('resource domains', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.workers.domains.list({
-      account_id: '9a7806061c88ada191ed06f989cc3dac',
-    });
+    const responsePromise = client.workers.domains.list({ account_id: '9a7806061c88ada191ed06f989cc3dac' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -51,7 +49,7 @@ describe('resource domains', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.workers.domains.list({
+    const response = await client.workers.domains.list({
       account_id: '9a7806061c88ada191ed06f989cc3dac',
       environment: 'production',
       hostname: 'foo.example.com',
@@ -63,7 +61,7 @@ describe('resource domains', () => {
 
   // TODO: investigate broken test
   test.skip('delete: only required params', async () => {
-    const responsePromise = cloudflare.workers.domains.delete('dbe10b4bc17c295377eabd600e1787fd', {
+    const responsePromise = client.workers.domains.delete('dbe10b4bc17c295377eabd600e1787fd', {
       account_id: '9a7806061c88ada191ed06f989cc3dac',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -77,13 +75,13 @@ describe('resource domains', () => {
 
   // TODO: investigate broken test
   test.skip('delete: required and optional params', async () => {
-    const response = await cloudflare.workers.domains.delete('dbe10b4bc17c295377eabd600e1787fd', {
+    const response = await client.workers.domains.delete('dbe10b4bc17c295377eabd600e1787fd', {
       account_id: '9a7806061c88ada191ed06f989cc3dac',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workers.domains.get('dbe10b4bc17c295377eabd600e1787fd', {
+    const responsePromise = client.workers.domains.get('dbe10b4bc17c295377eabd600e1787fd', {
       account_id: '9a7806061c88ada191ed06f989cc3dac',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -96,7 +94,7 @@ describe('resource domains', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workers.domains.get('dbe10b4bc17c295377eabd600e1787fd', {
+    const response = await client.workers.domains.get('dbe10b4bc17c295377eabd600e1787fd', {
       account_id: '9a7806061c88ada191ed06f989cc3dac',
     });
   });
diff --git a/tests/api-resources/calls/calls.test.ts b/tests/api-resources/workers/routes.test.ts
similarity index 65%
rename from tests/api-resources/calls/calls.test.ts
rename to tests/api-resources/workers/routes.test.ts
index b2d5350b6f..9b69a3339d 100644
--- a/tests/api-resources/calls/calls.test.ts
+++ b/tests/api-resources/workers/routes.test.ts
@@ -3,15 +3,18 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource calls', () => {
+describe('resource routes', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.calls.create({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.workers.routes.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      pattern: 'example.net/*',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,15 +25,17 @@ describe('resource calls', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.calls.create({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      name: 'production-realtime-app',
+    const response = await client.workers.routes.create({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      pattern: 'example.net/*',
+      script: 'this-is_my_script-01',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.calls.update('2a95132c15732412d22c1476fa83f27a', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.workers.routes.update('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      pattern: 'example.net/*',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -42,14 +47,15 @@ describe('resource calls', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.calls.update('2a95132c15732412d22c1476fa83f27a', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      name: 'production-realtime-app',
+    const response = await client.workers.routes.update('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      pattern: 'example.net/*',
+      script: 'this-is_my_script-01',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.calls.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.workers.routes.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -60,12 +66,12 @@ describe('resource calls', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.calls.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.workers.routes.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.calls.delete('2a95132c15732412d22c1476fa83f27a', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.workers.routes.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -77,14 +83,14 @@ describe('resource calls', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.calls.delete('2a95132c15732412d22c1476fa83f27a', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.workers.routes.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.calls.get('2a95132c15732412d22c1476fa83f27a', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.workers.routes.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -96,8 +102,8 @@ describe('resource calls', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.calls.get('2a95132c15732412d22c1476fa83f27a', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.workers.routes.get('023e105f4ecef8ad9ca31a8372d0c353', {
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 });
diff --git a/tests/api-resources/workers/scripts/assets/upload.test.ts b/tests/api-resources/workers/scripts/assets/upload.test.ts
new file mode 100644
index 0000000000..88ac95eee6
--- /dev/null
+++ b/tests/api-resources/workers/scripts/assets/upload.test.ts
@@ -0,0 +1,32 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource upload', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.workers.scripts.assets.upload.create('this-is_my_script-01', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.workers.scripts.assets.upload.create('this-is_my_script-01', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      manifest: { foo: { hash: 'hash', size: 0 } },
+    });
+  });
+});
diff --git a/tests/api-resources/workers/scripts/content.test.ts b/tests/api-resources/workers/scripts/content.test.ts
index 1a8edd5443..1567728d10 100644
--- a/tests/api-resources/workers/scripts/content.test.ts
+++ b/tests/api-resources/workers/scripts/content.test.ts
@@ -1,9 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import Cloudflare, { toFile } from 'cloudflare';
+import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,8 +12,9 @@ const cloudflare = new Cloudflare({
 describe('resource content', () => {
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.content.update('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.content.update('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      metadata: {},
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,13 +27,8 @@ describe('resource content', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.content.update('this-is_my_script-01', {
+    const response = await client.workers.scripts.content.update('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      '<any part name>': [
-        await toFile(Buffer.from('# my file contents'), 'README.md'),
-        await toFile(Buffer.from('# my file contents'), 'README.md'),
-        await toFile(Buffer.from('# my file contents'), 'README.md'),
-      ],
       metadata: { body_part: 'worker.js', main_module: 'worker.js' },
       'CF-WORKER-BODY-PART': 'CF-WORKER-BODY-PART',
       'CF-WORKER-MAIN-MODULE-PART': 'CF-WORKER-MAIN-MODULE-PART',
@@ -40,7 +36,7 @@ describe('resource content', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.content.get('this-is_my_script-01', {
+    const response = await client.workers.scripts.content.get('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/workers/scripts/deployments.test.ts b/tests/api-resources/workers/scripts/deployments.test.ts
index f701b6279d..08559beefc 100644
--- a/tests/api-resources/workers/scripts/deployments.test.ts
+++ b/tests/api-resources/workers/scripts/deployments.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,8 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource deployments', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.deployments.create('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.deployments.create('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      strategy: 'percentage',
+      versions: [{ percentage: 100, version_id: 'bcf48806-b317-4351-9ee7-36e7d557d4de' }],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -24,15 +26,17 @@ describe('resource deployments', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.deployments.create('this-is_my_script-01', {
+    const response = await client.workers.scripts.deployments.create('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      strategy: 'percentage',
+      versions: [{ percentage: 100, version_id: 'bcf48806-b317-4351-9ee7-36e7d557d4de' }],
+      force: true,
       annotations: { 'workers/message': 'Deploy bug fix.' },
-      strategy: 'strategy',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.deployments.get('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.deployments.get('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,7 +49,7 @@ describe('resource deployments', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.deployments.get('this-is_my_script-01', {
+    const response = await client.workers.scripts.deployments.get('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/workers/scripts/schedules.test.ts b/tests/api-resources/workers/scripts/schedules.test.ts
index f05336c89a..90224aff1a 100644
--- a/tests/api-resources/workers/scripts/schedules.test.ts
+++ b/tests/api-resources/workers/scripts/schedules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource schedules', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.schedules.update('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.schedules.update('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: "[{'cron': '*/30 * * * *'}]",
+      body: [{}],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,14 +25,14 @@ describe('resource schedules', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.schedules.update('this-is_my_script-01', {
+    const response = await client.workers.scripts.schedules.update('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: "[{'cron': '*/30 * * * *'}]",
+      body: [{ cron: '*/30 * * * *' }],
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.schedules.get('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.schedules.get('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,7 +45,7 @@ describe('resource schedules', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.schedules.get('this-is_my_script-01', {
+    const response = await client.workers.scripts.schedules.get('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/workers/scripts/scripts.test.ts b/tests/api-resources/workers/scripts/scripts.test.ts
index 6d44a1ab99..6e1a6278cc 100644
--- a/tests/api-resources/workers/scripts/scripts.test.ts
+++ b/tests/api-resources/workers/scripts/scripts.test.ts
@@ -1,9 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import Cloudflare, { toFile } from 'cloudflare';
+import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,8 +12,9 @@ const cloudflare = new Cloudflare({
 describe('resource scripts', () => {
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.update('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.update('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      metadata: {},
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,55 +27,43 @@ describe('resource scripts', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.update('this-is_my_script-01', {
+    const response = await client.workers.scripts.update('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      rollback_to: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      '<any part name>': [
-        await toFile(Buffer.from('# my file contents'), 'README.md'),
-        await toFile(Buffer.from('# my file contents'), 'README.md'),
-        await toFile(Buffer.from('# my file contents'), 'README.md'),
-      ],
       metadata: {
-        bindings: [{ name: 'MY_ENV_VAR', text: 'my_data', type: 'plain_text' }],
+        assets: {
+          config: { html_handling: 'auto-trailing-slash', not_found_handling: 'none', serve_directly: true },
+          jwt: 'jwt',
+        },
+        bindings: [{ name: 'MY_ENV_VAR', type: 'plain_text' }],
         body_part: 'worker.js',
-        compatibility_date: '2023-07-25',
-        compatibility_flags: ['string', 'string', 'string'],
-        keep_bindings: ['string', 'string', 'string'],
+        compatibility_date: '2021-01-01',
+        compatibility_flags: ['nodejs_compat'],
+        keep_assets: false,
+        keep_bindings: ['string'],
         logpush: false,
         main_module: 'worker.js',
         migrations: {
+          deleted_classes: ['string'],
+          new_classes: ['string'],
+          new_sqlite_classes: ['string'],
           new_tag: 'v2',
           old_tag: 'v1',
-          deleted_classes: ['string', 'string', 'string'],
-          new_classes: ['string', 'string', 'string'],
-          renamed_classes: [
-            { from: 'from', to: 'to' },
-            { from: 'from', to: 'to' },
-            { from: 'from', to: 'to' },
-          ],
-          transferred_classes: [
-            { from: 'from', from_script: 'from_script', to: 'to' },
-            { from: 'from', from_script: 'from_script', to: 'to' },
-            { from: 'from', from_script: 'from_script', to: 'to' },
-          ],
+          renamed_classes: [{ from: 'from', to: 'to' }],
+          transferred_classes: [{ from: 'from', from_script: 'from_script', to: 'to' }],
         },
+        observability: { enabled: true, head_sampling_rate: 0.1 },
         placement: { mode: 'smart' },
-        tags: ['string', 'string', 'string'],
+        tags: ['string'],
         tail_consumers: [
-          { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
-          { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
-          { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
+          { service: 'my-log-consumer', environment: 'production', namespace: 'my-namespace' },
         ],
-        usage_model: 'bundled',
-        version_tags: {},
+        usage_model: 'standard',
       },
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.workers.scripts.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -85,13 +74,11 @@ describe('resource scripts', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.workers.scripts.list({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.delete('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.delete('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -104,14 +91,27 @@ describe('resource scripts', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.delete('this-is_my_script-01', {
+    const response = await client.workers.scripts.delete('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       force: true,
     });
   });
 
+  test('get: only required params', async () => {
+    const responsePromise = client.workers.scripts.get('this-is_my_script-01', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.get('this-is_my_script-01', {
+    const response = await client.workers.scripts.get('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/workers/scripts/settings.test.ts b/tests/api-resources/workers/scripts/settings.test.ts
index 86dd3fcc6e..2783b3e8f3 100644
--- a/tests/api-resources/workers/scripts/settings.test.ts
+++ b/tests/api-resources/workers/scripts/settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource settings', () => {
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.settings.edit('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.settings.edit('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,19 +24,16 @@ describe('resource settings', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.settings.edit('this-is_my_script-01', {
+    const response = await client.workers.scripts.settings.edit('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       logpush: false,
-      tail_consumers: [
-        { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
-        { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
-        { environment: 'production', namespace: 'my-namespace', service: 'my-log-consumer' },
-      ],
+      observability: { enabled: true, head_sampling_rate: 0.1 },
+      tail_consumers: [{ service: 'my-log-consumer', environment: 'production', namespace: 'my-namespace' }],
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.settings.get('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.settings.get('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -49,7 +46,7 @@ describe('resource settings', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.settings.get('this-is_my_script-01', {
+    const response = await client.workers.scripts.settings.get('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/workers/scripts/subdomain.test.ts b/tests/api-resources/workers/scripts/subdomain.test.ts
new file mode 100644
index 0000000000..f9ae371461
--- /dev/null
+++ b/tests/api-resources/workers/scripts/subdomain.test.ts
@@ -0,0 +1,53 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource subdomain', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.workers.scripts.subdomain.create('this-is_my_script-01', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      enabled: true,
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.workers.scripts.subdomain.create('this-is_my_script-01', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      enabled: true,
+      previews_enabled: true,
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.workers.scripts.subdomain.get('this-is_my_script-01', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.workers.scripts.subdomain.get('this-is_my_script-01', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/workers/scripts/tail.test.ts b/tests/api-resources/workers/scripts/tail.test.ts
index 759620f039..5b69343cc3 100644
--- a/tests/api-resources/workers/scripts/tail.test.ts
+++ b/tests/api-resources/workers/scripts/tail.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource tail', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.tail.create('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.tail.create('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
     });
@@ -25,14 +25,14 @@ describe('resource tail', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.tail.create('this-is_my_script-01', {
+    const response = await client.workers.scripts.tail.create('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       body: {},
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.tail.delete(
+    const responsePromise = client.workers.scripts.tail.delete(
       'this-is_my_script-01',
       '03dc9f77817b488fb26c5861ec18f791',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -47,7 +47,7 @@ describe('resource tail', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.tail.delete(
+    const response = await client.workers.scripts.tail.delete(
       'this-is_my_script-01',
       '03dc9f77817b488fb26c5861ec18f791',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -55,7 +55,7 @@ describe('resource tail', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.tail.get('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.tail.get('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -68,7 +68,7 @@ describe('resource tail', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.tail.get('this-is_my_script-01', {
+    const response = await client.workers.scripts.tail.get('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/workers/scripts/versions.test.ts b/tests/api-resources/workers/scripts/versions.test.ts
index e5711a64fa..c12c104fa3 100644
--- a/tests/api-resources/workers/scripts/versions.test.ts
+++ b/tests/api-resources/workers/scripts/versions.test.ts
@@ -1,9 +1,9 @@
 // File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
 
-import Cloudflare, { toFile } from 'cloudflare';
+import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,8 +12,9 @@ const cloudflare = new Cloudflare({
 describe('resource versions', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.versions.create('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.versions.create('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      metadata: { main_module: 'worker.js' },
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,27 +27,22 @@ describe('resource versions', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.versions.create('this-is_my_script-01', {
+    const response = await client.workers.scripts.versions.create('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      '<any part name>': [
-        await toFile(Buffer.from('# my file contents'), 'README.md'),
-        await toFile(Buffer.from('# my file contents'), 'README.md'),
-        await toFile(Buffer.from('# my file contents'), 'README.md'),
-      ],
       metadata: {
-        annotations: { 'workers/message': 'Fixed worker code.', 'workers/tag': 'workers/tag' },
-        bindings: [{ name: 'MY_ENV_VAR', text: 'my_data', type: 'plain_text' }],
-        compatibility_date: '2023-07-25',
-        compatibility_flags: ['string', 'string', 'string'],
-        keep_bindings: ['string', 'string', 'string'],
         main_module: 'worker.js',
+        annotations: { 'workers/message': 'Fixed worker code.', 'workers/tag': 'workers/tag' },
+        bindings: [{ name: 'MY_ENV_VAR', type: 'plain_text' }],
+        compatibility_date: '2021-01-01',
+        compatibility_flags: ['nodejs_compat'],
+        keep_bindings: ['string'],
         usage_model: 'standard',
       },
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.versions.list('this-is_my_script-01', {
+    const responsePromise = client.workers.scripts.versions.list('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -59,7 +55,7 @@ describe('resource versions', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.versions.list('this-is_my_script-01', {
+    const response = await client.workers.scripts.versions.list('this-is_my_script-01', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       deployable: true,
       page: 0,
@@ -68,7 +64,7 @@ describe('resource versions', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workers.scripts.versions.get(
+    const responsePromise = client.workers.scripts.versions.get(
       'this-is_my_script-01',
       'bcf48806-b317-4351-9ee7-36e7d557d4de',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -83,7 +79,7 @@ describe('resource versions', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workers.scripts.versions.get(
+    const response = await client.workers.scripts.versions.get(
       'this-is_my_script-01',
       'bcf48806-b317-4351-9ee7-36e7d557d4de',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/workers/subdomains.test.ts b/tests/api-resources/workers/subdomains.test.ts
index 7283abd5aa..620ea946b1 100644
--- a/tests/api-resources/workers/subdomains.test.ts
+++ b/tests/api-resources/workers/subdomains.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource subdomains', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.workers.subdomains.update({
+    const responsePromise = client.workers.subdomains.update({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: "{'subdomain': 'example-subdomain'}",
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,16 +24,14 @@ describe('resource subdomains', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.workers.subdomains.update({
+    const response = await client.workers.subdomains.update({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      body: "{'subdomain': 'example-subdomain'}",
+      subdomain: 'example-subdomain',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.workers.subdomains.get({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.workers.subdomains.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -45,8 +42,6 @@ describe('resource subdomains', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.workers.subdomains.get({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.workers.subdomains.get({ account_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/addressing/prefixes/bgp/prefixes.test.ts b/tests/api-resources/workflows/instances/instances.test.ts
similarity index 53%
rename from tests/api-resources/addressing/prefixes/bgp/prefixes.test.ts
rename to tests/api-resources/workflows/instances/instances.test.ts
index c4c17774bf..a0baa06a1a 100644
--- a/tests/api-resources/addressing/prefixes/bgp/prefixes.test.ts
+++ b/tests/api-resources/workflows/instances/instances.test.ts
@@ -3,18 +3,15 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource prefixes', () => {
-  test('list: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.bgp.prefixes.list(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+describe('resource instances', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.workflows.instances.create('x', { account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,19 +21,16 @@ describe('resource prefixes', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.bgp.prefixes.list(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+  test('create: required and optional params', async () => {
+    const response = await client.workflows.instances.create('x', {
+      account_id: 'account_id',
+      instance_id: 'instance_id',
+      params: {},
+    });
   });
 
-  test('edit: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.bgp.prefixes.edit(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+  test('list: only required params', async () => {
+    const responsePromise = client.workflows.instances.list('x', { account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -46,20 +40,19 @@ describe('resource prefixes', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('edit: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.bgp.prefixes.edit(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', on_demand: { advertised: true } },
-    );
+  test('list: required and optional params', async () => {
+    const response = await client.workflows.instances.list('x', {
+      account_id: 'account_id',
+      date_end: '2019-12-27T18:11:19.117Z',
+      date_start: '2019-12-27T18:11:19.117Z',
+      page: 1,
+      per_page: 1,
+      status: 'queued',
+    });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.addressing.prefixes.bgp.prefixes.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.workflows.instances.get('x', 'x', { account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -70,10 +63,6 @@ describe('resource prefixes', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.addressing.prefixes.bgp.prefixes.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.workflows.instances.get('x', 'x', { account_id: 'account_id' });
   });
 });
diff --git a/tests/api-resources/workflows/instances/status.test.ts b/tests/api-resources/workflows/instances/status.test.ts
new file mode 100644
index 0000000000..238df1e9a5
--- /dev/null
+++ b/tests/api-resources/workflows/instances/status.test.ts
@@ -0,0 +1,33 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource status', () => {
+  test('edit: only required params', async () => {
+    const responsePromise = client.workflows.instances.status.edit('x', 'x', {
+      account_id: 'account_id',
+      status: 'resume',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.workflows.instances.status.edit('x', 'x', {
+      account_id: 'account_id',
+      status: 'resume',
+    });
+  });
+});
diff --git a/tests/api-resources/workflows/versions.test.ts b/tests/api-resources/workflows/versions.test.ts
new file mode 100644
index 0000000000..ee27857662
--- /dev/null
+++ b/tests/api-resources/workflows/versions.test.ts
@@ -0,0 +1,50 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource versions', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.workflows.versions.list('x', { account_id: 'account_id' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.workflows.versions.list('x', {
+      account_id: 'account_id',
+      page: 1,
+      per_page: 1,
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.workflows.versions.get('x', '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.workflows.versions.get('x', '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+  });
+});
diff --git a/tests/api-resources/workflows/workflows.test.ts b/tests/api-resources/workflows/workflows.test.ts
new file mode 100644
index 0000000000..6a07510f7b
--- /dev/null
+++ b/tests/api-resources/workflows/workflows.test.ts
@@ -0,0 +1,65 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource workflows', () => {
+  test('update: only required params', async () => {
+    const responsePromise = client.workflows.update('x', {
+      account_id: 'account_id',
+      class_name: 'x',
+      script_name: 'x',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.workflows.update('x', {
+      account_id: 'account_id',
+      class_name: 'x',
+      script_name: 'x',
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.workflows.list({ account_id: 'account_id' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.workflows.list({ account_id: 'account_id', page: 1, per_page: 1 });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.workflows.get('x', { account_id: 'account_id' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.workflows.get('x', { account_id: 'account_id' });
+  });
+});
diff --git a/tests/api-resources/zero-trust/access/applications/applications.test.ts b/tests/api-resources/zero-trust/access/applications/applications.test.ts
index 8e68fb6cd0..123ae20b5f 100644
--- a/tests/api-resources/zero-trust/access/applications/applications.test.ts
+++ b/tests/api-resources/zero-trust/access/applications/applications.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource applications', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.create({
+    const responsePromise = client.zeroTrust.access.applications.create({
       domain: 'test.example.com/admin',
       type: 'self_hosted',
       account_id: 'account_id',
@@ -28,16 +28,12 @@ describe('resource applications', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.applications.create({
+    const response = await client.zeroTrust.access.applications.create({
       domain: 'test.example.com/admin',
       type: 'self_hosted',
       account_id: 'account_id',
       allow_authenticate_via_warp: true,
-      allowed_idps: [
-        '699d98642c564d2e855e9661899b7252',
-        '699d98642c564d2e855e9661899b7252',
-        '699d98642c564d2e855e9661899b7252',
-      ],
+      allowed_idps: ['699d98642c564d2e855e9661899b7252'],
       app_launcher_visible: true,
       auto_redirect_to_identity: true,
       cors_headers: {
@@ -45,7 +41,7 @@ describe('resource applications', () => {
         allow_all_methods: true,
         allow_all_origins: true,
         allow_credentials: true,
-        allowed_headers: ['string', 'string', 'string'],
+        allowed_headers: ['string'],
         allowed_methods: ['GET'],
         allowed_origins: ['https://example.com'],
         max_age: -1,
@@ -53,10 +49,34 @@ describe('resource applications', () => {
       custom_deny_message: 'custom_deny_message',
       custom_deny_url: 'custom_deny_url',
       custom_non_identity_deny_url: 'custom_non_identity_deny_url',
-      custom_pages: [
-        '699d98642c564d2e855e9661899b7252',
-        '699d98642c564d2e855e9661899b7252',
-        '699d98642c564d2e855e9661899b7252',
+      custom_pages: ['699d98642c564d2e855e9661899b7252'],
+      destinations: [
+        { type: 'public', uri: 'test.example.com/admin' },
+        { type: 'public', uri: 'test.anotherexample.com/staff' },
+        {
+          cidr: '10.5.0.0/24',
+          hostname: 'hostname',
+          l4_protocol: 'tcp',
+          port_range: '80-90',
+          type: 'private',
+          vnet_id: 'vnet_id',
+        },
+        {
+          cidr: '10.5.0.3/32',
+          hostname: 'hostname',
+          l4_protocol: 'tcp',
+          port_range: '80',
+          type: 'private',
+          vnet_id: 'vnet_id',
+        },
+        {
+          cidr: 'cidr',
+          hostname: 'hostname',
+          l4_protocol: 'tcp',
+          port_range: 'port_range',
+          type: 'private',
+          vnet_id: 'vnet_id',
+        },
       ],
       enable_binding_cookie: true,
       http_only_cookie_attribute: true,
@@ -64,59 +84,41 @@ describe('resource applications', () => {
       name: 'Admin Site',
       options_preflight_bypass: true,
       path_cookie_attribute: true,
-      policies: [
-        { id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415', precedence: 0 },
-        { id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415', precedence: 0 },
-        { id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415', precedence: 0 },
-      ],
+      policies: [{ id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415', precedence: 0 }],
       same_site_cookie_attribute: 'strict',
       scim_config: {
+        idp_uid: 'idp_uid',
+        remote_uri: 'remote_uri',
         authentication: { password: 'password', scheme: 'httpbasic', user: 'user' },
         deactivate_on_delete: true,
         enabled: true,
-        idp_uid: 'idp_uid',
         mappings: [
           {
-            enabled: true,
-            filter: 'title pr or userType eq "Intern"',
-            operations: { create: true, delete: true, update: true },
             schema: 'urn:ietf:params:scim:schemas:core:2.0:User',
-            transform_jsonata:
-              "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-          },
-          {
             enabled: true,
             filter: 'title pr or userType eq "Intern"',
             operations: { create: true, delete: true, update: true },
-            schema: 'urn:ietf:params:scim:schemas:core:2.0:User',
-            transform_jsonata:
-              "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-          },
-          {
-            enabled: true,
-            filter: 'title pr or userType eq "Intern"',
-            operations: { create: true, delete: true, update: true },
-            schema: 'urn:ietf:params:scim:schemas:core:2.0:User',
+            strictness: 'strict',
             transform_jsonata:
               "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
           },
         ],
-        remote_uri: 'remote_uri',
       },
       self_hosted_domains: ['test.example.com/admin', 'test.anotherexample.com/staff'],
       service_auth_401_redirect: true,
       session_duration: '24h',
       skip_interstitial: true,
-      tags: ['engineers', 'engineers', 'engineers'],
+      tags: ['engineers'],
     });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { domain: 'test.example.com/admin', type: 'self_hosted', account_id: 'account_id' },
-    );
+    const responsePromise = client.zeroTrust.access.applications.update('023e105f4ecef8ad9ca31a8372d0c353', {
+      domain: 'test.example.com/admin',
+      type: 'self_hosted',
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -128,95 +130,93 @@ describe('resource applications', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.applications.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      {
-        domain: 'test.example.com/admin',
-        type: 'self_hosted',
-        account_id: 'account_id',
-        allow_authenticate_via_warp: true,
-        allowed_idps: [
-          '699d98642c564d2e855e9661899b7252',
-          '699d98642c564d2e855e9661899b7252',
-          '699d98642c564d2e855e9661899b7252',
-        ],
-        app_launcher_visible: true,
-        auto_redirect_to_identity: true,
-        cors_headers: {
-          allow_all_headers: true,
-          allow_all_methods: true,
-          allow_all_origins: true,
-          allow_credentials: true,
-          allowed_headers: ['string', 'string', 'string'],
-          allowed_methods: ['GET'],
-          allowed_origins: ['https://example.com'],
-          max_age: -1,
+    const response = await client.zeroTrust.access.applications.update('023e105f4ecef8ad9ca31a8372d0c353', {
+      domain: 'test.example.com/admin',
+      type: 'self_hosted',
+      account_id: 'account_id',
+      allow_authenticate_via_warp: true,
+      allowed_idps: ['699d98642c564d2e855e9661899b7252'],
+      app_launcher_visible: true,
+      auto_redirect_to_identity: true,
+      cors_headers: {
+        allow_all_headers: true,
+        allow_all_methods: true,
+        allow_all_origins: true,
+        allow_credentials: true,
+        allowed_headers: ['string'],
+        allowed_methods: ['GET'],
+        allowed_origins: ['https://example.com'],
+        max_age: -1,
+      },
+      custom_deny_message: 'custom_deny_message',
+      custom_deny_url: 'custom_deny_url',
+      custom_non_identity_deny_url: 'custom_non_identity_deny_url',
+      custom_pages: ['699d98642c564d2e855e9661899b7252'],
+      destinations: [
+        { type: 'public', uri: 'test.example.com/admin' },
+        { type: 'public', uri: 'test.anotherexample.com/staff' },
+        {
+          cidr: '10.5.0.0/24',
+          hostname: 'hostname',
+          l4_protocol: 'tcp',
+          port_range: '80-90',
+          type: 'private',
+          vnet_id: 'vnet_id',
         },
-        custom_deny_message: 'custom_deny_message',
-        custom_deny_url: 'custom_deny_url',
-        custom_non_identity_deny_url: 'custom_non_identity_deny_url',
-        custom_pages: [
-          '699d98642c564d2e855e9661899b7252',
-          '699d98642c564d2e855e9661899b7252',
-          '699d98642c564d2e855e9661899b7252',
-        ],
-        enable_binding_cookie: true,
-        http_only_cookie_attribute: true,
-        logo_url: 'https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg',
-        name: 'Admin Site',
-        options_preflight_bypass: true,
-        path_cookie_attribute: true,
-        policies: [
-          { id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415', precedence: 0 },
-          { id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415', precedence: 0 },
-          { id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415', precedence: 0 },
-        ],
-        same_site_cookie_attribute: 'strict',
-        scim_config: {
-          authentication: { password: 'password', scheme: 'httpbasic', user: 'user' },
-          deactivate_on_delete: true,
-          enabled: true,
-          idp_uid: 'idp_uid',
-          mappings: [
-            {
-              enabled: true,
-              filter: 'title pr or userType eq "Intern"',
-              operations: { create: true, delete: true, update: true },
-              schema: 'urn:ietf:params:scim:schemas:core:2.0:User',
-              transform_jsonata:
-                "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-            },
-            {
-              enabled: true,
-              filter: 'title pr or userType eq "Intern"',
-              operations: { create: true, delete: true, update: true },
-              schema: 'urn:ietf:params:scim:schemas:core:2.0:User',
-              transform_jsonata:
-                "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-            },
-            {
-              enabled: true,
-              filter: 'title pr or userType eq "Intern"',
-              operations: { create: true, delete: true, update: true },
-              schema: 'urn:ietf:params:scim:schemas:core:2.0:User',
-              transform_jsonata:
-                "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
-            },
-          ],
-          remote_uri: 'remote_uri',
+        {
+          cidr: '10.5.0.3/32',
+          hostname: 'hostname',
+          l4_protocol: 'tcp',
+          port_range: '80',
+          type: 'private',
+          vnet_id: 'vnet_id',
+        },
+        {
+          cidr: 'cidr',
+          hostname: 'hostname',
+          l4_protocol: 'tcp',
+          port_range: 'port_range',
+          type: 'private',
+          vnet_id: 'vnet_id',
         },
-        self_hosted_domains: ['test.example.com/admin', 'test.anotherexample.com/staff'],
-        service_auth_401_redirect: true,
-        session_duration: '24h',
-        skip_interstitial: true,
-        tags: ['engineers', 'engineers', 'engineers'],
+      ],
+      enable_binding_cookie: true,
+      http_only_cookie_attribute: true,
+      logo_url: 'https://www.cloudflare.com/img/logo-web-badges/cf-logo-on-white-bg.svg',
+      name: 'Admin Site',
+      options_preflight_bypass: true,
+      path_cookie_attribute: true,
+      policies: [{ id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415', precedence: 0 }],
+      same_site_cookie_attribute: 'strict',
+      scim_config: {
+        idp_uid: 'idp_uid',
+        remote_uri: 'remote_uri',
+        authentication: { password: 'password', scheme: 'httpbasic', user: 'user' },
+        deactivate_on_delete: true,
+        enabled: true,
+        mappings: [
+          {
+            schema: 'urn:ietf:params:scim:schemas:core:2.0:User',
+            enabled: true,
+            filter: 'title pr or userType eq "Intern"',
+            operations: { create: true, delete: true, update: true },
+            strictness: 'strict',
+            transform_jsonata:
+              "$merge([$, {'userName': $substringBefore($.userName, '@') & '+test@' & $substringAfter($.userName, '@')}])",
+          },
+        ],
       },
-    );
+      self_hosted_domains: ['test.example.com/admin', 'test.anotherexample.com/staff'],
+      service_auth_401_redirect: true,
+      session_duration: '24h',
+      skip_interstitial: true,
+      tags: ['engineers'],
+    });
   });
 
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.list({ account_id: 'account_id' });
+    const responsePromise = client.zeroTrust.access.applications.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -228,10 +228,9 @@ describe('resource applications', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.delete(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      { account_id: 'account_id' },
-    );
+    const responsePromise = client.zeroTrust.access.applications.delete('023e105f4ecef8ad9ca31a8372d0c353', {
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -243,7 +242,7 @@ describe('resource applications', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.get('023e105f4ecef8ad9ca31a8372d0c353', {
+    const responsePromise = client.zeroTrust.access.applications.get('023e105f4ecef8ad9ca31a8372d0c353', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -257,7 +256,7 @@ describe('resource applications', () => {
 
   // TODO: investigate broken test
   test.skip('revokeTokens', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.revokeTokens(
+    const responsePromise = client.zeroTrust.access.applications.revokeTokens(
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: 'account_id' },
     );
diff --git a/tests/api-resources/zero-trust/access/applications/cas.test.ts b/tests/api-resources/zero-trust/access/applications/cas.test.ts
index 69d8cd7472..9222630ff4 100644
--- a/tests/api-resources/zero-trust/access/applications/cas.test.ts
+++ b/tests/api-resources/zero-trust/access/applications/cas.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource cas', () => {
   // TODO: investigate broken test
   test.skip('create', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.cas.create(
+    const responsePromise = client.zeroTrust.access.applications.cas.create(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: 'account_id' },
     );
@@ -27,7 +27,7 @@ describe('resource cas', () => {
 
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.cas.list({ account_id: 'account_id' });
+    const responsePromise = client.zeroTrust.access.applications.cas.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -39,7 +39,7 @@ describe('resource cas', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.cas.delete(
+    const responsePromise = client.zeroTrust.access.applications.cas.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: 'account_id' },
     );
@@ -54,7 +54,7 @@ describe('resource cas', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.cas.get(
+    const responsePromise = client.zeroTrust.access.applications.cas.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: 'account_id' },
     );
diff --git a/tests/api-resources/zero-trust/access/applications/policies.test.ts b/tests/api-resources/zero-trust/access/applications/policies.test.ts
index fc3b816cbc..af2642eefe 100644
--- a/tests/api-resources/zero-trust/access/applications/policies.test.ts
+++ b/tests/api-resources/zero-trust/access/applications/policies.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,19 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource policies', () => {
   // TODO: investigate broken test
-  test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.policies.create(
+  test.skip('create', async () => {
+    const responsePromise = client.zeroTrust.access.applications.policies.create(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        decision: 'allow',
-        include: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        name: 'Allow devs',
-        account_id: 'account_id',
-      },
+      { account_id: 'account_id' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -35,65 +26,11 @@ describe('resource policies', () => {
   });
 
   // TODO: investigate broken test
-  test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.applications.policies.create(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        decision: 'allow',
-        include: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        name: 'Allow devs',
-        account_id: 'account_id',
-        approval_groups: [
-          {
-            approvals_needed: 1,
-            email_addresses: ['test1@cloudflare.com', 'test2@cloudflare.com'],
-            email_list_uuid: 'email_list_uuid',
-          },
-          {
-            approvals_needed: 3,
-            email_addresses: ['test@cloudflare.com', 'test2@cloudflare.com'],
-            email_list_uuid: '597147a1-976b-4ef2-9af0-81d5d007fc34',
-          },
-        ],
-        approval_required: true,
-        exclude: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        isolation_required: false,
-        precedence: 0,
-        purpose_justification_prompt: 'Please enter a justification for entering this protected domain.',
-        purpose_justification_required: true,
-        require: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        session_duration: '24h',
-      },
-    );
-  });
-
-  // TODO: investigate broken test
-  test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.policies.update(
+  test.skip('update', async () => {
+    const responsePromise = client.zeroTrust.access.applications.policies.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        decision: 'allow',
-        include: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        name: 'Allow devs',
-        account_id: 'account_id',
-      },
+      { account_id: 'account_id' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -104,55 +41,9 @@ describe('resource policies', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  // TODO: investigate broken test
-  test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.applications.policies.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        decision: 'allow',
-        include: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        name: 'Allow devs',
-        account_id: 'account_id',
-        approval_groups: [
-          {
-            approvals_needed: 1,
-            email_addresses: ['test1@cloudflare.com', 'test2@cloudflare.com'],
-            email_list_uuid: 'email_list_uuid',
-          },
-          {
-            approvals_needed: 3,
-            email_addresses: ['test@cloudflare.com', 'test2@cloudflare.com'],
-            email_list_uuid: '597147a1-976b-4ef2-9af0-81d5d007fc34',
-          },
-        ],
-        approval_required: true,
-        exclude: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        isolation_required: false,
-        precedence: 0,
-        purpose_justification_prompt: 'Please enter a justification for entering this protected domain.',
-        purpose_justification_required: true,
-        require: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        session_duration: '24h',
-      },
-    );
-  });
-
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.policies.list(
+    const responsePromise = client.zeroTrust.access.applications.policies.list(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: 'account_id' },
     );
@@ -167,7 +58,7 @@ describe('resource policies', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.policies.delete(
+    const responsePromise = client.zeroTrust.access.applications.policies.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: 'account_id' },
@@ -183,7 +74,7 @@ describe('resource policies', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.policies.get(
+    const responsePromise = client.zeroTrust.access.applications.policies.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: 'account_id' },
diff --git a/tests/api-resources/zero-trust/access/applications/policy-tests/policy-tests.test.ts b/tests/api-resources/zero-trust/access/applications/policy-tests/policy-tests.test.ts
new file mode 100755
index 0000000000..1ddafb7d62
--- /dev/null
+++ b/tests/api-resources/zero-trust/access/applications/policy-tests/policy-tests.test.ts
@@ -0,0 +1,75 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource policyTests', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.applications.policyTests.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.zeroTrust.access.applications.policyTests.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      approval_groups: [
+        {
+          approvals_needed: 1,
+          email_addresses: ['test1@cloudflare.com', 'test2@cloudflare.com'],
+          email_list_uuid: 'email_list_uuid',
+        },
+        {
+          approvals_needed: 3,
+          email_addresses: ['test@cloudflare.com', 'test2@cloudflare.com'],
+          email_list_uuid: '597147a1-976b-4ef2-9af0-81d5d007fc34',
+        },
+      ],
+      approval_required: true,
+      decision: 'allow',
+      exclude: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
+      include: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
+      isolation_required: false,
+      name: 'Allow devs',
+      purpose_justification_prompt: 'Please enter a justification for entering this protected domain.',
+      purpose_justification_required: true,
+      require: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
+      session_duration: '24h',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.applications.policyTests.get(
+      'f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.access.applications.policyTests.get(
+      'f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+  });
+});
diff --git a/tests/api-resources/rate-plans.test.ts b/tests/api-resources/zero-trust/access/applications/policy-tests/users.test.ts
old mode 100644
new mode 100755
similarity index 53%
rename from tests/api-resources/rate-plans.test.ts
rename to tests/api-resources/zero-trust/access/applications/policy-tests/users.test.ts
index e1833d53ed..a83799ed1c
--- a/tests/api-resources/rate-plans.test.ts
+++ b/tests/api-resources/zero-trust/access/applications/policy-tests/users.test.ts
@@ -3,15 +3,18 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource ratePlans', () => {
-  test('get', async () => {
-    const responsePromise = cloudflare.ratePlans.get('023e105f4ecef8ad9ca31a8372d0c353');
+describe('resource users', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.applications.policyTests.users.list(
+      'f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,10 +24,10 @@ describe('resource ratePlans', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.ratePlans.get('023e105f4ecef8ad9ca31a8372d0c353', { path: '/_stainless_unknown_path' }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('list: required and optional params', async () => {
+    const response = await client.zeroTrust.access.applications.policyTests.users.list(
+      'f1a8b3c9d4e5f6789a0b1c2d3e4f5678a9b0c1d2e3f4a5b67890c1d2e3f4b5a6',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
   });
 });
diff --git a/tests/api-resources/zero-trust/access/applications/user-policy-checks.test.ts b/tests/api-resources/zero-trust/access/applications/user-policy-checks.test.ts
index 883e2ec219..df377c09e1 100644
--- a/tests/api-resources/zero-trust/access/applications/user-policy-checks.test.ts
+++ b/tests/api-resources/zero-trust/access/applications/user-policy-checks.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource userPolicyChecks', () => {
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.applications.userPolicyChecks.list(
+    const responsePromise = client.zeroTrust.access.applications.userPolicyChecks.list(
       '023e105f4ecef8ad9ca31a8372d0c353',
       { account_id: 'account_id' },
     );
diff --git a/tests/api-resources/zero-trust/access/bookmarks.test.ts b/tests/api-resources/zero-trust/access/bookmarks.test.ts
index 7b0a573239..46c0047f9c 100644
--- a/tests/api-resources/zero-trust/access/bookmarks.test.ts
+++ b/tests/api-resources/zero-trust/access/bookmarks.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource bookmarks', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.bookmarks.create(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252', body: {} },
-    );
+    const responsePromise = client.zeroTrust.access.bookmarks.create('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      body: {},
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -25,17 +25,17 @@ describe('resource bookmarks', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.bookmarks.create(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252', body: {} },
-    );
+    const response = await client.zeroTrust.access.bookmarks.create('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      body: {},
+    });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.bookmarks.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252', body: {} },
-    );
+    const responsePromise = client.zeroTrust.access.bookmarks.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      body: {},
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -46,14 +46,14 @@ describe('resource bookmarks', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.bookmarks.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252', body: {} },
-    );
+    const response = await client.zeroTrust.access.bookmarks.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      body: {},
+    });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.bookmarks.list({
+    const responsePromise = client.zeroTrust.access.bookmarks.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -66,16 +66,15 @@ describe('resource bookmarks', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.bookmarks.list({
+    const response = await client.zeroTrust.access.bookmarks.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.bookmarks.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.access.bookmarks.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -86,17 +85,15 @@ describe('resource bookmarks', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.bookmarks.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const response = await client.zeroTrust.access.bookmarks.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.bookmarks.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.access.bookmarks.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -107,7 +104,7 @@ describe('resource bookmarks', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.bookmarks.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.access.bookmarks.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/access/certificates/certificates.test.ts b/tests/api-resources/zero-trust/access/certificates/certificates.test.ts
index 80baac82be..4719f42f71 100644
--- a/tests/api-resources/zero-trust/access/certificates/certificates.test.ts
+++ b/tests/api-resources/zero-trust/access/certificates/certificates.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource certificates', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.certificates.create({
+    const responsePromise = client.zeroTrust.access.certificates.create({
       certificate:
         '-----BEGIN CERTIFICATE-----\nMIIGAjCCA+qgAwIBAgIJAI7kymlF7CWT...N4RI7KKB7nikiuUf8vhULKy5IX10\nDrUtmu/B\n-----END CERTIFICATE-----',
       name: 'Allow devs',
@@ -29,23 +29,20 @@ describe('resource certificates', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.certificates.create({
+    const response = await client.zeroTrust.access.certificates.create({
       certificate:
         '-----BEGIN CERTIFICATE-----\nMIIGAjCCA+qgAwIBAgIJAI7kymlF7CWT...N4RI7KKB7nikiuUf8vhULKy5IX10\nDrUtmu/B\n-----END CERTIFICATE-----',
       name: 'Allow devs',
       account_id: 'account_id',
-      associated_hostnames: ['admin.example.com', 'admin.example.com', 'admin.example.com'],
+      associated_hostnames: ['admin.example.com'],
     });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.certificates.update(
+    const responsePromise = client.zeroTrust.access.certificates.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        associated_hostnames: ['admin.example.com', 'admin.example.com', 'admin.example.com'],
-        account_id: 'account_id',
-      },
+      { associated_hostnames: ['admin.example.com'], account_id: 'account_id' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -58,19 +55,15 @@ describe('resource certificates', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.certificates.update(
+    const response = await client.zeroTrust.access.certificates.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        associated_hostnames: ['admin.example.com', 'admin.example.com', 'admin.example.com'],
-        account_id: 'account_id',
-        name: 'Allow devs',
-      },
+      { associated_hostnames: ['admin.example.com'], account_id: 'account_id', name: 'Allow devs' },
     );
   });
 
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.certificates.list({ account_id: 'account_id' });
+    const responsePromise = client.zeroTrust.access.certificates.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -82,7 +75,7 @@ describe('resource certificates', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.certificates.delete(
+    const responsePromise = client.zeroTrust.access.certificates.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: 'account_id' },
     );
@@ -97,10 +90,9 @@ describe('resource certificates', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.certificates.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: 'account_id' },
-    );
+    const responsePromise = client.zeroTrust.access.certificates.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
diff --git a/tests/api-resources/zero-trust/access/certificates/settings.test.ts b/tests/api-resources/zero-trust/access/certificates/settings.test.ts
index b85dc2d95e..e7481b6ff8 100644
--- a/tests/api-resources/zero-trust/access/certificates/settings.test.ts
+++ b/tests/api-resources/zero-trust/access/certificates/settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,11 +12,9 @@ const cloudflare = new Cloudflare({
 describe('resource settings', () => {
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.certificates.settings.update({
+    const responsePromise = client.zeroTrust.access.certificates.settings.update({
       settings: [
         { china_network: false, client_certificate_forwarding: true, hostname: 'admin.example.com' },
-        { china_network: false, client_certificate_forwarding: true, hostname: 'admin.example.com' },
-        { china_network: false, client_certificate_forwarding: true, hostname: 'admin.example.com' },
       ],
       account_id: 'account_id',
     });
@@ -31,11 +29,9 @@ describe('resource settings', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.certificates.settings.update({
+    const response = await client.zeroTrust.access.certificates.settings.update({
       settings: [
         { china_network: false, client_certificate_forwarding: true, hostname: 'admin.example.com' },
-        { china_network: false, client_certificate_forwarding: true, hostname: 'admin.example.com' },
-        { china_network: false, client_certificate_forwarding: true, hostname: 'admin.example.com' },
       ],
       account_id: 'account_id',
     });
@@ -43,9 +39,7 @@ describe('resource settings', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.certificates.settings.get({
-      account_id: 'account_id',
-    });
+    const responsePromise = client.zeroTrust.access.certificates.settings.get({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
diff --git a/tests/api-resources/zero-trust/access/custom-pages.test.ts b/tests/api-resources/zero-trust/access/custom-pages.test.ts
index 2927a9f15b..96f2d36db4 100644
--- a/tests/api-resources/zero-trust/access/custom-pages.test.ts
+++ b/tests/api-resources/zero-trust/access/custom-pages.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource customPages', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.customPages.create({
+    const responsePromise = client.zeroTrust.access.customPages.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       custom_html: '<html><body><h1>Access Denied</h1></body></html>',
       name: 'name',
@@ -27,20 +27,17 @@ describe('resource customPages', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.customPages.create({
+    const response = await client.zeroTrust.access.customPages.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       custom_html: '<html><body><h1>Access Denied</h1></body></html>',
       name: 'name',
       type: 'identity_denied',
       app_count: 0,
-      created_at: '2014-01-01T05:20:00.12345Z',
-      uid: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      updated_at: '2014-01-01T05:20:00.12345Z',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.customPages.update(
+    const responsePromise = client.zeroTrust.access.customPages.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
@@ -59,7 +56,7 @@ describe('resource customPages', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.customPages.update(
+    const response = await client.zeroTrust.access.customPages.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '023e105f4ecef8ad9ca31a8372d0c353',
@@ -67,15 +64,12 @@ describe('resource customPages', () => {
         name: 'name',
         type: 'identity_denied',
         app_count: 0,
-        created_at: '2014-01-01T05:20:00.12345Z',
-        uid: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-        updated_at: '2014-01-01T05:20:00.12345Z',
       },
     );
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.customPages.list({
+    const responsePromise = client.zeroTrust.access.customPages.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -88,13 +82,13 @@ describe('resource customPages', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.customPages.list({
+    const response = await client.zeroTrust.access.customPages.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.customPages.delete(
+    const responsePromise = client.zeroTrust.access.customPages.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -108,17 +102,16 @@ describe('resource customPages', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.customPages.delete(
+    const response = await client.zeroTrust.access.customPages.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.customPages.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.zeroTrust.access.customPages.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -129,9 +122,8 @@ describe('resource customPages', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.customPages.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.zeroTrust.access.customPages.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 });
diff --git a/tests/api-resources/r2/sippy.test.ts b/tests/api-resources/zero-trust/access/gateway-ca.test.ts
similarity index 66%
rename from tests/api-resources/r2/sippy.test.ts
rename to tests/api-resources/zero-trust/access/gateway-ca.test.ts
index d15ec3d663..bca21ee6ff 100644
--- a/tests/api-resources/r2/sippy.test.ts
+++ b/tests/api-resources/zero-trust/access/gateway-ca.test.ts
@@ -3,15 +3,15 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource sippy', () => {
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.r2.sippy.update('example-bucket', {
+describe('resource gatewayCA', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.gatewayCA.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -23,22 +23,14 @@ describe('resource sippy', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.r2.sippy.update('example-bucket', {
+  test('create: required and optional params', async () => {
+    const response = await client.zeroTrust.access.gatewayCA.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      destination: { accessKeyId: 'accessKeyId', provider: 'r2', secretAccessKey: 'secretAccessKey' },
-      source: {
-        accessKeyId: 'accessKeyId',
-        bucket: 'bucket',
-        provider: 'aws',
-        region: 'region',
-        secretAccessKey: 'secretAccessKey',
-      },
     });
   });
 
-  test('delete: only required params', async () => {
-    const responsePromise = cloudflare.r2.sippy.delete('example-bucket', {
+  test('list: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.gatewayCA.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -50,14 +42,14 @@ describe('resource sippy', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('delete: required and optional params', async () => {
-    const response = await cloudflare.r2.sippy.delete('example-bucket', {
+  test('list: required and optional params', async () => {
+    const response = await client.zeroTrust.access.gatewayCA.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
-  test('get: only required params', async () => {
-    const responsePromise = cloudflare.r2.sippy.get('example-bucket', {
+  test('delete: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.gatewayCA.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -69,8 +61,8 @@ describe('resource sippy', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: required and optional params', async () => {
-    const response = await cloudflare.r2.sippy.get('example-bucket', {
+  test('delete: required and optional params', async () => {
+    const response = await client.zeroTrust.access.gatewayCA.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/zero-trust/access/groups.test.ts b/tests/api-resources/zero-trust/access/groups.test.ts
index defedd7000..f43f05c407 100644
--- a/tests/api-resources/zero-trust/access/groups.test.ts
+++ b/tests/api-resources/zero-trust/access/groups.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,12 +12,8 @@ const cloudflare = new Cloudflare({
 describe('resource groups', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.groups.create({
-      include: [
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-      ],
+    const responsePromise = client.zeroTrust.access.groups.create({
+      include: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
       name: 'Allow devs',
       account_id: 'account_id',
     });
@@ -32,42 +28,23 @@ describe('resource groups', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.groups.create({
-      include: [
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-      ],
+    const response = await client.zeroTrust.access.groups.create({
+      include: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
       name: 'Allow devs',
       account_id: 'account_id',
-      exclude: [
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-      ],
+      exclude: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
       is_default: true,
-      require: [
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-      ],
+      require: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
     });
   });
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.groups.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        include: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        name: 'Allow devs',
-        account_id: 'account_id',
-      },
-    );
+    const responsePromise = client.zeroTrust.access.groups.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      include: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
+      name: 'Allow devs',
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -79,31 +56,19 @@ describe('resource groups', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.groups.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
-      include: [
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-      ],
+    const response = await client.zeroTrust.access.groups.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      include: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
       name: 'Allow devs',
       account_id: 'account_id',
-      exclude: [
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-      ],
+      exclude: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
       is_default: true,
-      require: [
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-      ],
+      require: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
     });
   });
 
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.groups.list({ account_id: 'account_id' });
+    const responsePromise = client.zeroTrust.access.groups.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -115,10 +80,9 @@ describe('resource groups', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.groups.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: 'account_id' },
-    );
+    const responsePromise = client.zeroTrust.access.groups.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -130,7 +94,7 @@ describe('resource groups', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.groups.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.access.groups.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
diff --git a/tests/api-resources/zero-trust/access/infrastructure/targets.test.ts b/tests/api-resources/zero-trust/access/infrastructure/targets.test.ts
new file mode 100644
index 0000000000..a188b1f5ee
--- /dev/null
+++ b/tests/api-resources/zero-trust/access/infrastructure/targets.test.ts
@@ -0,0 +1,198 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource targets', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.infrastructure.targets.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      hostname: 'infra-access-target',
+      ip: {},
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.zeroTrust.access.infrastructure.targets.create({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      hostname: 'infra-access-target',
+      ip: {
+        ipv4: { ip_addr: '187.26.29.249', virtual_network_id: 'c77b744e-acc8-428f-9257-6878c046ed55' },
+        ipv6: {
+          ip_addr: '64c0:64e8:f0b4:8dbf:7104:72b0:ec8f:f5e0',
+          virtual_network_id: 'c77b744e-acc8-428f-9257-6878c046ed55',
+        },
+      },
+    });
+  });
+
+  test('update: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.infrastructure.targets.update(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353', hostname: 'infra-access-target', ip: {} },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.zeroTrust.access.infrastructure.targets.update(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      {
+        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+        hostname: 'infra-access-target',
+        ip: {
+          ipv4: { ip_addr: '187.26.29.249', virtual_network_id: 'c77b744e-acc8-428f-9257-6878c046ed55' },
+          ipv6: {
+            ip_addr: '64c0:64e8:f0b4:8dbf:7104:72b0:ec8f:f5e0',
+            virtual_network_id: 'c77b744e-acc8-428f-9257-6878c046ed55',
+          },
+        },
+      },
+    );
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.infrastructure.targets.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.zeroTrust.access.infrastructure.targets.list({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      created_after: '2019-12-27T18:11:19.117Z',
+      created_before: '2019-12-27T18:11:19.117Z',
+      direction: 'asc',
+      hostname: 'hostname',
+      hostname_contains: 'hostname_contains',
+      ip_v4: 'ip_v4',
+      ip_v6: 'ip_v6',
+      ips: ['string'],
+      modified_after: '2019-12-27T18:11:19.117Z',
+      modified_before: '2019-12-27T18:11:19.117Z',
+      order: 'hostname',
+      page: 1,
+      per_page: 1,
+      virtual_network_id: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+    });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.infrastructure.targets.delete(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.zeroTrust.access.infrastructure.targets.delete(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+  });
+
+  test('bulkDelete: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.infrastructure.targets.bulkDelete({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkDelete: required and optional params', async () => {
+    const response = await client.zeroTrust.access.infrastructure.targets.bulkDelete({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+
+  test('bulkUpdate: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.infrastructure.targets.bulkUpdate({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: [{ hostname: 'infra-access-target', ip: {} }],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkUpdate: required and optional params', async () => {
+    const response = await client.zeroTrust.access.infrastructure.targets.bulkUpdate({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: [
+        {
+          hostname: 'infra-access-target',
+          ip: {
+            ipv4: { ip_addr: '187.26.29.249', virtual_network_id: 'c77b744e-acc8-428f-9257-6878c046ed55' },
+            ipv6: {
+              ip_addr: '64c0:64e8:f0b4:8dbf:7104:72b0:ec8f:f5e0',
+              virtual_network_id: 'c77b744e-acc8-428f-9257-6878c046ed55',
+            },
+          },
+        },
+      ],
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.access.infrastructure.targets.get(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.access.infrastructure.targets.get(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    );
+  });
+});
diff --git a/tests/api-resources/zero-trust/access/keys.test.ts b/tests/api-resources/zero-trust/access/keys.test.ts
index cff6093e45..d0b2282766 100644
--- a/tests/api-resources/zero-trust/access/keys.test.ts
+++ b/tests/api-resources/zero-trust/access/keys.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource keys', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.keys.update({
+    const responsePromise = client.zeroTrust.access.keys.update({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       key_rotation_interval_days: 30,
     });
@@ -25,14 +25,14 @@ describe('resource keys', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.keys.update({
+    const response = await client.zeroTrust.access.keys.update({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       key_rotation_interval_days: 30,
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.keys.get({
+    const responsePromise = client.zeroTrust.access.keys.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,13 +45,13 @@ describe('resource keys', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.keys.get({
+    const response = await client.zeroTrust.access.keys.get({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('rotate: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.keys.rotate({
+    const responsePromise = client.zeroTrust.access.keys.rotate({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -64,7 +64,7 @@ describe('resource keys', () => {
   });
 
   test('rotate: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.keys.rotate({
+    const response = await client.zeroTrust.access.keys.rotate({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/zero-trust/access/logs/access-requests.test.ts b/tests/api-resources/zero-trust/access/logs/access-requests.test.ts
index be35847664..e7543bfc33 100644
--- a/tests/api-resources/zero-trust/access/logs/access-requests.test.ts
+++ b/tests/api-resources/zero-trust/access/logs/access-requests.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource accessRequests', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.logs.accessRequests.list({
+    const responsePromise = client.zeroTrust.access.logs.accessRequests.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource accessRequests', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.logs.accessRequests.list({
+    const response = await client.zeroTrust.access.logs.accessRequests.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       direction: 'desc',
       limit: 0,
diff --git a/tests/api-resources/zero-trust/access/policies.test.ts b/tests/api-resources/zero-trust/access/policies.test.ts
index 8948289061..f6ed1c6ab8 100644
--- a/tests/api-resources/zero-trust/access/policies.test.ts
+++ b/tests/api-resources/zero-trust/access/policies.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,14 +11,10 @@ const cloudflare = new Cloudflare({
 
 describe('resource policies', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.policies.create({
+    const responsePromise = client.zeroTrust.access.policies.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       decision: 'allow',
-      include: [
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-      ],
+      include: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
       name: 'Allow devs',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -31,14 +27,10 @@ describe('resource policies', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.policies.create({
+    const response = await client.zeroTrust.access.policies.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       decision: 'allow',
-      include: [
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-      ],
+      include: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
       name: 'Allow devs',
       approval_groups: [
         {
@@ -53,37 +45,22 @@ describe('resource policies', () => {
         },
       ],
       approval_required: true,
-      exclude: [
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-      ],
+      exclude: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
       isolation_required: false,
       purpose_justification_prompt: 'Please enter a justification for entering this protected domain.',
       purpose_justification_required: true,
-      require: [
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-        { email: { email: 'test@example.com' } },
-      ],
+      require: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
       session_duration: '24h',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.policies.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        decision: 'allow',
-        include: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        name: 'Allow devs',
-      },
-    );
+    const responsePromise = client.zeroTrust.access.policies.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      decision: 'allow',
+      include: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
+      name: 'Allow devs',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -94,50 +71,35 @@ describe('resource policies', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.policies.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        decision: 'allow',
-        include: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        name: 'Allow devs',
-        approval_groups: [
-          {
-            approvals_needed: 1,
-            email_addresses: ['test1@cloudflare.com', 'test2@cloudflare.com'],
-            email_list_uuid: 'email_list_uuid',
-          },
-          {
-            approvals_needed: 3,
-            email_addresses: ['test@cloudflare.com', 'test2@cloudflare.com'],
-            email_list_uuid: '597147a1-976b-4ef2-9af0-81d5d007fc34',
-          },
-        ],
-        approval_required: true,
-        exclude: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        isolation_required: false,
-        purpose_justification_prompt: 'Please enter a justification for entering this protected domain.',
-        purpose_justification_required: true,
-        require: [
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-          { email: { email: 'test@example.com' } },
-        ],
-        session_duration: '24h',
-      },
-    );
+    const response = await client.zeroTrust.access.policies.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      decision: 'allow',
+      include: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
+      name: 'Allow devs',
+      approval_groups: [
+        {
+          approvals_needed: 1,
+          email_addresses: ['test1@cloudflare.com', 'test2@cloudflare.com'],
+          email_list_uuid: 'email_list_uuid',
+        },
+        {
+          approvals_needed: 3,
+          email_addresses: ['test@cloudflare.com', 'test2@cloudflare.com'],
+          email_list_uuid: '597147a1-976b-4ef2-9af0-81d5d007fc34',
+        },
+      ],
+      approval_required: true,
+      exclude: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
+      isolation_required: false,
+      purpose_justification_prompt: 'Please enter a justification for entering this protected domain.',
+      purpose_justification_required: true,
+      require: [{ group: { id: 'aa0a4aab-672b-4bdb-bc33-a59f1130a11f' } }],
+      session_duration: '24h',
+    });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.policies.list({
+    const responsePromise = client.zeroTrust.access.policies.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -150,16 +112,15 @@ describe('resource policies', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.policies.list({
+    const response = await client.zeroTrust.access.policies.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.policies.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.zeroTrust.access.policies.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -170,14 +131,13 @@ describe('resource policies', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.policies.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.zeroTrust.access.policies.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.policies.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.access.policies.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -190,7 +150,7 @@ describe('resource policies', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.policies.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.access.policies.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/zero-trust/access/service-tokens.test.ts b/tests/api-resources/zero-trust/access/service-tokens.test.ts
index 3226157d39..8cd19377b7 100644
--- a/tests/api-resources/zero-trust/access/service-tokens.test.ts
+++ b/tests/api-resources/zero-trust/access/service-tokens.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource serviceTokens', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.serviceTokens.create({
+    const responsePromise = client.zeroTrust.access.serviceTokens.create({
       name: 'CI/CD token',
       account_id: 'account_id',
     });
@@ -27,7 +27,7 @@ describe('resource serviceTokens', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.serviceTokens.create({
+    const response = await client.zeroTrust.access.serviceTokens.create({
       name: 'CI/CD token',
       account_id: 'account_id',
       duration: '60m',
@@ -36,7 +36,7 @@ describe('resource serviceTokens', () => {
 
   // TODO: investigate broken test
   test.skip('update', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.serviceTokens.update(
+    const responsePromise = client.zeroTrust.access.serviceTokens.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: 'account_id' },
     );
@@ -51,7 +51,7 @@ describe('resource serviceTokens', () => {
 
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.serviceTokens.list({ account_id: 'account_id' });
+    const responsePromise = client.zeroTrust.access.serviceTokens.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,7 +63,7 @@ describe('resource serviceTokens', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.serviceTokens.delete(
+    const responsePromise = client.zeroTrust.access.serviceTokens.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: 'account_id' },
     );
@@ -78,7 +78,7 @@ describe('resource serviceTokens', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.serviceTokens.get(
+    const responsePromise = client.zeroTrust.access.serviceTokens.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: 'account_id' },
     );
@@ -92,7 +92,7 @@ describe('resource serviceTokens', () => {
   });
 
   test('refresh: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.serviceTokens.refresh(
+    const responsePromise = client.zeroTrust.access.serviceTokens.refresh(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -106,14 +106,14 @@ describe('resource serviceTokens', () => {
   });
 
   test('refresh: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.serviceTokens.refresh(
+    const response = await client.zeroTrust.access.serviceTokens.refresh(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
   });
 
   test('rotate: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.serviceTokens.rotate(
+    const responsePromise = client.zeroTrust.access.serviceTokens.rotate(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -127,7 +127,7 @@ describe('resource serviceTokens', () => {
   });
 
   test('rotate: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.serviceTokens.rotate(
+    const response = await client.zeroTrust.access.serviceTokens.rotate(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
diff --git a/tests/api-resources/zero-trust/access/tags.test.ts b/tests/api-resources/zero-trust/access/tags.test.ts
index 550c4893b6..e39c23a0fe 100644
--- a/tests/api-resources/zero-trust/access/tags.test.ts
+++ b/tests/api-resources/zero-trust/access/tags.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,8 @@ const cloudflare = new Cloudflare({
 
 describe('resource tags', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.tags.create({
+    const responsePromise = client.zeroTrust.access.tags.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      name: 'engineers',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,16 +24,14 @@ describe('resource tags', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.tags.create({
+    const response = await client.zeroTrust.access.tags.create({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'engineers',
-      created_at: '2014-01-01T05:20:00.12345Z',
-      updated_at: '2014-01-01T05:20:00.12345Z',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.tags.update('engineers', {
+    const responsePromise = client.zeroTrust.access.tags.update('engineers', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'engineers',
     });
@@ -48,16 +45,14 @@ describe('resource tags', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.tags.update('engineers', {
+    const response = await client.zeroTrust.access.tags.update('engineers', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
       name: 'engineers',
-      created_at: '2014-01-01T05:20:00.12345Z',
-      updated_at: '2014-01-01T05:20:00.12345Z',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.tags.list({
+    const responsePromise = client.zeroTrust.access.tags.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -70,13 +65,13 @@ describe('resource tags', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.tags.list({
+    const response = await client.zeroTrust.access.tags.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.tags.delete('engineers', {
+    const responsePromise = client.zeroTrust.access.tags.delete('engineers', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -89,13 +84,13 @@ describe('resource tags', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.tags.delete('engineers', {
+    const response = await client.zeroTrust.access.tags.delete('engineers', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.tags.get('engineers', {
+    const responsePromise = client.zeroTrust.access.tags.get('engineers', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -108,7 +103,7 @@ describe('resource tags', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.tags.get('engineers', {
+    const response = await client.zeroTrust.access.tags.get('engineers', {
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/zero-trust/access/users/active-sessions.test.ts b/tests/api-resources/zero-trust/access/users/active-sessions.test.ts
index 5bcbb737b4..475af2c287 100644
--- a/tests/api-resources/zero-trust/access/users/active-sessions.test.ts
+++ b/tests/api-resources/zero-trust/access/users/active-sessions.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource activeSessions', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.users.activeSessions.list(
+    const responsePromise = client.zeroTrust.access.users.activeSessions.list(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -25,14 +25,14 @@ describe('resource activeSessions', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.users.activeSessions.list(
+    const response = await client.zeroTrust.access.users.activeSessions.list(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.users.activeSessions.get(
+    const responsePromise = client.zeroTrust.access.users.activeSessions.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       'X1aXj1lFVcqqyoXF',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
@@ -47,7 +47,7 @@ describe('resource activeSessions', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.users.activeSessions.get(
+    const response = await client.zeroTrust.access.users.activeSessions.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       'X1aXj1lFVcqqyoXF',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
diff --git a/tests/api-resources/zero-trust/access/users/failed-logins.test.ts b/tests/api-resources/zero-trust/access/users/failed-logins.test.ts
index 3a3cce93ca..74a8d7761b 100644
--- a/tests/api-resources/zero-trust/access/users/failed-logins.test.ts
+++ b/tests/api-resources/zero-trust/access/users/failed-logins.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource failedLogins', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.users.failedLogins.list(
+    const responsePromise = client.zeroTrust.access.users.failedLogins.list(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -25,7 +25,7 @@ describe('resource failedLogins', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.users.failedLogins.list(
+    const response = await client.zeroTrust.access.users.failedLogins.list(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
diff --git a/tests/api-resources/zero-trust/access/users/last-seen-identity.test.ts b/tests/api-resources/zero-trust/access/users/last-seen-identity.test.ts
index bddd9dac45..5d51c9c7a8 100644
--- a/tests/api-resources/zero-trust/access/users/last-seen-identity.test.ts
+++ b/tests/api-resources/zero-trust/access/users/last-seen-identity.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource lastSeenIdentity', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.users.lastSeenIdentity.get(
+    const responsePromise = client.zeroTrust.access.users.lastSeenIdentity.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
@@ -25,7 +25,7 @@ describe('resource lastSeenIdentity', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.users.lastSeenIdentity.get(
+    const response = await client.zeroTrust.access.users.lastSeenIdentity.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
diff --git a/tests/api-resources/zero-trust/access/users/users.test.ts b/tests/api-resources/zero-trust/access/users/users.test.ts
index 9bf7db152f..994dff9d57 100644
--- a/tests/api-resources/zero-trust/access/users/users.test.ts
+++ b/tests/api-resources/zero-trust/access/users/users.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource users', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.access.users.list({
+    const responsePromise = client.zeroTrust.access.users.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,8 +24,11 @@ describe('resource users', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.access.users.list({
+    const response = await client.zeroTrust.access.users.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      email: 'email',
+      name: 'name',
+      search: 'search',
     });
   });
 });
diff --git a/tests/api-resources/zero-trust/connectivity-settings.test.ts b/tests/api-resources/zero-trust/connectivity-settings.test.ts
index 4117e6167f..23e03dae29 100644
--- a/tests/api-resources/zero-trust/connectivity-settings.test.ts
+++ b/tests/api-resources/zero-trust/connectivity-settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource connectivitySettings', () => {
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.connectivitySettings.edit({
+    const responsePromise = client.zeroTrust.connectivitySettings.edit({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource connectivitySettings', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.connectivitySettings.edit({
+    const response = await client.zeroTrust.connectivitySettings.edit({
       account_id: '699d98642c564d2e855e9661899b7252',
       icmp_proxy_enabled: true,
       offramp_warp_enabled: true,
@@ -32,7 +32,7 @@ describe('resource connectivitySettings', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.connectivitySettings.get({
+    const responsePromise = client.zeroTrust.connectivitySettings.get({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,7 +45,7 @@ describe('resource connectivitySettings', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.connectivitySettings.get({
+    const response = await client.zeroTrust.connectivitySettings.get({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/devices/devices.test.ts b/tests/api-resources/zero-trust/devices/devices.test.ts
index c066d97d59..59661f67f1 100644
--- a/tests/api-resources/zero-trust/devices/devices.test.ts
+++ b/tests/api-resources/zero-trust/devices/devices.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource devices', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.list({
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const responsePromise = client.zeroTrust.devices.list({ account_id: '699d98642c564d2e855e9661899b7252' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,13 +22,11 @@ describe('resource devices', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.list({
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const response = await client.zeroTrust.devices.list({ account_id: '699d98642c564d2e855e9661899b7252' });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.devices.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -43,7 +39,7 @@ describe('resource devices', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.devices.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/devices/dex-tests.test.ts b/tests/api-resources/zero-trust/devices/dex-tests.test.ts
index d7e026e30d..f786d689ca 100644
--- a/tests/api-resources/zero-trust/devices/dex-tests.test.ts
+++ b/tests/api-resources/zero-trust/devices/dex-tests.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource dexTests', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.dexTests.create({
+    const responsePromise = client.zeroTrust.devices.dexTests.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       data: {},
       enabled: true,
@@ -28,33 +28,26 @@ describe('resource dexTests', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.dexTests.create({
+    const response = await client.zeroTrust.devices.dexTests.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       data: { host: 'https://dash.cloudflare.com', kind: 'http', method: 'GET' },
       enabled: true,
       interval: '30m',
       name: 'HTTP dash health check',
       description: 'Checks the dash endpoint every 30 minutes',
-      target_policies: [
-        { default: true, id: 'id', name: 'name' },
-        { default: true, id: 'id', name: 'name' },
-        { default: true, id: 'id', name: 'name' },
-      ],
+      target_policies: [{ id: 'id', default: true, name: 'name' }],
       targeted: true,
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.dexTests.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        account_id: '699d98642c564d2e855e9661899b7252',
-        data: {},
-        enabled: true,
-        interval: '30m',
-        name: 'HTTP dash health check',
-      },
-    );
+    const responsePromise = client.zeroTrust.devices.dexTests.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      data: {},
+      enabled: true,
+      interval: '30m',
+      name: 'HTTP dash health check',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -65,27 +58,20 @@ describe('resource dexTests', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.dexTests.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        account_id: '699d98642c564d2e855e9661899b7252',
-        data: { host: 'https://dash.cloudflare.com', kind: 'http', method: 'GET' },
-        enabled: true,
-        interval: '30m',
-        name: 'HTTP dash health check',
-        description: 'Checks the dash endpoint every 30 minutes',
-        target_policies: [
-          { default: true, id: 'id', name: 'name' },
-          { default: true, id: 'id', name: 'name' },
-          { default: true, id: 'id', name: 'name' },
-        ],
-        targeted: true,
-      },
-    );
+    const response = await client.zeroTrust.devices.dexTests.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      data: { host: 'https://dash.cloudflare.com', kind: 'http', method: 'GET' },
+      enabled: true,
+      interval: '30m',
+      name: 'HTTP dash health check',
+      description: 'Checks the dash endpoint every 30 minutes',
+      target_policies: [{ id: 'id', default: true, name: 'name' }],
+      targeted: true,
+    });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.dexTests.list({
+    const responsePromise = client.zeroTrust.devices.dexTests.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -98,16 +84,15 @@ describe('resource dexTests', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.dexTests.list({
+    const response = await client.zeroTrust.devices.dexTests.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.dexTests.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.devices.dexTests.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -118,17 +103,15 @@ describe('resource dexTests', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.dexTests.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const response = await client.zeroTrust.devices.dexTests.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.dexTests.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.devices.dexTests.get('372e67954025e0ba6aaa6d586b9e0b59', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -139,7 +122,7 @@ describe('resource dexTests', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.dexTests.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.devices.dexTests.get('372e67954025e0ba6aaa6d586b9e0b59', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/rulesets/versions/by-tag.test.ts b/tests/api-resources/zero-trust/devices/fleet-status.test.ts
similarity index 60%
rename from tests/api-resources/rulesets/versions/by-tag.test.ts
rename to tests/api-resources/zero-trust/devices/fleet-status.test.ts
index ebb1397d5b..3a0f821381 100644
--- a/tests/api-resources/rulesets/versions/by-tag.test.ts
+++ b/tests/api-resources/zero-trust/devices/fleet-status.test.ts
@@ -3,20 +3,18 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource byTag', () => {
+describe('resource fleetStatus', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.rulesets.versions.byTag.get(
-      '2f2feab2026849078ba485f918791bdc',
-      '1',
-      'directory-traversal',
-      { account_id: 'abf9b32d38c5f572afde3336ec0ce302' },
-    );
+    const responsePromise = client.zeroTrust.devices.fleetStatus.get('cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7', {
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+      since_minutes: 10,
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -27,11 +25,11 @@ describe('resource byTag', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.rulesets.versions.byTag.get(
-      '2f2feab2026849078ba485f918791bdc',
-      '1',
-      'directory-traversal',
-      { account_id: 'abf9b32d38c5f572afde3336ec0ce302' },
-    );
+    const response = await client.zeroTrust.devices.fleetStatus.get('cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7', {
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+      since_minutes: 10,
+      colo: 'SJC',
+      time_now: '2023-10-11T00:00:00Z',
+    });
   });
 });
diff --git a/tests/api-resources/zero-trust/devices/networks.test.ts b/tests/api-resources/zero-trust/devices/networks.test.ts
index 2bf3fa92d1..a52a1caf67 100644
--- a/tests/api-resources/zero-trust/devices/networks.test.ts
+++ b/tests/api-resources/zero-trust/devices/networks.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource networks', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.networks.create({
+    const responsePromise = client.zeroTrust.devices.networks.create({
       account_id: '699d98642c564d2e855e9661899b7252',
-      config: { tls_sockaddr: 'foo.bar:1234' },
+      config: { tls_sockaddr: 'foobar:1234' },
       name: 'managed-network-1',
       type: 'tls',
     });
@@ -27,11 +27,11 @@ describe('resource networks', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.networks.create({
+    const response = await client.zeroTrust.devices.networks.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       config: {
+        tls_sockaddr: 'foobar:1234',
         sha256: 'b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c',
-        tls_sockaddr: 'foo.bar:1234',
       },
       name: 'managed-network-1',
       type: 'tls',
@@ -39,10 +39,9 @@ describe('resource networks', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.networks.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.devices.networks.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -53,22 +52,19 @@ describe('resource networks', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.networks.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        account_id: '699d98642c564d2e855e9661899b7252',
-        config: {
-          sha256: 'b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c',
-          tls_sockaddr: 'foo.bar:1234',
-        },
-        name: 'managed-network-1',
-        type: 'tls',
+    const response = await client.zeroTrust.devices.networks.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      config: {
+        tls_sockaddr: 'foobar:1234',
+        sha256: 'b5bb9d8014a0f9b1d61e21e796d78dccdf1352f23cd32812f4850b878ae4944c',
       },
-    );
+      name: 'managed-network-1',
+      type: 'tls',
+    });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.networks.list({
+    const responsePromise = client.zeroTrust.devices.networks.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -81,16 +77,15 @@ describe('resource networks', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.networks.list({
+    const response = await client.zeroTrust.devices.networks.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.networks.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.devices.networks.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -101,17 +96,15 @@ describe('resource networks', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.networks.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const response = await client.zeroTrust.devices.networks.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.networks.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.devices.networks.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -122,7 +115,7 @@ describe('resource networks', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.networks.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.devices.networks.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/devices/override-codes.test.ts b/tests/api-resources/zero-trust/devices/override-codes.test.ts
index b6510355c0..7ea3b99e8b 100644
--- a/tests/api-resources/zero-trust/devices/override-codes.test.ts
+++ b/tests/api-resources/zero-trust/devices/override-codes.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource overrideCodes', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.overrideCodes.list(
+    const responsePromise = client.zeroTrust.devices.overrideCodes.list(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -25,7 +25,7 @@ describe('resource overrideCodes', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.overrideCodes.list(
+    const response = await client.zeroTrust.devices.overrideCodes.list(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
diff --git a/tests/api-resources/zero-trust/devices/policies/policies.test.ts b/tests/api-resources/zero-trust/devices/policies/custom/custom.test.ts
similarity index 83%
rename from tests/api-resources/zero-trust/devices/policies/policies.test.ts
rename to tests/api-resources/zero-trust/devices/policies/custom/custom.test.ts
index e17e6a3733..c0b0064712 100644
--- a/tests/api-resources/zero-trust/devices/policies/policies.test.ts
+++ b/tests/api-resources/zero-trust/devices/policies/custom/custom.test.ts
@@ -3,16 +3,16 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource policies', () => {
+describe('resource custom', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.create({
+    const responsePromise = client.zeroTrust.devices.policies.custom.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       match: 'user.identity == "test@cloudflare.com"',
       name: 'Allow Developers',
@@ -29,7 +29,7 @@ describe('resource policies', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.create({
+    const response = await client.zeroTrust.devices.policies.custom.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       match: 'user.identity == "test@cloudflare.com"',
       name: 'Allow Developers',
@@ -48,11 +48,12 @@ describe('resource policies', () => {
       service_mode_v2: { mode: 'proxy', port: 3000 },
       support_url: 'https://1.1.1.1/help',
       switch_locked: true,
+      tunnel_protocol: 'wireguard',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.list({
+    const responsePromise = client.zeroTrust.devices.policies.custom.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -65,13 +66,13 @@ describe('resource policies', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.list({
+    const response = await client.zeroTrust.devices.policies.custom.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.delete(
+    const responsePromise = client.zeroTrust.devices.policies.custom.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -85,7 +86,7 @@ describe('resource policies', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.delete(
+    const response = await client.zeroTrust.devices.policies.custom.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -93,7 +94,7 @@ describe('resource policies', () => {
 
   // TODO: investigate broken test
   test.skip('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.edit(
+    const responsePromise = client.zeroTrust.devices.policies.custom.edit(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -108,7 +109,7 @@ describe('resource policies', () => {
 
   // TODO: investigate broken test
   test.skip('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.edit(
+    const response = await client.zeroTrust.devices.policies.custom.edit(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '699d98642c564d2e855e9661899b7252',
@@ -127,13 +128,14 @@ describe('resource policies', () => {
         service_mode_v2: { mode: 'proxy', port: 3000 },
         support_url: 'https://1.1.1.1/help',
         switch_locked: true,
+        tunnel_protocol: 'wireguard',
       },
     );
   });
 
   // TODO: investigate broken test
   test.skip('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.get(
+    const responsePromise = client.zeroTrust.devices.policies.custom.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -148,8 +150,9 @@ describe('resource policies', () => {
 
   // TODO: investigate broken test
   test.skip('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const response = await client.zeroTrust.devices.policies.custom.get(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
   });
 });
diff --git a/tests/api-resources/zero-trust/devices/policies/custom/excludes.test.ts b/tests/api-resources/zero-trust/devices/policies/custom/excludes.test.ts
new file mode 100644
index 0000000000..61fde95d41
--- /dev/null
+++ b/tests/api-resources/zero-trust/devices/policies/custom/excludes.test.ts
@@ -0,0 +1,66 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource excludes', () => {
+  test('update: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.custom.excludes.update(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      {
+        account_id: '699d98642c564d2e855e9661899b7252',
+        body: [{ address: '192.0.2.0/24', description: 'Exclude testing domains from the tunnel' }],
+      },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.custom.excludes.update(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      {
+        account_id: '699d98642c564d2e855e9661899b7252',
+        body: [
+          {
+            address: '192.0.2.0/24',
+            description: 'Exclude testing domains from the tunnel',
+            host: '*.example.com',
+          },
+        ],
+      },
+    );
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.custom.excludes.get(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.custom.excludes.get(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
+  });
+});
diff --git a/tests/api-resources/zero-trust/devices/policies/fallback-domains.test.ts b/tests/api-resources/zero-trust/devices/policies/custom/fallback-domains.test.ts
similarity index 52%
rename from tests/api-resources/zero-trust/devices/policies/fallback-domains.test.ts
rename to tests/api-resources/zero-trust/devices/policies/custom/fallback-domains.test.ts
index 88bea256fc..f7425b9155 100644
--- a/tests/api-resources/zero-trust/devices/policies/fallback-domains.test.ts
+++ b/tests/api-resources/zero-trust/devices/policies/custom/fallback-domains.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,12 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource fallbackDomains', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.fallbackDomains.update(
+    const responsePromise = client.zeroTrust.devices.policies.custom.fallbackDomains.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        account_id: '699d98642c564d2e855e9661899b7252',
-        body: [{ suffix: 'example.com' }, { suffix: 'example.com' }, { suffix: 'example.com' }],
-      },
+      { account_id: '699d98642c564d2e855e9661899b7252', domains: [{ suffix: 'example.com' }] },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -28,52 +25,23 @@ describe('resource fallbackDomains', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.fallbackDomains.update(
+    const response = await client.zeroTrust.devices.policies.custom.fallbackDomains.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '699d98642c564d2e855e9661899b7252',
-        body: [
+        domains: [
           {
-            description: 'Domain bypass for local development',
-            dns_server: [{}, {}, {}],
             suffix: 'example.com',
-          },
-          {
             description: 'Domain bypass for local development',
-            dns_server: [{}, {}, {}],
-            suffix: 'example.com',
-          },
-          {
-            description: 'Domain bypass for local development',
-            dns_server: [{}, {}, {}],
-            suffix: 'example.com',
+            dns_server: ['1.1.1.1'],
           },
         ],
       },
     );
   });
 
-  test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.fallbackDomains.list({
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
-    const rawResponse = await responsePromise.asResponse();
-    expect(rawResponse).toBeInstanceOf(Response);
-    const response = await responsePromise;
-    expect(response).not.toBeInstanceOf(Response);
-    const dataAndResponse = await responsePromise.withResponse();
-    expect(dataAndResponse.data).toBe(response);
-    expect(dataAndResponse.response).toBe(rawResponse);
-  });
-
-  test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.fallbackDomains.list({
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
-  });
-
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.fallbackDomains.get(
+    const responsePromise = client.zeroTrust.devices.policies.custom.fallbackDomains.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -87,7 +55,7 @@ describe('resource fallbackDomains', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.fallbackDomains.get(
+    const response = await client.zeroTrust.devices.policies.custom.fallbackDomains.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
diff --git a/tests/api-resources/zero-trust/devices/policies/custom/includes.test.ts b/tests/api-resources/zero-trust/devices/policies/custom/includes.test.ts
new file mode 100644
index 0000000000..7a3b061e06
--- /dev/null
+++ b/tests/api-resources/zero-trust/devices/policies/custom/includes.test.ts
@@ -0,0 +1,66 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource includes', () => {
+  test('update: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.custom.includes.update(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      {
+        account_id: '699d98642c564d2e855e9661899b7252',
+        body: [{ address: '192.0.2.0/24', description: 'Include testing domains from the tunnel' }],
+      },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.custom.includes.update(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      {
+        account_id: '699d98642c564d2e855e9661899b7252',
+        body: [
+          {
+            address: '192.0.2.0/24',
+            description: 'Include testing domains from the tunnel',
+            host: '*.example.com',
+          },
+        ],
+      },
+    );
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.custom.includes.get(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.custom.includes.get(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
+  });
+});
diff --git a/tests/api-resources/zero-trust/devices/policies/default/certificates.test.ts b/tests/api-resources/zero-trust/devices/policies/default/certificates.test.ts
new file mode 100644
index 0000000000..599593f594
--- /dev/null
+++ b/tests/api-resources/zero-trust/devices/policies/default/certificates.test.ts
@@ -0,0 +1,52 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource certificates', () => {
+  test('edit: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.default.certificates.edit({
+      zone_id: '699d98642c564d2e855e9661899b7252',
+      enabled: true,
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.default.certificates.edit({
+      zone_id: '699d98642c564d2e855e9661899b7252',
+      enabled: true,
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.default.certificates.get({
+      zone_id: '699d98642c564d2e855e9661899b7252',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.default.certificates.get({
+      zone_id: '699d98642c564d2e855e9661899b7252',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/devices/policies/default/default.test.ts b/tests/api-resources/zero-trust/devices/policies/default/default.test.ts
new file mode 100644
index 0000000000..8fc2a96103
--- /dev/null
+++ b/tests/api-resources/zero-trust/devices/policies/default/default.test.ts
@@ -0,0 +1,61 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource default', () => {
+  test('edit: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.default.edit({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.default.edit({
+      account_id: '699d98642c564d2e855e9661899b7252',
+      allow_mode_switch: true,
+      allow_updates: true,
+      allowed_to_leave: true,
+      auto_connect: 0,
+      captive_portal: 180,
+      disable_auto_fallback: true,
+      exclude_office_ips: true,
+      service_mode_v2: { mode: 'proxy', port: 3000 },
+      support_url: 'https://1.1.1.1/help',
+      switch_locked: true,
+      tunnel_protocol: 'wireguard',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.default.get({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.default.get({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/devices/policies/default/excludes.test.ts b/tests/api-resources/zero-trust/devices/policies/default/excludes.test.ts
new file mode 100644
index 0000000000..a823ec296d
--- /dev/null
+++ b/tests/api-resources/zero-trust/devices/policies/default/excludes.test.ts
@@ -0,0 +1,58 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource excludes', () => {
+  test('update: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.default.excludes.update({
+      account_id: '699d98642c564d2e855e9661899b7252',
+      body: [{ address: '192.0.2.0/24', description: 'Exclude testing domains from the tunnel' }],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.default.excludes.update({
+      account_id: '699d98642c564d2e855e9661899b7252',
+      body: [
+        {
+          address: '192.0.2.0/24',
+          description: 'Exclude testing domains from the tunnel',
+          host: '*.example.com',
+        },
+      ],
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.default.excludes.get({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.default.excludes.get({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/devices/policies/default/fallback-domains.test.ts b/tests/api-resources/zero-trust/devices/policies/default/fallback-domains.test.ts
new file mode 100644
index 0000000000..70ba1b7b0b
--- /dev/null
+++ b/tests/api-resources/zero-trust/devices/policies/default/fallback-domains.test.ts
@@ -0,0 +1,58 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource fallbackDomains', () => {
+  test('update: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.default.fallbackDomains.update({
+      account_id: '699d98642c564d2e855e9661899b7252',
+      domains: [{ suffix: 'example.com' }],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.default.fallbackDomains.update({
+      account_id: '699d98642c564d2e855e9661899b7252',
+      domains: [
+        {
+          suffix: 'example.com',
+          description: 'Domain bypass for local development',
+          dns_server: ['1.1.1.1'],
+        },
+      ],
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.default.fallbackDomains.get({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.default.fallbackDomains.get({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/devices/policies/default/includes.test.ts b/tests/api-resources/zero-trust/devices/policies/default/includes.test.ts
new file mode 100644
index 0000000000..65f856ee96
--- /dev/null
+++ b/tests/api-resources/zero-trust/devices/policies/default/includes.test.ts
@@ -0,0 +1,58 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource includes', () => {
+  test('update: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.default.includes.update({
+      account_id: '699d98642c564d2e855e9661899b7252',
+      body: [{ address: '192.0.2.0/24', description: 'Include testing domains from the tunnel' }],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.default.includes.update({
+      account_id: '699d98642c564d2e855e9661899b7252',
+      body: [
+        {
+          address: '192.0.2.0/24',
+          description: 'Include testing domains from the tunnel',
+          host: '*.example.com',
+        },
+      ],
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.policies.default.includes.get({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.policies.default.includes.get({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/devices/policies/excludes.test.ts b/tests/api-resources/zero-trust/devices/policies/excludes.test.ts
deleted file mode 100644
index 87a704fd75..0000000000
--- a/tests/api-resources/zero-trust/devices/policies/excludes.test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import Cloudflare from 'cloudflare';
-import { Response } from 'node-fetch';
-
-const cloudflare = new Cloudflare({
-  apiKey: '144c9defac04969c7bfad8efaa8ea194',
-  apiEmail: 'user@example.com',
-  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
-});
-
-describe('resource excludes', () => {
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.excludes.update({
-      account_id: '699d98642c564d2e855e9661899b7252',
-      body: [
-        { address: '192.0.2.0/24', description: 'Exclude testing domains from the tunnel' },
-        { address: '192.0.2.0/24', description: 'Exclude testing domains from the tunnel' },
-        { address: '192.0.2.0/24', description: 'Exclude testing domains from the tunnel' },
-      ],
-    });
-    const rawResponse = await responsePromise.asResponse();
-    expect(rawResponse).toBeInstanceOf(Response);
-    const response = await responsePromise;
-    expect(response).not.toBeInstanceOf(Response);
-    const dataAndResponse = await responsePromise.withResponse();
-    expect(dataAndResponse.data).toBe(response);
-    expect(dataAndResponse.response).toBe(rawResponse);
-  });
-
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.excludes.update({
-      account_id: '699d98642c564d2e855e9661899b7252',
-      body: [
-        {
-          address: '192.0.2.0/24',
-          description: 'Exclude testing domains from the tunnel',
-          host: '*.example.com',
-        },
-        {
-          address: '192.0.2.0/24',
-          description: 'Exclude testing domains from the tunnel',
-          host: '*.example.com',
-        },
-        {
-          address: '192.0.2.0/24',
-          description: 'Exclude testing domains from the tunnel',
-          host: '*.example.com',
-        },
-      ],
-    });
-  });
-
-  test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.excludes.list({
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
-    const rawResponse = await responsePromise.asResponse();
-    expect(rawResponse).toBeInstanceOf(Response);
-    const response = await responsePromise;
-    expect(response).not.toBeInstanceOf(Response);
-    const dataAndResponse = await responsePromise.withResponse();
-    expect(dataAndResponse.data).toBe(response);
-    expect(dataAndResponse.response).toBe(rawResponse);
-  });
-
-  test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.excludes.list({
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
-  });
-
-  test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.excludes.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
-    const rawResponse = await responsePromise.asResponse();
-    expect(rawResponse).toBeInstanceOf(Response);
-    const response = await responsePromise;
-    expect(response).not.toBeInstanceOf(Response);
-    const dataAndResponse = await responsePromise.withResponse();
-    expect(dataAndResponse.data).toBe(response);
-    expect(dataAndResponse.response).toBe(rawResponse);
-  });
-
-  test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.excludes.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
-  });
-});
diff --git a/tests/api-resources/zero-trust/devices/policies/includes.test.ts b/tests/api-resources/zero-trust/devices/policies/includes.test.ts
deleted file mode 100644
index 2382d0fb82..0000000000
--- a/tests/api-resources/zero-trust/devices/policies/includes.test.ts
+++ /dev/null
@@ -1,93 +0,0 @@
-// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
-
-import Cloudflare from 'cloudflare';
-import { Response } from 'node-fetch';
-
-const cloudflare = new Cloudflare({
-  apiKey: '144c9defac04969c7bfad8efaa8ea194',
-  apiEmail: 'user@example.com',
-  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
-});
-
-describe('resource includes', () => {
-  test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.includes.update({
-      account_id: '699d98642c564d2e855e9661899b7252',
-      body: [
-        { address: '192.0.2.0/24', description: 'Include testing domains from the tunnel' },
-        { address: '192.0.2.0/24', description: 'Include testing domains from the tunnel' },
-        { address: '192.0.2.0/24', description: 'Include testing domains from the tunnel' },
-      ],
-    });
-    const rawResponse = await responsePromise.asResponse();
-    expect(rawResponse).toBeInstanceOf(Response);
-    const response = await responsePromise;
-    expect(response).not.toBeInstanceOf(Response);
-    const dataAndResponse = await responsePromise.withResponse();
-    expect(dataAndResponse.data).toBe(response);
-    expect(dataAndResponse.response).toBe(rawResponse);
-  });
-
-  test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.includes.update({
-      account_id: '699d98642c564d2e855e9661899b7252',
-      body: [
-        {
-          address: '192.0.2.0/24',
-          description: 'Include testing domains from the tunnel',
-          host: '*.example.com',
-        },
-        {
-          address: '192.0.2.0/24',
-          description: 'Include testing domains from the tunnel',
-          host: '*.example.com',
-        },
-        {
-          address: '192.0.2.0/24',
-          description: 'Include testing domains from the tunnel',
-          host: '*.example.com',
-        },
-      ],
-    });
-  });
-
-  test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.includes.list({
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
-    const rawResponse = await responsePromise.asResponse();
-    expect(rawResponse).toBeInstanceOf(Response);
-    const response = await responsePromise;
-    expect(response).not.toBeInstanceOf(Response);
-    const dataAndResponse = await responsePromise.withResponse();
-    expect(dataAndResponse.data).toBe(response);
-    expect(dataAndResponse.response).toBe(rawResponse);
-  });
-
-  test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.includes.list({
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
-  });
-
-  test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.includes.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
-    const rawResponse = await responsePromise.asResponse();
-    expect(rawResponse).toBeInstanceOf(Response);
-    const response = await responsePromise;
-    expect(response).not.toBeInstanceOf(Response);
-    const dataAndResponse = await responsePromise.withResponse();
-    expect(dataAndResponse.data).toBe(response);
-    expect(dataAndResponse.response).toBe(rawResponse);
-  });
-
-  test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.includes.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
-  });
-});
diff --git a/tests/api-resources/zero-trust/devices/posture/integrations.test.ts b/tests/api-resources/zero-trust/devices/posture/integrations.test.ts
index 2b8e0c687c..515fe8bdc0 100644
--- a/tests/api-resources/zero-trust/devices/posture/integrations.test.ts
+++ b/tests/api-resources/zero-trust/devices/posture/integrations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource integrations', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.posture.integrations.create({
+    const responsePromise = client.zeroTrust.devices.posture.integrations.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       config: {
         api_url: 'https://as123.awmdm.com/API',
@@ -33,7 +33,7 @@ describe('resource integrations', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.posture.integrations.create({
+    const response = await client.zeroTrust.devices.posture.integrations.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       config: {
         api_url: 'https://as123.awmdm.com/API',
@@ -48,7 +48,7 @@ describe('resource integrations', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.posture.integrations.list({
+    const responsePromise = client.zeroTrust.devices.posture.integrations.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -61,13 +61,13 @@ describe('resource integrations', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.posture.integrations.list({
+    const response = await client.zeroTrust.devices.posture.integrations.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.posture.integrations.delete(
+    const responsePromise = client.zeroTrust.devices.posture.integrations.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -81,14 +81,14 @@ describe('resource integrations', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.posture.integrations.delete(
+    const response = await client.zeroTrust.devices.posture.integrations.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.posture.integrations.edit(
+    const responsePromise = client.zeroTrust.devices.posture.integrations.edit(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -102,7 +102,7 @@ describe('resource integrations', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.posture.integrations.edit(
+    const response = await client.zeroTrust.devices.posture.integrations.edit(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '699d98642c564d2e855e9661899b7252',
@@ -120,7 +120,7 @@ describe('resource integrations', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.posture.integrations.get(
+    const responsePromise = client.zeroTrust.devices.posture.integrations.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -134,7 +134,7 @@ describe('resource integrations', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.posture.integrations.get(
+    const response = await client.zeroTrust.devices.posture.integrations.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
diff --git a/tests/api-resources/zero-trust/devices/posture/posture.test.ts b/tests/api-resources/zero-trust/devices/posture/posture.test.ts
index 50a584a0db..3421b8bd79 100644
--- a/tests/api-resources/zero-trust/devices/posture/posture.test.ts
+++ b/tests/api-resources/zero-trust/devices/posture/posture.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource posture', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.posture.create({
+    const responsePromise = client.zeroTrust.devices.posture.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'Admin Serial Numbers',
       type: 'file',
@@ -26,29 +26,30 @@ describe('resource posture', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.posture.create({
+    const response = await client.zeroTrust.devices.posture.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'Admin Serial Numbers',
       type: 'file',
       description: 'The rule for admin serial numbers',
       expiration: '1h',
       input: {
-        exists: true,
-        operating_system: 'linux',
+        operating_system: 'windows',
         path: '/bin/cat',
+        exists: true,
         sha256: 'https://api.us-2.crowdstrike.com',
         thumbprint: '0aabab210bdb998e9cf45da2c9ce352977ab531c681b74cf1e487be1bbe9fe6e',
       },
-      match: [{ platform: 'windows' }, { platform: 'windows' }, { platform: 'windows' }],
+      match: [{ platform: 'windows' }],
       schedule: '1h',
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.posture.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252', name: 'Admin Serial Numbers', type: 'file' },
-    );
+    const responsePromise = client.zeroTrust.devices.posture.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      name: 'Admin Serial Numbers',
+      type: 'file',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -59,29 +60,26 @@ describe('resource posture', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.posture.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        account_id: '699d98642c564d2e855e9661899b7252',
-        name: 'Admin Serial Numbers',
-        type: 'file',
-        description: 'The rule for admin serial numbers',
-        expiration: '1h',
-        input: {
-          exists: true,
-          operating_system: 'linux',
-          path: '/bin/cat',
-          sha256: 'https://api.us-2.crowdstrike.com',
-          thumbprint: '0aabab210bdb998e9cf45da2c9ce352977ab531c681b74cf1e487be1bbe9fe6e',
-        },
-        match: [{ platform: 'windows' }, { platform: 'windows' }, { platform: 'windows' }],
-        schedule: '1h',
+    const response = await client.zeroTrust.devices.posture.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      name: 'Admin Serial Numbers',
+      type: 'file',
+      description: 'The rule for admin serial numbers',
+      expiration: '1h',
+      input: {
+        operating_system: 'windows',
+        path: '/bin/cat',
+        exists: true,
+        sha256: 'https://api.us-2.crowdstrike.com',
+        thumbprint: '0aabab210bdb998e9cf45da2c9ce352977ab531c681b74cf1e487be1bbe9fe6e',
       },
-    );
+      match: [{ platform: 'windows' }],
+      schedule: '1h',
+    });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.posture.list({
+    const responsePromise = client.zeroTrust.devices.posture.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -94,16 +92,15 @@ describe('resource posture', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.posture.list({
+    const response = await client.zeroTrust.devices.posture.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.posture.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.devices.posture.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -114,14 +111,13 @@ describe('resource posture', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.posture.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const response = await client.zeroTrust.devices.posture.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.posture.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.devices.posture.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -134,7 +130,7 @@ describe('resource posture', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.posture.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.devices.posture.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/devices/revoke.test.ts b/tests/api-resources/zero-trust/devices/revoke.test.ts
index d7374ab271..680c011681 100644
--- a/tests/api-resources/zero-trust/devices/revoke.test.ts
+++ b/tests/api-resources/zero-trust/devices/revoke.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,13 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource revoke', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.revoke.create({
+    const responsePromise = client.zeroTrust.devices.revoke.create({
       account_id: '699d98642c564d2e855e9661899b7252',
-      body: [
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      ],
+      body: ['f174e90a-fafe-4643-bbbc-4a0ed4fc8415'],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -29,13 +25,9 @@ describe('resource revoke', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.revoke.create({
+    const response = await client.zeroTrust.devices.revoke.create({
       account_id: '699d98642c564d2e855e9661899b7252',
-      body: [
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      ],
+      body: ['f174e90a-fafe-4643-bbbc-4a0ed4fc8415'],
     });
   });
 });
diff --git a/tests/api-resources/zero-trust/devices/settings.test.ts b/tests/api-resources/zero-trust/devices/settings.test.ts
index e261c71fed..5c8e986a77 100644
--- a/tests/api-resources/zero-trust/devices/settings.test.ts
+++ b/tests/api-resources/zero-trust/devices/settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource settings', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.settings.update({
+    const responsePromise = client.zeroTrust.devices.settings.update({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,8 +24,9 @@ describe('resource settings', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.settings.update({
+    const response = await client.zeroTrust.devices.settings.update({
       account_id: '699d98642c564d2e855e9661899b7252',
+      disable_for_time: 0,
       gateway_proxy_enabled: true,
       gateway_udp_proxy_enabled: true,
       root_certificate_installation_enabled: true,
@@ -34,7 +35,7 @@ describe('resource settings', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.settings.list({
+    const responsePromise = client.zeroTrust.devices.settings.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -47,8 +48,32 @@ describe('resource settings', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.settings.list({
+    const response = await client.zeroTrust.devices.settings.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
+
+  test('edit: only required params', async () => {
+    const responsePromise = client.zeroTrust.devices.settings.edit({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.zeroTrust.devices.settings.edit({
+      account_id: '699d98642c564d2e855e9661899b7252',
+      disable_for_time: 0,
+      gateway_proxy_enabled: true,
+      gateway_udp_proxy_enabled: true,
+      root_certificate_installation_enabled: true,
+      use_zt_virtual_ip: true,
+    });
+  });
 });
diff --git a/tests/api-resources/zero-trust/devices/unrevoke.test.ts b/tests/api-resources/zero-trust/devices/unrevoke.test.ts
index 8eaa0c80a5..17e873c928 100644
--- a/tests/api-resources/zero-trust/devices/unrevoke.test.ts
+++ b/tests/api-resources/zero-trust/devices/unrevoke.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,13 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource unrevoke', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.unrevoke.create({
+    const responsePromise = client.zeroTrust.devices.unrevoke.create({
       account_id: '699d98642c564d2e855e9661899b7252',
-      body: [
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      ],
+      body: ['f174e90a-fafe-4643-bbbc-4a0ed4fc8415'],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -29,13 +25,9 @@ describe('resource unrevoke', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.unrevoke.create({
+    const response = await client.zeroTrust.devices.unrevoke.create({
       account_id: '699d98642c564d2e855e9661899b7252',
-      body: [
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-        'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      ],
+      body: ['f174e90a-fafe-4643-bbbc-4a0ed4fc8415'],
     });
   });
 });
diff --git a/tests/api-resources/zero-trust/dex/colos.test.ts b/tests/api-resources/zero-trust/dex/colos.test.ts
index bb9a5e195f..61cba07ea7 100644
--- a/tests/api-resources/zero-trust/dex/colos.test.ts
+++ b/tests/api-resources/zero-trust/dex/colos.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource colos', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.colos.list({
+    const responsePromise = client.zeroTrust.dex.colos.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
       from: '2023-08-20T20:45:00Z',
       to: '2023-08-24T20:45:00Z',
@@ -26,7 +26,7 @@ describe('resource colos', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.colos.list({
+    const response = await client.zeroTrust.dex.colos.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
       from: '2023-08-20T20:45:00Z',
       to: '2023-08-24T20:45:00Z',
diff --git a/tests/api-resources/zero-trust/dex/commands/commands.test.ts b/tests/api-resources/zero-trust/dex/commands/commands.test.ts
new file mode 100644
index 0000000000..aee782be0d
--- /dev/null
+++ b/tests/api-resources/zero-trust/dex/commands/commands.test.ts
@@ -0,0 +1,75 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource commands', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.zeroTrust.dex.commands.create({
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+      commands: [{ command_type: 'pcap', device_id: 'device_id', user_email: 'user_email' }],
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.zeroTrust.dex.commands.create({
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+      commands: [
+        {
+          command_type: 'pcap',
+          device_id: 'device_id',
+          user_email: 'user_email',
+          command_args: {
+            interfaces: ['default'],
+            'max-file-size-mb': 1,
+            'packet-size-bytes': 1,
+            'test-all-routes': true,
+            'time-limit-min': 1,
+          },
+        },
+      ],
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.zeroTrust.dex.commands.list({
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+      page: 1,
+      per_page: 50,
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.zeroTrust.dex.commands.list({
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+      page: 1,
+      per_page: 50,
+      command_type: 'command_type',
+      device_id: 'device_id',
+      from: '2023-08-20T20:45:00Z',
+      status: 'PENDING_EXEC',
+      to: '2023-08-24T20:45:00Z',
+      user_email: 'user_email',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/dex/commands/devices.test.ts b/tests/api-resources/zero-trust/dex/commands/devices.test.ts
new file mode 100644
index 0000000000..e3f74b0aca
--- /dev/null
+++ b/tests/api-resources/zero-trust/dex/commands/devices.test.ts
@@ -0,0 +1,36 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource devices', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.zeroTrust.dex.commands.devices.list({
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+      page: 1,
+      per_page: 1,
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.zeroTrust.dex.commands.devices.list({
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+      page: 1,
+      per_page: 1,
+      search: 'search',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/dex/commands/downloads.test.ts b/tests/api-resources/zero-trust/dex/commands/downloads.test.ts
new file mode 100644
index 0000000000..fd64903c23
--- /dev/null
+++ b/tests/api-resources/zero-trust/dex/commands/downloads.test.ts
@@ -0,0 +1,19 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource downloads', () => {
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.dex.commands.downloads.get(
+      '5758fefe-ae7e-4538-a39b-1fef6abcb909',
+      'filename',
+      { account_id: '01a7362d577a6c3019a474fd6f485823' },
+    );
+  });
+});
diff --git a/tests/api-resources/zero-trust/dex/commands/quota.test.ts b/tests/api-resources/zero-trust/dex/commands/quota.test.ts
new file mode 100644
index 0000000000..eeb227d18f
--- /dev/null
+++ b/tests/api-resources/zero-trust/dex/commands/quota.test.ts
@@ -0,0 +1,31 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource quota', () => {
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.dex.commands.quota.get({
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.dex.commands.quota.get({
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/dex/commands/users.test.ts b/tests/api-resources/zero-trust/dex/commands/users.test.ts
new file mode 100644
index 0000000000..cac143500a
--- /dev/null
+++ b/tests/api-resources/zero-trust/dex/commands/users.test.ts
@@ -0,0 +1,32 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource users', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.zeroTrust.dex.commands.users.list({
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.zeroTrust.dex.commands.users.list({
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+      search: 'search',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/dex/fleet-status/devices.test.ts b/tests/api-resources/zero-trust/dex/fleet-status/devices.test.ts
index 56c104301e..6fceacf0e4 100644
--- a/tests/api-resources/zero-trust/dex/fleet-status/devices.test.ts
+++ b/tests/api-resources/zero-trust/dex/fleet-status/devices.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,12 +12,11 @@ const cloudflare = new Cloudflare({
 describe('resource devices', () => {
   // TODO: investigate broken test
   test.skip('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.fleetStatus.devices.list({
+    const responsePromise = client.zeroTrust.dex.fleetStatus.devices.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
       from: '2023-10-11T00:00:00Z',
       page: 1,
       per_page: 10,
-      source: 'last_seen',
       to: '2023-10-11T00:00:00Z',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -31,18 +30,18 @@ describe('resource devices', () => {
 
   // TODO: investigate broken test
   test.skip('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.fleetStatus.devices.list({
+    const response = await client.zeroTrust.dex.fleetStatus.devices.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
       from: '2023-10-11T00:00:00Z',
       page: 1,
       per_page: 10,
-      source: 'last_seen',
       to: '2023-10-11T00:00:00Z',
       colo: 'SJC',
       device_id: 'cb49c27f-7f97-49c5-b6f3-f7c01ead0fd7',
       mode: 'proxy',
       platform: 'windows',
       sort_by: 'colo',
+      source: 'last_seen',
       status: 'connected',
       version: '1.0.0',
     });
diff --git a/tests/api-resources/zero-trust/dex/fleet-status/fleet-status.test.ts b/tests/api-resources/zero-trust/dex/fleet-status/fleet-status.test.ts
index 6dd8dbd1ee..04989a11db 100644
--- a/tests/api-resources/zero-trust/dex/fleet-status/fleet-status.test.ts
+++ b/tests/api-resources/zero-trust/dex/fleet-status/fleet-status.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource fleetStatus', () => {
   test('live: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.fleetStatus.live({
+    const responsePromise = client.zeroTrust.dex.fleetStatus.live({
       account_id: '01a7362d577a6c3019a474fd6f485823',
       since_minutes: 10,
     });
@@ -25,14 +25,14 @@ describe('resource fleetStatus', () => {
   });
 
   test('live: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.fleetStatus.live({
+    const response = await client.zeroTrust.dex.fleetStatus.live({
       account_id: '01a7362d577a6c3019a474fd6f485823',
       since_minutes: 10,
     });
   });
 
   test('overTime: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.fleetStatus.overTime({
+    const responsePromise = client.zeroTrust.dex.fleetStatus.overTime({
       account_id: '01a7362d577a6c3019a474fd6f485823',
       from: '2023-10-11T00:00:00Z',
       to: '2023-10-11T00:00:00Z',
@@ -47,7 +47,7 @@ describe('resource fleetStatus', () => {
   });
 
   test('overTime: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.fleetStatus.overTime({
+    const response = await client.zeroTrust.dex.fleetStatus.overTime({
       account_id: '01a7362d577a6c3019a474fd6f485823',
       from: '2023-10-11T00:00:00Z',
       to: '2023-10-11T00:00:00Z',
diff --git a/tests/api-resources/zero-trust/dex/http-tests/http-tests.test.ts b/tests/api-resources/zero-trust/dex/http-tests/http-tests.test.ts
index 1e8631694f..146959d801 100644
--- a/tests/api-resources/zero-trust/dex/http-tests/http-tests.test.ts
+++ b/tests/api-resources/zero-trust/dex/http-tests/http-tests.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource httpTests', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.httpTests.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.dex.httpTests.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
       from: '1689520412000',
       interval: 'minute',
@@ -27,13 +27,13 @@ describe('resource httpTests', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.httpTests.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.dex.httpTests.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '01a7362d577a6c3019a474fd6f485823',
       from: '1689520412000',
       interval: 'minute',
       to: '1689606812000',
       colo: 'colo',
-      deviceId: ['string', 'string', 'string'],
+      deviceId: ['string'],
     });
   });
 });
diff --git a/tests/api-resources/zero-trust/dex/http-tests/percentiles.test.ts b/tests/api-resources/zero-trust/dex/http-tests/percentiles.test.ts
index 844135106d..03b24776ba 100644
--- a/tests/api-resources/zero-trust/dex/http-tests/percentiles.test.ts
+++ b/tests/api-resources/zero-trust/dex/http-tests/percentiles.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource percentiles', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.httpTests.percentiles.get(
+    const responsePromise = client.zeroTrust.dex.httpTests.percentiles.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '01a7362d577a6c3019a474fd6f485823',
@@ -29,14 +29,14 @@ describe('resource percentiles', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.httpTests.percentiles.get(
+    const response = await client.zeroTrust.dex.httpTests.percentiles.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '01a7362d577a6c3019a474fd6f485823',
         from: '2023-09-20T17:00:00Z',
         to: '2023-09-20T17:00:00Z',
         colo: 'colo',
-        deviceId: ['string', 'string', 'string'],
+        deviceId: ['string'],
       },
     );
   });
diff --git a/tests/api-resources/zero-trust/dex/tests/tests.test.ts b/tests/api-resources/zero-trust/dex/tests/tests.test.ts
index dd848e398c..814680ba37 100644
--- a/tests/api-resources/zero-trust/dex/tests/tests.test.ts
+++ b/tests/api-resources/zero-trust/dex/tests/tests.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource tests', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.tests.list({
+    const responsePromise = client.zeroTrust.dex.tests.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,10 +24,10 @@ describe('resource tests', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.tests.list({
+    const response = await client.zeroTrust.dex.tests.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
       colo: 'colo',
-      deviceId: ['string', 'string', 'string'],
+      deviceId: ['string'],
       page: 1,
       per_page: 1,
       testName: 'testName',
diff --git a/tests/api-resources/zero-trust/dex/tests/unique-devices.test.ts b/tests/api-resources/zero-trust/dex/tests/unique-devices.test.ts
index e91b76f891..d6192c0958 100644
--- a/tests/api-resources/zero-trust/dex/tests/unique-devices.test.ts
+++ b/tests/api-resources/zero-trust/dex/tests/unique-devices.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource uniqueDevices', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.tests.uniqueDevices.list({
+    const responsePromise = client.zeroTrust.dex.tests.uniqueDevices.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,9 +24,9 @@ describe('resource uniqueDevices', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.tests.uniqueDevices.list({
+    const response = await client.zeroTrust.dex.tests.uniqueDevices.list({
       account_id: '01a7362d577a6c3019a474fd6f485823',
-      deviceId: ['string', 'string', 'string'],
+      deviceId: ['string'],
       testName: 'testName',
     });
   });
diff --git a/tests/api-resources/zero-trust/dex/traceroute-test-results/network-path.test.ts b/tests/api-resources/zero-trust/dex/traceroute-test-results/network-path.test.ts
index 6e6efcc248..b32a35b70c 100644
--- a/tests/api-resources/zero-trust/dex/traceroute-test-results/network-path.test.ts
+++ b/tests/api-resources/zero-trust/dex/traceroute-test-results/network-path.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource networkPath', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.tracerouteTestResults.networkPath.get(
+    const responsePromise = client.zeroTrust.dex.tracerouteTestResults.networkPath.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '01a7362d577a6c3019a474fd6f485823' },
     );
@@ -25,7 +25,7 @@ describe('resource networkPath', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.tracerouteTestResults.networkPath.get(
+    const response = await client.zeroTrust.dex.tracerouteTestResults.networkPath.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '01a7362d577a6c3019a474fd6f485823' },
     );
diff --git a/tests/api-resources/zero-trust/dex/traceroute-tests.test.ts b/tests/api-resources/zero-trust/dex/traceroute-tests.test.ts
index 6fb3ef5bb7..47bfbfb1e2 100644
--- a/tests/api-resources/zero-trust/dex/traceroute-tests.test.ts
+++ b/tests/api-resources/zero-trust/dex/traceroute-tests.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,15 +11,12 @@ const cloudflare = new Cloudflare({
 
 describe('resource tracerouteTests', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.tracerouteTests.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        account_id: '01a7362d577a6c3019a474fd6f485823',
-        from: '1689520412000',
-        interval: 'minute',
-        to: '1689606812000',
-      },
-    );
+    const responsePromise = client.zeroTrust.dex.tracerouteTests.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+      from: '1689520412000',
+      interval: 'minute',
+      to: '1689606812000',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -30,21 +27,18 @@ describe('resource tracerouteTests', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.tracerouteTests.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        account_id: '01a7362d577a6c3019a474fd6f485823',
-        from: '1689520412000',
-        interval: 'minute',
-        to: '1689606812000',
-        colo: 'colo',
-        deviceId: ['string', 'string', 'string'],
-      },
-    );
+    const response = await client.zeroTrust.dex.tracerouteTests.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '01a7362d577a6c3019a474fd6f485823',
+      from: '1689520412000',
+      interval: 'minute',
+      to: '1689606812000',
+      colo: 'colo',
+      deviceId: ['string'],
+    });
   });
 
   test('networkPath: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.tracerouteTests.networkPath(
+    const responsePromise = client.zeroTrust.dex.tracerouteTests.networkPath(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '01a7362d577a6c3019a474fd6f485823',
@@ -64,7 +58,7 @@ describe('resource tracerouteTests', () => {
   });
 
   test('networkPath: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.tracerouteTests.networkPath(
+    const response = await client.zeroTrust.dex.tracerouteTests.networkPath(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '01a7362d577a6c3019a474fd6f485823',
@@ -77,7 +71,7 @@ describe('resource tracerouteTests', () => {
   });
 
   test('percentiles: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dex.tracerouteTests.percentiles(
+    const responsePromise = client.zeroTrust.dex.tracerouteTests.percentiles(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '01a7362d577a6c3019a474fd6f485823',
@@ -95,14 +89,14 @@ describe('resource tracerouteTests', () => {
   });
 
   test('percentiles: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dex.tracerouteTests.percentiles(
+    const response = await client.zeroTrust.dex.tracerouteTests.percentiles(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '01a7362d577a6c3019a474fd6f485823',
         from: '2023-09-20T17:00:00Z',
         to: '2023-09-20T17:00:00Z',
         colo: 'colo',
-        deviceId: ['string', 'string', 'string'],
+        deviceId: ['string'],
       },
     );
   });
diff --git a/tests/api-resources/zero-trust/dlp/datasets/datasets.test.ts b/tests/api-resources/zero-trust/dlp/datasets/datasets.test.ts
index f37d3db4bc..2be5a300b8 100644
--- a/tests/api-resources/zero-trust/dlp/datasets/datasets.test.ts
+++ b/tests/api-resources/zero-trust/dlp/datasets/datasets.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource datasets', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.datasets.create({
-      account_id: 'account_id',
-      name: 'name',
-    });
+    const responsePromise = client.zeroTrust.dlp.datasets.create({ account_id: 'account_id', name: 'name' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -25,16 +22,17 @@ describe('resource datasets', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.datasets.create({
+    const response = await client.zeroTrust.dlp.datasets.create({
       account_id: 'account_id',
       name: 'name',
       description: 'description',
+      encoding_version: 0,
       secret: true,
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.datasets.update('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+    const responsePromise = client.zeroTrust.dlp.datasets.update('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -47,7 +45,7 @@ describe('resource datasets', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.datasets.update('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+    const response = await client.zeroTrust.dlp.datasets.update('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
       account_id: 'account_id',
       description: 'description',
       name: 'name',
@@ -55,7 +53,7 @@ describe('resource datasets', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.datasets.list({ account_id: 'account_id' });
+    const responsePromise = client.zeroTrust.dlp.datasets.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -66,11 +64,11 @@ describe('resource datasets', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.datasets.list({ account_id: 'account_id' });
+    const response = await client.zeroTrust.dlp.datasets.list({ account_id: 'account_id' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.datasets.delete('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+    const responsePromise = client.zeroTrust.dlp.datasets.delete('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -83,13 +81,13 @@ describe('resource datasets', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.datasets.delete('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+    const response = await client.zeroTrust.dlp.datasets.delete('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
       account_id: 'account_id',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.datasets.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+    const responsePromise = client.zeroTrust.dlp.datasets.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -102,7 +100,7 @@ describe('resource datasets', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.datasets.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+    const response = await client.zeroTrust.dlp.datasets.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
       account_id: 'account_id',
     });
   });
diff --git a/tests/api-resources/zero-trust/dlp/datasets/upload.test.ts b/tests/api-resources/zero-trust/dlp/datasets/upload.test.ts
index caaf227f6f..2f7b313cbf 100644
--- a/tests/api-resources/zero-trust/dlp/datasets/upload.test.ts
+++ b/tests/api-resources/zero-trust/dlp/datasets/upload.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource upload', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.datasets.upload.create(
+    const responsePromise = client.zeroTrust.dlp.datasets.upload.create(
       '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       { account_id: 'account_id' },
     );
@@ -25,7 +25,7 @@ describe('resource upload', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.datasets.upload.create(
+    const response = await client.zeroTrust.dlp.datasets.upload.create(
       '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       { account_id: 'account_id' },
     );
@@ -33,7 +33,7 @@ describe('resource upload', () => {
 
   // TODO: investigate broken test
   test.skip('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.datasets.upload.edit(
+    const responsePromise = client.zeroTrust.dlp.datasets.upload.edit(
       '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       0,
       { account_id: 'account_id', body: 'body' },
@@ -49,7 +49,7 @@ describe('resource upload', () => {
 
   // TODO: investigate broken test
   test.skip('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.datasets.upload.edit(
+    const response = await client.zeroTrust.dlp.datasets.upload.edit(
       '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       0,
       { account_id: 'account_id', body: 'body' },
diff --git a/tests/api-resources/zero-trust/dlp/datasets/versions/entries.test.ts b/tests/api-resources/zero-trust/dlp/datasets/versions/entries.test.ts
new file mode 100755
index 0000000000..a572af0890
--- /dev/null
+++ b/tests/api-resources/zero-trust/dlp/datasets/versions/entries.test.ts
@@ -0,0 +1,39 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource entries', () => {
+  // TODO: investigate broken test
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.datasets.versions.entries.create(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      0,
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: 'account_id', body: 'body' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('create: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.datasets.versions.entries.create(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      0,
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: 'account_id', body: 'body' },
+    );
+  });
+});
diff --git a/tests/api-resources/zero-trust/dlp/datasets/versions/versions.test.ts b/tests/api-resources/zero-trust/dlp/datasets/versions/versions.test.ts
new file mode 100755
index 0000000000..5314fdfc9b
--- /dev/null
+++ b/tests/api-resources/zero-trust/dlp/datasets/versions/versions.test.ts
@@ -0,0 +1,42 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource versions', () => {
+  // TODO: investigate broken test
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.datasets.versions.create(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      0,
+      { account_id: 'account_id', body: [{ entry_id: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e' }] },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('create: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.datasets.versions.create(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      0,
+      {
+        account_id: 'account_id',
+        body: [
+          { entry_id: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', header_name: 'header_name', num_cells: 0 },
+        ],
+      },
+    );
+  });
+});
diff --git a/tests/api-resources/zero-trust/dlp/email/account-mapping.test.ts b/tests/api-resources/zero-trust/dlp/email/account-mapping.test.ts
new file mode 100644
index 0000000000..2161b09ba3
--- /dev/null
+++ b/tests/api-resources/zero-trust/dlp/email/account-mapping.test.ts
@@ -0,0 +1,52 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource accountMapping', () => {
+  // TODO: investigate broken test
+  test.skip('create: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.email.accountMapping.create({
+      account_id: 'account_id',
+      auth_requirements: { allowed_microsoft_organizations: ['string'], type: 'Org' },
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('create: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.email.accountMapping.create({
+      account_id: 'account_id',
+      auth_requirements: { allowed_microsoft_organizations: ['string'], type: 'Org' },
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.email.accountMapping.get({ account_id: 'account_id' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('get: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.email.accountMapping.get({ account_id: 'account_id' });
+  });
+});
diff --git a/tests/api-resources/zero-trust/dlp/email/rules.test.ts b/tests/api-resources/zero-trust/dlp/email/rules.test.ts
new file mode 100644
index 0000000000..e96d9588e4
--- /dev/null
+++ b/tests/api-resources/zero-trust/dlp/email/rules.test.ts
@@ -0,0 +1,142 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource rules', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.email.rules.create({
+      account_id: 'account_id',
+      action: { action: 'Block' },
+      conditions: [{ operator: 'InList', selector: 'Recipients', value: {} }],
+      enabled: true,
+      name: 'name',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.email.rules.create({
+      account_id: 'account_id',
+      action: { action: 'Block', message: 'message' },
+      conditions: [{ operator: 'InList', selector: 'Recipients', value: {} }],
+      enabled: true,
+      name: 'name',
+      description: 'description',
+    });
+  });
+
+  test('update: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.email.rules.update('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+      action: { action: 'Block' },
+      conditions: [{ operator: 'InList', selector: 'Recipients', value: {} }],
+      enabled: true,
+      name: 'name',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.email.rules.update('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+      action: { action: 'Block', message: 'message' },
+      conditions: [{ operator: 'InList', selector: 'Recipients', value: {} }],
+      enabled: true,
+      name: 'name',
+      description: 'description',
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.email.rules.list({ account_id: 'account_id' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.email.rules.list({ account_id: 'account_id' });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.email.rules.delete('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.email.rules.delete('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+  });
+
+  test('bulkEdit: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.email.rules.bulkEdit({
+      account_id: 'account_id',
+      new_priorities: { foo: 0 },
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('bulkEdit: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.email.rules.bulkEdit({
+      account_id: 'account_id',
+      new_priorities: { foo: 0 },
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.email.rules.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.email.rules.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/dlp/entries.test.ts b/tests/api-resources/zero-trust/dlp/entries.test.ts
new file mode 100644
index 0000000000..0758392e54
--- /dev/null
+++ b/tests/api-resources/zero-trust/dlp/entries.test.ts
@@ -0,0 +1,120 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource entries', () => {
+  test('create: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.entries.create({
+      account_id: 'account_id',
+      enabled: true,
+      name: 'name',
+      pattern: { regex: 'regex' },
+      profile_id: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('create: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.entries.create({
+      account_id: 'account_id',
+      enabled: true,
+      name: 'name',
+      pattern: { regex: 'regex', validation: 'luhn' },
+      profile_id: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+    });
+  });
+
+  // TODO: investigate broken test
+  test.skip('update: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.entries.update('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+      name: 'name',
+      pattern: { regex: 'regex' },
+      type: 'custom',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  // TODO: investigate broken test
+  test.skip('update: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.entries.update('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+      name: 'name',
+      pattern: { regex: 'regex', validation: 'luhn' },
+      type: 'custom',
+      enabled: true,
+    });
+  });
+
+  test('list: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.entries.list({ account_id: 'account_id' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.entries.list({ account_id: 'account_id' });
+  });
+
+  test('delete: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.entries.delete('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('delete: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.entries.delete('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.entries.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.entries.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/dlp/limits.test.ts b/tests/api-resources/zero-trust/dlp/limits.test.ts
new file mode 100755
index 0000000000..b75344ccf6
--- /dev/null
+++ b/tests/api-resources/zero-trust/dlp/limits.test.ts
@@ -0,0 +1,27 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource limits', () => {
+  test('list: only required params', async () => {
+    const responsePromise = client.zeroTrust.dlp.limits.list({ account_id: 'account_id' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('list: required and optional params', async () => {
+    const response = await client.zeroTrust.dlp.limits.list({ account_id: 'account_id' });
+  });
+});
diff --git a/tests/api-resources/zero-trust/dlp/patterns.test.ts b/tests/api-resources/zero-trust/dlp/patterns.test.ts
index 140eeadbad..1a4ce9f10a 100644
--- a/tests/api-resources/zero-trust/dlp/patterns.test.ts
+++ b/tests/api-resources/zero-trust/dlp/patterns.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource patterns', () => {
   test('validate: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.patterns.validate({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      regex: '^4[0-9]{6,}$',
+    const responsePromise = client.zeroTrust.dlp.patterns.validate({
+      account_id: 'account_id',
+      regex: 'regex',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,9 +25,10 @@ describe('resource patterns', () => {
   });
 
   test('validate: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.patterns.validate({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      regex: '^4[0-9]{6,}$',
+    const response = await client.zeroTrust.dlp.patterns.validate({
+      account_id: 'account_id',
+      regex: 'regex',
+      max_match_bytes: 0,
     });
   });
 });
diff --git a/tests/api-resources/zero-trust/dlp/payload-logs.test.ts b/tests/api-resources/zero-trust/dlp/payload-logs.test.ts
index 6dcc3218a4..cc8ad1d338 100644
--- a/tests/api-resources/zero-trust/dlp/payload-logs.test.ts
+++ b/tests/api-resources/zero-trust/dlp/payload-logs.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource payloadLogs', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.payloadLogs.update({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      public_key: 'EmpOvSXw8BfbrGCi0fhGiD/3yXk2SiV1Nzg2lru3oj0=',
-    });
+    const responsePromise = client.zeroTrust.dlp.payloadLogs.update({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -25,16 +22,14 @@ describe('resource payloadLogs', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.payloadLogs.update({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      public_key: 'EmpOvSXw8BfbrGCi0fhGiD/3yXk2SiV1Nzg2lru3oj0=',
+    const response = await client.zeroTrust.dlp.payloadLogs.update({
+      account_id: 'account_id',
+      public_key: 'public_key',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.payloadLogs.get({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.zeroTrust.dlp.payloadLogs.get({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -45,8 +40,6 @@ describe('resource payloadLogs', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.payloadLogs.get({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.zeroTrust.dlp.payloadLogs.get({ account_id: 'account_id' });
   });
 });
diff --git a/tests/api-resources/zero-trust/dlp/profiles/custom.test.ts b/tests/api-resources/zero-trust/dlp/profiles/custom.test.ts
index 6bdab375d5..8be8644876 100644
--- a/tests/api-resources/zero-trust/dlp/profiles/custom.test.ts
+++ b/tests/api-resources/zero-trust/dlp/profiles/custom.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource custom', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.profiles.custom.create({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      profiles: [{}, {}, {}],
+    const responsePromise = client.zeroTrust.dlp.profiles.custom.create({
+      account_id: 'account_id',
+      profiles: [{ entries: [{ enabled: true, name: 'name', pattern: { regex: 'regex' } }], name: 'name' }],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,89 +25,29 @@ describe('resource custom', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.profiles.custom.create({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.zeroTrust.dlp.profiles.custom.create({
+      account_id: 'account_id',
       profiles: [
         {
+          entries: [{ enabled: true, name: 'name', pattern: { regex: 'regex', validation: 'luhn' } }],
+          name: 'name',
           allowed_match_count: 5,
+          confidence_threshold: 'confidence_threshold',
           context_awareness: { enabled: true, skip: { files: true } },
-          description: 'A standard CVV card number',
-          entries: [
-            {
-              enabled: true,
-              name: 'Credit card (Visa)',
-              pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            },
-            {
-              enabled: true,
-              name: 'Credit card (Visa)',
-              pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            },
-            {
-              enabled: true,
-              name: 'Credit card (Visa)',
-              pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            },
-          ],
-          name: 'Generic CVV Card Number',
-          ocr_enabled: true,
-        },
-        {
-          allowed_match_count: 5,
-          context_awareness: { enabled: true, skip: { files: true } },
-          description: 'A standard CVV card number',
-          entries: [
-            {
-              enabled: true,
-              name: 'Credit card (Visa)',
-              pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            },
-            {
-              enabled: true,
-              name: 'Credit card (Visa)',
-              pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            },
-            {
-              enabled: true,
-              name: 'Credit card (Visa)',
-              pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            },
-          ],
-          name: 'Generic CVV Card Number',
+          description: 'description',
           ocr_enabled: true,
-        },
-        {
-          allowed_match_count: 5,
-          context_awareness: { enabled: true, skip: { files: true } },
-          description: 'A standard CVV card number',
-          entries: [
-            {
-              enabled: true,
-              name: 'Credit card (Visa)',
-              pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            },
-            {
-              enabled: true,
-              name: 'Credit card (Visa)',
-              pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            },
-            {
-              enabled: true,
-              name: 'Credit card (Visa)',
-              pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            },
+          shared_entries: [
+            { enabled: true, entry_id: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', entry_type: 'custom' },
           ],
-          name: 'Generic CVV Card Number',
-          ocr_enabled: true,
         },
       ],
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.profiles.custom.update(
-      '384e129d-25bd-403c-8019-bc19eb7a8a5f',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    const responsePromise = client.zeroTrust.dlp.profiles.custom.update(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: 'account_id', name: 'name' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -119,44 +59,35 @@ describe('resource custom', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.profiles.custom.update(
-      '384e129d-25bd-403c-8019-bc19eb7a8a5f',
+    const response = await client.zeroTrust.dlp.profiles.custom.update(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        allowed_match_count: 5,
+        account_id: 'account_id',
+        name: 'name',
+        allowed_match_count: 0,
+        confidence_threshold: 'confidence_threshold',
         context_awareness: { enabled: true, skip: { files: true } },
-        description: 'A standard CVV card number',
+        description: 'description',
         entries: [
           {
             enabled: true,
-            name: 'Credit card (Visa)',
-            pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            profile_id: {},
-          },
-          {
-            enabled: true,
-            name: 'Credit card (Visa)',
-            pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            profile_id: {},
-          },
-          {
-            enabled: true,
-            name: 'Credit card (Visa)',
-            pattern: { regex: '^4[0-9]{6,14}$', validation: 'luhn' },
-            profile_id: {},
+            entry_id: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+            name: 'name',
+            pattern: { regex: 'regex', validation: 'luhn' },
           },
         ],
-        name: 'Generic CVV Card Number',
         ocr_enabled: true,
-        shared_entries: [{ enabled: true }, { enabled: true }, { enabled: true }],
+        shared_entries: [
+          { enabled: true, entry_id: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', entry_type: 'predefined' },
+        ],
       },
     );
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.profiles.custom.delete(
-      '384e129d-25bd-403c-8019-bc19eb7a8a5f',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    const responsePromise = client.zeroTrust.dlp.profiles.custom.delete(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: 'account_id' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -168,17 +99,16 @@ describe('resource custom', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.profiles.custom.delete(
-      '384e129d-25bd-403c-8019-bc19eb7a8a5f',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    const response = await client.zeroTrust.dlp.profiles.custom.delete(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: 'account_id' },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.profiles.custom.get(
-      '384e129d-25bd-403c-8019-bc19eb7a8a5f',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const responsePromise = client.zeroTrust.dlp.profiles.custom.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -189,9 +119,8 @@ describe('resource custom', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.profiles.custom.get(
-      '384e129d-25bd-403c-8019-bc19eb7a8a5f',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
-    );
+    const response = await client.zeroTrust.dlp.profiles.custom.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
   });
 });
diff --git a/tests/api-resources/zero-trust/dlp/profiles/predefined.test.ts b/tests/api-resources/zero-trust/dlp/profiles/predefined.test.ts
index 6669866bac..d854d1c3cf 100644
--- a/tests/api-resources/zero-trust/dlp/profiles/predefined.test.ts
+++ b/tests/api-resources/zero-trust/dlp/profiles/predefined.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource predefined', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.profiles.predefined.update(
-      '384e129d-25bd-403c-8019-bc19eb7a8a5f',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    const responsePromise = client.zeroTrust.dlp.profiles.predefined.update(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: 'account_id', entries: [{ id: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', enabled: true }] },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,22 +25,23 @@ describe('resource predefined', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.profiles.predefined.update(
-      '384e129d-25bd-403c-8019-bc19eb7a8a5f',
+    const response = await client.zeroTrust.dlp.profiles.predefined.update(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       {
-        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-        allowed_match_count: 5,
+        account_id: 'account_id',
+        entries: [{ id: '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', enabled: true }],
+        allowed_match_count: 0,
+        confidence_threshold: 'confidence_threshold',
         context_awareness: { enabled: true, skip: { files: true } },
-        entries: [{ enabled: true }, { enabled: true }, { enabled: true }],
         ocr_enabled: true,
       },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.profiles.predefined.get(
-      '384e129d-25bd-403c-8019-bc19eb7a8a5f',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    const responsePromise = client.zeroTrust.dlp.profiles.predefined.get(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: 'account_id' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -52,9 +53,9 @@ describe('resource predefined', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.profiles.predefined.get(
-      '384e129d-25bd-403c-8019-bc19eb7a8a5f',
-      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
+    const response = await client.zeroTrust.dlp.profiles.predefined.get(
+      '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
+      { account_id: 'account_id' },
     );
   });
 });
diff --git a/tests/api-resources/zero-trust/dlp/profiles/profiles.test.ts b/tests/api-resources/zero-trust/dlp/profiles/profiles.test.ts
index 1f75a8f42d..f8111055f2 100644
--- a/tests/api-resources/zero-trust/dlp/profiles/profiles.test.ts
+++ b/tests/api-resources/zero-trust/dlp/profiles/profiles.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource profiles', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.profiles.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const responsePromise = client.zeroTrust.dlp.profiles.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,14 +22,12 @@ describe('resource profiles', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.profiles.list({
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
-    });
+    const response = await client.zeroTrust.dlp.profiles.list({ account_id: 'account_id', all: true });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.dlp.profiles.get('384e129d-25bd-403c-8019-bc19eb7a8a5f', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const responsePromise = client.zeroTrust.dlp.profiles.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -43,8 +39,8 @@ describe('resource profiles', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.dlp.profiles.get('384e129d-25bd-403c-8019-bc19eb7a8a5f', {
-      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    const response = await client.zeroTrust.dlp.profiles.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
     });
   });
 });
diff --git a/tests/api-resources/zero-trust/gateway/app-types.test.ts b/tests/api-resources/zero-trust/gateway/app-types.test.ts
index 9d70972360..573eb51f68 100644
--- a/tests/api-resources/zero-trust/gateway/app-types.test.ts
+++ b/tests/api-resources/zero-trust/gateway/app-types.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource appTypes', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.appTypes.list({
+    const responsePromise = client.zeroTrust.gateway.appTypes.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource appTypes', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.appTypes.list({
+    const response = await client.zeroTrust.gateway.appTypes.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/zero-trust/gateway/audit-ssh-settings.test.ts b/tests/api-resources/zero-trust/gateway/audit-ssh-settings.test.ts
index f7fc6c6126..b0c8db76a0 100644
--- a/tests/api-resources/zero-trust/gateway/audit-ssh-settings.test.ts
+++ b/tests/api-resources/zero-trust/gateway/audit-ssh-settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource auditSSHSettings', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.auditSSHSettings.update({
+    const responsePromise = client.zeroTrust.gateway.auditSSHSettings.update({
       account_id: '699d98642c564d2e855e9661899b7252',
       public_key: '1pyl6I1tL7xfJuFYVzXlUW8uXXlpxegHXBzGCBKaSFA=',
     });
@@ -25,15 +25,14 @@ describe('resource auditSSHSettings', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.auditSSHSettings.update({
+    const response = await client.zeroTrust.gateway.auditSSHSettings.update({
       account_id: '699d98642c564d2e855e9661899b7252',
       public_key: '1pyl6I1tL7xfJuFYVzXlUW8uXXlpxegHXBzGCBKaSFA=',
-      seed_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.auditSSHSettings.get({
+    const responsePromise = client.zeroTrust.gateway.auditSSHSettings.get({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -46,7 +45,26 @@ describe('resource auditSSHSettings', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.auditSSHSettings.get({
+    const response = await client.zeroTrust.gateway.auditSSHSettings.get({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+  });
+
+  test('rotateSeed: only required params', async () => {
+    const responsePromise = client.zeroTrust.gateway.auditSSHSettings.rotateSeed({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('rotateSeed: required and optional params', async () => {
+    const response = await client.zeroTrust.gateway.auditSSHSettings.rotateSeed({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/gateway/categories.test.ts b/tests/api-resources/zero-trust/gateway/categories.test.ts
index 716481706e..0163ff9de0 100644
--- a/tests/api-resources/zero-trust/gateway/categories.test.ts
+++ b/tests/api-resources/zero-trust/gateway/categories.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource categories', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.categories.list({
+    const responsePromise = client.zeroTrust.gateway.categories.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource categories', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.categories.list({
+    const response = await client.zeroTrust.gateway.categories.list({
       account_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/zero-trust/gateway/certificates.test.ts b/tests/api-resources/zero-trust/gateway/certificates.test.ts
index 4905debbe8..07e3af88ae 100644
--- a/tests/api-resources/zero-trust/gateway/certificates.test.ts
+++ b/tests/api-resources/zero-trust/gateway/certificates.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource certificates', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.certificates.create({
+    const responsePromise = client.zeroTrust.gateway.certificates.create({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,14 +24,14 @@ describe('resource certificates', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.certificates.create({
+    const response = await client.zeroTrust.gateway.certificates.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       validity_period_days: 1826,
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.certificates.list({
+    const responsePromise = client.zeroTrust.gateway.certificates.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -44,13 +44,13 @@ describe('resource certificates', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.certificates.list({
+    const response = await client.zeroTrust.gateway.certificates.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.certificates.delete(
+    const responsePromise = client.zeroTrust.gateway.certificates.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -64,16 +64,16 @@ describe('resource certificates', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.certificates.delete(
+    const response = await client.zeroTrust.gateway.certificates.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
   });
 
-  test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.certificates.get(
+  test('activate: only required params', async () => {
+    const responsePromise = client.zeroTrust.gateway.certificates.activate(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
+      { account_id: '699d98642c564d2e855e9661899b7252', body: {} },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -84,10 +84,51 @@ describe('resource certificates', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.certificates.get(
+  test('activate: required and optional params', async () => {
+    const response = await client.zeroTrust.gateway.certificates.activate(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252', body: {} },
+    );
+  });
+
+  test('deactivate: only required params', async () => {
+    const responsePromise = client.zeroTrust.gateway.certificates.deactivate(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252', body: {} },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('deactivate: required and optional params', async () => {
+    const response = await client.zeroTrust.gateway.certificates.deactivate(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252', body: {} },
+    );
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.gateway.certificates.get(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.gateway.certificates.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
   });
 });
diff --git a/tests/api-resources/zero-trust/gateway/configurations.test.ts b/tests/api-resources/zero-trust/gateway/configurations/configurations.test.ts
old mode 100644
new mode 100755
similarity index 88%
rename from tests/api-resources/zero-trust/gateway/configurations.test.ts
rename to tests/api-resources/zero-trust/gateway/configurations/configurations.test.ts
index 7b731bdf24..d08e9bd8b7
--- a/tests/api-resources/zero-trust/gateway/configurations.test.ts
+++ b/tests/api-resources/zero-trust/gateway/configurations/configurations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource configurations', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.configurations.update({
+    const responsePromise = client.zeroTrust.gateway.configurations.update({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource configurations', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.configurations.update({
+    const response = await client.zeroTrust.gateway.configurations.update({
       account_id: '699d98642c564d2e855e9661899b7252',
       settings: {
         activity_log: { enabled: true },
@@ -52,13 +52,14 @@ describe('resource configurations', () => {
         extended_email_matching: { enabled: true },
         fips: { tls: true },
         protocol_detection: { enabled: true },
+        sandbox: { enabled: true, fallback_action: 'allow' },
         tls_decrypt: { enabled: true },
       },
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.configurations.edit({
+    const responsePromise = client.zeroTrust.gateway.configurations.edit({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -71,7 +72,7 @@ describe('resource configurations', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.configurations.edit({
+    const response = await client.zeroTrust.gateway.configurations.edit({
       account_id: '699d98642c564d2e855e9661899b7252',
       settings: {
         activity_log: { enabled: true },
@@ -99,13 +100,14 @@ describe('resource configurations', () => {
         extended_email_matching: { enabled: true },
         fips: { tls: true },
         protocol_detection: { enabled: true },
+        sandbox: { enabled: true, fallback_action: 'allow' },
         tls_decrypt: { enabled: true },
       },
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.configurations.get({
+    const responsePromise = client.zeroTrust.gateway.configurations.get({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -118,7 +120,7 @@ describe('resource configurations', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.configurations.get({
+    const response = await client.zeroTrust.gateway.configurations.get({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/devices/policies/default-policy.test.ts b/tests/api-resources/zero-trust/gateway/configurations/custom-certificate.test.ts
old mode 100644
new mode 100755
similarity index 78%
rename from tests/api-resources/zero-trust/devices/policies/default-policy.test.ts
rename to tests/api-resources/zero-trust/gateway/configurations/custom-certificate.test.ts
index d7a8a5a685..bff2bad4b5
--- a/tests/api-resources/zero-trust/devices/policies/default-policy.test.ts
+++ b/tests/api-resources/zero-trust/gateway/configurations/custom-certificate.test.ts
@@ -3,15 +3,15 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource defaultPolicy', () => {
+describe('resource customCertificate', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.devices.policies.defaultPolicy.get({
+    const responsePromise = client.zeroTrust.gateway.configurations.customCertificate.get({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource defaultPolicy', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.devices.policies.defaultPolicy.get({
+    const response = await client.zeroTrust.gateway.configurations.customCertificate.get({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/gateway/gateway.test.ts b/tests/api-resources/zero-trust/gateway/gateway.test.ts
index e1e6f1f355..0dae90a80c 100644
--- a/tests/api-resources/zero-trust/gateway/gateway.test.ts
+++ b/tests/api-resources/zero-trust/gateway/gateway.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource gateway', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.create({
+    const responsePromise = client.zeroTrust.gateway.create({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,15 +24,13 @@ describe('resource gateway', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.create({
+    const response = await client.zeroTrust.gateway.create({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.list({
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const responsePromise = client.zeroTrust.gateway.list({ account_id: '699d98642c564d2e855e9661899b7252' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -43,8 +41,6 @@ describe('resource gateway', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.list({
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const response = await client.zeroTrust.gateway.list({ account_id: '699d98642c564d2e855e9661899b7252' });
   });
 });
diff --git a/tests/api-resources/zero-trust/gateway/lists/items.test.ts b/tests/api-resources/zero-trust/gateway/lists/items.test.ts
index 1d495bb196..cfff63c42f 100644
--- a/tests/api-resources/zero-trust/gateway/lists/items.test.ts
+++ b/tests/api-resources/zero-trust/gateway/lists/items.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource items', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.lists.items.list(
+    const responsePromise = client.zeroTrust.gateway.lists.items.list(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -25,9 +25,8 @@ describe('resource items', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.lists.items.list(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const response = await client.zeroTrust.gateway.lists.items.list('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
   });
 });
diff --git a/tests/api-resources/zero-trust/gateway/lists/lists.test.ts b/tests/api-resources/zero-trust/gateway/lists/lists.test.ts
index c3a438a635..12ef41ed64 100644
--- a/tests/api-resources/zero-trust/gateway/lists/lists.test.ts
+++ b/tests/api-resources/zero-trust/gateway/lists/lists.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource lists', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.lists.create({
+    const responsePromise = client.zeroTrust.gateway.lists.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'Admin Serial Numbers',
       type: 'SERIAL',
@@ -26,24 +26,20 @@ describe('resource lists', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.lists.create({
+    const response = await client.zeroTrust.gateway.lists.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'Admin Serial Numbers',
       type: 'SERIAL',
       description: 'The serial numbers for administrators',
-      items: [
-        { created_at: '2014-01-01T05:20:00.12345Z', description: 'Austin office IP', value: '8GE8721REF' },
-        { created_at: '2014-01-01T05:20:00.12345Z', description: 'Austin office IP', value: '8GE8721REF' },
-        { created_at: '2014-01-01T05:20:00.12345Z', description: 'Austin office IP', value: '8GE8721REF' },
-      ],
+      items: [{ description: 'Austin office IP', value: '8GE8721REF' }],
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.lists.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252', name: 'Admin Serial Numbers' },
-    );
+    const responsePromise = client.zeroTrust.gateway.lists.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      name: 'Admin Serial Numbers',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -54,15 +50,16 @@ describe('resource lists', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.lists.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.gateway.lists.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'Admin Serial Numbers',
       description: 'The serial numbers for administrators',
+      items: [{ description: 'Austin office IP', value: '8GE8721REF' }],
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.lists.list({
+    const responsePromise = client.zeroTrust.gateway.lists.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -75,17 +72,16 @@ describe('resource lists', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.lists.list({
+    const response = await client.zeroTrust.gateway.lists.list({
       account_id: '699d98642c564d2e855e9661899b7252',
       type: 'SERIAL',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.lists.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.gateway.lists.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -96,13 +92,13 @@ describe('resource lists', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.lists.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.gateway.lists.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.lists.edit('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.gateway.lists.edit('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -115,19 +111,15 @@ describe('resource lists', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.lists.edit('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.gateway.lists.edit('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
-      append: [
-        { created_at: '2014-01-01T05:20:00.12345Z', description: 'Austin office IP', value: '8GE8721REF' },
-        { created_at: '2014-01-01T05:20:00.12345Z', description: 'Austin office IP', value: '8GE8721REF' },
-        { created_at: '2014-01-01T05:20:00.12345Z', description: 'Austin office IP', value: '8GE8721REF' },
-      ],
-      remove: ['8GE8721REF', '8GE8721REF', '8GE8721REF'],
+      append: [{ description: 'Austin office IP', value: '8GE8721REF' }],
+      remove: ['8GE8721REF'],
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.lists.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.gateway.lists.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -140,7 +132,7 @@ describe('resource lists', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.lists.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.gateway.lists.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/gateway/locations.test.ts b/tests/api-resources/zero-trust/gateway/locations.test.ts
index f3d8c159d2..31cae0e471 100644
--- a/tests/api-resources/zero-trust/gateway/locations.test.ts
+++ b/tests/api-resources/zero-trust/gateway/locations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource locations', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.locations.create({
+    const responsePromise = client.zeroTrust.gateway.locations.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'Austin Office Location',
     });
@@ -25,21 +25,27 @@ describe('resource locations', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.locations.create({
+    const response = await client.zeroTrust.gateway.locations.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'Austin Office Location',
       client_default: false,
       dns_destination_ips_id: '0e4a32c6-6fb8-4858-9296-98f51631e8e6',
       ecs_support: false,
-      networks: [{ network: '192.0.2.1/32' }, { network: '192.0.2.1/32' }, { network: '192.0.2.1/32' }],
+      endpoints: {
+        doh: { enabled: true, networks: [{ network: '2001:85a3::/64' }], require_token: true },
+        dot: { enabled: true, networks: [{ network: '2001:85a3::/64' }] },
+        ipv4: { enabled: true },
+        ipv6: { enabled: true, networks: [{ network: '2001:85a3::/64' }] },
+      },
+      networks: [{ network: '192.0.2.1/32' }],
     });
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.locations.update(
-      'ed35569b41ce4d1facfe683550f54086',
-      { account_id: '699d98642c564d2e855e9661899b7252', name: 'Austin Office Location' },
-    );
+    const responsePromise = client.zeroTrust.gateway.locations.update('ed35569b41ce4d1facfe683550f54086', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      name: 'Austin Office Location',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -50,18 +56,24 @@ describe('resource locations', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.locations.update('ed35569b41ce4d1facfe683550f54086', {
+    const response = await client.zeroTrust.gateway.locations.update('ed35569b41ce4d1facfe683550f54086', {
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'Austin Office Location',
       client_default: false,
       dns_destination_ips_id: '0e4a32c6-6fb8-4858-9296-98f51631e8e6',
       ecs_support: false,
-      networks: [{ network: '192.0.2.1/32' }, { network: '192.0.2.1/32' }, { network: '192.0.2.1/32' }],
+      endpoints: {
+        doh: { enabled: true, networks: [{ network: '2001:85a3::/64' }], require_token: true },
+        dot: { enabled: true, networks: [{ network: '2001:85a3::/64' }] },
+        ipv4: { enabled: true },
+        ipv6: { enabled: true, networks: [{ network: '2001:85a3::/64' }] },
+      },
+      networks: [{ network: '192.0.2.1/32' }],
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.locations.list({
+    const responsePromise = client.zeroTrust.gateway.locations.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -74,16 +86,15 @@ describe('resource locations', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.locations.list({
+    const response = await client.zeroTrust.gateway.locations.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.locations.delete(
-      'ed35569b41ce4d1facfe683550f54086',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.gateway.locations.delete('ed35569b41ce4d1facfe683550f54086', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -94,13 +105,13 @@ describe('resource locations', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.locations.delete('ed35569b41ce4d1facfe683550f54086', {
+    const response = await client.zeroTrust.gateway.locations.delete('ed35569b41ce4d1facfe683550f54086', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.locations.get('ed35569b41ce4d1facfe683550f54086', {
+    const responsePromise = client.zeroTrust.gateway.locations.get('ed35569b41ce4d1facfe683550f54086', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -113,7 +124,7 @@ describe('resource locations', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.locations.get('ed35569b41ce4d1facfe683550f54086', {
+    const response = await client.zeroTrust.gateway.locations.get('ed35569b41ce4d1facfe683550f54086', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/gateway/logging.test.ts b/tests/api-resources/zero-trust/gateway/logging.test.ts
index 2a40a491f4..68106b5c53 100644
--- a/tests/api-resources/zero-trust/gateway/logging.test.ts
+++ b/tests/api-resources/zero-trust/gateway/logging.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource logging', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.logging.update({
+    const responsePromise = client.zeroTrust.gateway.logging.update({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource logging', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.logging.update({
+    const response = await client.zeroTrust.gateway.logging.update({
       account_id: '699d98642c564d2e855e9661899b7252',
       redact_pii: true,
       settings_by_rule_type: { dns: {}, http: {}, l4: {} },
@@ -32,7 +32,7 @@ describe('resource logging', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.logging.get({
+    const responsePromise = client.zeroTrust.gateway.logging.get({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,7 +45,7 @@ describe('resource logging', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.logging.get({
+    const response = await client.zeroTrust.gateway.logging.get({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/gateway/proxy-endpoints.test.ts b/tests/api-resources/zero-trust/gateway/proxy-endpoints.test.ts
index 826be220ad..1231e14f8f 100644
--- a/tests/api-resources/zero-trust/gateway/proxy-endpoints.test.ts
+++ b/tests/api-resources/zero-trust/gateway/proxy-endpoints.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource proxyEndpoints', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.proxyEndpoints.create({
+    const responsePromise = client.zeroTrust.gateway.proxyEndpoints.create({
       account_id: '699d98642c564d2e855e9661899b7252',
-      ips: ['192.0.2.1/32', '192.0.2.1/32', '192.0.2.1/32'],
+      ips: ['192.0.2.1/32'],
       name: 'Devops team',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -26,15 +26,15 @@ describe('resource proxyEndpoints', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.proxyEndpoints.create({
+    const response = await client.zeroTrust.gateway.proxyEndpoints.create({
       account_id: '699d98642c564d2e855e9661899b7252',
-      ips: ['192.0.2.1/32', '192.0.2.1/32', '192.0.2.1/32'],
+      ips: ['192.0.2.1/32'],
       name: 'Devops team',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.proxyEndpoints.list({
+    const responsePromise = client.zeroTrust.gateway.proxyEndpoints.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -47,13 +47,13 @@ describe('resource proxyEndpoints', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.proxyEndpoints.list({
+    const response = await client.zeroTrust.gateway.proxyEndpoints.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.proxyEndpoints.delete(
+    const responsePromise = client.zeroTrust.gateway.proxyEndpoints.delete(
       'ed35569b41ce4d1facfe683550f54086',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -67,17 +67,16 @@ describe('resource proxyEndpoints', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.proxyEndpoints.delete(
+    const response = await client.zeroTrust.gateway.proxyEndpoints.delete(
       'ed35569b41ce4d1facfe683550f54086',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.proxyEndpoints.edit(
-      'ed35569b41ce4d1facfe683550f54086',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.gateway.proxyEndpoints.edit('ed35569b41ce4d1facfe683550f54086', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -88,21 +87,17 @@ describe('resource proxyEndpoints', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.proxyEndpoints.edit(
-      'ed35569b41ce4d1facfe683550f54086',
-      {
-        account_id: '699d98642c564d2e855e9661899b7252',
-        ips: ['192.0.2.1/32', '192.0.2.1/32', '192.0.2.1/32'],
-        name: 'Devops team',
-      },
-    );
+    const response = await client.zeroTrust.gateway.proxyEndpoints.edit('ed35569b41ce4d1facfe683550f54086', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      ips: ['192.0.2.1/32'],
+      name: 'Devops team',
+    });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.proxyEndpoints.get(
-      'ed35569b41ce4d1facfe683550f54086',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.gateway.proxyEndpoints.get('ed35569b41ce4d1facfe683550f54086', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -113,9 +108,8 @@ describe('resource proxyEndpoints', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.proxyEndpoints.get(
-      'ed35569b41ce4d1facfe683550f54086',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const response = await client.zeroTrust.gateway.proxyEndpoints.get('ed35569b41ce4d1facfe683550f54086', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
   });
 });
diff --git a/tests/api-resources/zero-trust/gateway/rules.test.ts b/tests/api-resources/zero-trust/gateway/rules.test.ts
index 019d4406c0..8f0200cffc 100644
--- a/tests/api-resources/zero-trust/gateway/rules.test.ts
+++ b/tests/api-resources/zero-trust/gateway/rules.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource rules', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.rules.create({
+    const responsePromise = client.zeroTrust.gateway.rules.create({
       account_id: '699d98642c564d2e855e9661899b7252',
-      action: 'allow',
+      action: 'on',
       name: 'block bad websites',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -26,18 +26,19 @@ describe('resource rules', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.rules.create({
+    const response = await client.zeroTrust.gateway.rules.create({
       account_id: '699d98642c564d2e855e9661899b7252',
-      action: 'allow',
+      action: 'on',
       name: 'block bad websites',
       description: 'Block bad websites based on their host name.',
       device_posture: 'any(device_posture.checks.passed[*] in {"1308749e-fcfb-4ebc-b051-fe022b632644"})',
       enabled: true,
+      expiration: { expires_at: '2014-01-01T05:20:20Z', duration: 10, expired: false },
       filters: ['http'],
       identity: 'any(identity.groups.name[*] in {"finance"})',
       precedence: 0,
       rule_settings: {
-        add_headers: { 'My-Next-Header': ['foo', 'bar'], 'X-Custom-Header-Name': ['somecustomvalue'] },
+        add_headers: { foo: 'string' },
         allow_child_bypass: false,
         audit_ssh: { command_logging: false },
         biso_admin_controls: { dcp: false, dd: false, dk: false, dp: false, du: false },
@@ -53,18 +54,6 @@ describe('resource rules', () => {
               route_through_private_network: true,
               vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
             },
-            {
-              ip: '2.2.2.2',
-              port: 5053,
-              route_through_private_network: true,
-              vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-            },
-            {
-              ip: '2.2.2.2',
-              port: 5053,
-              route_through_private_network: true,
-              vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-            },
           ],
           ipv6: [
             {
@@ -73,18 +62,6 @@ describe('resource rules', () => {
               route_through_private_network: true,
               vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
             },
-            {
-              ip: '2001:DB8::',
-              port: 5053,
-              route_through_private_network: true,
-              vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-            },
-            {
-              ip: '2001:DB8::',
-              port: 5053,
-              route_through_private_network: true,
-              vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-            },
           ],
         },
         egress: { ipv4: '192.0.2.2', ipv4_fallback: '192.0.2.3', ipv6: '2001:DB8::/64' },
@@ -97,8 +74,10 @@ describe('resource rules', () => {
         override_host: 'example.com',
         override_ips: ['1.1.1.1', '2.2.2.2'],
         payload_log: { enabled: true },
+        quarantine: { file_types: ['exe'] },
+        resolve_dns_internally: { fallback: 'none', view_id: 'view_id' },
         resolve_dns_through_cloudflare: true,
-        untrusted_cert: { action: 'error' },
+        untrusted_cert: { action: 'pass_through' },
       },
       schedule: {
         fri: '08:00-12:30,13:30-17:00',
@@ -116,10 +95,11 @@ describe('resource rules', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.rules.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252', action: 'allow', name: 'block bad websites' },
-    );
+    const responsePromise = client.zeroTrust.gateway.rules.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+      action: 'on',
+      name: 'block bad websites',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -130,18 +110,19 @@ describe('resource rules', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.rules.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.gateway.rules.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
-      action: 'allow',
+      action: 'on',
       name: 'block bad websites',
       description: 'Block bad websites based on their host name.',
       device_posture: 'any(device_posture.checks.passed[*] in {"1308749e-fcfb-4ebc-b051-fe022b632644"})',
       enabled: true,
+      expiration: { expires_at: '2014-01-01T05:20:20Z', duration: 10, expired: false },
       filters: ['http'],
       identity: 'any(identity.groups.name[*] in {"finance"})',
       precedence: 0,
       rule_settings: {
-        add_headers: { 'My-Next-Header': ['foo', 'bar'], 'X-Custom-Header-Name': ['somecustomvalue'] },
+        add_headers: { foo: 'string' },
         allow_child_bypass: false,
         audit_ssh: { command_logging: false },
         biso_admin_controls: { dcp: false, dd: false, dk: false, dp: false, du: false },
@@ -157,18 +138,6 @@ describe('resource rules', () => {
               route_through_private_network: true,
               vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
             },
-            {
-              ip: '2.2.2.2',
-              port: 5053,
-              route_through_private_network: true,
-              vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-            },
-            {
-              ip: '2.2.2.2',
-              port: 5053,
-              route_through_private_network: true,
-              vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-            },
           ],
           ipv6: [
             {
@@ -177,18 +146,6 @@ describe('resource rules', () => {
               route_through_private_network: true,
               vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
             },
-            {
-              ip: '2001:DB8::',
-              port: 5053,
-              route_through_private_network: true,
-              vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-            },
-            {
-              ip: '2001:DB8::',
-              port: 5053,
-              route_through_private_network: true,
-              vnet_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-            },
           ],
         },
         egress: { ipv4: '192.0.2.2', ipv4_fallback: '192.0.2.3', ipv6: '2001:DB8::/64' },
@@ -201,8 +158,10 @@ describe('resource rules', () => {
         override_host: 'example.com',
         override_ips: ['1.1.1.1', '2.2.2.2'],
         payload_log: { enabled: true },
+        quarantine: { file_types: ['exe'] },
+        resolve_dns_internally: { fallback: 'none', view_id: 'view_id' },
         resolve_dns_through_cloudflare: true,
-        untrusted_cert: { action: 'error' },
+        untrusted_cert: { action: 'pass_through' },
       },
       schedule: {
         fri: '08:00-12:30,13:30-17:00',
@@ -220,7 +179,7 @@ describe('resource rules', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.rules.list({
+    const responsePromise = client.zeroTrust.gateway.rules.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -233,16 +192,15 @@ describe('resource rules', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.rules.list({
+    const response = await client.zeroTrust.gateway.rules.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.rules.delete(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.gateway.rules.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -253,13 +211,13 @@ describe('resource rules', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.rules.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.gateway.rules.delete('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.gateway.rules.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.gateway.rules.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -272,8 +230,29 @@ describe('resource rules', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.gateway.rules.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.gateway.rules.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
+
+  test('resetExpiration: only required params', async () => {
+    const responsePromise = client.zeroTrust.gateway.rules.resetExpiration(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('resetExpiration: required and optional params', async () => {
+    const response = await client.zeroTrust.gateway.rules.resetExpiration(
+      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
+  });
 });
diff --git a/tests/api-resources/zero-trust/identity-providers.test.ts b/tests/api-resources/zero-trust/identity-providers.test.ts
index b5225335be..9d0aee3fe6 100644
--- a/tests/api-resources/zero-trust/identity-providers.test.ts
+++ b/tests/api-resources/zero-trust/identity-providers.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource identityProviders', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.identityProviders.create({
+    const responsePromise = client.zeroTrust.identityProviders.create({
       config: {},
       name: 'Widget Corps IDP',
       type: 'onetimepin',
@@ -29,26 +29,24 @@ describe('resource identityProviders', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.identityProviders.create({
+    const response = await client.zeroTrust.identityProviders.create({
       config: {
+        claims: ['email_verified', 'preferred_username', 'custom_claim_name'],
         client_id: '<your client id>',
         client_secret: '<your client secret>',
-        claims: ['email_verified', 'preferred_username', 'custom_claim_name'],
-        email_claim_name: 'custom_claim_name',
         conditional_access_enabled: true,
         directory_id: '<your azure directory uuid>',
+        email_claim_name: 'custom_claim_name',
         prompt: 'login',
         support_groups: true,
       },
       name: 'Widget Corps IDP',
       type: 'onetimepin',
       account_id: 'account_id',
-      id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       scim_config: {
         enabled: true,
-        group_member_deprovision: true,
+        identity_update_behavior: 'automatic',
         seat_deprovision: true,
-        secret: 'secret',
         user_deprovision: true,
       },
     });
@@ -56,7 +54,7 @@ describe('resource identityProviders', () => {
 
   // TODO: investigate broken test
   test.skip('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.identityProviders.update(
+    const responsePromise = client.zeroTrust.identityProviders.update(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { config: {}, name: 'Widget Corps IDP', type: 'onetimepin', account_id: 'account_id' },
     );
@@ -71,37 +69,32 @@ describe('resource identityProviders', () => {
 
   // TODO: investigate broken test
   test.skip('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.identityProviders.update(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      {
-        config: {
-          client_id: '<your client id>',
-          client_secret: '<your client secret>',
-          claims: ['email_verified', 'preferred_username', 'custom_claim_name'],
-          email_claim_name: 'custom_claim_name',
-          conditional_access_enabled: true,
-          directory_id: '<your azure directory uuid>',
-          prompt: 'login',
-          support_groups: true,
-        },
-        name: 'Widget Corps IDP',
-        type: 'onetimepin',
-        account_id: 'account_id',
-        id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-        scim_config: {
-          enabled: true,
-          group_member_deprovision: true,
-          seat_deprovision: true,
-          secret: 'secret',
-          user_deprovision: true,
-        },
+    const response = await client.zeroTrust.identityProviders.update('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      config: {
+        claims: ['email_verified', 'preferred_username', 'custom_claim_name'],
+        client_id: '<your client id>',
+        client_secret: '<your client secret>',
+        conditional_access_enabled: true,
+        directory_id: '<your azure directory uuid>',
+        email_claim_name: 'custom_claim_name',
+        prompt: 'login',
+        support_groups: true,
       },
-    );
+      name: 'Widget Corps IDP',
+      type: 'onetimepin',
+      account_id: 'account_id',
+      scim_config: {
+        enabled: true,
+        identity_update_behavior: 'automatic',
+        seat_deprovision: true,
+        user_deprovision: true,
+      },
+    });
   });
 
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.zeroTrust.identityProviders.list({ account_id: 'account_id' });
+    const responsePromise = client.zeroTrust.identityProviders.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -113,7 +106,7 @@ describe('resource identityProviders', () => {
 
   // TODO: investigate broken test
   test.skip('delete', async () => {
-    const responsePromise = cloudflare.zeroTrust.identityProviders.delete(
+    const responsePromise = client.zeroTrust.identityProviders.delete(
       'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
       { account_id: 'account_id' },
     );
@@ -128,10 +121,9 @@ describe('resource identityProviders', () => {
 
   // TODO: investigate broken test
   test.skip('get', async () => {
-    const responsePromise = cloudflare.zeroTrust.identityProviders.get(
-      'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
-      { account_id: 'account_id' },
-    );
+    const responsePromise = client.zeroTrust.identityProviders.get('f174e90a-fafe-4643-bbbc-4a0ed4fc8415', {
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
diff --git a/tests/api-resources/zero-trust/networks/routes/ips.test.ts b/tests/api-resources/zero-trust/networks/routes/ips.test.ts
index 9c42c6b5ea..13f77333bc 100644
--- a/tests/api-resources/zero-trust/networks/routes/ips.test.ts
+++ b/tests/api-resources/zero-trust/networks/routes/ips.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource ips', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.routes.ips.get('10.1.0.137', {
+    const responsePromise = client.zeroTrust.networks.routes.ips.get('10.1.0.137', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource ips', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.routes.ips.get('10.1.0.137', {
+    const response = await client.zeroTrust.networks.routes.ips.get('10.1.0.137', {
       account_id: '699d98642c564d2e855e9661899b7252',
       virtual_network_id: 'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
     });
diff --git a/tests/api-resources/zero-trust/networks/routes/networks.test.ts b/tests/api-resources/zero-trust/networks/routes/networks.test.ts
index 02e8e385c5..e30d312ec2 100644
--- a/tests/api-resources/zero-trust/networks/routes/networks.test.ts
+++ b/tests/api-resources/zero-trust/networks/routes/networks.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource networks', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.routes.networks.create('172.16.0.0%2F16', {
+    const responsePromise = client.zeroTrust.networks.routes.networks.create('172.16.0.0%2F16', {
       account_id: '699d98642c564d2e855e9661899b7252',
       tunnel_id: 'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
     });
@@ -25,7 +25,7 @@ describe('resource networks', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.routes.networks.create('172.16.0.0%2F16', {
+    const response = await client.zeroTrust.networks.routes.networks.create('172.16.0.0%2F16', {
       account_id: '699d98642c564d2e855e9661899b7252',
       tunnel_id: 'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       comment: 'Example comment for this route.',
@@ -34,7 +34,7 @@ describe('resource networks', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.routes.networks.delete('172.16.0.0%2F16', {
+    const responsePromise = client.zeroTrust.networks.routes.networks.delete('172.16.0.0%2F16', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -47,7 +47,7 @@ describe('resource networks', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.routes.networks.delete('172.16.0.0%2F16', {
+    const response = await client.zeroTrust.networks.routes.networks.delete('172.16.0.0%2F16', {
       account_id: '699d98642c564d2e855e9661899b7252',
       tun_type: 'cfd_tunnel',
       tunnel_id: 'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
@@ -56,7 +56,7 @@ describe('resource networks', () => {
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.routes.networks.edit('172.16.0.0%2F16', {
+    const responsePromise = client.zeroTrust.networks.routes.networks.edit('172.16.0.0%2F16', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -69,7 +69,7 @@ describe('resource networks', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.routes.networks.edit('172.16.0.0%2F16', {
+    const response = await client.zeroTrust.networks.routes.networks.edit('172.16.0.0%2F16', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/networks/routes/routes.test.ts b/tests/api-resources/zero-trust/networks/routes/routes.test.ts
index bb8d1d5e12..33838480f9 100644
--- a/tests/api-resources/zero-trust/networks/routes/routes.test.ts
+++ b/tests/api-resources/zero-trust/networks/routes/routes.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource routes', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.routes.create({
+    const responsePromise = client.zeroTrust.networks.routes.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       network: '172.16.0.0/16',
       tunnel_id: 'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
@@ -26,7 +26,7 @@ describe('resource routes', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.routes.create({
+    const response = await client.zeroTrust.networks.routes.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       network: '172.16.0.0/16',
       tunnel_id: 'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
@@ -36,7 +36,7 @@ describe('resource routes', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.routes.list({
+    const responsePromise = client.zeroTrust.networks.routes.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -49,7 +49,7 @@ describe('resource routes', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.routes.list({
+    const response = await client.zeroTrust.networks.routes.list({
       account_id: '699d98642c564d2e855e9661899b7252',
       comment: 'Example comment for this route.',
       existed_at: '2019-10-12T07:20:50.52Z',
@@ -66,10 +66,9 @@ describe('resource routes', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.routes.delete(
-      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.networks.routes.delete('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -80,17 +79,15 @@ describe('resource routes', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.routes.delete(
-      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const response = await client.zeroTrust.networks.routes.delete('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.routes.edit(
-      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.networks.routes.edit('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -101,7 +98,7 @@ describe('resource routes', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.routes.edit('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.networks.routes.edit('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
       comment: 'Example comment for this route.',
       network: '172.16.0.0/16',
@@ -109,4 +106,23 @@ describe('resource routes', () => {
       virtual_network_id: 'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
     });
   });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.networks.routes.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.networks.routes.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
+  });
 });
diff --git a/tests/api-resources/zero-trust/networks/virtual-networks.test.ts b/tests/api-resources/zero-trust/networks/virtual-networks.test.ts
index 5f10a0c2f8..288b29b30c 100644
--- a/tests/api-resources/zero-trust/networks/virtual-networks.test.ts
+++ b/tests/api-resources/zero-trust/networks/virtual-networks.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource virtualNetworks', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.virtualNetworks.create({
+    const responsePromise = client.zeroTrust.networks.virtualNetworks.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'us-east-1-vpc',
     });
@@ -25,7 +25,7 @@ describe('resource virtualNetworks', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.virtualNetworks.create({
+    const response = await client.zeroTrust.networks.virtualNetworks.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'us-east-1-vpc',
       comment: 'Staging VPC for data science',
@@ -34,7 +34,7 @@ describe('resource virtualNetworks', () => {
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.virtualNetworks.list({
+    const responsePromise = client.zeroTrust.networks.virtualNetworks.list({
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -47,7 +47,7 @@ describe('resource virtualNetworks', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.virtualNetworks.list({
+    const response = await client.zeroTrust.networks.virtualNetworks.list({
       account_id: '699d98642c564d2e855e9661899b7252',
       id: 'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       is_default: true,
@@ -57,7 +57,7 @@ describe('resource virtualNetworks', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.virtualNetworks.delete(
+    const responsePromise = client.zeroTrust.networks.virtualNetworks.delete(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -71,14 +71,14 @@ describe('resource virtualNetworks', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.virtualNetworks.delete(
+    const response = await client.zeroTrust.networks.virtualNetworks.delete(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.networks.virtualNetworks.edit(
+    const responsePromise = client.zeroTrust.networks.virtualNetworks.edit(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -92,7 +92,7 @@ describe('resource virtualNetworks', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.networks.virtualNetworks.edit(
+    const response = await client.zeroTrust.networks.virtualNetworks.edit(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       {
         account_id: '699d98642c564d2e855e9661899b7252',
@@ -102,4 +102,25 @@ describe('resource virtualNetworks', () => {
       },
     );
   });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.networks.virtualNetworks.get(
+      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.networks.virtualNetworks.get(
+      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
+  });
 });
diff --git a/tests/api-resources/zero-trust/organizations/doh.test.ts b/tests/api-resources/zero-trust/organizations/doh.test.ts
new file mode 100644
index 0000000000..50ce94d9ac
--- /dev/null
+++ b/tests/api-resources/zero-trust/organizations/doh.test.ts
@@ -0,0 +1,52 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource doh', () => {
+  test('update: only required params', async () => {
+    const responsePromise = client.zeroTrust.organizations.doh.update({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('update: required and optional params', async () => {
+    const response = await client.zeroTrust.organizations.doh.update({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      doh_jwt_duration: '800h',
+      service_token_id: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415',
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.organizations.doh.get({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.organizations.doh.get({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+    });
+  });
+});
diff --git a/tests/api-resources/zero-trust/organizations.test.ts b/tests/api-resources/zero-trust/organizations/organizations.test.ts
similarity index 83%
rename from tests/api-resources/zero-trust/organizations.test.ts
rename to tests/api-resources/zero-trust/organizations/organizations.test.ts
index 08f101f189..b8abfc2a9e 100644
--- a/tests/api-resources/zero-trust/organizations.test.ts
+++ b/tests/api-resources/zero-trust/organizations/organizations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,7 +12,7 @@ const cloudflare = new Cloudflare({
 describe('resource organizations', () => {
   // TODO: investigate broken test
   test.skip('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.organizations.create({
+    const responsePromise = client.zeroTrust.organizations.create({
       auth_domain: 'test.cloudflareaccess.com',
       name: 'Widget Corps Internal Applications',
       account_id: 'account_id',
@@ -28,7 +28,7 @@ describe('resource organizations', () => {
 
   // TODO: investigate broken test
   test.skip('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.organizations.create({
+    const response = await client.zeroTrust.organizations.create({
       auth_domain: 'test.cloudflareaccess.com',
       name: 'Widget Corps Internal Applications',
       account_id: 'account_id',
@@ -44,14 +44,14 @@ describe('resource organizations', () => {
       },
       session_duration: '24h',
       ui_read_only_toggle_reason: 'Temporarily turn off the UI read only lock to make a change via the UI',
-      user_seat_expiration_inactive_time: '720h',
+      user_seat_expiration_inactive_time: '730h',
       warp_auth_session_duration: '24h',
     });
   });
 
   // TODO: investigate broken test
   test.skip('update', async () => {
-    const responsePromise = cloudflare.zeroTrust.organizations.update({ account_id: 'account_id' });
+    const responsePromise = client.zeroTrust.organizations.update({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -63,7 +63,7 @@ describe('resource organizations', () => {
 
   // TODO: investigate broken test
   test.skip('list', async () => {
-    const responsePromise = cloudflare.zeroTrust.organizations.list({ account_id: 'account_id' });
+    const responsePromise = client.zeroTrust.organizations.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -75,7 +75,7 @@ describe('resource organizations', () => {
 
   // TODO: investigate broken test
   test.skip('revokeUsers: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.organizations.revokeUsers({
+    const responsePromise = client.zeroTrust.organizations.revokeUsers({
       email: 'test@example.com',
       account_id: 'account_id',
     });
@@ -90,9 +90,13 @@ describe('resource organizations', () => {
 
   // TODO: investigate broken test
   test.skip('revokeUsers: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.organizations.revokeUsers({
+    const response = await client.zeroTrust.organizations.revokeUsers({
       email: 'test@example.com',
       account_id: 'account_id',
+      query_devices: true,
+      body_devices: true,
+      user_uid: '699d98642c564d2e855e9661899b7252',
+      warp_session_reauth: true,
     });
   });
 });
diff --git a/tests/api-resources/zero-trust/risk-scoring/behaviours.test.ts b/tests/api-resources/zero-trust/risk-scoring/behaviours.test.ts
index e3f9c00f08..289ecda534 100644
--- a/tests/api-resources/zero-trust/risk-scoring/behaviours.test.ts
+++ b/tests/api-resources/zero-trust/risk-scoring/behaviours.test.ts
@@ -3,18 +3,18 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource behaviours', () => {
-  test('update', async () => {
-    const responsePromise = cloudflare.zeroTrust.riskScoring.behaviours.update(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      {},
-    );
+  test('update: only required params', async () => {
+    const responsePromise = client.zeroTrust.riskScoring.behaviours.update({
+      account_id: 'account_id',
+      behaviors: { foo: { enabled: true, risk_level: 'low' } },
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,10 +24,15 @@ describe('resource behaviours', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get', async () => {
-    const responsePromise = cloudflare.zeroTrust.riskScoring.behaviours.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-    );
+  test('update: required and optional params', async () => {
+    const response = await client.zeroTrust.riskScoring.behaviours.update({
+      account_id: 'account_id',
+      behaviors: { foo: { enabled: true, risk_level: 'low' } },
+    });
+  });
+
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.riskScoring.behaviours.get({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -37,12 +42,7 @@ describe('resource behaviours', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.zeroTrust.riskScoring.behaviours.get('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.riskScoring.behaviours.get({ account_id: 'account_id' });
   });
 });
diff --git a/tests/api-resources/zero-trust/risk-scoring/integrations/integrations.test.ts b/tests/api-resources/zero-trust/risk-scoring/integrations/integrations.test.ts
index 49f4311a1b..a14a613ca3 100644
--- a/tests/api-resources/zero-trust/risk-scoring/integrations/integrations.test.ts
+++ b/tests/api-resources/zero-trust/risk-scoring/integrations/integrations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource integrations', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.riskScoring.integrations.create({
+    const responsePromise = client.zeroTrust.riskScoring.integrations.create({
       account_id: 'account_id',
       integration_type: 'Okta',
       tenant_url: 'https://example.com',
@@ -26,7 +26,7 @@ describe('resource integrations', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.riskScoring.integrations.create({
+    const response = await client.zeroTrust.riskScoring.integrations.create({
       account_id: 'account_id',
       integration_type: 'Okta',
       tenant_url: 'https://example.com',
@@ -35,7 +35,7 @@ describe('resource integrations', () => {
   });
 
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.riskScoring.integrations.update(
+    const responsePromise = client.zeroTrust.riskScoring.integrations.update(
       '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       { account_id: 'account_id', active: true, tenant_url: 'https://example.com' },
     );
@@ -49,7 +49,7 @@ describe('resource integrations', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.riskScoring.integrations.update(
+    const response = await client.zeroTrust.riskScoring.integrations.update(
       '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       {
         account_id: 'account_id',
@@ -62,7 +62,7 @@ describe('resource integrations', () => {
 
   // bug in prism where it confuses this method with /zt_risk_scoring/{user_id}
   test.skip('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.riskScoring.integrations.list({ account_id: 'account_id' });
+    const responsePromise = client.zeroTrust.riskScoring.integrations.list({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -74,11 +74,11 @@ describe('resource integrations', () => {
 
   // bug in prism where it confuses this method with /zt_risk_scoring/{user_id}
   test.skip('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.riskScoring.integrations.list({ account_id: 'account_id' });
+    const response = await client.zeroTrust.riskScoring.integrations.list({ account_id: 'account_id' });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.riskScoring.integrations.delete(
+    const responsePromise = client.zeroTrust.riskScoring.integrations.delete(
       '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       { account_id: 'account_id' },
     );
@@ -92,14 +92,14 @@ describe('resource integrations', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.riskScoring.integrations.delete(
+    const response = await client.zeroTrust.riskScoring.integrations.delete(
       '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       { account_id: 'account_id' },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.riskScoring.integrations.get(
+    const responsePromise = client.zeroTrust.riskScoring.integrations.get(
       '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       { account_id: 'account_id' },
     );
@@ -113,7 +113,7 @@ describe('resource integrations', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.riskScoring.integrations.get(
+    const response = await client.zeroTrust.riskScoring.integrations.get(
       '182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e',
       { account_id: 'account_id' },
     );
diff --git a/tests/api-resources/zero-trust/risk-scoring/integrations/references.test.ts b/tests/api-resources/zero-trust/risk-scoring/integrations/references.test.ts
index 26bf6e8df8..35a372572f 100644
--- a/tests/api-resources/zero-trust/risk-scoring/integrations/references.test.ts
+++ b/tests/api-resources/zero-trust/risk-scoring/integrations/references.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource references', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.riskScoring.integrations.references.get('reference_id', {
+    const responsePromise = client.zeroTrust.riskScoring.integrations.references.get('reference_id', {
       account_id: 'account_id',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource references', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.riskScoring.integrations.references.get('reference_id', {
+    const response = await client.zeroTrust.riskScoring.integrations.references.get('reference_id', {
       account_id: 'account_id',
     });
   });
diff --git a/tests/api-resources/zero-trust/risk-scoring/risk-scoring.test.ts b/tests/api-resources/zero-trust/risk-scoring/risk-scoring.test.ts
index a0b5495a8a..ebfed22840 100644
--- a/tests/api-resources/zero-trust/risk-scoring/risk-scoring.test.ts
+++ b/tests/api-resources/zero-trust/risk-scoring/risk-scoring.test.ts
@@ -3,18 +3,17 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource riskScoring', () => {
-  test('get', async () => {
-    const responsePromise = cloudflare.zeroTrust.riskScoring.get(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'f2108713-1206-4e84-8b80-0e71a6a1c67b',
-    );
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.riskScoring.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -24,34 +23,16 @@ describe('resource riskScoring', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.zeroTrust.riskScoring.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        'f2108713-1206-4e84-8b80-0e71a6a1c67b',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.riskScoring.get('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
   });
 
-  test('get: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.zeroTrust.riskScoring.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        'f2108713-1206-4e84-8b80-0e71a6a1c67b',
-        { direction: 'desc', order_by: 'timestamp', page: 0, per_page: 0 },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('reset', async () => {
-    const responsePromise = cloudflare.zeroTrust.riskScoring.reset(
-      '023e105f4ecef8ad9ca31a8372d0c353',
-      'f2108713-1206-4e84-8b80-0e71a6a1c67b',
-    );
+  test('reset: only required params', async () => {
+    const responsePromise = client.zeroTrust.riskScoring.reset('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -61,14 +42,9 @@ describe('resource riskScoring', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('reset: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.zeroTrust.riskScoring.reset(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        'f2108713-1206-4e84-8b80-0e71a6a1c67b',
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('reset: required and optional params', async () => {
+    const response = await client.zeroTrust.riskScoring.reset('182bd5e5-6e1a-4fe4-a799-aa6d9a6ab26e', {
+      account_id: 'account_id',
+    });
   });
 });
diff --git a/tests/api-resources/zero-trust/risk-scoring/summary.test.ts b/tests/api-resources/zero-trust/risk-scoring/summary.test.ts
index a38d0451b3..ba4f0908fb 100644
--- a/tests/api-resources/zero-trust/risk-scoring/summary.test.ts
+++ b/tests/api-resources/zero-trust/risk-scoring/summary.test.ts
@@ -3,15 +3,15 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
 describe('resource summary', () => {
-  test('get', async () => {
-    const responsePromise = cloudflare.zeroTrust.riskScoring.summary.get('023e105f4ecef8ad9ca31a8372d0c353');
+  test('get: only required params', async () => {
+    const responsePromise = client.zeroTrust.riskScoring.summary.get({ account_id: 'account_id' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,23 +21,7 @@ describe('resource summary', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('get: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.zeroTrust.riskScoring.summary.get('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
-  test('get: request options and params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.zeroTrust.riskScoring.summary.get(
-        '023e105f4ecef8ad9ca31a8372d0c353',
-        { direction: 'desc', order_by: 'timestamp', page: 0, per_page: 0 },
-        { path: '/_stainless_unknown_path' },
-      ),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
+  test('get: required and optional params', async () => {
+    const response = await client.zeroTrust.riskScoring.summary.get({ account_id: 'account_id' });
   });
 });
diff --git a/tests/api-resources/zero-trust/seats.test.ts b/tests/api-resources/zero-trust/seats.test.ts
index a958341aa9..a659dfc2a2 100644
--- a/tests/api-resources/zero-trust/seats.test.ts
+++ b/tests/api-resources/zero-trust/seats.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -12,13 +12,9 @@ const cloudflare = new Cloudflare({
 describe('resource seats', () => {
   // TODO: investigate broken test
   test.skip('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.seats.edit({
-      account_id: '699d98642c564d2e855e9661899b7252',
-      body: [
-        { access_seat: false, gateway_seat: false, seat_uid: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415' },
-        { access_seat: false, gateway_seat: false, seat_uid: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415' },
-        { access_seat: false, gateway_seat: false, seat_uid: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415' },
-      ],
+    const responsePromise = client.zeroTrust.seats.edit({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: [{ access_seat: false, gateway_seat: false, seat_uid: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415' }],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -31,13 +27,9 @@ describe('resource seats', () => {
 
   // TODO: investigate broken test
   test.skip('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.seats.edit({
-      account_id: '699d98642c564d2e855e9661899b7252',
-      body: [
-        { access_seat: false, gateway_seat: false, seat_uid: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415' },
-        { access_seat: false, gateway_seat: false, seat_uid: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415' },
-        { access_seat: false, gateway_seat: false, seat_uid: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415' },
-      ],
+    const response = await client.zeroTrust.seats.edit({
+      account_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      body: [{ access_seat: false, gateway_seat: false, seat_uid: 'f174e90a-fafe-4643-bbbc-4a0ed4fc8415' }],
     });
   });
 });
diff --git a/tests/api-resources/zero-trust/tunnels/configurations.test.ts b/tests/api-resources/zero-trust/tunnels/configurations.test.ts
index 2caaa4e3b5..d9a5fc9398 100644
--- a/tests/api-resources/zero-trust/tunnels/configurations.test.ts
+++ b/tests/api-resources/zero-trust/tunnels/configurations.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,9 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource configurations', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.configurations.update(
+    const responsePromise = client.zeroTrust.tunnels.configurations.update(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -25,58 +25,17 @@ describe('resource configurations', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.configurations.update(
+    const response = await client.zeroTrust.tunnels.configurations.update(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       {
-        account_id: '699d98642c564d2e855e9661899b7252',
+        account_id: '023e105f4ecef8ad9ca31a8372d0c353',
         config: {
           ingress: [
             {
               hostname: 'tunnel.example.com',
-              originRequest: {
-                access: { audTag: ['string', 'string', 'string'], required: true, teamName: 'teamName' },
-                caPool: 'caPool',
-                connectTimeout: 0,
-                disableChunkedEncoding: true,
-                http2Origin: true,
-                httpHostHeader: 'httpHostHeader',
-                keepAliveConnections: 0,
-                keepAliveTimeout: 0,
-                noHappyEyeballs: true,
-                noTLSVerify: true,
-                originServerName: 'originServerName',
-                proxyType: 'proxyType',
-                tcpKeepAlive: 0,
-                tlsTimeout: 0,
-              },
-              path: 'subpath',
-              service: 'https://localhost:8001',
-            },
-            {
-              hostname: 'tunnel.example.com',
-              originRequest: {
-                access: { audTag: ['string', 'string', 'string'], required: true, teamName: 'teamName' },
-                caPool: 'caPool',
-                connectTimeout: 0,
-                disableChunkedEncoding: true,
-                http2Origin: true,
-                httpHostHeader: 'httpHostHeader',
-                keepAliveConnections: 0,
-                keepAliveTimeout: 0,
-                noHappyEyeballs: true,
-                noTLSVerify: true,
-                originServerName: 'originServerName',
-                proxyType: 'proxyType',
-                tcpKeepAlive: 0,
-                tlsTimeout: 0,
-              },
-              path: 'subpath',
               service: 'https://localhost:8001',
-            },
-            {
-              hostname: 'tunnel.example.com',
               originRequest: {
-                access: { audTag: ['string', 'string', 'string'], required: true, teamName: 'teamName' },
+                access: { audTag: ['string'], teamName: 'teamName', required: true },
                 caPool: 'caPool',
                 connectTimeout: 0,
                 disableChunkedEncoding: true,
@@ -92,11 +51,10 @@ describe('resource configurations', () => {
                 tlsTimeout: 0,
               },
               path: 'subpath',
-              service: 'https://localhost:8001',
             },
           ],
           originRequest: {
-            access: { audTag: ['string', 'string', 'string'], required: true, teamName: 'teamName' },
+            access: { audTag: ['string'], teamName: 'teamName', required: true },
             caPool: 'caPool',
             connectTimeout: 0,
             disableChunkedEncoding: true,
@@ -111,16 +69,15 @@ describe('resource configurations', () => {
             tcpKeepAlive: 0,
             tlsTimeout: 0,
           },
-          'warp-routing': { enabled: true },
         },
       },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.configurations.get(
+    const responsePromise = client.zeroTrust.tunnels.configurations.get(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -132,9 +89,9 @@ describe('resource configurations', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.configurations.get(
+    const response = await client.zeroTrust.tunnels.configurations.get(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
+      { account_id: '023e105f4ecef8ad9ca31a8372d0c353' },
     );
   });
 });
diff --git a/tests/api-resources/zero-trust/tunnels/connections.test.ts b/tests/api-resources/zero-trust/tunnels/connections.test.ts
index 47b4348231..ac146c1182 100644
--- a/tests/api-resources/zero-trust/tunnels/connections.test.ts
+++ b/tests/api-resources/zero-trust/tunnels/connections.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource connections', () => {
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.connections.delete(
+    const responsePromise = client.zeroTrust.tunnels.connections.delete(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252' },
     );
@@ -25,17 +25,16 @@ describe('resource connections', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.connections.delete(
+    const response = await client.zeroTrust.tunnels.connections.delete(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
+      { account_id: '699d98642c564d2e855e9661899b7252', client_id: '1bedc50d-42b3-473c-b108-ff3d10c0d925' },
     );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.connections.get(
-      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const responsePromise = client.zeroTrust.tunnels.connections.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -46,9 +45,8 @@ describe('resource connections', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.connections.get(
-      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
-      { account_id: '699d98642c564d2e855e9661899b7252' },
-    );
+    const response = await client.zeroTrust.tunnels.connections.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
   });
 });
diff --git a/tests/api-resources/zero-trust/tunnels/connectors.test.ts b/tests/api-resources/zero-trust/tunnels/connectors.test.ts
index a3aa681a68..39dd43709a 100644
--- a/tests/api-resources/zero-trust/tunnels/connectors.test.ts
+++ b/tests/api-resources/zero-trust/tunnels/connectors.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource connectors', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.connectors.get(
+    const responsePromise = client.zeroTrust.tunnels.connectors.get(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       '1bedc50d-42b3-473c-b108-ff3d10c0d925',
       { account_id: '699d98642c564d2e855e9661899b7252' },
@@ -26,7 +26,7 @@ describe('resource connectors', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.connectors.get(
+    const response = await client.zeroTrust.tunnels.connectors.get(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       '1bedc50d-42b3-473c-b108-ff3d10c0d925',
       { account_id: '699d98642c564d2e855e9661899b7252' },
diff --git a/tests/api-resources/zero-trust/tunnels/management.test.ts b/tests/api-resources/zero-trust/tunnels/management.test.ts
index 7c0b668c5d..af9420f748 100644
--- a/tests/api-resources/zero-trust/tunnels/management.test.ts
+++ b/tests/api-resources/zero-trust/tunnels/management.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource management', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.management.create(
+    const responsePromise = client.zeroTrust.tunnels.management.create(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252', resources: ['logs'] },
     );
@@ -25,7 +25,7 @@ describe('resource management', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.management.create(
+    const response = await client.zeroTrust.tunnels.management.create(
       'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       { account_id: '699d98642c564d2e855e9661899b7252', resources: ['logs'] },
     );
diff --git a/tests/api-resources/zero-trust/tunnels/token.test.ts b/tests/api-resources/zero-trust/tunnels/token.test.ts
index 1b1cea6ec2..b067fbcecd 100644
--- a/tests/api-resources/zero-trust/tunnels/token.test.ts
+++ b/tests/api-resources/zero-trust/tunnels/token.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource token', () => {
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.token.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.tunnels.token.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource token', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.token.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.tunnels.token.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/zero-trust/tunnels/tunnels.test.ts b/tests/api-resources/zero-trust/tunnels/tunnels.test.ts
index 681ec6d857..425ff44dbf 100644
--- a/tests/api-resources/zero-trust/tunnels/tunnels.test.ts
+++ b/tests/api-resources/zero-trust/tunnels/tunnels.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,10 +11,9 @@ const cloudflare = new Cloudflare({
 
 describe('resource tunnels', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.create({
+    const responsePromise = client.zeroTrust.tunnels.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'blog',
-      tunnel_secret: 'AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=',
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -26,17 +25,16 @@ describe('resource tunnels', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.create({
+    const response = await client.zeroTrust.tunnels.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'blog',
+      config_src: 'local',
       tunnel_secret: 'AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.list({
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const responsePromise = client.zeroTrust.tunnels.list({ account_id: '699d98642c564d2e855e9661899b7252' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -47,7 +45,7 @@ describe('resource tunnels', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.list({
+    const response = await client.zeroTrust.tunnels.list({
       account_id: '699d98642c564d2e855e9661899b7252',
       exclude_prefix: 'vpc1-',
       existed_at: '2019-10-12T07:20:50.52Z',
@@ -56,8 +54,7 @@ describe('resource tunnels', () => {
       name: 'blog',
       page: 1,
       per_page: 1,
-      status: 'healthy',
-      tun_types: 'cfd_tunnel,warp_connector',
+      status: 'inactive',
       uuid: 'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       was_active_at: '2009-11-10T23:00:00Z',
       was_inactive_at: '2009-11-10T23:00:00Z',
@@ -65,7 +62,7 @@ describe('resource tunnels', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.delete('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.tunnels.delete('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -78,13 +75,13 @@ describe('resource tunnels', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.delete('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.tunnels.delete('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.edit('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.tunnels.edit('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -97,7 +94,7 @@ describe('resource tunnels', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.edit('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.tunnels.edit('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'blog',
       tunnel_secret: 'AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=',
@@ -105,7 +102,7 @@ describe('resource tunnels', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zeroTrust.tunnels.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+    const responsePromise = client.zeroTrust.tunnels.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -118,7 +115,7 @@ describe('resource tunnels', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zeroTrust.tunnels.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
+    const response = await client.zeroTrust.tunnels.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
       account_id: '699d98642c564d2e855e9661899b7252',
     });
   });
diff --git a/tests/api-resources/warp-connector.test.ts b/tests/api-resources/zero-trust/tunnels/warp-connector.test.ts
similarity index 67%
rename from tests/api-resources/warp-connector.test.ts
rename to tests/api-resources/zero-trust/tunnels/warp-connector.test.ts
index f28ffdfba2..24b5b58efe 100644
--- a/tests/api-resources/warp-connector.test.ts
+++ b/tests/api-resources/zero-trust/tunnels/warp-connector.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource warpConnector', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.warpConnector.create({
+    const responsePromise = client.zeroTrust.tunnels.warpConnector.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'blog',
     });
@@ -25,14 +25,16 @@ describe('resource warpConnector', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.warpConnector.create({
+    const response = await client.zeroTrust.tunnels.warpConnector.create({
       account_id: '699d98642c564d2e855e9661899b7252',
       name: 'blog',
     });
   });
 
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.warpConnector.list({ account_id: '699d98642c564d2e855e9661899b7252' });
+    const responsePromise = client.zeroTrust.tunnels.warpConnector.list({
+      account_id: '699d98642c564d2e855e9661899b7252',
+    });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -43,7 +45,7 @@ describe('resource warpConnector', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.warpConnector.list({
+    const response = await client.zeroTrust.tunnels.warpConnector.list({
       account_id: '699d98642c564d2e855e9661899b7252',
       exclude_prefix: 'vpc1-',
       existed_at: '2019-10-12T07:20:50.52Z',
@@ -52,7 +54,7 @@ describe('resource warpConnector', () => {
       name: 'blog',
       page: 1,
       per_page: 1,
-      status: 'healthy',
+      status: 'inactive',
       uuid: 'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
       was_active_at: '2009-11-10T23:00:00Z',
       was_inactive_at: '2009-11-10T23:00:00Z',
@@ -60,9 +62,10 @@ describe('resource warpConnector', () => {
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.warpConnector.delete('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const responsePromise = client.zeroTrust.tunnels.warpConnector.delete(
+      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -73,15 +76,17 @@ describe('resource warpConnector', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.warpConnector.delete('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const response = await client.zeroTrust.tunnels.warpConnector.delete(
+      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.warpConnector.edit('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const responsePromise = client.zeroTrust.tunnels.warpConnector.edit(
+      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -92,17 +97,21 @@ describe('resource warpConnector', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.warpConnector.edit('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
-      account_id: '699d98642c564d2e855e9661899b7252',
-      name: 'blog',
-      tunnel_secret: 'AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=',
-    });
+    const response = await client.zeroTrust.tunnels.warpConnector.edit(
+      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
+      {
+        account_id: '699d98642c564d2e855e9661899b7252',
+        name: 'blog',
+        tunnel_secret: 'AQIDBAUGBwgBAgMEBQYHCAECAwQFBgcIAQIDBAUGBwg=',
+      },
+    );
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.warpConnector.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const responsePromise = client.zeroTrust.tunnels.warpConnector.get(
+      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -113,15 +122,17 @@ describe('resource warpConnector', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.warpConnector.get('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const response = await client.zeroTrust.tunnels.warpConnector.get(
+      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
   });
 
   test('token: only required params', async () => {
-    const responsePromise = cloudflare.warpConnector.token('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const responsePromise = client.zeroTrust.tunnels.warpConnector.token(
+      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -132,8 +143,9 @@ describe('resource warpConnector', () => {
   });
 
   test('token: required and optional params', async () => {
-    const response = await cloudflare.warpConnector.token('f70ff985-a4ef-4643-bbbc-4a0ed4fc8415', {
-      account_id: '699d98642c564d2e855e9661899b7252',
-    });
+    const response = await client.zeroTrust.tunnels.warpConnector.token(
+      'f70ff985-a4ef-4643-bbbc-4a0ed4fc8415',
+      { account_id: '699d98642c564d2e855e9661899b7252' },
+    );
   });
 });
diff --git a/tests/api-resources/zones/activation-check.test.ts b/tests/api-resources/zones/activation-check.test.ts
index 90af09c49e..5b9c688983 100644
--- a/tests/api-resources/zones/activation-check.test.ts
+++ b/tests/api-resources/zones/activation-check.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource activationCheck', () => {
   test('trigger: only required params', async () => {
-    const responsePromise = cloudflare.zones.activationCheck.trigger({
+    const responsePromise = client.zones.activationCheck.trigger({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource activationCheck', () => {
   });
 
   test('trigger: required and optional params', async () => {
-    const response = await cloudflare.zones.activationCheck.trigger({
+    const response = await client.zones.activationCheck.trigger({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/zones/custom-nameservers.test.ts b/tests/api-resources/zones/custom-nameservers.test.ts
index e05a114dd0..a29407fff3 100644
--- a/tests/api-resources/zones/custom-nameservers.test.ts
+++ b/tests/api-resources/zones/custom-nameservers.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource customNameservers', () => {
   test('update: only required params', async () => {
-    const responsePromise = cloudflare.zones.customNameservers.update({
+    const responsePromise = client.zones.customNameservers.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -24,7 +24,7 @@ describe('resource customNameservers', () => {
   });
 
   test('update: required and optional params', async () => {
-    const response = await cloudflare.zones.customNameservers.update({
+    const response = await client.zones.customNameservers.update({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       enabled: true,
       ns_set: 1,
@@ -32,7 +32,7 @@ describe('resource customNameservers', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zones.customNameservers.get({
+    const responsePromise = client.zones.customNameservers.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -45,7 +45,7 @@ describe('resource customNameservers', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zones.customNameservers.get({
+    const response = await client.zones.customNameservers.get({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/zones/holds.test.ts b/tests/api-resources/zones/holds.test.ts
index 5275072de6..30c0264442 100644
--- a/tests/api-resources/zones/holds.test.ts
+++ b/tests/api-resources/zones/holds.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource holds', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zones.holds.create({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.zones.holds.create({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,14 +22,14 @@ describe('resource holds', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zones.holds.create({
+    const response = await client.zones.holds.create({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       include_subdomains: true,
     });
   });
 
   test('delete: only required params', async () => {
-    const responsePromise = cloudflare.zones.holds.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.zones.holds.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -40,14 +40,33 @@ describe('resource holds', () => {
   });
 
   test('delete: required and optional params', async () => {
-    const response = await cloudflare.zones.holds.delete({
+    const response = await client.zones.holds.delete({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       hold_after: 'hold_after',
     });
   });
 
+  test('edit: only required params', async () => {
+    const responsePromise = client.zones.holds.edit({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('edit: required and optional params', async () => {
+    const response = await client.zones.holds.edit({
+      zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
+      hold_after: '2023-01-31T15:56:36+00:00',
+      include_subdomains: true,
+    });
+  });
+
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zones.holds.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.zones.holds.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -58,6 +77,6 @@ describe('resource holds', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zones.holds.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.zones.holds.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/api-resources/managed-headers.test.ts b/tests/api-resources/zones/plans.test.ts
similarity index 55%
rename from tests/api-resources/managed-headers.test.ts
rename to tests/api-resources/zones/plans.test.ts
index b2e771bb83..20d787c64e 100644
--- a/tests/api-resources/managed-headers.test.ts
+++ b/tests/api-resources/zones/plans.test.ts
@@ -3,15 +3,15 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
 });
 
-describe('resource managedHeaders', () => {
+describe('resource plans', () => {
   test('list: only required params', async () => {
-    const responsePromise = cloudflare.managedHeaders.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.zones.plans.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,14 +22,12 @@ describe('resource managedHeaders', () => {
   });
 
   test('list: required and optional params', async () => {
-    const response = await cloudflare.managedHeaders.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.zones.plans.list({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
-  test('edit: only required params', async () => {
-    const responsePromise = cloudflare.managedHeaders.edit({
+  test('get: only required params', async () => {
+    const responsePromise = client.zones.plans.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      managed_request_headers: [{}, {}, {}],
-      managed_response_headers: [{}, {}, {}],
     });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
@@ -40,19 +38,9 @@ describe('resource managedHeaders', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('edit: required and optional params', async () => {
-    const response = await cloudflare.managedHeaders.edit({
+  test('get: required and optional params', async () => {
+    const response = await client.zones.plans.get('023e105f4ecef8ad9ca31a8372d0c353', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      managed_request_headers: [
-        { enabled: true, id: 'add_cf-bot-score_header' },
-        { enabled: true, id: 'add_cf-bot-score_header' },
-        { enabled: true, id: 'add_cf-bot-score_header' },
-      ],
-      managed_response_headers: [
-        { enabled: true, id: 'add_cf-bot-score_header' },
-        { enabled: true, id: 'add_cf-bot-score_header' },
-        { enabled: true, id: 'add_cf-bot-score_header' },
-      ],
     });
   });
 });
diff --git a/tests/api-resources/zones/rate-plans.test.ts b/tests/api-resources/zones/rate-plans.test.ts
new file mode 100644
index 0000000000..85f6bbe66d
--- /dev/null
+++ b/tests/api-resources/zones/rate-plans.test.ts
@@ -0,0 +1,27 @@
+// File generated from our OpenAPI spec by Stainless. See CONTRIBUTING.md for details.
+
+import Cloudflare from 'cloudflare';
+import { Response } from 'node-fetch';
+
+const client = new Cloudflare({
+  apiKey: '144c9defac04969c7bfad8efaa8ea194',
+  apiEmail: 'user@example.com',
+  baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
+});
+
+describe('resource ratePlans', () => {
+  test('get: only required params', async () => {
+    const responsePromise = client.zones.ratePlans.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const rawResponse = await responsePromise.asResponse();
+    expect(rawResponse).toBeInstanceOf(Response);
+    const response = await responsePromise;
+    expect(response).not.toBeInstanceOf(Response);
+    const dataAndResponse = await responsePromise.withResponse();
+    expect(dataAndResponse.data).toBe(response);
+    expect(dataAndResponse.response).toBe(rawResponse);
+  });
+
+  test('get: required and optional params', async () => {
+    const response = await client.zones.ratePlans.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+  });
+});
diff --git a/tests/api-resources/zones/settings.test.ts b/tests/api-resources/zones/settings.test.ts
index 989253c382..70de6644e1 100644
--- a/tests/api-resources/zones/settings.test.ts
+++ b/tests/api-resources/zones/settings.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource settings', () => {
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.zones.settings.edit('always_online', {
+    const responsePromise = client.zones.settings.edit('always_online', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       id: '0rtt',
       value: 'on',
@@ -26,7 +26,7 @@ describe('resource settings', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.zones.settings.edit('always_online', {
+    const response = await client.zones.settings.edit('always_online', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
       id: '0rtt',
       value: 'on',
@@ -34,7 +34,7 @@ describe('resource settings', () => {
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zones.settings.get('always_online', {
+    const responsePromise = client.zones.settings.get('always_online', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
     const rawResponse = await responsePromise.asResponse();
@@ -47,7 +47,7 @@ describe('resource settings', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zones.settings.get('always_online', {
+    const response = await client.zones.settings.get('always_online', {
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
     });
   });
diff --git a/tests/api-resources/zones/subscriptions.test.ts b/tests/api-resources/zones/subscriptions.test.ts
index 7642e62994..89e171b005 100644
--- a/tests/api-resources/zones/subscriptions.test.ts
+++ b/tests/api-resources/zones/subscriptions.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource subscriptions', () => {
   test('create', async () => {
-    const responsePromise = cloudflare.zones.subscriptions.create('506e3185e9c882d175a2d0cb0093d9f2', {});
+    const responsePromise = client.zones.subscriptions.create('506e3185e9c882d175a2d0cb0093d9f2', {});
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -21,8 +21,8 @@ describe('resource subscriptions', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list', async () => {
-    const responsePromise = cloudflare.zones.subscriptions.list('023e105f4ecef8ad9ca31a8372d0c353');
+  test('update', async () => {
+    const responsePromise = client.zones.subscriptions.update('506e3185e9c882d175a2d0cb0093d9f2', {});
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -32,17 +32,8 @@ describe('resource subscriptions', () => {
     expect(dataAndResponse.response).toBe(rawResponse);
   });
 
-  test('list: request options instead of params are passed correctly', async () => {
-    // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(
-      cloudflare.zones.subscriptions.list('023e105f4ecef8ad9ca31a8372d0c353', {
-        path: '/_stainless_unknown_path',
-      }),
-    ).rejects.toThrow(Cloudflare.NotFoundError);
-  });
-
   test('get', async () => {
-    const responsePromise = cloudflare.zones.subscriptions.get('506e3185e9c882d175a2d0cb0093d9f2');
+    const responsePromise = client.zones.subscriptions.get('506e3185e9c882d175a2d0cb0093d9f2');
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -55,7 +46,7 @@ describe('resource subscriptions', () => {
   test('get: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.zones.subscriptions.get('506e3185e9c882d175a2d0cb0093d9f2', {
+      client.zones.subscriptions.get('506e3185e9c882d175a2d0cb0093d9f2', {
         path: '/_stainless_unknown_path',
       }),
     ).rejects.toThrow(Cloudflare.NotFoundError);
diff --git a/tests/api-resources/zones/zones.test.ts b/tests/api-resources/zones/zones.test.ts
index 0e62fe9eff..3ab76e7340 100644
--- a/tests/api-resources/zones/zones.test.ts
+++ b/tests/api-resources/zones/zones.test.ts
@@ -3,7 +3,7 @@
 import Cloudflare from 'cloudflare';
 import { Response } from 'node-fetch';
 
-const cloudflare = new Cloudflare({
+const client = new Cloudflare({
   apiKey: '144c9defac04969c7bfad8efaa8ea194',
   apiEmail: 'user@example.com',
   baseURL: process.env['TEST_API_BASE_URL'] ?? 'http://127.0.0.1:4010',
@@ -11,7 +11,7 @@ const cloudflare = new Cloudflare({
 
 describe('resource zones', () => {
   test('create: only required params', async () => {
-    const responsePromise = cloudflare.zones.create({ account: {}, name: 'example.com' });
+    const responsePromise = client.zones.create({ account: {}, name: 'example.com' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -22,7 +22,7 @@ describe('resource zones', () => {
   });
 
   test('create: required and optional params', async () => {
-    const response = await cloudflare.zones.create({
+    const response = await client.zones.create({
       account: { id: '023e105f4ecef8ad9ca31a8372d0c353' },
       name: 'example.com',
       type: 'full',
@@ -30,7 +30,7 @@ describe('resource zones', () => {
   });
 
   test('list', async () => {
-    const responsePromise = cloudflare.zones.list();
+    const responsePromise = client.zones.list();
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -42,7 +42,7 @@ describe('resource zones', () => {
 
   test('list: request options instead of params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
-    await expect(cloudflare.zones.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
+    await expect(client.zones.list({ path: '/_stainless_unknown_path' })).rejects.toThrow(
       Cloudflare.NotFoundError,
     );
   });
@@ -50,13 +50,13 @@ describe('resource zones', () => {
   test('list: request options and params are passed correctly', async () => {
     // ensure the request options are being passed correctly by passing an invalid HTTP method in order to cause an error
     await expect(
-      cloudflare.zones.list(
+      client.zones.list(
         {
           account: { id: 'id', name: 'name' },
-          direction: 'desc',
+          direction: 'asc',
           match: 'any',
           name: 'name',
-          order: 'status',
+          order: 'name',
           page: 1,
           per_page: 5,
           status: 'initializing',
@@ -68,7 +68,7 @@ describe('resource zones', () => {
 
   // body parameter is required
   test.skip('delete: only required params', async () => {
-    const responsePromise = cloudflare.zones.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.zones.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -80,11 +80,11 @@ describe('resource zones', () => {
 
   // body parameter is required
   test.skip('delete: required and optional params', async () => {
-    const response = await cloudflare.zones.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.zones.delete({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 
   test('edit: only required params', async () => {
-    const responsePromise = cloudflare.zones.edit({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.zones.edit({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -95,16 +95,15 @@ describe('resource zones', () => {
   });
 
   test('edit: required and optional params', async () => {
-    const response = await cloudflare.zones.edit({
+    const response = await client.zones.edit({
       zone_id: '023e105f4ecef8ad9ca31a8372d0c353',
-      plan: { id: '023e105f4ecef8ad9ca31a8372d0c353' },
       type: 'full',
       vanity_name_servers: ['ns1.example.com', 'ns2.example.com'],
     });
   });
 
   test('get: only required params', async () => {
-    const responsePromise = cloudflare.zones.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const responsePromise = client.zones.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
     const rawResponse = await responsePromise.asResponse();
     expect(rawResponse).toBeInstanceOf(Response);
     const response = await responsePromise;
@@ -115,6 +114,6 @@ describe('resource zones', () => {
   });
 
   test('get: required and optional params', async () => {
-    const response = await cloudflare.zones.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
+    const response = await client.zones.get({ zone_id: '023e105f4ecef8ad9ca31a8372d0c353' });
   });
 });
diff --git a/tests/index.test.ts b/tests/index.test.ts
index 5379eb0c6e..0c356031e9 100644
--- a/tests/index.test.ts
+++ b/tests/index.test.ts
@@ -128,6 +128,24 @@ describe('instantiate client', () => {
     expect(spy).toHaveBeenCalledTimes(1);
   });
 
+  test('normalized method', async () => {
+    let capturedRequest: RequestInit | undefined;
+    const testFetch = async (url: RequestInfo, init: RequestInit = {}): Promise<Response> => {
+      capturedRequest = init;
+      return new Response(JSON.stringify({}), { headers: { 'Content-Type': 'application/json' } });
+    };
+
+    const client = new Cloudflare({
+      baseURL: 'http://localhost:5000/',
+      apiKey: '144c9defac04969c7bfad8efaa8ea194',
+      apiEmail: 'user@example.com',
+      fetch: testFetch,
+    });
+
+    await client.patch('/foo');
+    expect(capturedRequest?.method).toEqual('PATCH');
+  });
+
   describe('baseUrl', () => {
     test('trailing slash', () => {
       const client = new Cloudflare({
@@ -213,7 +231,7 @@ describe('instantiate client', () => {
     expect(client.apiEmail).toBe('user@example.com');
   });
 
-  test('with overriden environment variable arguments', () => {
+  test('with overridden environment variable arguments', () => {
     // set options via env var
     process.env['CLOUDFLARE_API_KEY'] = 'another 144c9defac04969c7bfad8efaa8ea194';
     process.env['CLOUDFLARE_EMAIL'] = 'another user@example.com';
@@ -287,6 +305,138 @@ describe('retries', () => {
     expect(count).toEqual(3);
   });
 
+  test('retry count header', async () => {
+    let count = 0;
+    let capturedRequest: RequestInit | undefined;
+    const testFetch = async (url: RequestInfo, init: RequestInit = {}): Promise<Response> => {
+      count++;
+      if (count <= 2) {
+        return new Response(undefined, {
+          status: 429,
+          headers: {
+            'Retry-After': '0.1',
+          },
+        });
+      }
+      capturedRequest = init;
+      return new Response(JSON.stringify({ a: 1 }), { headers: { 'Content-Type': 'application/json' } });
+    };
+
+    const client = new Cloudflare({
+      apiKey: '144c9defac04969c7bfad8efaa8ea194',
+      apiEmail: 'user@example.com',
+      fetch: testFetch,
+      maxRetries: 4,
+    });
+
+    expect(await client.request({ path: '/foo', method: 'get' })).toEqual({ a: 1 });
+
+    expect((capturedRequest!.headers as Headers)['x-stainless-retry-count']).toEqual('2');
+    expect(count).toEqual(3);
+  });
+
+  test('omit retry count header', async () => {
+    let count = 0;
+    let capturedRequest: RequestInit | undefined;
+    const testFetch = async (url: RequestInfo, init: RequestInit = {}): Promise<Response> => {
+      count++;
+      if (count <= 2) {
+        return new Response(undefined, {
+          status: 429,
+          headers: {
+            'Retry-After': '0.1',
+          },
+        });
+      }
+      capturedRequest = init;
+      return new Response(JSON.stringify({ a: 1 }), { headers: { 'Content-Type': 'application/json' } });
+    };
+    const client = new Cloudflare({
+      apiKey: '144c9defac04969c7bfad8efaa8ea194',
+      apiEmail: 'user@example.com',
+      fetch: testFetch,
+      maxRetries: 4,
+    });
+
+    expect(
+      await client.request({
+        path: '/foo',
+        method: 'get',
+        headers: { 'X-Stainless-Retry-Count': null },
+      }),
+    ).toEqual({ a: 1 });
+
+    expect(capturedRequest!.headers as Headers).not.toHaveProperty('x-stainless-retry-count');
+  });
+
+  test('omit retry count header by default', async () => {
+    let count = 0;
+    let capturedRequest: RequestInit | undefined;
+    const testFetch = async (url: RequestInfo, init: RequestInit = {}): Promise<Response> => {
+      count++;
+      if (count <= 2) {
+        return new Response(undefined, {
+          status: 429,
+          headers: {
+            'Retry-After': '0.1',
+          },
+        });
+      }
+      capturedRequest = init;
+      return new Response(JSON.stringify({ a: 1 }), { headers: { 'Content-Type': 'application/json' } });
+    };
+    const client = new Cloudflare({
+      apiKey: '144c9defac04969c7bfad8efaa8ea194',
+      apiEmail: 'user@example.com',
+      fetch: testFetch,
+      maxRetries: 4,
+      defaultHeaders: { 'X-Stainless-Retry-Count': null },
+    });
+
+    expect(
+      await client.request({
+        path: '/foo',
+        method: 'get',
+      }),
+    ).toEqual({ a: 1 });
+
+    expect(capturedRequest!.headers as Headers).not.toHaveProperty('x-stainless-retry-count');
+  });
+
+  test('overwrite retry count header', async () => {
+    let count = 0;
+    let capturedRequest: RequestInit | undefined;
+    const testFetch = async (url: RequestInfo, init: RequestInit = {}): Promise<Response> => {
+      count++;
+      if (count <= 2) {
+        return new Response(undefined, {
+          status: 429,
+          headers: {
+            'Retry-After': '0.1',
+          },
+        });
+      }
+      capturedRequest = init;
+      return new Response(JSON.stringify({ a: 1 }), { headers: { 'Content-Type': 'application/json' } });
+    };
+    const client = new Cloudflare({
+      apiKey: '144c9defac04969c7bfad8efaa8ea194',
+      apiEmail: 'user@example.com',
+      fetch: testFetch,
+      maxRetries: 4,
+    });
+
+    expect(
+      await client.request({
+        path: '/foo',
+        method: 'get',
+        headers: { 'X-Stainless-Retry-Count': '42' },
+      }),
+    ).toEqual({ a: 1 });
+
+    expect((capturedRequest!.headers as Headers)['x-stainless-retry-count']).toBe('42');
+  });
+
   test('retry on 429 with retry-after', async () => {
     let count = 0;
     const testFetch = async (url: RequestInfo, { signal }: RequestInit = {}): Promise<Response> => {
diff --git a/tests/qs/empty-keys-cases.ts b/tests/qs/empty-keys-cases.ts
new file mode 100644
index 0000000000..ea2c1b0a28
--- /dev/null
+++ b/tests/qs/empty-keys-cases.ts
@@ -0,0 +1,271 @@
+export const empty_test_cases = [
+  {
+    input: '&',
+    with_empty_keys: {},
+    stringify_output: {
+      brackets: '',
+      indices: '',
+      repeat: '',
+    },
+    no_empty_keys: {},
+  },
+  {
+    input: '&&',
+    with_empty_keys: {},
+    stringify_output: {
+      brackets: '',
+      indices: '',
+      repeat: '',
+    },
+    no_empty_keys: {},
+  },
+  {
+    input: '&=',
+    with_empty_keys: { '': '' },
+    stringify_output: {
+      brackets: '=',
+      indices: '=',
+      repeat: '=',
+    },
+    no_empty_keys: {},
+  },
+  {
+    input: '&=&',
+    with_empty_keys: { '': '' },
+    stringify_output: {
+      brackets: '=',
+      indices: '=',
+      repeat: '=',
+    },
+    no_empty_keys: {},
+  },
+  {
+    input: '&=&=',
+    with_empty_keys: { '': ['', ''] },
+    stringify_output: {
+      brackets: '[]=&[]=',
+      indices: '[0]=&[1]=',
+      repeat: '=&=',
+    },
+    no_empty_keys: {},
+  },
+  {
+    input: '&=&=&',
+    with_empty_keys: { '': ['', ''] },
+    stringify_output: {
+      brackets: '[]=&[]=',
+      indices: '[0]=&[1]=',
+      repeat: '=&=',
+    },
+    no_empty_keys: {},
+  },
+  {
+    input: '=',
+    with_empty_keys: { '': '' },
+    no_empty_keys: {},
+    stringify_output: {
+      brackets: '=',
+      indices: '=',
+      repeat: '=',
+    },
+  },
+  {
+    input: '=&',
+    with_empty_keys: { '': '' },
+    stringify_output: {
+      brackets: '=',
+      indices: '=',
+      repeat: '=',
+    },
+    no_empty_keys: {},
+  },
+  {
+    input: '=&&&',
+    with_empty_keys: { '': '' },
+    stringify_output: {
+      brackets: '=',
+      indices: '=',
+      repeat: '=',
+    },
+    no_empty_keys: {},
+  },
+  {
+    input: '=&=&=&',
+    with_empty_keys: { '': ['', '', ''] },
+    stringify_output: {
+      brackets: '[]=&[]=&[]=',
+      indices: '[0]=&[1]=&[2]=',
+      repeat: '=&=&=',
+    },
+    no_empty_keys: {},
+  },
+  {
+    input: '=&a[]=b&a[1]=c',
+    with_empty_keys: { '': '', a: ['b', 'c'] },
+    stringify_output: {
+      brackets: '=&a[]=b&a[]=c',
+      indices: '=&a[0]=b&a[1]=c',
+      repeat: '=&a=b&a=c',
+    },
+    no_empty_keys: { a: ['b', 'c'] },
+  },
+  {
+    input: '=a',
+    with_empty_keys: { '': 'a' },
+    no_empty_keys: {},
+    stringify_output: {
+      brackets: '=a',
+      indices: '=a',
+      repeat: '=a',
+    },
+  },
+  {
+    input: 'a==a',
+    with_empty_keys: { a: '=a' },
+    no_empty_keys: { a: '=a' },
+    stringify_output: {
+      brackets: 'a==a',
+      indices: 'a==a',
+      repeat: 'a==a',
+    },
+  },
+  {
+    input: '=&a[]=b',
+    with_empty_keys: { '': '', a: ['b'] },
+    stringify_output: {
+      brackets: '=&a[]=b',
+      indices: '=&a[0]=b',
+      repeat: '=&a=b',
+    },
+    no_empty_keys: { a: ['b'] },
+  },
+  {
+    input: '=&a[]=b&a[]=c&a[2]=d',
+    with_empty_keys: { '': '', a: ['b', 'c', 'd'] },
+    stringify_output: {
+      brackets: '=&a[]=b&a[]=c&a[]=d',
+      indices: '=&a[0]=b&a[1]=c&a[2]=d',
+      repeat: '=&a=b&a=c&a=d',
+    },
+    no_empty_keys: { a: ['b', 'c', 'd'] },
+  },
+  {
+    input: '=a&=b',
+    with_empty_keys: { '': ['a', 'b'] },
+    stringify_output: {
+      brackets: '[]=a&[]=b',
+      indices: '[0]=a&[1]=b',
+      repeat: '=a&=b',
+    },
+    no_empty_keys: {},
+  },
+  {
+    input: '=a&foo=b',
+    with_empty_keys: { '': 'a', foo: 'b' },
+    no_empty_keys: { foo: 'b' },
+    stringify_output: {
+      brackets: '=a&foo=b',
+      indices: '=a&foo=b',
+      repeat: '=a&foo=b',
+    },
+  },
+  {
+    input: 'a[]=b&a=c&=',
+    with_empty_keys: { '': '', a: ['b', 'c'] },
+    stringify_output: {
+      brackets: '=&a[]=b&a[]=c',
+      indices: '=&a[0]=b&a[1]=c',
+      repeat: '=&a=b&a=c',
+    },
+    no_empty_keys: { a: ['b', 'c'] },
+  },
+  {
+    input: 'a[]=b&a=c&=',
+    with_empty_keys: { '': '', a: ['b', 'c'] },
+    stringify_output: {
+      brackets: '=&a[]=b&a[]=c',
+      indices: '=&a[0]=b&a[1]=c',
+      repeat: '=&a=b&a=c',
+    },
+    no_empty_keys: { a: ['b', 'c'] },
+  },
+  {
+    input: 'a[0]=b&a=c&=',
+    with_empty_keys: { '': '', a: ['b', 'c'] },
+    stringify_output: {
+      brackets: '=&a[]=b&a[]=c',
+      indices: '=&a[0]=b&a[1]=c',
+      repeat: '=&a=b&a=c',
+    },
+    no_empty_keys: { a: ['b', 'c'] },
+  },
+  {
+    input: 'a=b&a[]=c&=',
+    with_empty_keys: { '': '', a: ['b', 'c'] },
+    stringify_output: {
+      brackets: '=&a[]=b&a[]=c',
+      indices: '=&a[0]=b&a[1]=c',
+      repeat: '=&a=b&a=c',
+    },
+    no_empty_keys: { a: ['b', 'c'] },
+  },
+  {
+    input: 'a=b&a[0]=c&=',
+    with_empty_keys: { '': '', a: ['b', 'c'] },
+    stringify_output: {
+      brackets: '=&a[]=b&a[]=c',
+      indices: '=&a[0]=b&a[1]=c',
+      repeat: '=&a=b&a=c',
+    },
+    no_empty_keys: { a: ['b', 'c'] },
+  },
+  {
+    input: '[]=a&[]=b& []=1',
+    with_empty_keys: { '': ['a', 'b'], ' ': ['1'] },
+    stringify_output: {
+      brackets: '[]=a&[]=b& []=1',
+      indices: '[0]=a&[1]=b& [0]=1',
+      repeat: '=a&=b& =1',
+    },
+    no_empty_keys: { 0: 'a', 1: 'b', ' ': ['1'] },
+  },
+  {
+    input: '[0]=a&[1]=b&a[0]=1&a[1]=2',
+    with_empty_keys: { '': ['a', 'b'], a: ['1', '2'] },
+    no_empty_keys: { 0: 'a', 1: 'b', a: ['1', '2'] },
+    stringify_output: {
+      brackets: '[]=a&[]=b&a[]=1&a[]=2',
+      indices: '[0]=a&[1]=b&a[0]=1&a[1]=2',
+      repeat: '=a&=b&a=1&a=2',
+    },
+  },
+  {
+    input: '[deep]=a&[deep]=2',
+    with_empty_keys: { '': { deep: ['a', '2'] } },
+    stringify_output: {
+      brackets: '[deep][]=a&[deep][]=2',
+      indices: '[deep][0]=a&[deep][1]=2',
+      repeat: '[deep]=a&[deep]=2',
+    },
+    no_empty_keys: { deep: ['a', '2'] },
+  },
+  {
+    input: '%5B0%5D=a&%5B1%5D=b',
+    with_empty_keys: { '': ['a', 'b'] },
+    stringify_output: {
+      brackets: '[]=a&[]=b',
+      indices: '[0]=a&[1]=b',
+      repeat: '=a&=b',
+    },
+    no_empty_keys: { 0: 'a', 1: 'b' },
+  },
+] satisfies {
+  input: string;
+  with_empty_keys: Record<string, unknown>;
+  stringify_output: {
+    brackets: string;
+    indices: string;
+    repeat: string;
+  };
+  no_empty_keys: Record<string, unknown>;
+}[];
diff --git a/tests/qs/stringify.test.ts b/tests/qs/stringify.test.ts
new file mode 100644
index 0000000000..9ec12625d2
--- /dev/null
+++ b/tests/qs/stringify.test.ts
@@ -0,0 +1,2232 @@
+import iconv from 'iconv-lite';
+import { stringify } from 'cloudflare/internal/qs';
+import { encode } from 'cloudflare/internal/qs/utils';
+import { StringifyOptions } from 'cloudflare/internal/qs/types';
+import { empty_test_cases } from './empty-keys-cases';
+import assert from 'assert';
+
+describe('stringify()', function () {
+  test('stringifies a querystring object', function () {
+    expect(stringify({ a: 'b' })).toBe('a=b');
+    expect(stringify({ a: 1 })).toBe('a=1');
+    expect(stringify({ a: 1, b: 2 })).toBe('a=1&b=2');
+    expect(stringify({ a: 'A_Z' })).toBe('a=A_Z');
+    expect(stringify({ a: '€' })).toBe('a=%E2%82%AC');
+    expect(stringify({ a: '' })).toBe('a=%EE%80%80');
+    expect(stringify({ a: 'א' })).toBe('a=%D7%90');
+    expect(stringify({ a: '𐐷' })).toBe('a=%F0%90%90%B7');
+  });
+
+  test('stringifies falsy values', function () {
+    expect(stringify(undefined)).toBe('');
+    expect(stringify(null)).toBe('');
+    expect(stringify(null, { strictNullHandling: true })).toBe('');
+    expect(stringify(false)).toBe('');
+    expect(stringify(0)).toBe('');
+  });
+
+  test('stringifies symbols', function () {
+    expect(stringify(Symbol.iterator)).toBe('');
+    expect(stringify([Symbol.iterator])).toBe('0=Symbol%28Symbol.iterator%29');
+    expect(stringify({ a: Symbol.iterator })).toBe('a=Symbol%28Symbol.iterator%29');
+    expect(stringify({ a: [Symbol.iterator] }, { encodeValuesOnly: true, arrayFormat: 'brackets' })).toBe(
+      'a[]=Symbol%28Symbol.iterator%29',
+    );
+  });
+
+  test('stringifies bigints', function () {
+    var three = BigInt(3);
+    // @ts-expect-error
+    var encodeWithN = function (value, defaultEncoder, charset) {
+      var result = defaultEncoder(value, defaultEncoder, charset);
+      return typeof value === 'bigint' ? result + 'n' : result;
+    };
+
+    expect(stringify(three)).toBe('');
+    expect(stringify([three])).toBe('0=3');
+    expect(stringify([three], { encoder: encodeWithN })).toBe('0=3n');
+    expect(stringify({ a: three })).toBe('a=3');
+    expect(stringify({ a: three }, { encoder: encodeWithN })).toBe('a=3n');
+    expect(stringify({ a: [three] }, { encodeValuesOnly: true, arrayFormat: 'brackets' })).toBe('a[]=3');
+    expect(
+      stringify({ a: [three] }, { encodeValuesOnly: true, encoder: encodeWithN, arrayFormat: 'brackets' }),
+    ).toBe('a[]=3n');
+  });
+
+  test('encodes dot in key of object when encodeDotInKeys and allowDots is provided', function () {
+    expect(
+      stringify({ 'name.obj': { first: 'John', last: 'Doe' } }, { allowDots: false, encodeDotInKeys: false }),
+    ).toBe('name.obj%5Bfirst%5D=John&name.obj%5Blast%5D=Doe');
+    expect(
+      stringify({ 'name.obj': { first: 'John', last: 'Doe' } }, { allowDots: true, encodeDotInKeys: false }),
+    ).toBe('name.obj.first=John&name.obj.last=Doe');
+    expect(
+      stringify({ 'name.obj': { first: 'John', last: 'Doe' } }, { allowDots: false, encodeDotInKeys: true }),
+    ).toBe('name%252Eobj%5Bfirst%5D=John&name%252Eobj%5Blast%5D=Doe');
+    expect(
+      stringify({ 'name.obj': { first: 'John', last: 'Doe' } }, { allowDots: true, encodeDotInKeys: true }),
+    ).toBe('name%252Eobj.first=John&name%252Eobj.last=Doe');
+
+    // st.equal(
+    // 	stringify(
+    // 		{ 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+    // 		{ allowDots: false, encodeDotInKeys: false },
+    // 	),
+    // 	'name.obj.subobject%5Bfirst.godly.name%5D=John&name.obj.subobject%5Blast%5D=Doe',
+    // 	'with allowDots false and encodeDotInKeys false',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+    // 		{ allowDots: true, encodeDotInKeys: false },
+    // 	),
+    // 	'name.obj.subobject.first.godly.name=John&name.obj.subobject.last=Doe',
+    // 	'with allowDots false and encodeDotInKeys false',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+    // 		{ allowDots: false, encodeDotInKeys: true },
+    // 	),
+    // 	'name%252Eobj%252Esubobject%5Bfirst.godly.name%5D=John&name%252Eobj%252Esubobject%5Blast%5D=Doe',
+    // 	'with allowDots false and encodeDotInKeys true',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+    // 		{ allowDots: true, encodeDotInKeys: true },
+    // 	),
+    // 	'name%252Eobj%252Esubobject.first%252Egodly%252Ename=John&name%252Eobj%252Esubobject.last=Doe',
+    // 	'with allowDots true and encodeDotInKeys true',
+    // );
+    expect(
+      stringify(
+        { 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+        { allowDots: false, encodeDotInKeys: false },
+      ),
+    ).toBe('name.obj.subobject%5Bfirst.godly.name%5D=John&name.obj.subobject%5Blast%5D=Doe');
+    expect(
+      stringify(
+        { 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+        { allowDots: true, encodeDotInKeys: false },
+      ),
+    ).toBe('name.obj.subobject.first.godly.name=John&name.obj.subobject.last=Doe');
+    expect(
+      stringify(
+        { 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+        { allowDots: false, encodeDotInKeys: true },
+      ),
+    ).toBe('name%252Eobj%252Esubobject%5Bfirst.godly.name%5D=John&name%252Eobj%252Esubobject%5Blast%5D=Doe');
+    expect(
+      stringify(
+        { 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+        { allowDots: true, encodeDotInKeys: true },
+      ),
+    ).toBe('name%252Eobj%252Esubobject.first%252Egodly%252Ename=John&name%252Eobj%252Esubobject.last=Doe');
+  });
+
+  test('should encode dot in key of object, and automatically set allowDots to `true` when encodeDotInKeys is true and allowDots in undefined', function () {
+    // st.equal(
+    // 	stringify(
+    // 		{ 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+    // 		{ encodeDotInKeys: true },
+    // 	),
+    // 	'name%252Eobj%252Esubobject.first%252Egodly%252Ename=John&name%252Eobj%252Esubobject.last=Doe',
+    // 	'with allowDots undefined and encodeDotInKeys true',
+    // );
+    expect(
+      stringify(
+        { 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+        { encodeDotInKeys: true },
+      ),
+    ).toBe('name%252Eobj%252Esubobject.first%252Egodly%252Ename=John&name%252Eobj%252Esubobject.last=Doe');
+  });
+
+  test('should encode dot in key of object when encodeDotInKeys and allowDots is provided, and nothing else when encodeValuesOnly is provided', function () {
+    // st.equal(
+    // 	stringify(
+    // 		{ 'name.obj': { first: 'John', last: 'Doe' } },
+    // 		{
+    // 			encodeDotInKeys: true,
+    // 			allowDots: true,
+    // 			encodeValuesOnly: true,
+    // 		},
+    // 	),
+    // 	'name%2Eobj.first=John&name%2Eobj.last=Doe',
+    // );
+    expect(
+      stringify(
+        { 'name.obj': { first: 'John', last: 'Doe' } },
+        {
+          encodeDotInKeys: true,
+          allowDots: true,
+          encodeValuesOnly: true,
+        },
+      ),
+    ).toBe('name%2Eobj.first=John&name%2Eobj.last=Doe');
+
+    // st.equal(
+    // 	stringify(
+    // 		{ 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+    // 		{ allowDots: true, encodeDotInKeys: true, encodeValuesOnly: true },
+    // 	),
+    // 	'name%2Eobj%2Esubobject.first%2Egodly%2Ename=John&name%2Eobj%2Esubobject.last=Doe',
+    // );
+    expect(
+      stringify(
+        { 'name.obj.subobject': { 'first.godly.name': 'John', last: 'Doe' } },
+        { allowDots: true, encodeDotInKeys: true, encodeValuesOnly: true },
+      ),
+    ).toBe('name%2Eobj%2Esubobject.first%2Egodly%2Ename=John&name%2Eobj%2Esubobject.last=Doe');
+  });
+
+  test('throws when `commaRoundTrip` is not a boolean', function () {
+    // st['throws'](
+    // 	function () {
+    // 		stringify({}, { commaRoundTrip: 'not a boolean' });
+    // 	},
+    // 	TypeError,
+    // 	'throws when `commaRoundTrip` is not a boolean',
+    // );
+    expect(() => {
+      // @ts-expect-error
+      stringify({}, { commaRoundTrip: 'not a boolean' });
+    }).toThrow(TypeError);
+  });
+
+  test('throws when `encodeDotInKeys` is not a boolean', function () {
+    // st['throws'](function () {
+    // 	stringify({ a: [], b: 'zz' }, { encodeDotInKeys: 'foobar' });
+    // }, TypeError);
+    expect(() => {
+      // @ts-expect-error
+      stringify({ a: [], b: 'zz' }, { encodeDotInKeys: 'foobar' });
+    }).toThrow(TypeError);
+
+    // st['throws'](function () {
+    // 	stringify({ a: [], b: 'zz' }, { encodeDotInKeys: 0 });
+    // }, TypeError);
+    expect(() => {
+      // @ts-expect-error
+      stringify({ a: [], b: 'zz' }, { encodeDotInKeys: 0 });
+    }).toThrow(TypeError);
+
+    // st['throws'](function () {
+    // 	stringify({ a: [], b: 'zz' }, { encodeDotInKeys: NaN });
+    // }, TypeError);
+    expect(() => {
+      // @ts-expect-error
+      stringify({ a: [], b: 'zz' }, { encodeDotInKeys: NaN });
+    }).toThrow(TypeError);
+
+    // st['throws'](function () {
+    // 	stringify({ a: [], b: 'zz' }, { encodeDotInKeys: null });
+    // }, TypeError);
+    expect(() => {
+      // @ts-expect-error
+      stringify({ a: [], b: 'zz' }, { encodeDotInKeys: null });
+    }).toThrow(TypeError);
+  });
+
+  test('adds query prefix', function () {
+    // st.equal(stringify({ a: 'b' }, { addQueryPrefix: true }), '?a=b');
+    expect(stringify({ a: 'b' }, { addQueryPrefix: true })).toBe('?a=b');
+  });
+
+  test('with query prefix, outputs blank string given an empty object', function () {
+    // st.equal(stringify({}, { addQueryPrefix: true }), '');
+    expect(stringify({}, { addQueryPrefix: true })).toBe('');
+  });
+
+  test('stringifies nested falsy values', function () {
+    // st.equal(stringify({ a: { b: { c: null } } }), 'a%5Bb%5D%5Bc%5D=');
+    // st.equal(
+    // 	stringify({ a: { b: { c: null } } }, { strictNullHandling: true }),
+    // 	'a%5Bb%5D%5Bc%5D',
+    // );
+    // st.equal(stringify({ a: { b: { c: false } } }), 'a%5Bb%5D%5Bc%5D=false');
+    expect(stringify({ a: { b: { c: null } } })).toBe('a%5Bb%5D%5Bc%5D=');
+    expect(stringify({ a: { b: { c: null } } }, { strictNullHandling: true })).toBe('a%5Bb%5D%5Bc%5D');
+    expect(stringify({ a: { b: { c: false } } })).toBe('a%5Bb%5D%5Bc%5D=false');
+  });
+
+  test('stringifies a nested object', function () {
+    // st.equal(stringify({ a: { b: 'c' } }), 'a%5Bb%5D=c');
+    // st.equal(stringify({ a: { b: { c: { d: 'e' } } } }), 'a%5Bb%5D%5Bc%5D%5Bd%5D=e');
+    expect(stringify({ a: { b: 'c' } })).toBe('a%5Bb%5D=c');
+    expect(stringify({ a: { b: { c: { d: 'e' } } } })).toBe('a%5Bb%5D%5Bc%5D%5Bd%5D=e');
+  });
+
+  test('`allowDots` option: stringifies a nested object with dots notation', function () {
+    // st.equal(stringify({ a: { b: 'c' } }, { allowDots: true }), 'a.b=c');
+    // st.equal(stringify({ a: { b: { c: { d: 'e' } } } }, { allowDots: true }), 'a.b.c.d=e');
+    expect(stringify({ a: { b: 'c' } }, { allowDots: true })).toBe('a.b=c');
+    expect(stringify({ a: { b: { c: { d: 'e' } } } }, { allowDots: true })).toBe('a.b.c.d=e');
+  });
+
+  test('stringifies an array value', function () {
+    // st.equal(
+    // 	stringify({ a: ['b', 'c', 'd'] }, { arrayFormat: 'indices' }),
+    // 	'a%5B0%5D=b&a%5B1%5D=c&a%5B2%5D=d',
+    // 	'indices => indices',
+    // );
+    // st.equal(
+    // 	stringify({ a: ['b', 'c', 'd'] }, { arrayFormat: 'brackets' }),
+    // 	'a%5B%5D=b&a%5B%5D=c&a%5B%5D=d',
+    // 	'brackets => brackets',
+    // );
+    // st.equal(
+    // 	stringify({ a: ['b', 'c', 'd'] }, { arrayFormat: 'comma' }),
+    // 	'a=b%2Cc%2Cd',
+    // 	'comma => comma',
+    // );
+    // st.equal(
+    // 	stringify({ a: ['b', 'c', 'd'] }, { arrayFormat: 'comma', commaRoundTrip: true }),
+    // 	'a=b%2Cc%2Cd',
+    // 	'comma round trip => comma',
+    // );
+    // st.equal(
+    // 	stringify({ a: ['b', 'c', 'd'] }),
+    // 	'a%5B0%5D=b&a%5B1%5D=c&a%5B2%5D=d',
+    // 	'default => indices',
+    // );
+    expect(stringify({ a: ['b', 'c', 'd'] }, { arrayFormat: 'indices' })).toBe(
+      'a%5B0%5D=b&a%5B1%5D=c&a%5B2%5D=d',
+    );
+    expect(stringify({ a: ['b', 'c', 'd'] }, { arrayFormat: 'brackets' })).toBe(
+      'a%5B%5D=b&a%5B%5D=c&a%5B%5D=d',
+    );
+    expect(stringify({ a: ['b', 'c', 'd'] }, { arrayFormat: 'comma' })).toBe('a=b%2Cc%2Cd');
+    expect(stringify({ a: ['b', 'c', 'd'] }, { arrayFormat: 'comma', commaRoundTrip: true })).toBe(
+      'a=b%2Cc%2Cd',
+    );
+    expect(stringify({ a: ['b', 'c', 'd'] })).toBe('a%5B0%5D=b&a%5B1%5D=c&a%5B2%5D=d');
+  });
+
+  test('`skipNulls` option', function () {
+    // st.equal(
+    // 	stringify({ a: 'b', c: null }, { skipNulls: true }),
+    // 	'a=b',
+    // 	'omits nulls when asked',
+    // );
+    expect(stringify({ a: 'b', c: null }, { skipNulls: true })).toBe('a=b');
+
+    // st.equal(
+    // 	stringify({ a: { b: 'c', d: null } }, { skipNulls: true }),
+    // 	'a%5Bb%5D=c',
+    // 	'omits nested nulls when asked',
+    // );
+    expect(stringify({ a: { b: 'c', d: null } }, { skipNulls: true })).toBe('a%5Bb%5D=c');
+  });
+
+  test('omits array indices when asked', function () {
+    // st.equal(stringify({ a: ['b', 'c', 'd'] }, { indices: false }), 'a=b&a=c&a=d');
+    expect(stringify({ a: ['b', 'c', 'd'] }, { indices: false })).toBe('a=b&a=c&a=d');
+  });
+
+  test('omits object key/value pair when value is empty array', function () {
+    // st.equal(stringify({ a: [], b: 'zz' }), 'b=zz');
+    expect(stringify({ a: [], b: 'zz' })).toBe('b=zz');
+  });
+
+  test('should not omit object key/value pair when value is empty array and when asked', function () {
+    // st.equal(stringify({ a: [], b: 'zz' }), 'b=zz');
+    // st.equal(stringify({ a: [], b: 'zz' }, { allowEmptyArrays: false }), 'b=zz');
+    // st.equal(stringify({ a: [], b: 'zz' }, { allowEmptyArrays: true }), 'a[]&b=zz');
+    expect(stringify({ a: [], b: 'zz' })).toBe('b=zz');
+    expect(stringify({ a: [], b: 'zz' }, { allowEmptyArrays: false })).toBe('b=zz');
+    expect(stringify({ a: [], b: 'zz' }, { allowEmptyArrays: true })).toBe('a[]&b=zz');
+  });
+
+  test('should throw when allowEmptyArrays is not of type boolean', function () {
+    // st['throws'](function () {
+    // 	stringify({ a: [], b: 'zz' }, { allowEmptyArrays: 'foobar' });
+    // }, TypeError);
+    expect(() => {
+      // @ts-expect-error
+      stringify({ a: [], b: 'zz' }, { allowEmptyArrays: 'foobar' });
+    }).toThrow(TypeError);
+
+    // st['throws'](function () {
+    // 	stringify({ a: [], b: 'zz' }, { allowEmptyArrays: 0 });
+    // }, TypeError);
+    expect(() => {
+      // @ts-expect-error
+      stringify({ a: [], b: 'zz' }, { allowEmptyArrays: 0 });
+    }).toThrow(TypeError);
+
+    // st['throws'](function () {
+    // 	stringify({ a: [], b: 'zz' }, { allowEmptyArrays: NaN });
+    // }, TypeError);
+    expect(() => {
+      // @ts-expect-error
+      stringify({ a: [], b: 'zz' }, { allowEmptyArrays: NaN });
+    }).toThrow(TypeError);
+
+    // st['throws'](function () {
+    // 	stringify({ a: [], b: 'zz' }, { allowEmptyArrays: null });
+    // }, TypeError);
+    expect(() => {
+      // @ts-expect-error
+      stringify({ a: [], b: 'zz' }, { allowEmptyArrays: null });
+    }).toThrow(TypeError);
+  });
+
+  test('allowEmptyArrays + strictNullHandling', function () {
+    // st.equal(
+    // 	stringify({ testEmptyArray: [] }, { strictNullHandling: true, allowEmptyArrays: true }),
+    // 	'testEmptyArray[]',
+    // );
+    expect(stringify({ testEmptyArray: [] }, { strictNullHandling: true, allowEmptyArrays: true })).toBe(
+      'testEmptyArray[]',
+    );
+  });
+
+  describe('stringifies an array value with one item vs multiple items', function () {
+    test('non-array item', function () {
+      // s2t.equal(
+      // 	stringify({ a: 'c' }, { encodeValuesOnly: true, arrayFormat: 'indices' }),
+      // 	'a=c',
+      // );
+      // s2t.equal(
+      // 	stringify({ a: 'c' }, { encodeValuesOnly: true, arrayFormat: 'brackets' }),
+      // 	'a=c',
+      // );
+      // s2t.equal(stringify({ a: 'c' }, { encodeValuesOnly: true, arrayFormat: 'comma' }), 'a=c');
+      // s2t.equal(stringify({ a: 'c' }, { encodeValuesOnly: true }), 'a=c');
+      expect(stringify({ a: 'c' }, { encodeValuesOnly: true, arrayFormat: 'indices' })).toBe('a=c');
+      expect(stringify({ a: 'c' }, { encodeValuesOnly: true, arrayFormat: 'brackets' })).toBe('a=c');
+      expect(stringify({ a: 'c' }, { encodeValuesOnly: true, arrayFormat: 'comma' })).toBe('a=c');
+      expect(stringify({ a: 'c' }, { encodeValuesOnly: true })).toBe('a=c');
+    });
+
+    test('array with a single item', function () {
+      // s2t.equal(
+      // 	stringify({ a: ['c'] }, { encodeValuesOnly: true, arrayFormat: 'indices' }),
+      // 	'a[0]=c',
+      // );
+      // s2t.equal(
+      // 	stringify({ a: ['c'] }, { encodeValuesOnly: true, arrayFormat: 'brackets' }),
+      // 	'a[]=c',
+      // );
+      // s2t.equal(
+      // 	stringify({ a: ['c'] }, { encodeValuesOnly: true, arrayFormat: 'comma' }),
+      // 	'a=c',
+      // );
+      // s2t.equal(
+      // 	stringify(
+      // 		{ a: ['c'] },
+      // 		{ encodeValuesOnly: true, arrayFormat: 'comma', commaRoundTrip: true },
+      // 	),
+      // 	'a[]=c',
+      // ); // so it parses back as an array
+      // s2t.equal(stringify({ a: ['c'] }, { encodeValuesOnly: true }), 'a[0]=c');
+      expect(stringify({ a: ['c'] }, { encodeValuesOnly: true, arrayFormat: 'indices' })).toBe('a[0]=c');
+      expect(stringify({ a: ['c'] }, { encodeValuesOnly: true, arrayFormat: 'brackets' })).toBe('a[]=c');
+      expect(stringify({ a: ['c'] }, { encodeValuesOnly: true, arrayFormat: 'comma' })).toBe('a=c');
+      expect(
+        stringify({ a: ['c'] }, { encodeValuesOnly: true, arrayFormat: 'comma', commaRoundTrip: true }),
+      ).toBe('a[]=c');
+      expect(stringify({ a: ['c'] }, { encodeValuesOnly: true })).toBe('a[0]=c');
+    });
+
+    test('array with multiple items', function () {
+      // s2t.equal(
+      // 	stringify({ a: ['c', 'd'] }, { encodeValuesOnly: true, arrayFormat: 'indices' }),
+      // 	'a[0]=c&a[1]=d',
+      // );
+      // s2t.equal(
+      // 	stringify({ a: ['c', 'd'] }, { encodeValuesOnly: true, arrayFormat: 'brackets' }),
+      // 	'a[]=c&a[]=d',
+      // );
+      // s2t.equal(
+      // 	stringify({ a: ['c', 'd'] }, { encodeValuesOnly: true, arrayFormat: 'comma' }),
+      // 	'a=c,d',
+      // );
+      // s2t.equal(
+      // 	stringify(
+      // 		{ a: ['c', 'd'] },
+      // 		{ encodeValuesOnly: true, arrayFormat: 'comma', commaRoundTrip: true },
+      // 	),
+      // 	'a=c,d',
+      // );
+      // s2t.equal(stringify({ a: ['c', 'd'] }, { encodeValuesOnly: true }), 'a[0]=c&a[1]=d');
+      expect(stringify({ a: ['c', 'd'] }, { encodeValuesOnly: true, arrayFormat: 'indices' })).toBe(
+        'a[0]=c&a[1]=d',
+      );
+      expect(stringify({ a: ['c', 'd'] }, { encodeValuesOnly: true, arrayFormat: 'brackets' })).toBe(
+        'a[]=c&a[]=d',
+      );
+      expect(stringify({ a: ['c', 'd'] }, { encodeValuesOnly: true, arrayFormat: 'comma' })).toBe('a=c,d');
+      expect(
+        stringify({ a: ['c', 'd'] }, { encodeValuesOnly: true, arrayFormat: 'comma', commaRoundTrip: true }),
+      ).toBe('a=c,d');
+      expect(stringify({ a: ['c', 'd'] }, { encodeValuesOnly: true })).toBe('a[0]=c&a[1]=d');
+    });
+
+    test('array with multiple items with a comma inside', function () {
+      // s2t.equal(
+      // 	stringify({ a: ['c,d', 'e'] }, { encodeValuesOnly: true, arrayFormat: 'comma' }),
+      // 	'a=c%2Cd,e',
+      // );
+      // s2t.equal(stringify({ a: ['c,d', 'e'] }, { arrayFormat: 'comma' }), 'a=c%2Cd%2Ce');
+      expect(stringify({ a: ['c,d', 'e'] }, { encodeValuesOnly: true, arrayFormat: 'comma' })).toBe(
+        'a=c%2Cd,e',
+      );
+      expect(stringify({ a: ['c,d', 'e'] }, { arrayFormat: 'comma' })).toBe('a=c%2Cd%2Ce');
+
+      // s2t.equal(
+      // 	stringify(
+      // 		{ a: ['c,d', 'e'] },
+      // 		{ encodeValuesOnly: true, arrayFormat: 'comma', commaRoundTrip: true },
+      // 	),
+      // 	'a=c%2Cd,e',
+      // );
+      // s2t.equal(
+      // 	stringify({ a: ['c,d', 'e'] }, { arrayFormat: 'comma', commaRoundTrip: true }),
+      // 	'a=c%2Cd%2Ce',
+      // );
+      expect(
+        stringify(
+          { a: ['c,d', 'e'] },
+          { encodeValuesOnly: true, arrayFormat: 'comma', commaRoundTrip: true },
+        ),
+      ).toBe('a=c%2Cd,e');
+      expect(stringify({ a: ['c,d', 'e'] }, { arrayFormat: 'comma', commaRoundTrip: true })).toBe(
+        'a=c%2Cd%2Ce',
+      );
+    });
+  });
+
+  test('stringifies a nested array value', function () {
+    expect(stringify({ a: { b: ['c', 'd'] } }, { encodeValuesOnly: true, arrayFormat: 'indices' })).toBe(
+      'a[b][0]=c&a[b][1]=d',
+    );
+    expect(stringify({ a: { b: ['c', 'd'] } }, { encodeValuesOnly: true, arrayFormat: 'brackets' })).toBe(
+      'a[b][]=c&a[b][]=d',
+    );
+    expect(stringify({ a: { b: ['c', 'd'] } }, { encodeValuesOnly: true, arrayFormat: 'comma' })).toBe(
+      'a[b]=c,d',
+    );
+    expect(stringify({ a: { b: ['c', 'd'] } }, { encodeValuesOnly: true })).toBe('a[b][0]=c&a[b][1]=d');
+  });
+
+  test('stringifies comma and empty array values', function () {
+    // st.equal(
+    // 	stringify({ a: [',', '', 'c,d%'] }, { encode: false, arrayFormat: 'indices' }),
+    // 	'a[0]=,&a[1]=&a[2]=c,d%',
+    // );
+    // st.equal(
+    // 	stringify({ a: [',', '', 'c,d%'] }, { encode: false, arrayFormat: 'brackets' }),
+    // 	'a[]=,&a[]=&a[]=c,d%',
+    // );
+    // st.equal(
+    // 	stringify({ a: [',', '', 'c,d%'] }, { encode: false, arrayFormat: 'comma' }),
+    // 	'a=,,,c,d%',
+    // );
+    // st.equal(
+    // 	stringify({ a: [',', '', 'c,d%'] }, { encode: false, arrayFormat: 'repeat' }),
+    // 	'a=,&a=&a=c,d%',
+    // );
+    expect(stringify({ a: [',', '', 'c,d%'] }, { encode: false, arrayFormat: 'indices' })).toBe(
+      'a[0]=,&a[1]=&a[2]=c,d%',
+    );
+    expect(stringify({ a: [',', '', 'c,d%'] }, { encode: false, arrayFormat: 'brackets' })).toBe(
+      'a[]=,&a[]=&a[]=c,d%',
+    );
+    expect(stringify({ a: [',', '', 'c,d%'] }, { encode: false, arrayFormat: 'comma' })).toBe('a=,,,c,d%');
+    expect(stringify({ a: [',', '', 'c,d%'] }, { encode: false, arrayFormat: 'repeat' })).toBe(
+      'a=,&a=&a=c,d%',
+    );
+
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [',', '', 'c,d%'] },
+    // 		{ encode: true, encodeValuesOnly: true, arrayFormat: 'indices' },
+    // 	),
+    // 	'a[0]=%2C&a[1]=&a[2]=c%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [',', '', 'c,d%'] },
+    // 		{ encode: true, encodeValuesOnly: true, arrayFormat: 'brackets' },
+    // 	),
+    // 	'a[]=%2C&a[]=&a[]=c%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [',', '', 'c,d%'] },
+    // 		{ encode: true, encodeValuesOnly: true, arrayFormat: 'comma' },
+    // 	),
+    // 	'a=%2C,,c%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [',', '', 'c,d%'] },
+    // 		{ encode: true, encodeValuesOnly: true, arrayFormat: 'repeat' },
+    // 	),
+    // 	'a=%2C&a=&a=c%2Cd%25',
+    // );
+    expect(
+      stringify({ a: [',', '', 'c,d%'] }, { encode: true, encodeValuesOnly: false, arrayFormat: 'indices' }),
+    ).toBe('a%5B0%5D=%2C&a%5B1%5D=&a%5B2%5D=c%2Cd%25');
+    expect(
+      stringify({ a: [',', '', 'c,d%'] }, { encode: true, encodeValuesOnly: true, arrayFormat: 'brackets' }),
+    ).toBe('a[]=%2C&a[]=&a[]=c%2Cd%25');
+    expect(
+      stringify({ a: [',', '', 'c,d%'] }, { encode: true, encodeValuesOnly: false, arrayFormat: 'comma' }),
+    ).toBe('a=%2C%2C%2Cc%2Cd%25');
+    expect(
+      stringify({ a: [',', '', 'c,d%'] }, { encode: true, encodeValuesOnly: false, arrayFormat: 'repeat' }),
+    ).toBe('a=%2C&a=&a=c%2Cd%25');
+
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [',', '', 'c,d%'] },
+    // 		{ encode: true, encodeValuesOnly: false, arrayFormat: 'indices' },
+    // 	),
+    // 	'a%5B0%5D=%2C&a%5B1%5D=&a%5B2%5D=c%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [',', '', 'c,d%'] },
+    // 		{ encode: true, encodeValuesOnly: false, arrayFormat: 'brackets' },
+    // 	),
+    // 	'a%5B%5D=%2C&a%5B%5D=&a%5B%5D=c%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [',', '', 'c,d%'] },
+    // 		{ encode: true, encodeValuesOnly: false, arrayFormat: 'comma' },
+    // 	),
+    // 	'a=%2C%2C%2Cc%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [',', '', 'c,d%'] },
+    // 		{ encode: true, encodeValuesOnly: false, arrayFormat: 'repeat' },
+    // 	),
+    // 	'a=%2C&a=&a=c%2Cd%25',
+    // );
+    expect(
+      stringify({ a: [',', '', 'c,d%'] }, { encode: true, encodeValuesOnly: false, arrayFormat: 'repeat' }),
+    ).toBe('a=%2C&a=&a=c%2Cd%25');
+    expect(
+      stringify({ a: [',', '', 'c,d%'] }, { encode: true, encodeValuesOnly: false, arrayFormat: 'indices' }),
+    ).toBe('a%5B0%5D=%2C&a%5B1%5D=&a%5B2%5D=c%2Cd%25');
+    expect(
+      stringify({ a: [',', '', 'c,d%'] }, { encode: true, encodeValuesOnly: true, arrayFormat: 'brackets' }),
+    ).toBe('a[]=%2C&a[]=&a[]=c%2Cd%25');
+    expect(
+      stringify({ a: [',', '', 'c,d%'] }, { encode: true, encodeValuesOnly: false, arrayFormat: 'comma' }),
+    ).toBe('a=%2C%2C%2Cc%2Cd%25');
+    expect(
+      stringify({ a: [',', '', 'c,d%'] }, { encode: true, encodeValuesOnly: false, arrayFormat: 'repeat' }),
+    ).toBe('a=%2C&a=&a=c%2Cd%25');
+  });
+
+  test('stringifies comma and empty non-array values', function () {
+    // st.equal(
+    // 	stringify({ a: ',', b: '', c: 'c,d%' }, { encode: false, arrayFormat: 'indices' }),
+    // 	'a=,&b=&c=c,d%',
+    // );
+    // st.equal(
+    // 	stringify({ a: ',', b: '', c: 'c,d%' }, { encode: false, arrayFormat: 'brackets' }),
+    // 	'a=,&b=&c=c,d%',
+    // );
+    // st.equal(
+    // 	stringify({ a: ',', b: '', c: 'c,d%' }, { encode: false, arrayFormat: 'comma' }),
+    // 	'a=,&b=&c=c,d%',
+    // );
+    // st.equal(
+    // 	stringify({ a: ',', b: '', c: 'c,d%' }, { encode: false, arrayFormat: 'repeat' }),
+    // 	'a=,&b=&c=c,d%',
+    // );
+    expect(stringify({ a: ',', b: '', c: 'c,d%' }, { encode: false, arrayFormat: 'indices' })).toBe(
+      'a=,&b=&c=c,d%',
+    );
+    expect(stringify({ a: ',', b: '', c: 'c,d%' }, { encode: false, arrayFormat: 'brackets' })).toBe(
+      'a=,&b=&c=c,d%',
+    );
+
+    // st.equal(
+    // 	stringify(
+    // 		{ a: ',', b: '', c: 'c,d%' },
+    // 		{ encode: true, encodeValuesOnly: true, arrayFormat: 'indices' },
+    // 	),
+    // 	'a=%2C&b=&c=c%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: ',', b: '', c: 'c,d%' },
+    // 		{ encode: true, encodeValuesOnly: true, arrayFormat: 'brackets' },
+    // 	),
+    // 	'a=%2C&b=&c=c%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: ',', b: '', c: 'c,d%' },
+    // 		{ encode: true, encodeValuesOnly: true, arrayFormat: 'comma' },
+    // 	),
+    // 	'a=%2C&b=&c=c%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: ',', b: '', c: 'c,d%' },
+    // 		{ encode: true, encodeValuesOnly: true, arrayFormat: 'repeat' },
+    // 	),
+    // 	'a=%2C&b=&c=c%2Cd%25',
+    // );
+    expect(
+      stringify(
+        { a: ',', b: '', c: 'c,d%' },
+        { encode: true, encodeValuesOnly: true, arrayFormat: 'indices' },
+      ),
+    ).toBe('a=%2C&b=&c=c%2Cd%25');
+    expect(
+      stringify(
+        { a: ',', b: '', c: 'c,d%' },
+        { encode: true, encodeValuesOnly: true, arrayFormat: 'brackets' },
+      ),
+    ).toBe('a=%2C&b=&c=c%2Cd%25');
+    expect(
+      stringify({ a: ',', b: '', c: 'c,d%' }, { encode: true, encodeValuesOnly: true, arrayFormat: 'comma' }),
+    ).toBe('a=%2C&b=&c=c%2Cd%25');
+    expect(
+      stringify(
+        { a: ',', b: '', c: 'c,d%' },
+        { encode: true, encodeValuesOnly: true, arrayFormat: 'repeat' },
+      ),
+    ).toBe('a=%2C&b=&c=c%2Cd%25');
+
+    // st.equal(
+    // 	stringify(
+    // 		{ a: ',', b: '', c: 'c,d%' },
+    // 		{ encode: true, encodeValuesOnly: false, arrayFormat: 'indices' },
+    // 	),
+    // 	'a=%2C&b=&c=c%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: ',', b: '', c: 'c,d%' },
+    // 		{ encode: true, encodeValuesOnly: false, arrayFormat: 'brackets' },
+    // 	),
+    // 	'a=%2C&b=&c=c%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: ',', b: '', c: 'c,d%' },
+    // 		{ encode: true, encodeValuesOnly: false, arrayFormat: 'comma' },
+    // 	),
+    // 	'a=%2C&b=&c=c%2Cd%25',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: ',', b: '', c: 'c,d%' },
+    // 		{ encode: true, encodeValuesOnly: false, arrayFormat: 'repeat' },
+    // 	),
+    // 	'a=%2C&b=&c=c%2Cd%25',
+    // );
+    expect(
+      stringify(
+        { a: ',', b: '', c: 'c,d%' },
+        { encode: true, encodeValuesOnly: false, arrayFormat: 'indices' },
+      ),
+    ).toBe('a=%2C&b=&c=c%2Cd%25');
+    expect(
+      stringify(
+        { a: ',', b: '', c: 'c,d%' },
+        { encode: true, encodeValuesOnly: false, arrayFormat: 'brackets' },
+      ),
+    ).toBe('a=%2C&b=&c=c%2Cd%25');
+    expect(
+      stringify(
+        { a: ',', b: '', c: 'c,d%' },
+        { encode: true, encodeValuesOnly: false, arrayFormat: 'comma' },
+      ),
+    ).toBe('a=%2C&b=&c=c%2Cd%25');
+    expect(
+      stringify(
+        { a: ',', b: '', c: 'c,d%' },
+        { encode: true, encodeValuesOnly: false, arrayFormat: 'repeat' },
+      ),
+    ).toBe('a=%2C&b=&c=c%2Cd%25');
+  });
+
+  test('stringifies a nested array value with dots notation', function () {
+    // st.equal(
+    // 	stringify(
+    // 		{ a: { b: ['c', 'd'] } },
+    // 		{ allowDots: true, encodeValuesOnly: true, arrayFormat: 'indices' },
+    // 	),
+    // 	'a.b[0]=c&a.b[1]=d',
+    // 	'indices: stringifies with dots + indices',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: { b: ['c', 'd'] } },
+    // 		{ allowDots: true, encodeValuesOnly: true, arrayFormat: 'brackets' },
+    // 	),
+    // 	'a.b[]=c&a.b[]=d',
+    // 	'brackets: stringifies with dots + brackets',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: { b: ['c', 'd'] } },
+    // 		{ allowDots: true, encodeValuesOnly: true, arrayFormat: 'comma' },
+    // 	),
+    // 	'a.b=c,d',
+    // 	'comma: stringifies with dots + comma',
+    // );
+    // st.equal(
+    // 	stringify({ a: { b: ['c', 'd'] } }, { allowDots: true, encodeValuesOnly: true }),
+    // 	'a.b[0]=c&a.b[1]=d',
+    // 	'default: stringifies with dots + indices',
+    // );
+    expect(
+      stringify(
+        { a: { b: ['c', 'd'] } },
+        { allowDots: true, encodeValuesOnly: true, arrayFormat: 'indices' },
+      ),
+    ).toBe('a.b[0]=c&a.b[1]=d');
+    expect(
+      stringify(
+        { a: { b: ['c', 'd'] } },
+        { allowDots: true, encodeValuesOnly: true, arrayFormat: 'brackets' },
+      ),
+    ).toBe('a.b[]=c&a.b[]=d');
+    expect(
+      stringify({ a: { b: ['c', 'd'] } }, { allowDots: true, encodeValuesOnly: true, arrayFormat: 'comma' }),
+    ).toBe('a.b=c,d');
+    expect(stringify({ a: { b: ['c', 'd'] } }, { allowDots: true, encodeValuesOnly: true })).toBe(
+      'a.b[0]=c&a.b[1]=d',
+    );
+  });
+
+  test('stringifies an object inside an array', function () {
+    // st.equal(
+    // 	stringify({ a: [{ b: 'c' }] }, { arrayFormat: 'indices', encodeValuesOnly: true }),
+    // 	'a[0][b]=c',
+    // 	'indices => indices',
+    // );
+    // st.equal(
+    // 	stringify({ a: [{ b: 'c' }] }, { arrayFormat: 'repeat', encodeValuesOnly: true }),
+    // 	'a[b]=c',
+    // 	'repeat => repeat',
+    // );
+    // st.equal(
+    // 	stringify({ a: [{ b: 'c' }] }, { arrayFormat: 'brackets', encodeValuesOnly: true }),
+    // 	'a[][b]=c',
+    // 	'brackets => brackets',
+    // );
+    // st.equal(
+    // 	stringify({ a: [{ b: 'c' }] }, { encodeValuesOnly: true }),
+    // 	'a[0][b]=c',
+    // 	'default => indices',
+    // );
+    expect(stringify({ a: [{ b: 'c' }] }, { arrayFormat: 'indices', encodeValuesOnly: true })).toBe(
+      'a[0][b]=c',
+    );
+    expect(stringify({ a: [{ b: 'c' }] }, { arrayFormat: 'repeat', encodeValuesOnly: true })).toBe('a[b]=c');
+    expect(stringify({ a: [{ b: 'c' }] }, { arrayFormat: 'brackets', encodeValuesOnly: true })).toBe(
+      'a[][b]=c',
+    );
+    expect(stringify({ a: [{ b: 'c' }] }, { encodeValuesOnly: true })).toBe('a[0][b]=c');
+
+    // st.equal(
+    // 	stringify({ a: [{ b: { c: [1] } }] }, { arrayFormat: 'indices', encodeValuesOnly: true }),
+    // 	'a[0][b][c][0]=1',
+    // 	'indices => indices',
+    // );
+    // st.equal(
+    // 	stringify({ a: [{ b: { c: [1] } }] }, { arrayFormat: 'repeat', encodeValuesOnly: true }),
+    // 	'a[b][c]=1',
+    // 	'repeat => repeat',
+    // );
+    // st.equal(
+    // 	stringify({ a: [{ b: { c: [1] } }] }, { arrayFormat: 'brackets', encodeValuesOnly: true }),
+    // 	'a[][b][c][]=1',
+    // 	'brackets => brackets',
+    // );
+    // st.equal(
+    // 	stringify({ a: [{ b: { c: [1] } }] }, { encodeValuesOnly: true }),
+    // 	'a[0][b][c][0]=1',
+    // 	'default => indices',
+    // );
+    expect(stringify({ a: [{ b: { c: [1] } }] }, { arrayFormat: 'indices', encodeValuesOnly: true })).toBe(
+      'a[0][b][c][0]=1',
+    );
+    expect(stringify({ a: [{ b: { c: [1] } }] }, { arrayFormat: 'repeat', encodeValuesOnly: true })).toBe(
+      'a[b][c]=1',
+    );
+    expect(stringify({ a: [{ b: { c: [1] } }] }, { arrayFormat: 'brackets', encodeValuesOnly: true })).toBe(
+      'a[][b][c][]=1',
+    );
+    expect(stringify({ a: [{ b: { c: [1] } }] }, { encodeValuesOnly: true })).toBe('a[0][b][c][0]=1');
+  });
+
+  test('stringifies an array with mixed objects and primitives', function () {
+    // st.equal(
+    // 	stringify({ a: [{ b: 1 }, 2, 3] }, { encodeValuesOnly: true, arrayFormat: 'indices' }),
+    // 	'a[0][b]=1&a[1]=2&a[2]=3',
+    // 	'indices => indices',
+    // );
+    // st.equal(
+    // 	stringify({ a: [{ b: 1 }, 2, 3] }, { encodeValuesOnly: true, arrayFormat: 'brackets' }),
+    // 	'a[][b]=1&a[]=2&a[]=3',
+    // 	'brackets => brackets',
+    // );
+    // st.equal(
+    // 	stringify({ a: [{ b: 1 }, 2, 3] }, { encodeValuesOnly: true, arrayFormat: 'comma' }),
+    // 	'???',
+    // 	'brackets => brackets',
+    // 	{ skip: 'TODO: figure out what this should do' },
+    // );
+    // st.equal(
+    // 	stringify({ a: [{ b: 1 }, 2, 3] }, { encodeValuesOnly: true }),
+    // 	'a[0][b]=1&a[1]=2&a[2]=3',
+    // 	'default => indices',
+    // );
+    expect(stringify({ a: [{ b: 1 }, 2, 3] }, { encodeValuesOnly: true, arrayFormat: 'indices' })).toBe(
+      'a[0][b]=1&a[1]=2&a[2]=3',
+    );
+    expect(stringify({ a: [{ b: 1 }, 2, 3] }, { encodeValuesOnly: true, arrayFormat: 'brackets' })).toBe(
+      'a[][b]=1&a[]=2&a[]=3',
+    );
+    // !Skipped: Figure out what this should do
+    // expect(
+    // 	stringify({ a: [{ b: 1 }, 2, 3] }, { encodeValuesOnly: true, arrayFormat: 'comma' }),
+    // ).toBe('???');
+    expect(stringify({ a: [{ b: 1 }, 2, 3] }, { encodeValuesOnly: true })).toBe('a[0][b]=1&a[1]=2&a[2]=3');
+  });
+
+  test('stringifies an object inside an array with dots notation', function () {
+    // st.equal(
+    // 	stringify({ a: [{ b: 'c' }] }, { allowDots: true, encode: false, arrayFormat: 'indices' }),
+    // 	'a[0].b=c',
+    // 	'indices => indices',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [{ b: 'c' }] },
+    // 		{ allowDots: true, encode: false, arrayFormat: 'brackets' },
+    // 	),
+    // 	'a[].b=c',
+    // 	'brackets => brackets',
+    // );
+    // st.equal(
+    // 	stringify({ a: [{ b: 'c' }] }, { allowDots: true, encode: false }),
+    // 	'a[0].b=c',
+    // 	'default => indices',
+    // );
+    expect(stringify({ a: [{ b: 'c' }] }, { allowDots: true, encode: false, arrayFormat: 'indices' })).toBe(
+      'a[0].b=c',
+    );
+    expect(stringify({ a: [{ b: 'c' }] }, { allowDots: true, encode: false, arrayFormat: 'brackets' })).toBe(
+      'a[].b=c',
+    );
+    expect(stringify({ a: [{ b: 'c' }] }, { allowDots: true, encode: false })).toBe('a[0].b=c');
+
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [{ b: { c: [1] } }] },
+    // 		{ allowDots: true, encode: false, arrayFormat: 'indices' },
+    // 	),
+    // 	'a[0].b.c[0]=1',
+    // 	'indices => indices',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [{ b: { c: [1] } }] },
+    // 		{ allowDots: true, encode: false, arrayFormat: 'brackets' },
+    // 	),
+    // 	'a[].b.c[]=1',
+    // 	'brackets => brackets',
+    // );
+    // st.equal(
+    // 	stringify({ a: [{ b: { c: [1] } }] }, { allowDots: true, encode: false }),
+    // 	'a[0].b.c[0]=1',
+    // 	'default => indices',
+    // );
+    expect(
+      stringify({ a: [{ b: { c: [1] } }] }, { allowDots: true, encode: false, arrayFormat: 'indices' }),
+    ).toBe('a[0].b.c[0]=1');
+    expect(
+      stringify({ a: [{ b: { c: [1] } }] }, { allowDots: true, encode: false, arrayFormat: 'brackets' }),
+    ).toBe('a[].b.c[]=1');
+    expect(stringify({ a: [{ b: { c: [1] } }] }, { allowDots: true, encode: false })).toBe('a[0].b.c[0]=1');
+  });
+
+  test('does not omit object keys when indices = false', function () {
+    // st.equal(stringify({ a: [{ b: 'c' }] }, { indices: false }), 'a%5Bb%5D=c');
+    expect(stringify({ a: [{ b: 'c' }] }, { indices: false })).toBe('a%5Bb%5D=c');
+  });
+
+  test('uses indices notation for arrays when indices=true', function () {
+    // st.equal(stringify({ a: ['b', 'c'] }, { indices: true }), 'a%5B0%5D=b&a%5B1%5D=c');
+    expect(stringify({ a: ['b', 'c'] }, { indices: true })).toBe('a%5B0%5D=b&a%5B1%5D=c');
+  });
+
+  test('uses indices notation for arrays when no arrayFormat is specified', function () {
+    // st.equal(stringify({ a: ['b', 'c'] }), 'a%5B0%5D=b&a%5B1%5D=c');
+    expect(stringify({ a: ['b', 'c'] })).toBe('a%5B0%5D=b&a%5B1%5D=c');
+  });
+
+  test('uses indices notation for arrays when arrayFormat=indices', function () {
+    // st.equal(stringify({ a: ['b', 'c'] }, { arrayFormat: 'indices' }), 'a%5B0%5D=b&a%5B1%5D=c');
+    expect(stringify({ a: ['b', 'c'] }, { arrayFormat: 'indices' })).toBe('a%5B0%5D=b&a%5B1%5D=c');
+  });
+
+  test('uses repeat notation for arrays when arrayFormat=repeat', function () {
+    // st.equal(stringify({ a: ['b', 'c'] }, { arrayFormat: 'repeat' }), 'a=b&a=c');
+    expect(stringify({ a: ['b', 'c'] }, { arrayFormat: 'repeat' })).toBe('a=b&a=c');
+  });
+
+  test('uses brackets notation for arrays when arrayFormat=brackets', function () {
+    // st.equal(stringify({ a: ['b', 'c'] }, { arrayFormat: 'brackets' }), 'a%5B%5D=b&a%5B%5D=c');
+    expect(stringify({ a: ['b', 'c'] }, { arrayFormat: 'brackets' })).toBe('a%5B%5D=b&a%5B%5D=c');
+  });
+
+  test('stringifies a complicated object', function () {
+    // st.equal(stringify({ a: { b: 'c', d: 'e' } }), 'a%5Bb%5D=c&a%5Bd%5D=e');
+    expect(stringify({ a: { b: 'c', d: 'e' } })).toBe('a%5Bb%5D=c&a%5Bd%5D=e');
+  });
+
+  test('stringifies an empty value', function () {
+    // st.equal(stringify({ a: '' }), 'a=');
+    // st.equal(stringify({ a: null }, { strictNullHandling: true }), 'a');
+    expect(stringify({ a: '' })).toBe('a=');
+    expect(stringify({ a: null }, { strictNullHandling: true })).toBe('a');
+
+    // st.equal(stringify({ a: '', b: '' }), 'a=&b=');
+    // st.equal(stringify({ a: null, b: '' }, { strictNullHandling: true }), 'a&b=');
+    expect(stringify({ a: '', b: '' })).toBe('a=&b=');
+    expect(stringify({ a: null, b: '' }, { strictNullHandling: true })).toBe('a&b=');
+
+    // st.equal(stringify({ a: { b: '' } }), 'a%5Bb%5D=');
+    // st.equal(stringify({ a: { b: null } }, { strictNullHandling: true }), 'a%5Bb%5D');
+    // st.equal(stringify({ a: { b: null } }, { strictNullHandling: false }), 'a%5Bb%5D=');
+    expect(stringify({ a: { b: '' } })).toBe('a%5Bb%5D=');
+    expect(stringify({ a: { b: null } }, { strictNullHandling: true })).toBe('a%5Bb%5D');
+    expect(stringify({ a: { b: null } }, { strictNullHandling: false })).toBe('a%5Bb%5D=');
+  });
+
+  test('stringifies an empty array in different arrayFormat', function () {
+    // st.equal(stringify({ a: [], b: [null], c: 'c' }, { encode: false }), 'b[0]=&c=c');
+    expect(stringify({ a: [], b: [null], c: 'c' }, { encode: false })).toBe('b[0]=&c=c');
+    // arrayFormat default
+    // st.equal(
+    // 	stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'indices' }),
+    // 	'b[0]=&c=c',
+    // );
+    // st.equal(
+    // 	stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'brackets' }),
+    // 	'b[]=&c=c',
+    // );
+    // st.equal(
+    // 	stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'repeat' }),
+    // 	'b=&c=c',
+    // );
+    // st.equal(
+    // 	stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'comma' }),
+    // 	'b=&c=c',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [], b: [null], c: 'c' },
+    // 		{ encode: false, arrayFormat: 'comma', commaRoundTrip: true },
+    // 	),
+    // 	'b[]=&c=c',
+    // );
+    expect(stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'indices' })).toBe(
+      'b[0]=&c=c',
+    );
+    expect(stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'brackets' })).toBe(
+      'b[]=&c=c',
+    );
+    expect(stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'repeat' })).toBe('b=&c=c');
+    expect(stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'comma' })).toBe('b=&c=c');
+    expect(
+      stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'comma', commaRoundTrip: true }),
+    ).toBe('b[]=&c=c');
+
+    // with strictNullHandling
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [], b: [null], c: 'c' },
+    // 		{ encode: false, arrayFormat: 'indices', strictNullHandling: true },
+    // 	),
+    // 	'b[0]&c=c',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [], b: [null], c: 'c' },
+    // 		{ encode: false, arrayFormat: 'brackets', strictNullHandling: true },
+    // 	),
+    // 	'b[]&c=c',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [], b: [null], c: 'c' },
+    // 		{ encode: false, arrayFormat: 'repeat', strictNullHandling: true },
+    // 	),
+    // 	'b&c=c',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [], b: [null], c: 'c' },
+    // 		{ encode: false, arrayFormat: 'comma', strictNullHandling: true },
+    // 	),
+    // 	'b&c=c',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [], b: [null], c: 'c' },
+    // 		{ encode: false, arrayFormat: 'comma', strictNullHandling: true, commaRoundTrip: true },
+    // 	),
+    // 	'b[]&c=c',
+    // );
+
+    expect(
+      stringify(
+        { a: [], b: [null], c: 'c' },
+        { encode: false, arrayFormat: 'indices', strictNullHandling: true },
+      ),
+    ).toBe('b[0]&c=c');
+    expect(
+      stringify(
+        { a: [], b: [null], c: 'c' },
+        { encode: false, arrayFormat: 'brackets', strictNullHandling: true },
+      ),
+    ).toBe('b[]&c=c');
+    expect(
+      stringify(
+        { a: [], b: [null], c: 'c' },
+        { encode: false, arrayFormat: 'repeat', strictNullHandling: true },
+      ),
+    ).toBe('b&c=c');
+    expect(
+      stringify(
+        { a: [], b: [null], c: 'c' },
+        { encode: false, arrayFormat: 'comma', strictNullHandling: true },
+      ),
+    ).toBe('b&c=c');
+    expect(
+      stringify(
+        { a: [], b: [null], c: 'c' },
+        { encode: false, arrayFormat: 'comma', strictNullHandling: true, commaRoundTrip: true },
+      ),
+    ).toBe('b[]&c=c');
+
+    // with skipNulls
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [], b: [null], c: 'c' },
+    // 		{ encode: false, arrayFormat: 'indices', skipNulls: true },
+    // 	),
+    // 	'c=c',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [], b: [null], c: 'c' },
+    // 		{ encode: false, arrayFormat: 'brackets', skipNulls: true },
+    // 	),
+    // 	'c=c',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [], b: [null], c: 'c' },
+    // 		{ encode: false, arrayFormat: 'repeat', skipNulls: true },
+    // 	),
+    // 	'c=c',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [], b: [null], c: 'c' },
+    // 		{ encode: false, arrayFormat: 'comma', skipNulls: true },
+    // 	),
+    // 	'c=c',
+    // );
+    expect(
+      stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'indices', skipNulls: true }),
+    ).toBe('c=c');
+    expect(
+      stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'brackets', skipNulls: true }),
+    ).toBe('c=c');
+    expect(
+      stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'repeat', skipNulls: true }),
+    ).toBe('c=c');
+    expect(
+      stringify({ a: [], b: [null], c: 'c' }, { encode: false, arrayFormat: 'comma', skipNulls: true }),
+    ).toBe('c=c');
+  });
+
+  test('stringifies a null object', function () {
+    var obj = Object.create(null);
+    obj.a = 'b';
+    // st.equal(stringify(obj), 'a=b');
+    expect(stringify(obj)).toBe('a=b');
+  });
+
+  test('returns an empty string for invalid input', function () {
+    // st.equal(stringify(undefined), '');
+    // st.equal(stringify(false), '');
+    // st.equal(stringify(null), '');
+    // st.equal(stringify(''), '');
+    expect(stringify(undefined)).toBe('');
+    expect(stringify(false)).toBe('');
+    expect(stringify(null)).toBe('');
+    expect(stringify('')).toBe('');
+  });
+
+  test('stringifies an object with a null object as a child', function () {
+    var obj = { a: Object.create(null) };
+
+    obj.a.b = 'c';
+    // st.equal(stringify(obj), 'a%5Bb%5D=c');
+    expect(stringify(obj)).toBe('a%5Bb%5D=c');
+  });
+
+  test('drops keys with a value of undefined', function () {
+    // st.equal(stringify({ a: undefined }), '');
+    expect(stringify({ a: undefined })).toBe('');
+
+    // st.equal(
+    // 	stringify({ a: { b: undefined, c: null } }, { strictNullHandling: true }),
+    // 	'a%5Bc%5D',
+    // );
+    // st.equal(
+    // 	stringify({ a: { b: undefined, c: null } }, { strictNullHandling: false }),
+    // 	'a%5Bc%5D=',
+    // );
+    // st.equal(stringify({ a: { b: undefined, c: '' } }), 'a%5Bc%5D=');
+    expect(stringify({ a: { b: undefined, c: null } }, { strictNullHandling: true })).toBe('a%5Bc%5D');
+    expect(stringify({ a: { b: undefined, c: null } }, { strictNullHandling: false })).toBe('a%5Bc%5D=');
+    expect(stringify({ a: { b: undefined, c: '' } })).toBe('a%5Bc%5D=');
+  });
+
+  test('url encodes values', function () {
+    // st.equal(stringify({ a: 'b c' }), 'a=b%20c');
+    expect(stringify({ a: 'b c' })).toBe('a=b%20c');
+  });
+
+  test('stringifies a date', function () {
+    var now = new Date();
+    var str = 'a=' + encodeURIComponent(now.toISOString());
+    // st.equal(stringify({ a: now }), str);
+    expect(stringify({ a: now })).toBe(str);
+  });
+
+  test('stringifies the weird object from qs', function () {
+    // st.equal(
+    // 	stringify({ 'my weird field': '~q1!2"\'w$5&7/z8)?' }),
+    // 	'my%20weird%20field=~q1%212%22%27w%245%267%2Fz8%29%3F',
+    // );
+    expect(stringify({ 'my weird field': '~q1!2"\'w$5&7/z8)?' })).toBe(
+      'my%20weird%20field=~q1%212%22%27w%245%267%2Fz8%29%3F',
+    );
+  });
+
+  // TODO: Investigate how to to intercept in vitest
+  // TODO(rob)
+  test('skips properties that are part of the object prototype', function () {
+    // st.intercept(Object.prototype, 'crash', { value: 'test' });
+    // @ts-expect-error
+    Object.prototype.crash = 'test';
+
+    // st.equal(stringify({ a: 'b' }), 'a=b');
+    // st.equal(stringify({ a: { b: 'c' } }), 'a%5Bb%5D=c');
+    expect(stringify({ a: 'b' })).toBe('a=b');
+    expect(stringify({ a: { b: 'c' } })).toBe('a%5Bb%5D=c');
+  });
+
+  test('stringifies boolean values', function () {
+    // st.equal(stringify({ a: true }), 'a=true');
+    // st.equal(stringify({ a: { b: true } }), 'a%5Bb%5D=true');
+    // st.equal(stringify({ b: false }), 'b=false');
+    // st.equal(stringify({ b: { c: false } }), 'b%5Bc%5D=false');
+    expect(stringify({ a: true })).toBe('a=true');
+    expect(stringify({ a: { b: true } })).toBe('a%5Bb%5D=true');
+    expect(stringify({ b: false })).toBe('b=false');
+    expect(stringify({ b: { c: false } })).toBe('b%5Bc%5D=false');
+  });
+
+  test('stringifies buffer values', function () {
+    // st.equal(stringify({ a: Buffer.from('test') }), 'a=test');
+    // st.equal(stringify({ a: { b: Buffer.from('test') } }), 'a%5Bb%5D=test');
+  });
+
+  test('stringifies an object using an alternative delimiter', function () {
+    // st.equal(stringify({ a: 'b', c: 'd' }, { delimiter: ';' }), 'a=b;c=d');
+    expect(stringify({ a: 'b', c: 'd' }, { delimiter: ';' })).toBe('a=b;c=d');
+  });
+
+  // We dont target environments which dont even have Buffer
+  // test('does not blow up when Buffer global is missing', function () {
+  // 	var restore = mockProperty(global, 'Buffer', { delete: true });
+
+  // 	var result = stringify({ a: 'b', c: 'd' });
+
+  // 	restore();
+
+  // 	st.equal(result, 'a=b&c=d');
+  // 	st.end();
+  // });
+
+  test('does not crash when parsing circular references', function () {
+    var a: any = {};
+    a.b = a;
+
+    // st['throws'](
+    // 	function () {
+    // 		stringify({ 'foo[bar]': 'baz', 'foo[baz]': a });
+    // 	},
+    // 	/RangeError: Cyclic object value/,
+    // 	'cyclic values throw',
+    // );
+    expect(() => {
+      stringify({ 'foo[bar]': 'baz', 'foo[baz]': a });
+    }).toThrow('Cyclic object value');
+
+    var circular: any = {
+      a: 'value',
+    };
+    circular.a = circular;
+    // st['throws'](
+    // 	function () {
+    // 		stringify(circular);
+    // 	},
+    // 	/RangeError: Cyclic object value/,
+    // 	'cyclic values throw',
+    // );
+    expect(() => {
+      stringify(circular);
+    }).toThrow('Cyclic object value');
+
+    var arr = ['a'];
+    // st.doesNotThrow(function () {
+    // 	stringify({ x: arr, y: arr });
+    // }, 'non-cyclic values do not throw');
+    expect(() => {
+      stringify({ x: arr, y: arr });
+    }).not.toThrow();
+  });
+
+  test('non-circular duplicated references can still work', function () {
+    var hourOfDay = {
+      function: 'hour_of_day',
+    };
+
+    var p1 = {
+      function: 'gte',
+      arguments: [hourOfDay, 0],
+    };
+    var p2 = {
+      function: 'lte',
+      arguments: [hourOfDay, 23],
+    };
+
+    // st.equal(
+    // 	stringify(
+    // 		{ filters: { $and: [p1, p2] } },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'indices' },
+    // 	),
+    // 	'filters[$and][0][function]=gte&filters[$and][0][arguments][0][function]=hour_of_day&filters[$and][0][arguments][1]=0&filters[$and][1][function]=lte&filters[$and][1][arguments][0][function]=hour_of_day&filters[$and][1][arguments][1]=23',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ filters: { $and: [p1, p2] } },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'brackets' },
+    // 	),
+    // 	'filters[$and][][function]=gte&filters[$and][][arguments][][function]=hour_of_day&filters[$and][][arguments][]=0&filters[$and][][function]=lte&filters[$and][][arguments][][function]=hour_of_day&filters[$and][][arguments][]=23',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ filters: { $and: [p1, p2] } },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'repeat' },
+    // 	),
+    // 	'filters[$and][function]=gte&filters[$and][arguments][function]=hour_of_day&filters[$and][arguments]=0&filters[$and][function]=lte&filters[$and][arguments][function]=hour_of_day&filters[$and][arguments]=23',
+    // );
+    expect(
+      stringify({ filters: { $and: [p1, p2] } }, { encodeValuesOnly: true, arrayFormat: 'indices' }),
+    ).toBe(
+      'filters[$and][0][function]=gte&filters[$and][0][arguments][0][function]=hour_of_day&filters[$and][0][arguments][1]=0&filters[$and][1][function]=lte&filters[$and][1][arguments][0][function]=hour_of_day&filters[$and][1][arguments][1]=23',
+    );
+    expect(
+      stringify({ filters: { $and: [p1, p2] } }, { encodeValuesOnly: true, arrayFormat: 'brackets' }),
+    ).toBe(
+      'filters[$and][][function]=gte&filters[$and][][arguments][][function]=hour_of_day&filters[$and][][arguments][]=0&filters[$and][][function]=lte&filters[$and][][arguments][][function]=hour_of_day&filters[$and][][arguments][]=23',
+    );
+    expect(
+      stringify({ filters: { $and: [p1, p2] } }, { encodeValuesOnly: true, arrayFormat: 'repeat' }),
+    ).toBe(
+      'filters[$and][function]=gte&filters[$and][arguments][function]=hour_of_day&filters[$and][arguments]=0&filters[$and][function]=lte&filters[$and][arguments][function]=hour_of_day&filters[$and][arguments]=23',
+    );
+  });
+
+  test('selects properties when filter=array', function () {
+    // st.equal(stringify({ a: 'b' }, { filter: ['a'] }), 'a=b');
+    // st.equal(stringify({ a: 1 }, { filter: [] }), '');
+    expect(stringify({ a: 'b' }, { filter: ['a'] })).toBe('a=b');
+    expect(stringify({ a: 1 }, { filter: [] })).toBe('');
+
+    // st.equal(
+    // 	stringify(
+    // 		{ a: { b: [1, 2, 3, 4], c: 'd' }, c: 'f' },
+    // 		{ filter: ['a', 'b', 0, 2], arrayFormat: 'indices' },
+    // 	),
+    // 	'a%5Bb%5D%5B0%5D=1&a%5Bb%5D%5B2%5D=3',
+    // 	'indices => indices',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: { b: [1, 2, 3, 4], c: 'd' }, c: 'f' },
+    // 		{ filter: ['a', 'b', 0, 2], arrayFormat: 'brackets' },
+    // 	),
+    // 	'a%5Bb%5D%5B%5D=1&a%5Bb%5D%5B%5D=3',
+    // 	'brackets => brackets',
+    // );
+    // st.equal(
+    // 	stringify({ a: { b: [1, 2, 3, 4], c: 'd' }, c: 'f' }, { filter: ['a', 'b', 0, 2] }),
+    // 	'a%5Bb%5D%5B0%5D=1&a%5Bb%5D%5B2%5D=3',
+    // 	'default => indices',
+    // );
+    expect(stringify({ a: { b: [1, 2, 3, 4], c: 'd' }, c: 'f' }, { filter: ['a', 'b', 0, 2] })).toBe(
+      'a%5Bb%5D%5B0%5D=1&a%5Bb%5D%5B2%5D=3',
+    );
+    expect(
+      stringify(
+        { a: { b: [1, 2, 3, 4], c: 'd' }, c: 'f' },
+        { filter: ['a', 'b', 0, 2], arrayFormat: 'indices' },
+      ),
+    ).toBe('a%5Bb%5D%5B0%5D=1&a%5Bb%5D%5B2%5D=3');
+    expect(
+      stringify(
+        { a: { b: [1, 2, 3, 4], c: 'd' }, c: 'f' },
+        { filter: ['a', 'b', 0, 2], arrayFormat: 'brackets' },
+      ),
+    ).toBe('a%5Bb%5D%5B%5D=1&a%5Bb%5D%5B%5D=3');
+  });
+
+  test('supports custom representations when filter=function', function () {
+    var calls = 0;
+    var obj = { a: 'b', c: 'd', e: { f: new Date(1257894000000) } };
+    var filterFunc: StringifyOptions['filter'] = function (prefix, value) {
+      calls += 1;
+      if (calls === 1) {
+        // st.equal(prefix, '', 'prefix is empty');
+        // st.equal(value, obj);
+        expect(prefix).toBe('');
+        expect(value).toBe(obj);
+      } else if (prefix === 'c') {
+        return void 0;
+      } else if (value instanceof Date) {
+        // st.equal(prefix, 'e[f]');
+        expect(prefix).toBe('e[f]');
+        return value.getTime();
+      }
+      return value;
+    };
+
+    // st.equal(stringify(obj, { filter: filterFunc }), 'a=b&e%5Bf%5D=1257894000000');
+    // st.equal(calls, 5);
+    expect(stringify(obj, { filter: filterFunc })).toBe('a=b&e%5Bf%5D=1257894000000');
+    expect(calls).toBe(5);
+  });
+
+  test('can disable uri encoding', function () {
+    // st.equal(stringify({ a: 'b' }, { encode: false }), 'a=b');
+    // st.equal(stringify({ a: { b: 'c' } }, { encode: false }), 'a[b]=c');
+    // st.equal(
+    // 	stringify({ a: 'b', c: null }, { strictNullHandling: true, encode: false }),
+    // 	'a=b&c',
+    // );
+    expect(stringify({ a: 'b' }, { encode: false })).toBe('a=b');
+    expect(stringify({ a: { b: 'c' } }, { encode: false })).toBe('a[b]=c');
+    expect(stringify({ a: 'b', c: null }, { strictNullHandling: true, encode: false })).toBe('a=b&c');
+  });
+
+  test('can sort the keys', function () {
+    // @ts-expect-error
+    var sort: NonNullable<StringifyOptions['sort']> = function (a: string, b: string) {
+      return a.localeCompare(b);
+    };
+    // st.equal(stringify({ a: 'c', z: 'y', b: 'f' }, { sort: sort }), 'a=c&b=f&z=y');
+    // st.equal(
+    // 	stringify({ a: 'c', z: { j: 'a', i: 'b' }, b: 'f' }, { sort: sort }),
+    // 	'a=c&b=f&z%5Bi%5D=b&z%5Bj%5D=a',
+    // );
+    expect(stringify({ a: 'c', z: 'y', b: 'f' }, { sort: sort })).toBe('a=c&b=f&z=y');
+    expect(stringify({ a: 'c', z: { j: 'a', i: 'b' }, b: 'f' }, { sort: sort })).toBe(
+      'a=c&b=f&z%5Bi%5D=b&z%5Bj%5D=a',
+    );
+  });
+
+  test('can sort the keys at depth 3 or more too', function () {
+    // @ts-expect-error
+    var sort: NonNullable<StringifyOptions['sort']> = function (a: string, b: string) {
+      return a.localeCompare(b);
+    };
+    // st.equal(
+    // 	stringify(
+    // 		{ a: 'a', z: { zj: { zjb: 'zjb', zja: 'zja' }, zi: { zib: 'zib', zia: 'zia' } }, b: 'b' },
+    // 		{ sort: sort, encode: false },
+    // 	),
+    // 	'a=a&b=b&z[zi][zia]=zia&z[zi][zib]=zib&z[zj][zja]=zja&z[zj][zjb]=zjb',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: 'a', z: { zj: { zjb: 'zjb', zja: 'zja' }, zi: { zib: 'zib', zia: 'zia' } }, b: 'b' },
+    // 		{ sort: null, encode: false },
+    // 	),
+    // 	'a=a&z[zj][zjb]=zjb&z[zj][zja]=zja&z[zi][zib]=zib&z[zi][zia]=zia&b=b',
+    // );
+    expect(
+      stringify(
+        { a: 'a', z: { zj: { zjb: 'zjb', zja: 'zja' }, zi: { zib: 'zib', zia: 'zia' } }, b: 'b' },
+        { sort: sort, encode: false },
+      ),
+    ).toBe('a=a&b=b&z[zi][zia]=zia&z[zi][zib]=zib&z[zj][zja]=zja&z[zj][zjb]=zjb');
+    expect(
+      stringify(
+        { a: 'a', z: { zj: { zjb: 'zjb', zja: 'zja' }, zi: { zib: 'zib', zia: 'zia' } }, b: 'b' },
+        { sort: null, encode: false },
+      ),
+    ).toBe('a=a&z[zj][zjb]=zjb&z[zj][zja]=zja&z[zi][zib]=zib&z[zi][zia]=zia&b=b');
+  });
+
+  test('can stringify with custom encoding', function () {
+    // st.equal(
+    // 	stringify(
+    // 		{ 県: '大阪府', '': '' },
+    // 		{
+    // 			encoder: function (str) {
+    // 				if (str.length === 0) {
+    // 					return '';
+    // 				}
+    // 				var buf = iconv.encode(str, 'shiftjis');
+    // 				var result = [];
+    // 				for (var i = 0; i < buf.length; ++i) {
+    // 					result.push(buf.readUInt8(i).toString(16));
+    // 				}
+    // 				return '%' + result.join('%');
+    // 			},
+    // 		},
+    // 	),
+    // 	'%8c%a7=%91%e5%8d%e3%95%7b&=',
+    // );
+    expect(
+      stringify(
+        { 県: '大阪府', '': '' },
+        {
+          encoder: function (str) {
+            if (str.length === 0) {
+              return '';
+            }
+            var buf = iconv.encode(str, 'shiftjis');
+            var result = [];
+            for (var i = 0; i < buf.length; ++i) {
+              result.push(buf.readUInt8(i).toString(16));
+            }
+            return '%' + result.join('%');
+          },
+        },
+      ),
+    ).toBe('%8c%a7=%91%e5%8d%e3%95%7b&=');
+  });
+
+  test('receives the default encoder as a second argument', function () {
+    // stringify(
+    // 	{ a: 1, b: new Date(), c: true, d: [1] },
+    // 	{
+    // 		encoder: function (str) {
+    // 			st.match(typeof str, /^(?:string|number|boolean)$/);
+    // 			return '';
+    // 		},
+    // 	},
+    // );
+
+    stringify(
+      { a: 1, b: new Date(), c: true, d: [1] },
+      {
+        encoder: function (str) {
+          // st.match(typeof str, /^(?:string|number|boolean)$/);
+          assert.match(typeof str, /^(?:string|number|boolean)$/);
+          return '';
+        },
+      },
+    );
+  });
+
+  test('receives the default encoder as a second argument', function () {
+    // stringify(
+    // 	{ a: 1 },
+    // 	{
+    // 		encoder: function (str, defaultEncoder) {
+    // 			st.equal(defaultEncoder, utils.encode);
+    // 		},
+    // 	},
+    // );
+
+    stringify(
+      { a: 1 },
+      {
+        // @ts-ignore
+        encoder: function (_str, defaultEncoder) {
+          expect(defaultEncoder).toBe(encode);
+        },
+      },
+    );
+  });
+
+  test('throws error with wrong encoder', function () {
+    // st['throws'](function () {
+    // 	stringify({}, { encoder: 'string' });
+    // }, new TypeError('Encoder has to be a function.'));
+    // st.end();
+    expect(() => {
+      // @ts-expect-error
+      stringify({}, { encoder: 'string' });
+    }).toThrow(TypeError);
+  });
+
+  (typeof Buffer === 'undefined' ? test.skip : test)(
+    'can use custom encoder for a buffer object',
+    function () {
+      // st.equal(
+      // 	stringify(
+      // 		{ a: Buffer.from([1]) },
+      // 		{
+      // 			encoder: function (buffer) {
+      // 				if (typeof buffer === 'string') {
+      // 					return buffer;
+      // 				}
+      // 				return String.fromCharCode(buffer.readUInt8(0) + 97);
+      // 			},
+      // 		},
+      // 	),
+      // 	'a=b',
+      // );
+      expect(
+        stringify(
+          { a: Buffer.from([1]) },
+          {
+            encoder: function (buffer) {
+              if (typeof buffer === 'string') {
+                return buffer;
+              }
+              return String.fromCharCode(buffer.readUInt8(0) + 97);
+            },
+          },
+        ),
+      ).toBe('a=b');
+
+      // st.equal(
+      // 	stringify(
+      // 		{ a: Buffer.from('a b') },
+      // 		{
+      // 			encoder: function (buffer) {
+      // 				return buffer;
+      // 			},
+      // 		},
+      // 	),
+      // 	'a=a b',
+      // );
+      expect(
+        stringify(
+          { a: Buffer.from('a b') },
+          {
+            encoder: function (buffer) {
+              return buffer;
+            },
+          },
+        ),
+      ).toBe('a=a b');
+    },
+  );
+
+  test('serializeDate option', function () {
+    var date = new Date();
+    // st.equal(
+    // 	stringify({ a: date }),
+    // 	'a=' + date.toISOString().replace(/:/g, '%3A'),
+    // 	'default is toISOString',
+    // );
+    expect(stringify({ a: date })).toBe('a=' + date.toISOString().replace(/:/g, '%3A'));
+
+    var mutatedDate = new Date();
+    mutatedDate.toISOString = function () {
+      throw new SyntaxError();
+    };
+    // st['throws'](function () {
+    // 	mutatedDate.toISOString();
+    // }, SyntaxError);
+    expect(() => {
+      mutatedDate.toISOString();
+    }).toThrow(SyntaxError);
+    // st.equal(
+    // 	stringify({ a: mutatedDate }),
+    // 	'a=' + Date.prototype.toISOString.call(mutatedDate).replace(/:/g, '%3A'),
+    // 	'toISOString works even when method is not locally present',
+    // );
+    expect(stringify({ a: mutatedDate })).toBe(
+      'a=' + Date.prototype.toISOString.call(mutatedDate).replace(/:/g, '%3A'),
+    );
+
+    var specificDate = new Date(6);
+    // st.equal(
+    // 	stringify(
+    // 		{ a: specificDate },
+    // 		{
+    // 			serializeDate: function (d) {
+    // 				return d.getTime() * 7;
+    // 			},
+    // 		},
+    // 	),
+    // 	'a=42',
+    // 	'custom serializeDate function called',
+    // );
+    expect(
+      stringify(
+        { a: specificDate },
+        {
+          // @ts-ignore
+          serializeDate: function (d) {
+            return d.getTime() * 7;
+          },
+        },
+      ),
+    ).toBe('a=42');
+
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [date] },
+    // 		{
+    // 			serializeDate: function (d) {
+    // 				return d.getTime();
+    // 			},
+    // 			arrayFormat: 'comma',
+    // 		},
+    // 	),
+    // 	'a=' + date.getTime(),
+    // 	'works with arrayFormat comma',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [date] },
+    // 		{
+    // 			serializeDate: function (d) {
+    // 				return d.getTime();
+    // 			},
+    // 			arrayFormat: 'comma',
+    // 			commaRoundTrip: true,
+    // 		},
+    // 	),
+    // 	'a%5B%5D=' + date.getTime(),
+    // 	'works with arrayFormat comma',
+    // );
+    expect(
+      stringify(
+        { a: [date] },
+        {
+          // @ts-expect-error
+          serializeDate: function (d) {
+            return d.getTime();
+          },
+          arrayFormat: 'comma',
+        },
+      ),
+    ).toBe('a=' + date.getTime());
+    expect(
+      stringify(
+        { a: [date] },
+        {
+          // @ts-expect-error
+          serializeDate: function (d) {
+            return d.getTime();
+          },
+          arrayFormat: 'comma',
+          commaRoundTrip: true,
+        },
+      ),
+    ).toBe('a%5B%5D=' + date.getTime());
+  });
+
+  test('RFC 1738 serialization', function () {
+    // st.equal(stringify({ a: 'b c' }, { format: formats.RFC1738 }), 'a=b+c');
+    // st.equal(stringify({ 'a b': 'c d' }, { format: formats.RFC1738 }), 'a+b=c+d');
+    // st.equal(
+    // 	stringify({ 'a b': Buffer.from('a b') }, { format: formats.RFC1738 }),
+    // 	'a+b=a+b',
+    // );
+    expect(stringify({ a: 'b c' }, { format: 'RFC1738' })).toBe('a=b+c');
+    expect(stringify({ 'a b': 'c d' }, { format: 'RFC1738' })).toBe('a+b=c+d');
+    expect(stringify({ 'a b': Buffer.from('a b') }, { format: 'RFC1738' })).toBe('a+b=a+b');
+
+    // st.equal(stringify({ 'foo(ref)': 'bar' }, { format: formats.RFC1738 }), 'foo(ref)=bar');
+    expect(stringify({ 'foo(ref)': 'bar' }, { format: 'RFC1738' })).toBe('foo(ref)=bar');
+  });
+
+  test('RFC 3986 spaces serialization', function () {
+    // st.equal(stringify({ a: 'b c' }, { format: formats.RFC3986 }), 'a=b%20c');
+    // st.equal(stringify({ 'a b': 'c d' }, { format: formats.RFC3986 }), 'a%20b=c%20d');
+    // st.equal(
+    // 	stringify({ 'a b': Buffer.from('a b') }, { format: formats.RFC3986 }),
+    // 	'a%20b=a%20b',
+    // );
+    expect(stringify({ a: 'b c' }, { format: 'RFC3986' })).toBe('a=b%20c');
+    expect(stringify({ 'a b': 'c d' }, { format: 'RFC3986' })).toBe('a%20b=c%20d');
+    expect(stringify({ 'a b': Buffer.from('a b') }, { format: 'RFC3986' })).toBe('a%20b=a%20b');
+  });
+
+  test('Backward compatibility to RFC 3986', function () {
+    // st.equal(stringify({ a: 'b c' }), 'a=b%20c');
+    // st.equal(stringify({ 'a b': Buffer.from('a b') }), 'a%20b=a%20b');
+    expect(stringify({ a: 'b c' })).toBe('a=b%20c');
+    expect(stringify({ 'a b': Buffer.from('a b') })).toBe('a%20b=a%20b');
+  });
+
+  test('Edge cases and unknown formats', function () {
+    ['UFO1234', false, 1234, null, {}, []].forEach(function (format) {
+      // st['throws'](function () {
+      // 	stringify({ a: 'b c' }, { format: format });
+      // }, new TypeError('Unknown format option provided.'));
+      expect(() => {
+        // @ts-expect-error
+        stringify({ a: 'b c' }, { format: format });
+      }).toThrow(TypeError);
+    });
+  });
+
+  test('encodeValuesOnly', function () {
+    // st.equal(
+    // 	stringify(
+    // 		{ a: 'b', c: ['d', 'e=f'], f: [['g'], ['h']] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'indices' },
+    // 	),
+    // 	'a=b&c[0]=d&c[1]=e%3Df&f[0][0]=g&f[1][0]=h',
+    // 	'encodeValuesOnly + indices',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: 'b', c: ['d', 'e=f'], f: [['g'], ['h']] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'brackets' },
+    // 	),
+    // 	'a=b&c[]=d&c[]=e%3Df&f[][]=g&f[][]=h',
+    // 	'encodeValuesOnly + brackets',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: 'b', c: ['d', 'e=f'], f: [['g'], ['h']] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'repeat' },
+    // 	),
+    // 	'a=b&c=d&c=e%3Df&f=g&f=h',
+    // 	'encodeValuesOnly + repeat',
+    // );
+    expect(
+      stringify(
+        { a: 'b', c: ['d', 'e=f'], f: [['g'], ['h']] },
+        { encodeValuesOnly: true, arrayFormat: 'indices' },
+      ),
+    ).toBe('a=b&c[0]=d&c[1]=e%3Df&f[0][0]=g&f[1][0]=h');
+    expect(
+      stringify(
+        { a: 'b', c: ['d', 'e=f'], f: [['g'], ['h']] },
+        { encodeValuesOnly: true, arrayFormat: 'brackets' },
+      ),
+    ).toBe('a=b&c[]=d&c[]=e%3Df&f[][]=g&f[][]=h');
+    expect(
+      stringify(
+        { a: 'b', c: ['d', 'e=f'], f: [['g'], ['h']] },
+        { encodeValuesOnly: true, arrayFormat: 'repeat' },
+      ),
+    ).toBe('a=b&c=d&c=e%3Df&f=g&f=h');
+
+    // st.equal(
+    // 	stringify({ a: 'b', c: ['d', 'e'], f: [['g'], ['h']] }, { arrayFormat: 'indices' }),
+    // 	'a=b&c%5B0%5D=d&c%5B1%5D=e&f%5B0%5D%5B0%5D=g&f%5B1%5D%5B0%5D=h',
+    // 	'no encodeValuesOnly + indices',
+    // );
+    // st.equal(
+    // 	stringify({ a: 'b', c: ['d', 'e'], f: [['g'], ['h']] }, { arrayFormat: 'brackets' }),
+    // 	'a=b&c%5B%5D=d&c%5B%5D=e&f%5B%5D%5B%5D=g&f%5B%5D%5B%5D=h',
+    // 	'no encodeValuesOnly + brackets',
+    // );
+    // st.equal(
+    // 	stringify({ a: 'b', c: ['d', 'e'], f: [['g'], ['h']] }, { arrayFormat: 'repeat' }),
+    // 	'a=b&c=d&c=e&f=g&f=h',
+    // 	'no encodeValuesOnly + repeat',
+    // );
+    expect(stringify({ a: 'b', c: ['d', 'e'], f: [['g'], ['h']] }, { arrayFormat: 'indices' })).toBe(
+      'a=b&c%5B0%5D=d&c%5B1%5D=e&f%5B0%5D%5B0%5D=g&f%5B1%5D%5B0%5D=h',
+    );
+    expect(stringify({ a: 'b', c: ['d', 'e'], f: [['g'], ['h']] }, { arrayFormat: 'brackets' })).toBe(
+      'a=b&c%5B%5D=d&c%5B%5D=e&f%5B%5D%5B%5D=g&f%5B%5D%5B%5D=h',
+    );
+    expect(stringify({ a: 'b', c: ['d', 'e'], f: [['g'], ['h']] }, { arrayFormat: 'repeat' })).toBe(
+      'a=b&c=d&c=e&f=g&f=h',
+    );
+  });
+
+  test('encodeValuesOnly - strictNullHandling', function () {
+    // st.equal(
+    // 	stringify({ a: { b: null } }, { encodeValuesOnly: true, strictNullHandling: true }),
+    // 	'a[b]',
+    // );
+    expect(stringify({ a: { b: null } }, { encodeValuesOnly: true, strictNullHandling: true })).toBe('a[b]');
+  });
+
+  test('throws if an invalid charset is specified', function () {
+    // st['throws'](function () {
+    // 	stringify({ a: 'b' }, { charset: 'foobar' });
+    // }, new TypeError('The charset option must be either utf-8, iso-8859-1, or undefined'));
+    expect(() => {
+      // @ts-expect-error
+      stringify({ a: 'b' }, { charset: 'foobar' });
+    }).toThrow(TypeError);
+  });
+
+  test('respects a charset of iso-8859-1', function () {
+    // st.equal(stringify({ æ: 'æ' }, { charset: 'iso-8859-1' }), '%E6=%E6');
+    expect(stringify({ æ: 'æ' }, { charset: 'iso-8859-1' })).toBe('%E6=%E6');
+  });
+
+  test('encodes unrepresentable chars as numeric entities in iso-8859-1 mode', function () {
+    // st.equal(stringify({ a: '☺' }, { charset: 'iso-8859-1' }), 'a=%26%239786%3B');
+    expect(stringify({ a: '☺' }, { charset: 'iso-8859-1' })).toBe('a=%26%239786%3B');
+  });
+
+  test('respects an explicit charset of utf-8 (the default)', function () {
+    // st.equal(stringify({ a: 'æ' }, { charset: 'utf-8' }), 'a=%C3%A6');
+    expect(stringify({ a: 'æ' }, { charset: 'utf-8' })).toBe('a=%C3%A6');
+  });
+
+  test('`charsetSentinel` option', function () {
+    // st.equal(
+    // 	stringify({ a: 'æ' }, { charsetSentinel: true, charset: 'utf-8' }),
+    // 	'utf8=%E2%9C%93&a=%C3%A6',
+    // 	'adds the right sentinel when instructed to and the charset is utf-8',
+    // );
+    expect(stringify({ a: 'æ' }, { charsetSentinel: true, charset: 'utf-8' })).toBe(
+      'utf8=%E2%9C%93&a=%C3%A6',
+    );
+
+    // st.equal(
+    // 	stringify({ a: 'æ' }, { charsetSentinel: true, charset: 'iso-8859-1' }),
+    // 	'utf8=%26%2310003%3B&a=%E6',
+    // 	'adds the right sentinel when instructed to and the charset is iso-8859-1',
+    // );
+    expect(stringify({ a: 'æ' }, { charsetSentinel: true, charset: 'iso-8859-1' })).toBe(
+      'utf8=%26%2310003%3B&a=%E6',
+    );
+  });
+
+  test('does not mutate the options argument', function () {
+    var options = {};
+    stringify({}, options);
+    // st.deepEqual(options, {});
+    expect(options).toEqual({});
+  });
+
+  test('strictNullHandling works with custom filter', function () {
+    // @ts-expect-error
+    var filter = function (_prefix, value) {
+      return value;
+    };
+
+    var options = { strictNullHandling: true, filter: filter };
+    // st.equal(stringify({ key: null }, options), 'key');
+    expect(stringify({ key: null }, options)).toBe('key');
+  });
+
+  test('strictNullHandling works with null serializeDate', function () {
+    var serializeDate = function () {
+      return null;
+    };
+    var options = { strictNullHandling: true, serializeDate: serializeDate };
+    var date = new Date();
+    // st.equal(stringify({ key: date }, options), 'key');
+    // @ts-expect-error
+    expect(stringify({ key: date }, options)).toBe('key');
+  });
+
+  test('allows for encoding keys and values differently', function () {
+    // @ts-expect-error
+    var encoder = function (str, defaultEncoder, charset, type) {
+      if (type === 'key') {
+        return defaultEncoder(str, defaultEncoder, charset, type).toLowerCase();
+      }
+      if (type === 'value') {
+        return defaultEncoder(str, defaultEncoder, charset, type).toUpperCase();
+      }
+      throw 'this should never happen! type: ' + type;
+    };
+
+    // st.deepEqual(stringify({ KeY: 'vAlUe' }, { encoder: encoder }), 'key=VALUE');
+    expect(stringify({ KeY: 'vAlUe' }, { encoder: encoder })).toBe('key=VALUE');
+  });
+
+  test('objects inside arrays', function () {
+    var obj = { a: { b: { c: 'd', e: 'f' } } };
+    var withArray = { a: { b: [{ c: 'd', e: 'f' }] } };
+
+    // st.equal(
+    // 	stringify(obj, { encode: false }),
+    // 	'a[b][c]=d&a[b][e]=f',
+    // 	'no array, no arrayFormat',
+    // );
+    // st.equal(
+    // 	stringify(obj, { encode: false, arrayFormat: 'brackets' }),
+    // 	'a[b][c]=d&a[b][e]=f',
+    // 	'no array, bracket',
+    // );
+    // st.equal(
+    // 	stringify(obj, { encode: false, arrayFormat: 'indices' }),
+    // 	'a[b][c]=d&a[b][e]=f',
+    // 	'no array, indices',
+    // );
+    // st.equal(
+    // 	stringify(obj, { encode: false, arrayFormat: 'repeat' }),
+    // 	'a[b][c]=d&a[b][e]=f',
+    // 	'no array, repeat',
+    // );
+    // st.equal(
+    // 	stringify(obj, { encode: false, arrayFormat: 'comma' }),
+    // 	'a[b][c]=d&a[b][e]=f',
+    // 	'no array, comma',
+    // );
+    expect(stringify(obj, { encode: false })).toBe('a[b][c]=d&a[b][e]=f');
+    expect(stringify(obj, { encode: false, arrayFormat: 'brackets' })).toBe('a[b][c]=d&a[b][e]=f');
+    expect(stringify(obj, { encode: false, arrayFormat: 'indices' })).toBe('a[b][c]=d&a[b][e]=f');
+    expect(stringify(obj, { encode: false, arrayFormat: 'repeat' })).toBe('a[b][c]=d&a[b][e]=f');
+    expect(stringify(obj, { encode: false, arrayFormat: 'comma' })).toBe('a[b][c]=d&a[b][e]=f');
+
+    // st.equal(
+    // 	stringify(withArray, { encode: false }),
+    // 	'a[b][0][c]=d&a[b][0][e]=f',
+    // 	'array, no arrayFormat',
+    // );
+    // st.equal(
+    // 	stringify(withArray, { encode: false, arrayFormat: 'brackets' }),
+    // 	'a[b][][c]=d&a[b][][e]=f',
+    // 	'array, bracket',
+    // );
+    // st.equal(
+    // 	stringify(withArray, { encode: false, arrayFormat: 'indices' }),
+    // 	'a[b][0][c]=d&a[b][0][e]=f',
+    // 	'array, indices',
+    // );
+    // st.equal(
+    // 	stringify(withArray, { encode: false, arrayFormat: 'repeat' }),
+    // 	'a[b][c]=d&a[b][e]=f',
+    // 	'array, repeat',
+    // );
+    // st.equal(
+    // 	stringify(withArray, { encode: false, arrayFormat: 'comma' }),
+    // 	'???',
+    // 	'array, comma',
+    // 	{ skip: 'TODO: figure out what this should do' },
+    // );
+    expect(stringify(withArray, { encode: false })).toBe('a[b][0][c]=d&a[b][0][e]=f');
+    expect(stringify(withArray, { encode: false, arrayFormat: 'brackets' })).toBe('a[b][][c]=d&a[b][][e]=f');
+    expect(stringify(withArray, { encode: false, arrayFormat: 'indices' })).toBe('a[b][0][c]=d&a[b][0][e]=f');
+    expect(stringify(withArray, { encode: false, arrayFormat: 'repeat' })).toBe('a[b][c]=d&a[b][e]=f');
+    // !TODo: Figure out what this should do
+    // expect(stringify(withArray, { encode: false, arrayFormat: 'comma' })).toBe(
+    // 	'a[b][c]=d&a[b][e]=f',
+    // );
+  });
+
+  test('stringifies sparse arrays', function () {
+    // st.equal(
+    // 	stringify({ a: [, '2', , , '1'] }, { encodeValuesOnly: true, arrayFormat: 'indices' }),
+    // 	'a[1]=2&a[4]=1',
+    // );
+    // st.equal(
+    // 	stringify({ a: [, '2', , , '1'] }, { encodeValuesOnly: true, arrayFormat: 'brackets' }),
+    // 	'a[]=2&a[]=1',
+    // );
+    // st.equal(
+    // 	stringify({ a: [, '2', , , '1'] }, { encodeValuesOnly: true, arrayFormat: 'repeat' }),
+    // 	'a=2&a=1',
+    // );
+    expect(stringify({ a: [, '2', , , '1'] }, { encodeValuesOnly: true, arrayFormat: 'indices' })).toBe(
+      'a[1]=2&a[4]=1',
+    );
+    expect(stringify({ a: [, '2', , , '1'] }, { encodeValuesOnly: true, arrayFormat: 'brackets' })).toBe(
+      'a[]=2&a[]=1',
+    );
+    expect(stringify({ a: [, '2', , , '1'] }, { encodeValuesOnly: true, arrayFormat: 'repeat' })).toBe(
+      'a=2&a=1',
+    );
+
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [, { b: [, , { c: '1' }] }] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'indices' },
+    // 	),
+    // 	'a[1][b][2][c]=1',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [, { b: [, , { c: '1' }] }] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'brackets' },
+    // 	),
+    // 	'a[][b][][c]=1',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [, { b: [, , { c: '1' }] }] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'repeat' },
+    // 	),
+    // 	'a[b][c]=1',
+    // );
+    expect(
+      stringify({ a: [, { b: [, , { c: '1' }] }] }, { encodeValuesOnly: true, arrayFormat: 'indices' }),
+    ).toBe('a[1][b][2][c]=1');
+    expect(
+      stringify({ a: [, { b: [, , { c: '1' }] }] }, { encodeValuesOnly: true, arrayFormat: 'brackets' }),
+    ).toBe('a[][b][][c]=1');
+    expect(
+      stringify({ a: [, { b: [, , { c: '1' }] }] }, { encodeValuesOnly: true, arrayFormat: 'repeat' }),
+    ).toBe('a[b][c]=1');
+
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [, [, , [, , , { c: '1' }]]] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'indices' },
+    // 	),
+    // 	'a[1][2][3][c]=1',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [, [, , [, , , { c: '1' }]]] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'brackets' },
+    // 	),
+    // 	'a[][][][c]=1',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [, [, , [, , , { c: '1' }]]] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'repeat' },
+    // 	),
+    // 	'a[c]=1',
+    // );
+    expect(
+      stringify({ a: [, [, , [, , , { c: '1' }]]] }, { encodeValuesOnly: true, arrayFormat: 'indices' }),
+    ).toBe('a[1][2][3][c]=1');
+    expect(
+      stringify({ a: [, [, , [, , , { c: '1' }]]] }, { encodeValuesOnly: true, arrayFormat: 'brackets' }),
+    ).toBe('a[][][][c]=1');
+    expect(
+      stringify({ a: [, [, , [, , , { c: '1' }]]] }, { encodeValuesOnly: true, arrayFormat: 'repeat' }),
+    ).toBe('a[c]=1');
+
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [, [, , [, , , { c: [, '1'] }]]] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'indices' },
+    // 	),
+    // 	'a[1][2][3][c][1]=1',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [, [, , [, , , { c: [, '1'] }]]] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'brackets' },
+    // 	),
+    // 	'a[][][][c][]=1',
+    // );
+    // st.equal(
+    // 	stringify(
+    // 		{ a: [, [, , [, , , { c: [, '1'] }]]] },
+    // 		{ encodeValuesOnly: true, arrayFormat: 'repeat' },
+    // 	),
+    // 	'a[c]=1',
+    // );
+    expect(
+      stringify({ a: [, [, , [, , , { c: [, '1'] }]]] }, { encodeValuesOnly: true, arrayFormat: 'indices' }),
+    ).toBe('a[1][2][3][c][1]=1');
+    expect(
+      stringify({ a: [, [, , [, , , { c: [, '1'] }]]] }, { encodeValuesOnly: true, arrayFormat: 'brackets' }),
+    ).toBe('a[][][][c][]=1');
+    expect(
+      stringify({ a: [, [, , [, , , { c: [, '1'] }]]] }, { encodeValuesOnly: true, arrayFormat: 'repeat' }),
+    ).toBe('a[c]=1');
+  });
+
+  test('encodes a very long string', function () {
+    var chars = [];
+    var expected = [];
+    for (var i = 0; i < 5e3; i++) {
+      chars.push(' ' + i);
+
+      expected.push('%20' + i);
+    }
+
+    var obj = {
+      foo: chars.join(''),
+    };
+
+    // st.equal(
+    // 	stringify(obj, { arrayFormat: 'bracket', charset: 'utf-8' }),
+    // 	'foo=' + expected.join(''),
+    // );
+    // @ts-expect-error
+    expect(stringify(obj, { arrayFormat: 'bracket', charset: 'utf-8' })).toBe('foo=' + expected.join(''));
+  });
+});
+
+describe('stringifies empty keys', function () {
+  empty_test_cases.forEach(function (testCase) {
+    test('stringifies an object with empty string key with ' + testCase.input, function () {
+      // st.deepEqual(
+      // 	stringify(testCase.withEmptyKeys, { encode: false, arrayFormat: 'indices' }),
+      // 	testCase.stringifyOutput.indices,
+      // 	'test case: ' + testCase.input + ', indices',
+      // );
+      // st.deepEqual(
+      // 	stringify(testCase.withEmptyKeys, { encode: false, arrayFormat: 'brackets' }),
+      // 	testCase.stringifyOutput.brackets,
+      // 	'test case: ' + testCase.input + ', brackets',
+      // );
+      // st.deepEqual(
+      // 	stringify(testCase.withEmptyKeys, { encode: false, arrayFormat: 'repeat' }),
+      // 	testCase.stringifyOutput.repeat,
+      // 	'test case: ' + testCase.input + ', repeat',
+      // );
+      expect(stringify(testCase.with_empty_keys, { encode: false, arrayFormat: 'indices' })).toBe(
+        testCase.stringify_output.indices,
+      );
+      expect(stringify(testCase.with_empty_keys, { encode: false, arrayFormat: 'brackets' })).toBe(
+        testCase.stringify_output.brackets,
+      );
+      expect(stringify(testCase.with_empty_keys, { encode: false, arrayFormat: 'repeat' })).toBe(
+        testCase.stringify_output.repeat,
+      );
+    });
+  });
+
+  test('edge case with object/arrays', function () {
+    // st.deepEqual(stringify({ '': { '': [2, 3] } }, { encode: false }), '[][0]=2&[][1]=3');
+    // st.deepEqual(
+    // 	stringify({ '': { '': [2, 3], a: 2 } }, { encode: false }),
+    // 	'[][0]=2&[][1]=3&[a]=2',
+    // );
+    // st.deepEqual(
+    // 	stringify({ '': { '': [2, 3] } }, { encode: false, arrayFormat: 'indices' }),
+    // 	'[][0]=2&[][1]=3',
+    // );
+    // st.deepEqual(
+    // 	stringify({ '': { '': [2, 3], a: 2 } }, { encode: false, arrayFormat: 'indices' }),
+    // 	'[][0]=2&[][1]=3&[a]=2',
+    // );
+    expect(stringify({ '': { '': [2, 3] } }, { encode: false })).toBe('[][0]=2&[][1]=3');
+    expect(stringify({ '': { '': [2, 3], a: 2 } }, { encode: false })).toBe('[][0]=2&[][1]=3&[a]=2');
+    expect(stringify({ '': { '': [2, 3] } }, { encode: false, arrayFormat: 'indices' })).toBe(
+      '[][0]=2&[][1]=3',
+    );
+    expect(stringify({ '': { '': [2, 3], a: 2 } }, { encode: false, arrayFormat: 'indices' })).toBe(
+      '[][0]=2&[][1]=3&[a]=2',
+    );
+  });
+});
diff --git a/tests/qs/utils.test.ts b/tests/qs/utils.test.ts
new file mode 100644
index 0000000000..2c60b4e03d
--- /dev/null
+++ b/tests/qs/utils.test.ts
@@ -0,0 +1,169 @@
+import { combine, merge, is_buffer, assign_single_source } from 'cloudflare/internal/qs/utils';
+
+describe('merge()', function () {
+  // t.deepEqual(merge(null, true), [null, true], 'merges true into null');
+  expect(merge(null, true)).toEqual([null, true]);
+
+  // t.deepEqual(merge(null, [42]), [null, 42], 'merges null into an array');
+  expect(merge(null, [42])).toEqual([null, 42]);
+
+  // t.deepEqual(
+  // 	merge({ a: 'b' }, { a: 'c' }),
+  // 	{ a: ['b', 'c'] },
+  // 	'merges two objects with the same key',
+  // );
+  expect(merge({ a: 'b' }, { a: 'c' })).toEqual({ a: ['b', 'c'] });
+
+  var oneMerged = merge({ foo: 'bar' }, { foo: { first: '123' } });
+  // t.deepEqual(
+  // 	oneMerged,
+  // 	{ foo: ['bar', { first: '123' }] },
+  // 	'merges a standalone and an object into an array',
+  // );
+  expect(oneMerged).toEqual({ foo: ['bar', { first: '123' }] });
+
+  var twoMerged = merge({ foo: ['bar', { first: '123' }] }, { foo: { second: '456' } });
+  // t.deepEqual(
+  // 	twoMerged,
+  // 	{ foo: { 0: 'bar', 1: { first: '123' }, second: '456' } },
+  // 	'merges a standalone and two objects into an array',
+  // );
+  expect(twoMerged).toEqual({ foo: { 0: 'bar', 1: { first: '123' }, second: '456' } });
+
+  var sandwiched = merge({ foo: ['bar', { first: '123', second: '456' }] }, { foo: 'baz' });
+  // t.deepEqual(
+  // 	sandwiched,
+  // 	{ foo: ['bar', { first: '123', second: '456' }, 'baz'] },
+  // 	'merges an object sandwiched by two standalones into an array',
+  // );
+  expect(sandwiched).toEqual({ foo: ['bar', { first: '123', second: '456' }, 'baz'] });
+
+  var nestedArrays = merge({ foo: ['baz'] }, { foo: ['bar', 'xyzzy'] });
+  // t.deepEqual(nestedArrays, { foo: ['baz', 'bar', 'xyzzy'] });
+  expect(nestedArrays).toEqual({ foo: ['baz', 'bar', 'xyzzy'] });
+
+  var noOptionsNonObjectSource = merge({ foo: 'baz' }, 'bar');
+  // t.deepEqual(noOptionsNonObjectSource, { foo: 'baz', bar: true });
+  expect(noOptionsNonObjectSource).toEqual({ foo: 'baz', bar: true });
+
+  (typeof Object.defineProperty !== 'function' ? test.skip : test)(
+    'avoids invoking array setters unnecessarily',
+    function () {
+      var setCount = 0;
+      var getCount = 0;
+      var observed: any[] = [];
+      Object.defineProperty(observed, 0, {
+        get: function () {
+          getCount += 1;
+          return { bar: 'baz' };
+        },
+        set: function () {
+          setCount += 1;
+        },
+      });
+      merge(observed, [null]);
+      // st.equal(setCount, 0);
+      // st.equal(getCount, 1);
+      expect(setCount).toEqual(0);
+      expect(getCount).toEqual(1);
+      observed[0] = observed[0]; // eslint-disable-line no-self-assign
+      // st.equal(setCount, 1);
+      // st.equal(getCount, 2);
+      expect(setCount).toEqual(1);
+      expect(getCount).toEqual(2);
+    },
+  );
+});
+
+test('assign()', function () {
+  var target = { a: 1, b: 2 };
+  var source = { b: 3, c: 4 };
+  var result = assign_single_source(target, source);
+
+  expect(result).toEqual(target);
+  expect(target).toEqual({ a: 1, b: 3, c: 4 });
+  expect(source).toEqual({ b: 3, c: 4 });
+});
+
+describe('combine()', function () {
+  test('both arrays', function () {
+    var a = [1];
+    var b = [2];
+    var combined = combine(a, b);
+
+    // st.deepEqual(a, [1], 'a is not mutated');
+    // st.deepEqual(b, [2], 'b is not mutated');
+    // st.notEqual(a, combined, 'a !== combined');
+    // st.notEqual(b, combined, 'b !== combined');
+    // st.deepEqual(combined, [1, 2], 'combined is a + b');
+    expect(a).toEqual([1]);
+    expect(b).toEqual([2]);
+    expect(combined).toEqual([1, 2]);
+    expect(a).not.toEqual(combined);
+    expect(b).not.toEqual(combined);
+  });
+
+  test('one array, one non-array', function () {
+    var aN = 1;
+    var a = [aN];
+    var bN = 2;
+    var b = [bN];
+
+    var combinedAnB = combine(aN, b);
+    // st.deepEqual(b, [bN], 'b is not mutated');
+    // st.notEqual(aN, combinedAnB, 'aN + b !== aN');
+    // st.notEqual(a, combinedAnB, 'aN + b !== a');
+    // st.notEqual(bN, combinedAnB, 'aN + b !== bN');
+    // st.notEqual(b, combinedAnB, 'aN + b !== b');
+    // st.deepEqual([1, 2], combinedAnB, 'first argument is array-wrapped when not an array');
+    expect(b).toEqual([bN]);
+    expect(combinedAnB).not.toEqual(aN);
+    expect(combinedAnB).not.toEqual(a);
+    expect(combinedAnB).not.toEqual(bN);
+    expect(combinedAnB).not.toEqual(b);
+    expect(combinedAnB).toEqual([1, 2]);
+
+    var combinedABn = combine(a, bN);
+    // st.deepEqual(a, [aN], 'a is not mutated');
+    // st.notEqual(aN, combinedABn, 'a + bN !== aN');
+    // st.notEqual(a, combinedABn, 'a + bN !== a');
+    // st.notEqual(bN, combinedABn, 'a + bN !== bN');
+    // st.notEqual(b, combinedABn, 'a + bN !== b');
+    // st.deepEqual([1, 2], combinedABn, 'second argument is array-wrapped when not an array');
+    expect(a).toEqual([aN]);
+    expect(combinedABn).not.toEqual(aN);
+    expect(combinedABn).not.toEqual(a);
+    expect(combinedABn).not.toEqual(bN);
+    expect(combinedABn).not.toEqual(b);
+    expect(combinedABn).toEqual([1, 2]);
+  });
+
+  test('neither is an array', function () {
+    var combined = combine(1, 2);
+    // st.notEqual(1, combined, '1 + 2 !== 1');
+    // st.notEqual(2, combined, '1 + 2 !== 2');
+    // st.deepEqual([1, 2], combined, 'both arguments are array-wrapped when not an array');
+    expect(combined).not.toEqual(1);
+    expect(combined).not.toEqual(2);
+    expect(combined).toEqual([1, 2]);
+  });
+});
+
+test('is_buffer()', function () {
+  for (const x of [null, undefined, true, false, '', 'abc', 42, 0, NaN, {}, [], function () {}, /a/g]) {
+    // t.equal(is_buffer(x), false, inspect(x) + ' is not a buffer');
+    expect(is_buffer(x)).toEqual(false);
+  }
+
+  var fakeBuffer = { constructor: Buffer };
+  // t.equal(is_buffer(fakeBuffer), false, 'fake buffer is not a buffer');
+  expect(is_buffer(fakeBuffer)).toEqual(false);
+
+  var saferBuffer = Buffer.from('abc');
+  // t.equal(is_buffer(saferBuffer), true, 'SaferBuffer instance is a buffer');
+  expect(is_buffer(saferBuffer)).toEqual(true);
+
+  var buffer = Buffer.from('abc');
+  // t.equal(is_buffer(buffer), true, 'real Buffer instance is a buffer');
+  expect(is_buffer(buffer)).toEqual(true);
+});
diff --git a/tests/uploads.test.ts b/tests/uploads.test.ts
index 0072fec150..d6679a9a02 100644
--- a/tests/uploads.test.ts
+++ b/tests/uploads.test.ts
@@ -54,4 +54,12 @@ describe('toFile', () => {
     const file = await toFile(input);
     expect(file.name).toEqual('uploads.test.ts');
   });
+
+  it('does not copy File objects', async () => {
+    const input = new File(['foo'], 'input.jsonl', { type: 'jsonl' });
+    const file = await toFile(input);
+    expect(file).toBe(input);
+    expect(file.name).toEqual('input.jsonl');
+    expect(file.type).toBe('jsonl');
+  });
 });
diff --git a/tsconfig.deno.json b/tsconfig.deno.json
index c3312f3b17..849e070dbc 100644
--- a/tsconfig.deno.json
+++ b/tsconfig.deno.json
@@ -1,19 +1,14 @@
 {
   "extends": "./tsconfig.json",
-  "include": ["deno"],
+  "include": ["dist-deno"],
   "exclude": [],
   "compilerOptions": {
-    "rootDir": "./deno",
+    "rootDir": "./dist-deno",
     "lib": ["es2020", "DOM"],
-    "paths": {
-      "cloudflare/_shims/auto/*": ["deno/_shims/auto/*-deno"],
-      "cloudflare/*": ["deno/*"],
-      "cloudflare": ["deno/index.ts"],
-    },
     "noEmit": true,
     "declaration": true,
     "declarationMap": true,
-    "outDir": "deno",
+    "outDir": "dist-deno",
     "pretty": true,
     "sourceMap": true
   }
diff --git a/tsconfig.json b/tsconfig.json
index dc6f58612a..8c0d44f9c5 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,7 +11,7 @@
     "paths": {
       "cloudflare/_shims/auto/*": ["src/_shims/auto/*-node"],
       "cloudflare/*": ["src/*"],
-      "cloudflare": ["src/index.ts"],
+      "cloudflare": ["src/index.ts"]
     },
     "noEmit": true,
 
@@ -32,6 +32,7 @@
     "noUncheckedIndexedAccess": true,
     "noImplicitOverride": true,
     "noPropertyAccessFromIndexSignature": true,
+		"isolatedModules": false,
 
     "skipLibCheck": true
   }
diff --git a/yarn.lock b/yarn.lock
index 648fb3ccdd..bb1794207f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -322,9 +322,9 @@
     eslint-visitor-keys "^3.3.0"
 
 "@eslint-community/regexpp@^4.5.1":
-  version "4.9.0"
-  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.9.0.tgz#7ccb5f58703fa61ffdcbf39e2c604a109e781162"
-  integrity sha512-zJmuCWj2VLBt4c25CfBIbMZLGLyhkvs7LznyVX5HfpzeocThgIj5XQK4L+g3U36mMcx8bPMhGyPpwCATamC4jQ==
+  version "4.11.1"
+  resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.11.1.tgz#a547badfc719eb3e5f4b556325e542fbe9d7a18f"
+  integrity sha512-m4DVN9ZqskZoLU5GlWZadwDnYo3vAEydiUayB9widCl9ffWx2IvPnp6n3on5rJmziJSw9Bv+Z3ChDVdMwXCY8Q==
 
 "@eslint-community/regexpp@^4.6.1":
   version "4.6.2"
@@ -759,16 +759,6 @@
   dependencies:
     "@swc/counter" "^0.1.3"
 
-"@ts-morph/common@~0.20.0":
-  version "0.20.0"
-  resolved "https://registry.yarnpkg.com/@ts-morph/common/-/common-0.20.0.tgz#3f161996b085ba4519731e4d24c35f6cba5b80af"
-  integrity sha512-7uKjByfbPpwuzkstL3L5MQyuXPSKdoNG93Fmi2JoDcTf3pEP731JdRFAduRVkOs8oqxPsXKA+ScrWkdQ8t/I+Q==
-  dependencies:
-    fast-glob "^3.2.12"
-    minimatch "^7.4.3"
-    mkdirp "^2.1.6"
-    path-browserify "^1.0.1"
-
 "@tsconfig/node10@^1.0.7":
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
@@ -857,9 +847,9 @@
     pretty-format "^29.0.0"
 
 "@types/json-schema@^7.0.12":
-  version "7.0.13"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.13.tgz#02c24f4363176d2d18fc8b70b9f3c54aba178a85"
-  integrity sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==
+  version "7.0.15"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841"
+  integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==
 
 "@types/node-fetch@^2.6.4":
   version "2.6.4"
@@ -881,15 +871,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-18.11.18.tgz#8dfb97f0da23c2293e554c5a50d61ef134d7697f"
   integrity sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==
 
-"@types/qs@^6.9.7":
-  version "6.9.15"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.15.tgz#adde8a060ec9c305a82de1babc1056e73bd64dce"
-  integrity sha512-uXHQKES6DQKKCLh441Xv/dwxOq1TVS3JPUMlEqoEglvlhR6Mxnlew/Xq/LRVHpLyk7iK3zODe1qYHIMltO7XGg==
-
 "@types/semver@^7.5.0":
-  version "7.5.3"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.3.tgz#9a726e116beb26c24f1ccd6850201e1246122e04"
-  integrity sha512-OxepLK9EuNEIPxWNME+C6WwbRAOOI2o2BaQEGzz5Lu2e4Z5eDnEo+/aVEDMIXywoJitJ7xWd641wrGLZdtwRyw==
+  version "7.5.8"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.8.tgz#8268a8c57a3e4abd25c165ecd36237db7948a55e"
+  integrity sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==
 
 "@types/stack-utils@^2.0.0":
   version "2.0.3"
@@ -909,15 +894,15 @@
     "@types/yargs-parser" "*"
 
 "@typescript-eslint/eslint-plugin@^6.7.0":
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.7.3.tgz#d98046e9f7102d49a93d944d413c6055c47fafd7"
-  integrity sha512-vntq452UHNltxsaaN+L9WyuMch8bMd9CqJ3zhzTPXXidwbf5mqqKCVXEuvRZUqLJSTLeWE65lQwyXsRGnXkCTA==
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz#30830c1ca81fd5f3c2714e524c4303e0194f9cd3"
+  integrity sha512-oy9+hTPCUFpngkEZUSzbf9MxI65wbKFoQYsgPdILTfbUldp5ovUuphZVe4i30emU9M/kP+T64Di0mxl7dSw3MA==
   dependencies:
     "@eslint-community/regexpp" "^4.5.1"
-    "@typescript-eslint/scope-manager" "6.7.3"
-    "@typescript-eslint/type-utils" "6.7.3"
-    "@typescript-eslint/utils" "6.7.3"
-    "@typescript-eslint/visitor-keys" "6.7.3"
+    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/type-utils" "6.21.0"
+    "@typescript-eslint/utils" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
     debug "^4.3.4"
     graphemer "^1.4.0"
     ignore "^5.2.4"
@@ -926,71 +911,72 @@
     ts-api-utils "^1.0.1"
 
 "@typescript-eslint/parser@^6.7.0":
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.7.3.tgz#aaf40092a32877439e5957e18f2d6a91c82cc2fd"
-  integrity sha512-TlutE+iep2o7R8Lf+yoer3zU6/0EAUc8QIBB3GYBc1KGz4c4TRm83xwXUZVPlZ6YCLss4r77jbu6j3sendJoiQ==
-  dependencies:
-    "@typescript-eslint/scope-manager" "6.7.3"
-    "@typescript-eslint/types" "6.7.3"
-    "@typescript-eslint/typescript-estree" "6.7.3"
-    "@typescript-eslint/visitor-keys" "6.7.3"
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.21.0.tgz#af8fcf66feee2edc86bc5d1cf45e33b0630bf35b"
+  integrity sha512-tbsV1jPne5CkFQCgPBcDOt30ItF7aJoZL997JSF7MhGQqOeT3svWRYxiqlfA5RUdlHN6Fi+EI9bxqbdyAUZjYQ==
+  dependencies:
+    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/typescript-estree" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
     debug "^4.3.4"
 
-"@typescript-eslint/scope-manager@6.7.3":
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.7.3.tgz#07e5709c9bdae3eaf216947433ef97b3b8b7d755"
-  integrity sha512-wOlo0QnEou9cHO2TdkJmzF7DFGvAKEnB82PuPNHpT8ZKKaZu6Bm63ugOTn9fXNJtvuDPanBc78lGUGGytJoVzQ==
+"@typescript-eslint/scope-manager@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.21.0.tgz#ea8a9bfc8f1504a6ac5d59a6df308d3a0630a2b1"
+  integrity sha512-OwLUIWZJry80O99zvqXVEioyniJMa+d2GrqpUTqi5/v5D5rOrppJVBPa0yKCblcigC0/aYAzxxqQ1B+DS2RYsg==
   dependencies:
-    "@typescript-eslint/types" "6.7.3"
-    "@typescript-eslint/visitor-keys" "6.7.3"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
 
-"@typescript-eslint/type-utils@6.7.3":
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.7.3.tgz#c2c165c135dda68a5e70074ade183f5ad68f3400"
-  integrity sha512-Fc68K0aTDrKIBvLnKTZ5Pf3MXK495YErrbHb1R6aTpfK5OdSFj0rVN7ib6Tx6ePrZ2gsjLqr0s98NG7l96KSQw==
+"@typescript-eslint/type-utils@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.21.0.tgz#6473281cfed4dacabe8004e8521cee0bd9d4c01e"
+  integrity sha512-rZQI7wHfao8qMX3Rd3xqeYSMCL3SoiSQLBATSiVKARdFGCYSRvmViieZjqc58jKgs8Y8i9YvVVhRbHSTA4VBag==
   dependencies:
-    "@typescript-eslint/typescript-estree" "6.7.3"
-    "@typescript-eslint/utils" "6.7.3"
+    "@typescript-eslint/typescript-estree" "6.21.0"
+    "@typescript-eslint/utils" "6.21.0"
     debug "^4.3.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/types@6.7.3":
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.7.3.tgz#0402b5628a63f24f2dc9d4a678e9a92cc50ea3e9"
-  integrity sha512-4g+de6roB2NFcfkZb439tigpAMnvEIg3rIjWQ+EM7IBaYt/CdJt6em9BJ4h4UpdgaBWdmx2iWsafHTrqmgIPNw==
+"@typescript-eslint/types@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d"
+  integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg==
 
-"@typescript-eslint/typescript-estree@6.7.3":
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.7.3.tgz#ec5bb7ab4d3566818abaf0e4a8fa1958561b7279"
-  integrity sha512-YLQ3tJoS4VxLFYHTw21oe1/vIZPRqAO91z6Uv0Ss2BKm/Ag7/RVQBcXTGcXhgJMdA4U+HrKuY5gWlJlvoaKZ5g==
+"@typescript-eslint/typescript-estree@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.21.0.tgz#c47ae7901db3b8bddc3ecd73daff2d0895688c46"
+  integrity sha512-6npJTkZcO+y2/kr+z0hc4HwNfrrP4kNYh57ek7yCNlrBjWQ1Y0OS7jiZTkgumrvkX5HkEKXFZkkdFNkaW2wmUQ==
   dependencies:
-    "@typescript-eslint/types" "6.7.3"
-    "@typescript-eslint/visitor-keys" "6.7.3"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/visitor-keys" "6.21.0"
     debug "^4.3.4"
     globby "^11.1.0"
     is-glob "^4.0.3"
+    minimatch "9.0.3"
     semver "^7.5.4"
     ts-api-utils "^1.0.1"
 
-"@typescript-eslint/utils@6.7.3":
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.7.3.tgz#96c655816c373135b07282d67407cb577f62e143"
-  integrity sha512-vzLkVder21GpWRrmSR9JxGZ5+ibIUSudXlW52qeKpzUEQhRSmyZiVDDj3crAth7+5tmN1ulvgKaCU2f/bPRCzg==
+"@typescript-eslint/utils@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.21.0.tgz#4714e7a6b39e773c1c8e97ec587f520840cd8134"
+  integrity sha512-NfWVaC8HP9T8cbKQxHcsJBY5YE1O33+jpMwN45qzWWaPDZgLIbo12toGMWnmhvCpd3sIxkpDw3Wv1B3dYrbDQQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.4.0"
     "@types/json-schema" "^7.0.12"
     "@types/semver" "^7.5.0"
-    "@typescript-eslint/scope-manager" "6.7.3"
-    "@typescript-eslint/types" "6.7.3"
-    "@typescript-eslint/typescript-estree" "6.7.3"
+    "@typescript-eslint/scope-manager" "6.21.0"
+    "@typescript-eslint/types" "6.21.0"
+    "@typescript-eslint/typescript-estree" "6.21.0"
     semver "^7.5.4"
 
-"@typescript-eslint/visitor-keys@6.7.3":
-  version "6.7.3"
-  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.7.3.tgz#83809631ca12909bd2083558d2f93f5747deebb2"
-  integrity sha512-HEVXkU9IB+nk9o63CeICMHxFWbHWr3E1mpilIQBe9+7L/lH97rleFLVtYsfnWB+JVMaiFnEaxvknvmIzX+CqVg==
+"@typescript-eslint/visitor-keys@6.21.0":
+  version "6.21.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.21.0.tgz#87a99d077aa507e20e238b11d56cc26ade45fe47"
+  integrity sha512-JJtkDduxLi9bivAB+cYOVMtbkqdPOhZ+ZI5LC47MIRrDV4Yn2o+ZnW10Nkmr28xRpSpdJ6Sm42Hjf2+REYXm0A==
   dependencies:
-    "@typescript-eslint/types" "6.7.3"
+    "@typescript-eslint/types" "6.21.0"
     eslint-visitor-keys "^3.4.1"
 
 abort-controller@^3.0.0:
@@ -1205,12 +1191,12 @@ brace-expansion@^2.0.1:
   dependencies:
     balanced-match "^1.0.0"
 
-braces@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.2.tgz#3454e1a462ee8d599e236df336cd9ea4f8afe107"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+braces@^3.0.3:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 browserslist@^4.22.2:
   version "4.22.2"
@@ -1248,17 +1234,6 @@ bundle-name@^3.0.0:
   dependencies:
     run-applescript "^5.0.0"
 
-call-bind@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.7.tgz#06016599c40c56498c18769d2730be242b6fa3b9"
-  integrity sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==
-  dependencies:
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    set-function-length "^1.2.1"
-
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
@@ -1330,11 +1305,6 @@ co@^4.6.0:
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
   integrity sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==
 
-code-block-writer@^12.0.0:
-  version "12.0.0"
-  resolved "https://registry.yarnpkg.com/code-block-writer/-/code-block-writer-12.0.0.tgz#4dd58946eb4234105aff7f0035977b2afdc2a770"
-  integrity sha512-q4dMFMlXtKR3XNBHyMHt/3pwYNA69EDk00lloMOaaUMKPUXBw6lpXtbu3MMVG6/uOihGnRDOlkyqsONEUj60+w==
-
 collect-v8-coverage@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz#c0b29bcd33bcd0779a1344c2136051e6afd3d9e9"
@@ -1400,21 +1370,28 @@ create-require@^1.1.0:
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
 cross-spawn@^7.0.2, cross-spawn@^7.0.3:
-  version "7.0.3"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
-  integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.6.tgz#8a58fe78f00dcd70c370451759dfbfaf03e8ee9f"
+  integrity sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==
   dependencies:
     path-key "^3.1.0"
     shebang-command "^2.0.0"
     which "^2.0.1"
 
-debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4:
+debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2:
   version "4.3.4"
   resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.4.tgz#1319f6579357f2338d3337d2cdd4914bb5dcc865"
   integrity sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==
   dependencies:
     ms "2.1.2"
 
+debug@^4.3.4:
+  version "4.3.7"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.7.tgz#87945b4151a011d76d95a198d7111c865c360a52"
+  integrity sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==
+  dependencies:
+    ms "^2.1.3"
+
 dedent@^1.0.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/dedent/-/dedent-1.5.1.tgz#4f3fc94c8b711e9bb2800d185cd6ad20f2a90aff"
@@ -1448,15 +1425,6 @@ default-browser@^4.0.0:
     execa "^7.1.1"
     titleize "^3.0.0"
 
-define-data-property@^1.1.4:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/define-data-property/-/define-data-property-1.1.4.tgz#894dc141bb7d3060ae4366f6a0107e68fbe48c5e"
-  integrity sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==
-  dependencies:
-    es-define-property "^1.0.0"
-    es-errors "^1.3.0"
-    gopd "^1.0.1"
-
 define-lazy-prop@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz#dbb19adfb746d7fc6d734a06b72f4a00d021255f"
@@ -1523,18 +1491,6 @@ error-ex@^1.3.1:
   dependencies:
     is-arrayish "^0.2.1"
 
-es-define-property@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/es-define-property/-/es-define-property-1.0.0.tgz#c7faefbdff8b2696cf5f46921edfb77cc4ba3845"
-  integrity sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==
-  dependencies:
-    get-intrinsic "^1.2.4"
-
-es-errors@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/es-errors/-/es-errors-1.3.0.tgz#05f75a25dab98e4fb1dcd5e1472c0546d5057c8f"
-  integrity sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==
-
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -1583,12 +1539,7 @@ eslint-scope@^7.2.2:
     esrecurse "^4.3.0"
     estraverse "^5.2.0"
 
-eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1:
-  version "3.4.2"
-  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.2.tgz#8c2095440eca8c933bedcadf16fefa44dbe9ba5f"
-  integrity sha512-8drBzUEyZ2llkpCA67iYrgEssKDUu68V8ChqqOfFupIaG/LCVPUT+CoGJpT77zJprs4T/W7p07LP7zAIMuweVw==
-
-eslint-visitor-keys@^3.4.3:
+eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
@@ -1746,18 +1697,7 @@ fast-glob@^3.2.12:
     merge2 "^1.3.0"
     micromatch "^4.0.4"
 
-fast-glob@^3.2.9:
-  version "3.3.1"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.1.tgz#784b4e897340f3dbbef17413b3f11acf03c874c4"
-  integrity sha512-kNFPyjhh5cKjrUltxs+wFx+ZkbRaxxmZ+X0ZU31SOsxCEtP9VPgtq2teZw1DebupL5GmDaNQ6yKMMVcM41iqDg==
-  dependencies:
-    "@nodelib/fs.stat" "^2.0.2"
-    "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.2"
-    merge2 "^1.3.0"
-    micromatch "^4.0.4"
-
-fast-glob@^3.3.0:
+fast-glob@^3.2.9, fast-glob@^3.3.0:
   version "3.3.2"
   resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129"
   integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==
@@ -1779,9 +1719,9 @@ fast-levenshtein@^2.0.6:
   integrity sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==
 
 fastq@^1.6.0:
-  version "1.15.0"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.15.0.tgz#d04d07c6a2a68fe4599fea8d2e103a937fae6b3a"
-  integrity sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==
+  version "1.17.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.17.1.tgz#2a523f07a4e7b1e81a42b91b8bf2254107753b47"
+  integrity sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==
   dependencies:
     reusify "^1.0.4"
 
@@ -1799,10 +1739,10 @@ file-entry-cache@^6.0.1:
   dependencies:
     flat-cache "^3.0.4"
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -1882,17 +1822,6 @@ get-caller-file@^2.0.5:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
-get-intrinsic@^1.1.3, get-intrinsic@^1.2.4:
-  version "1.2.4"
-  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.2.4.tgz#e385f5a4b5227d449c3eabbad05494ef0abbeadd"
-  integrity sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==
-  dependencies:
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    has-proto "^1.0.1"
-    has-symbols "^1.0.3"
-    hasown "^2.0.0"
-
 get-package-type@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/get-package-type/-/get-package-type-0.1.0.tgz#8de2d803cff44df3bc6c456e6668b36c3926e11a"
@@ -1958,13 +1887,6 @@ globby@^11.1.0:
     merge2 "^1.4.1"
     slash "^3.0.0"
 
-gopd@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/gopd/-/gopd-1.0.1.tgz#29ff76de69dac7489b7c0918a5788e56477c332c"
-  integrity sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==
-  dependencies:
-    get-intrinsic "^1.1.3"
-
 graceful-fs@^4.2.9:
   version "4.2.11"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.11.tgz#4183e4e8bf08bb6e05bbb2f7d2e0c8f712ca40e3"
@@ -1985,23 +1907,6 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-property-descriptors@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz#963ed7d071dc7bf5f084c5bfbe0d1b6222586854"
-  integrity sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==
-  dependencies:
-    es-define-property "^1.0.0"
-
-has-proto@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-proto/-/has-proto-1.0.3.tgz#b31ddfe9b0e6e9914536a6ab286426d0214f77fd"
-  integrity sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==
-
-has-symbols@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
-  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
-
 hasown@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.0.tgz#f4c513d454a57b7c7e1650778de226b11700546c"
@@ -2031,10 +1936,17 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
+iconv-lite@^0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 ignore@^5.2.0, ignore@^5.2.4:
-  version "5.2.4"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324"
-  integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ==
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
 import-fresh@^3.2.1:
   version "3.3.0"
@@ -2710,11 +2622,11 @@ merge2@^1.3.0, merge2@^1.4.1:
   integrity sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==
 
 micromatch@^4.0.4:
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.5.tgz#bc8999a7cbbf77cdc89f132f6e467051b49090c6"
-  integrity sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.8.tgz#d66fa18f3a47076789320b9b1af32bd86d9fa202"
+  integrity sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==
   dependencies:
-    braces "^3.0.2"
+    braces "^3.0.3"
     picomatch "^2.3.1"
 
 mime-db@1.51.0:
@@ -2739,6 +2651,13 @@ mimic-fn@^4.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-4.0.0.tgz#60a90550d5cb0b239cca65d893b1a53b29871ecc"
   integrity sha512-vqiC06CuhBTUdZH+RYl8sFrL096vA45Ok5ISO6sE/Mr1jRbGH4Csnhi8f3wKVl7x8mO4Au7Ir9D3Oyv1VYMFJw==
 
+minimatch@9.0.3:
+  version "9.0.3"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825"
+  integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b"
@@ -2746,29 +2665,17 @@ minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2:
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^7.4.3:
-  version "7.4.6"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.6.tgz#845d6f254d8f4a5e4fd6baf44d5f10c8448365fb"
-  integrity sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimist@^1.2.6:
   version "1.2.6"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44"
   integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q==
 
-mkdirp@^2.1.6:
-  version "2.1.6"
-  resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-2.1.6.tgz#964fbcb12b2d8c5d6fbc62a963ac95a273e2cc19"
-  integrity sha512-+hEnITedc8LAtIP9u3HJDFIdcLV2vXP33sqLLIzkv1Db1zO/1OxbvYf0Y1OC/S/Qo5dxHXepofhmxL02PsKe+A==
-
 ms@2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
 
-ms@^2.0.0:
+ms@^2.0.0, ms@^2.1.3:
   version "2.1.3"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
   integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
@@ -2819,11 +2726,6 @@ npm-run-path@^5.1.0:
   dependencies:
     path-key "^4.0.0"
 
-object-inspect@^1.13.1:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.13.2.tgz#dea0088467fb991e67af4058147a24824a3043ff"
-  integrity sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3g==
-
 once@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
@@ -2931,11 +2833,6 @@ parse-json@^5.2.0:
     json-parse-even-better-errors "^2.3.0"
     lines-and-columns "^1.1.6"
 
-path-browserify@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-1.0.1.tgz#d98454a9c3753d5790860f16f68867b9e46be1fd"
-  integrity sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==
-
 path-exists@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
@@ -3032,13 +2929,6 @@ pure-rand@^6.0.0:
   resolved "https://registry.yarnpkg.com/pure-rand/-/pure-rand-6.0.4.tgz#50b737f6a925468679bff00ad20eade53f37d5c7"
   integrity sha512-LA0Y9kxMYv47GIPJy6MI84fqTd2HmYZI83W/kM/SkKfDlajnZYfmXFTxkbY+xSBPkLJxltMa9hIkmdc29eguMA==
 
-qs@^6.10.3:
-  version "6.12.3"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.12.3.tgz#e43ce03c8521b9c7fd7f1f13e514e5ca37727754"
-  integrity sha512-AWJm14H1vVaO/iNZ4/hO+HyaTehuy9nRqVdkTqlJt0HWvBiBIEXFmb4C0DGeYo3Xes9rrEW+TxHsaigCbN5ICQ==
-  dependencies:
-    side-channel "^1.0.6"
-
 queue-microtask@^1.2.2:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -3125,29 +3015,27 @@ safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
+"safer-buffer@>= 2.1.2 < 3.0.0":
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
+  integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
+
 semver@^6.3.0, semver@^6.3.1:
   version "6.3.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4"
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
-semver@^7.5.3, semver@^7.5.4:
+semver@^7.5.3:
   version "7.5.4"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e"
   integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA==
   dependencies:
     lru-cache "^6.0.0"
 
-set-function-length@^1.2.1:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/set-function-length/-/set-function-length-1.2.2.tgz#aac72314198eaed975cf77b2c3b6b880695e5449"
-  integrity sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==
-  dependencies:
-    define-data-property "^1.1.4"
-    es-errors "^1.3.0"
-    function-bind "^1.1.2"
-    get-intrinsic "^1.2.4"
-    gopd "^1.0.1"
-    has-property-descriptors "^1.0.2"
+semver@^7.5.4:
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
+  integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
 
 shebang-command@^2.0.0:
   version "2.0.0"
@@ -3161,16 +3049,6 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-side-channel@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
-  integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
-  dependencies:
-    call-bind "^1.0.7"
-    es-errors "^1.3.0"
-    get-intrinsic "^1.2.4"
-    object-inspect "^1.13.1"
-
 signal-exit@^3.0.3, signal-exit@^3.0.7:
   version "3.0.7"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9"
@@ -3355,9 +3233,9 @@ tr46@~0.0.3:
   integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o=
 
 ts-api-utils@^1.0.1:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
-  integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.3.0.tgz#4b490e27129f1e8e686b45cc4ab63714dc60eea1"
+  integrity sha512-UQMIo7pb8WRomKR1/+MFVLTroIvDVtMX3K6OUir8ynLyzB8Jeriont2bTAtmNPa1ekAgN7YPDyf6V+ygrdU+eQ==
 
 ts-jest@^29.1.0:
   version "29.1.1"
@@ -3373,14 +3251,6 @@ ts-jest@^29.1.0:
     semver "^7.5.3"
     yargs-parser "^21.0.1"
 
-ts-morph@^19.0.0:
-  version "19.0.0"
-  resolved "https://registry.yarnpkg.com/ts-morph/-/ts-morph-19.0.0.tgz#43e95fb0156c3fe3c77c814ac26b7d0be2f93169"
-  integrity sha512-D6qcpiJdn46tUqV45vr5UGM2dnIEuTGNxVhg0sk5NX11orcouwj6i1bMqZIz2mZTZB1Hcgy7C3oEVhAT+f6mbQ==
-  dependencies:
-    "@ts-morph/common" "~0.20.0"
-    code-block-writer "^12.0.0"
-
 ts-node@^10.5.0:
   version "10.7.0"
   resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.7.0.tgz#35d503d0fab3e2baa672a0e94f4b40653c2463f5"
@@ -3518,11 +3388,6 @@ web-streams-polyfill@4.0.0-beta.1:
   resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-4.0.0-beta.1.tgz#3b19b9817374b7cee06d374ba7eeb3aeb80e8c95"
   integrity sha512-3ux37gEX670UUphBF9AMCq8XM6iQ8Ac6A+DSRRjDoRBm1ufCkaCDdNVbaqq60PsEkdNlLKrGtv/YBP4EJXqNtQ==
 
-web-streams-polyfill@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/web-streams-polyfill/-/web-streams-polyfill-3.2.1.tgz#71c2718c52b45fd49dbeee88634b3a60ceab42a6"
-  integrity sha512-e0MO3wdXWKrLbL0DgGnUV7WHVuw9OUvL4hjgnPkIeEvESk74gAITi5G606JtZPp39cd8HA9VQzCIvA49LpPN5Q==
-
 webidl-conversions@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871"